mark_story
4b8c469004
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/VERSION.txt
2012-05-26 21:11:36 -04:00
José Lorenzo Rodríguez
33eb46cd87
Merge pull request #666 from boast/patch-1
...
Fixed XmlArticle and XmlUser Models associations.
2012-05-22 21:41:04 -07:00
David Thalmann
81fedbba9c
Fixed XmlArticle and XmlUser Models associations. Fixes failing testWithModel
test and does no longer try to use the 'default' datasource.
2012-05-23 07:19:06 +03:00
mark_story
5270721ade
Remove bonus intval()
...
It caused issues when getting numeric keys that
exceeded PHP_INT_MAX.
Fixes #2897
2012-05-22 22:33:46 -04:00
Jelle Henkens
7d080ea2d1
Adding an assert to check for zero prefixed numbers
2012-05-22 16:32:16 +01:00
Jelle Henkens
7546be6394
Adding a validation rule for checking natural numbers
2012-05-21 13:39:31 +01:00
ADmad
cfd9d8a815
Added CakeTime::listIdentifiers()
2012-05-21 03:05:42 +05:30
Jelle Henkens
97ebbc8e23
Fixing coding conventions
2012-05-19 16:08:40 +01:00
Jelle Henkens
5fe22cfc8d
Adding support for DateTime objects in the CakeTime Utility class
2012-05-17 19:31:30 +01:00
Rachman Chavik
f89bc6503a
CakeTime::format crashed when timezone is passed
2012-05-17 19:05:45 +07:00
mark_story
4dc07b6d39
Merge branch '2.1' into 2.2
2012-05-16 21:08:06 -04:00
mark_story
c6258fa68c
HTML escape context variables.
...
When creating HTML or js errors the context should be
escaped, as it is very possible that the context vars will contain
HTML.
Clean up some internals in Debugger::outputError(). There were
a few duplicate data structures, and $$ variables.
Fixes #2884
2012-05-16 21:07:45 -04:00
Jelle Henkens
0d9506fa2e
Fixing issue where nice and niceShort did not use the timezone if no dateString is passed
2012-05-13 13:43:06 +01:00
mark_story
d9244048b6
Fix hard coded date.
2012-05-12 23:25:11 -04:00
mark_story
683146de14
Add a few more tests.
2012-05-12 22:26:34 -04:00
mark_story
ca8046bfea
Fix whitespace and formatting.
2012-05-12 22:26:33 -04:00
mark_story
a80a7dadf8
Re-factor element generation.
...
Add the ability for arbitrary attributes.
Use built-in methods for attribute generation.
Add tests for element generation.
2012-05-12 22:26:33 -04:00
mark_story
fd5a8a8d6b
Fix code standards.
...
Remove failing test, and fix coding standards.
2012-05-12 22:26:33 -04:00
Magnus Johansson
9fa531d6e3
Added test cases for new features.
2012-05-12 22:26:33 -04:00
ADmad
14b7210d2b
Fixed server offset calculation
2012-05-13 06:20:29 +05:30
Rachman Chavik
edb44aadea
Merge branch '2.1' into 2.2
2012-05-11 12:34:26 +07:00
Rachman Chavik
15a74722b3
use LOGS constant
2012-05-11 08:33:53 +07:00
Ceeram
fe0c7d348a
add strict parameter to inList() and multiple()
2012-05-07 16:29:13 +02:00
mark_story
7b5e45b965
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Model/Datasource/DataSource.php
lib/Cake/VERSION.txt
2012-05-03 21:06:35 -04:00
mark_story
4ab6d37abb
Update assertions.
...
Use assertXmlStringEqualsXmlString() it gives
better error reporting. Also update string concat
into heredocs.
2012-05-03 21:00:52 -04:00
mark_story
73b0345ff4
Fix issue with non-sequential array keys.
...
Xml::fromArray() should not cause errors with non-sequential
numeric array keys.
Fixes #2580
2012-05-03 20:35:01 -04:00
Jose Lorenzo Rodriguez
bf0f5ab118
Merge remote-tracking branch 'origin/2.1' into 2.2
2012-04-29 20:05:39 -04:30
Kyle Robinson Young
b8488b8dfe
Update 1.x @link in docblocks
2012-04-26 19:49:18 -07:00
euromark
ba8a3c5f07
added missing utf8_encode to pass tests on windows
2012-04-27 02:39:32 +02:00
Rachman Chavik
2f87992d15
File::create() does not need to change umask
...
umask(0) causes all files to be created with 666 permission.
After input from jrbasso and AD7six, this was found to be an
additional code to support caching using file engine.
FileEngine has since moved to SplFile since 2.x and thus umask
juggling is not required anymore.
Refs: f9f1c4df5
Cherrypicked from 2.2 branch.
2012-04-24 23:35:32 +07:00
Rachman Chavik
74830b9b93
File::create() does not need to change umask
...
umask(0) causes all files to be created with 666 permission.
After input from jrbasso and AD7six, this was found to be an
additional code to support caching using file engine.
FileEngine has since moved to SplFile since 2.x and thus umask
juggling is not required anymore.
Refs: f9f1c4df5
2012-04-24 23:17:28 +07:00
mark_story
b6de177ffa
Merge branch '2.1' into 2.2
2012-04-23 21:50:36 -04:00
mark_story
13468937cc
Fix singularization of databases.
...
Fixes #2822
2012-04-23 21:01:03 -04:00
ADmad
058d57a85a
Added function to convert time from user timezone to server timezone.
2012-04-22 01:59:26 +05:30
ADmad
ebf304927b
Added "Config.timezone" config param to avoid having to specify timezone in each function call.
2012-04-22 01:59:26 +05:30
ADmad
d34f0c2bd8
CakeTime functions can now use timezone string or DateTimeZone object for user offsets. (Passing numeric offsets has been kept for BC)
2012-04-22 01:59:08 +05:30
euromark
8a52a77cbc
correct argument order for phpunit asserts
2012-04-21 15:19:57 +02:00
euromark
bc2cd00123
cake 2.2 test case fixes (assert corrections, correct class names)
2012-04-21 15:02:35 +02:00
mark_story
21ba5bf04a
Merge branch '2.1' into 2.2
2012-04-17 21:47:24 -04:00
Cauan Cabral
18aa5a040f
Include test to .0 and .00 decimals
2012-04-17 20:22:32 -04:00
Cauan Cabral
28bd6880df
Make Validation::decimal accept integers
...
Fix #2800
Force locale of ValidationTests with en_US to ensure decimal dot separator
2012-04-17 20:22:22 -04:00
mark_story
72c3059d94
Add missing parent calls.
...
Fixes piles of failing tests.
2012-04-15 22:20:34 -04:00
mark_story
f677bfea7d
Remove duplicated test code.
2012-04-10 22:26:33 -04:00
mark_story
a4f0399f74
Fix coding standards warnings.
2012-04-10 22:16:14 -04:00
mark_story
9f9feec222
Merge branch '2.2-hash' into 2.2
...
Conflicts:
lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
lib/Cake/View/Helper/FormHelper.php
2012-04-10 21:32:37 -04:00
mark_story
15c94dee4d
Fix whitespace and remove duplicate method calls.
2012-04-07 14:42:25 -04:00
mark_story
a24aca6ffc
Fix a few code standards errors.
2012-04-06 22:56:01 -04:00
Ceeram
7700a0261b
only use and test SORT_NATURAL on PHP 5.4
2012-04-04 18:21:52 +02:00
mark_story
e5ca80b711
Add additional sort flag support.
...
Add natural, numeric, and string sorting to Hash.
Fixes #1700
2012-04-01 23:09:15 -04:00
mark_story
475a1596b7
Merge branch '2.1' into 2.2
2012-04-01 15:37:21 -04:00
mark_story
a463033ee9
Set -> Hash
2012-03-31 08:49:04 -04:00
Kyle Robinson Young
4370bf280a
Support multiple bytes with thousands/decimals in CakeNumber::format < PHP5.4
...
Fixes #2602
2012-03-28 10:46:31 -07:00
Mark Story
0443fe1507
Merge pull request #584 from shama/patch-inpath-test
...
Add test/doc for reverse Folder::inPath()
2012-03-27 16:50:38 -07:00
Kyle Robinson Young
deb5a57cb9
Add test/doc for reverse Folder::inPath()
2012-03-27 11:55:13 -07:00
mark_story
95d4549c9b
Docs + coding standards.
2012-03-26 22:57:50 -04:00
mark_story
c087576f20
Port changes done to Set into Hash
...
See #2722
2012-03-26 22:39:13 -04:00
mark_story
66eabe462a
Copy Set::expand into Hash class.
2012-03-26 22:32:58 -04:00
mark_story
9015d78017
Port most recent changes in Set to Hash.
...
See [68eeee80d8
] and
[af575027da
]
2012-03-26 22:32:56 -04:00
mark_story
0ef9adba93
Move and rename pushDiff onto Hash.
...
Its used internally in a number of places and diff() + merge()
are not an resonable replacement.
2012-03-26 22:32:54 -04:00
mark_story
8becc4c985
Fix misnamed method calls.
2012-03-26 22:25:40 -04:00
mark_story
2231087ba3
Rename Set2 -> Hash.
2012-03-26 22:25:40 -04:00
mark_story
239f52c48c
Move nest() over
...
Make get() able to take arrays for $path.
2012-03-26 22:25:40 -04:00
mark_story
afa0329330
Fix incomplete test.
2012-03-26 22:25:39 -04:00
mark_story
ae66682c35
Add apply(), map() and reduce()
...
Add tests as well.
2012-03-26 22:25:39 -04:00
mark_story
8cadac3ee5
Add tests for issue #104
2012-03-26 22:25:39 -04:00
mark_story
ff5e72c9a7
Move Set::format across.
...
Remove the {0} style of formatting. Custom formatting
syntax is a bit silly. sprintf() is more than expressive enough
for this method.
2012-03-26 22:25:39 -04:00
mark_story
e4a505797d
Move combine() across.
2012-03-26 22:25:39 -04:00
mark_story
aa4dca6c0c
Move Set::check across.
2012-03-26 22:25:39 -04:00
mark_story
771efd950e
Fix sort() not working.
2012-03-26 22:25:38 -04:00
mark_story
3d8a955043
Add remove() and insert()
...
Also add support for multi insert and multi remove.
2012-03-26 22:25:38 -04:00
mark_story
6b69ed269a
Extracting duplicate loops.
2012-03-26 22:25:38 -04:00
mark_story
e72127e359
WIP, adding sort() and remove()
2012-03-26 22:25:37 -04:00
mark_story
31181f58d6
Add attribute pattern matching.
2012-03-26 22:25:37 -04:00
mark_story
cbfa938303
Fix muliple attribute conditions.
2012-03-26 22:25:37 -04:00
mark_story
8ad4e66eba
Making attributes work with any selector type.
...
Attributes work with all base selectors.
2012-03-26 22:25:37 -04:00
mark_story
9269a6dcde
Added some more operators.
...
Attribute + {n} is still not working.
2012-03-26 22:25:36 -04:00
mark_story
6c87be97ef
Implement presence and equality attributes.
2012-03-26 22:25:36 -04:00
mark_story
e87901ac6d
Adding tests for {n} and {s}
2012-03-26 22:25:36 -04:00
mark_story
37181e99a8
Basic path selectors implemented for extract().
2012-03-26 22:25:36 -04:00
mark_story
b3861c01dc
Move numeric() into Set2.
2012-03-26 22:25:36 -04:00
mark_story
1315e0f1a1
Moving filter() into Set2.
2012-03-26 22:25:35 -04:00
mark_story
885d5dfd80
Make contains() non-recursive.
...
Add a few more tests for contains().
2012-03-26 22:25:35 -04:00
mark_story
d37e10a8a9
Move contains() across.
...
Fix a few issues in contains() with nested needle values.
2012-03-26 22:25:35 -04:00
mark_story
ad65098348
Move normalize() into Set2.
...
Dropping the ability to 'normalize' string data.
2012-03-26 22:25:34 -04:00
mark_story
e736ea3af9
Move merge() into Set2.
2012-03-26 22:25:34 -04:00
mark_story
51f45c0f28
Moving flatten() across.
...
It is no longer recursive either.
2012-03-26 22:25:34 -04:00
mark_story
51e3ee0425
Adding dimensions() and maxDimensions()
...
Splitting the Set::countDim() into two methods. This creates a simpler
API, as each method only does one job, and only has one argument. Also
replacing recursion with iteration.
2012-03-26 22:25:34 -04:00
mark_story
328513d35e
Start Set2.
2012-03-26 22:25:33 -04:00
mark_story
6b045318d8
Merge branch '2.1' into 2.2
2012-03-26 22:24:30 -04:00
mark_story
b3d886fe82
Fix Set::insert() not overwriting values.
...
Set::insert() failed to overwrite values that were previously
defined as strings. Remove test in SessionComponentTest that was
ensuring this bug stuck around.
Fixes #2722
2012-03-26 21:50:53 -04:00
Thomas Ploch
fda065101b
Fixed test cases for successful being built on travis.
2012-03-24 21:32:31 +01:00
Ceeram
d748fc7451
Merge branch '2.1' into 2.2
2012-03-23 16:32:04 +01:00
Kyle Robinson Young
90e7afbdc7
Correct parameter order of assertEquals and assertNotEquals
2012-03-22 23:37:12 -07:00
Ceeram
c9528b8446
Merge branch '2.1' into 2.2
2012-03-21 11:19:08 +01:00
mark_story
edd54e4ddf
Ignore the remaining errors.
...
They are just part of the test to compare objects + arrays.
No need to cause standards errors.
2012-03-19 21:38:51 -04:00
Ceeram
c38419e33a
Fixing test, some 5.2 installs do not have function to read mime
2012-03-19 09:52:09 +01:00
mark_story
67698248ca
Fix some coding standards errors.
2012-03-18 21:48:50 -04:00
dogmatic69
d3a44811ce
adding test and fix for hightlighting tags, old bug 2111 for 1.3 but its the same issue. This should make more options possible
2012-03-16 21:20:27 +00:00
Rachman Chavik
079ae8265c
Set::expand as implemented by jeremyharris
2012-03-15 20:07:49 +07:00
mark_story
1efee89169
Fix most coding standards issues in Test/Case/Utility
2012-03-13 22:59:20 -04:00