Jose Lorenzo Rodriguez
0f5fa290ed
Merge remote-tracking branch 'origin/master' into 2.3
2012-12-01 23:19:53 +01:00
mark_story
479aefc438
Update TLD validation to accept gTLD variations
...
The upcoming gTLD extensions will allow much more variety in TLD names.
Loosen the validation to better accept different length TLDs.
Fixes #3414
2012-11-30 22:11:57 -05:00
mark_story
889c1ebc09
Fix sorting empty data with Hash & Set.
...
Fixes #3420
2012-11-30 13:05:14 -05:00
ADmad
72d6ca636f
Docblock fixes
2012-11-29 04:36:29 +05:30
euromark
18fb132d41
some doc block corrections as well a !! to (bool) convertion
...
remove nonsense default value
2012-11-22 14:28:09 +01:00
mark_story
27d7e2865e
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Console/Command/ConsoleShell.php
lib/Cake/Network/CakeSocket.php
lib/Cake/Network/Http/HttpResponse.php
lib/Cake/Utility/Folder.php
lib/Cake/View/MediaView.php
lib/Cake/basics.php
2012-11-20 23:02:33 -05:00
ceeram
4611c987db
Merge pull request #959 from ceeram/phpcsw
...
Make phpcs pass
2012-11-19 15:10:47 -08:00
mark_story
fb275c5fa2
Fix warnings from file_get_contents() in Xml::build()
...
Use HttpSocket to get proper exceptions when trying to load XML from
remote servers.
Fixes #3379
2012-11-19 14:46:45 -05:00
mark_story
6b4afb989e
Fix Set::merge() failing to merge correctly.
...
When merging 3 values, and the 2nd was empty, the resulting
merge was incorrect.
Fixes #3384
2012-11-19 14:03:03 -05:00
euromark
83b0c5042f
correct the doc block
2012-11-16 23:32:56 +01:00
euromark
94f19ef4b8
deprecate attached()
2012-11-16 12:19:23 +01:00
euromark
8acdb129b2
unify object load/unload and loaded methods
2012-11-16 12:14:28 +01:00
Ceeram
e02eab05d5
Remove all todo from core, create tickets for them
2012-11-14 14:59:51 +01:00
Ceeram
56225bcca3
fix all warnings except TODO warnings
2012-11-14 12:56:10 +01:00
Heath Nail
895fcac0cd
Improve Blowfish Docblocks
2012-11-12 14:36:43 -05:00
mark_story
e0aab77dab
Merge branch 'master' into 2.3
...
Conflicts:
app/Config/Schema/i18n.php
lib/Cake/I18n/Multibyte.php
lib/Cake/Test/Case/Log/CakeLogTest.php
lib/Cake/Test/Case/Routing/DispatcherTest.php
2012-11-10 21:33:26 -05:00
mark_story
8b7b139353
Fix failing tests using chr(226) instead of unicode codes.
2012-11-09 22:32:29 -05:00
Alexander Hofbauer
c7fda5674e
Use bytcode sequence for unicode ellipsis
...
The codepoint for "horizontal ellipsis" is 0x2026, which enables a more
robust display of that character on different systems.
2012-11-09 09:38:28 +01:00
mark_story
ec3e85e31d
Update docs for the escape option in CakeNumber::currency()
...
Unfortunately, using actual bytes creates a host of problems for sites
not using UTF-8. Update the documentation to reflect reality, as
changing reality could cause more problems than it solves.
Closes #3351
2012-11-08 22:20:17 -05:00
mark_story
fe4f9f246a
Update docs for the escape option in CakeNumber::currency()
...
Unfortunately, using actual bytes creates a host of problems for sites
not using UTF-8. Update the documentation to reflect reality, as
changing reality could cause more problems than it solves.
Closes #3351
2012-11-08 22:19:51 -05:00
Ber Clausen
8b2b077119
Set::flatten() fails to generate keys when 'tip' value is an empty
...
array.
2012-11-02 19:23:55 -03:00
mark_story
60f9626838
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/Test/Case/View/MediaViewTest.php
2012-11-02 16:52:51 -04:00
Schlaefer
dfe54e90d6
removed Inflictor::slug()replacement from Ä to A
...
The slug replacement for Ä -> A is not necessary, because the better
replacement Ä -> Ae is already defined and also covered by the test case.
2012-11-01 15:47:50 +01:00
Ceeram
0196c6f686
code optimizing and simplify _crypt(), see PR #853
2012-11-01 14:15:52 +01:00
euromark
0f978195d6
coding standards regarding whitespaces
2012-10-27 00:46:12 +02:00
Ceeram
f4f4aa4a2a
Squashed commit of the following:
...
commit 22311a1e62934da757d53d7aecfce884f5a1ca10
Merge: fda331e d051b69
Author: Ceeram <c33ram@gmail.com>
Date: Fri Oct 26 14:40:24 2012 +0200
Merge branch '2.3' into currency
commit fda331eab169068763717f88838032b7c0c02c29
Author: Ceeram <c33ram@gmail.com>
Date: Sun Oct 7 23:53:03 2012 +0200
NumberHelper now also uses the default currency from CakeNumber, instead of default argument value
commit 967bf8e27ea2438f1972390b7ef78ae62e17a762
Author: Ceeram <c33ram@gmail.com>
Date: Sun Oct 7 18:01:35 2012 +0200
Adding feature to set default currency on CakeNumber, to make repetetive calls to CakeNumber::currency() more DRY
2012-10-26 19:32:39 +02:00
mark_story
c4b9fa6c7a
Fix failing tests.
2012-10-24 21:00:56 -04:00
dogmatic69
641ba9f3e6
Merge branch '2.3' into type-checks
...
Conflicts:
lib/Cake/Error/ExceptionRenderer.php
lib/Cake/Routing/Dispatcher.php
2012-10-24 19:03:44 +01:00
ADmad
1763f46340
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/bootstrap.php
2012-10-23 16:53:01 +05:30
Jose Lorenzo Rodriguez
9dc3b243ac
Correct inflection rules for cookies, fixes fixes #3291
2012-10-22 23:07:42 +02:00
Adam Taylor
4090c2e932
Remove trailing whitespace from comments
...
See http://groups.google.com/d/topic/cakephp-core/fuHTYMKVJno/discussion
2012-10-15 18:19:37 -06:00
mark_story
9a66768aa4
Merge branch 'master' into 2.3
2012-10-08 13:08:58 -04:00
mark_story
2232c7e15d
Update doc blocks to reflect reality.
...
Closes #3263
2012-10-08 10:58:53 -04:00
euromark
7383298410
making messages() and errors() reset themselves by default
2012-10-01 14:20:53 +02:00
dogmatic69
408e619c9f
Merge branch '2.3' into type-checks
...
Conflicts:
lib/Cake/Console/Command/Task/ModelTask.php
lib/Cake/Controller/Component/RequestHandlerComponent.php
lib/Cake/Model/Datasource/Database/Mysql.php
lib/Cake/Utility/CakeNumber.php
2012-10-01 02:08:00 +01:00
mark_story
e5503326ac
Fix coding standard error.
2012-09-27 21:44:19 -04:00
mark_story
8bbb1f166c
Revert "Attempting to get passing builds on travisci"
...
This reverts commit 61d6f716bc
.
2012-09-26 21:58:14 -04:00
mark_story
61d6f716bc
Attempting to get passing builds on travisci
...
Currently the 5.2 builds fail due to the length checks on blowfish
hashes. Try a shorter wall to see if those builds will pass.
2012-09-26 21:48:05 -04:00
Jose Lorenzo Rodriguez
d5c9d97dc1
Merge remote-tracking branch 'origin/master' into 2.3
...
Conflicts:
lib/Cake/Model/Behavior/TranslateBehavior.php
lib/Cake/Model/CakeSchema.php
lib/Cake/Utility/CakeTime.php
lib/Cake/Utility/ClassRegistry.php
lib/Cake/View/MediaView.php
2012-09-25 16:36:03 +02:00
Jose Lorenzo Rodriguez
6818d69fc3
Fixed issue in CakeTime that it would apply userOffset twice when using
...
the format() function
2012-09-25 15:23:46 +02:00
dogmatic69
b1f26b59a3
converting if ($foo != null) to if ($foo)
2012-09-21 23:30:43 +01:00
José Lorenzo Rodríguez
2818ec6eb4
Merge pull request #859 from dereuromark/2.3-format-delta
...
adding CakeNumber::formatDelta() and fixing issue with format()
2012-09-21 00:18:35 -07:00
dogmatic69
6d4f4b57d7
adding a plugin propery to models wwith tests for ticket #85
...
Merge pull request #696
2012-09-20 21:31:31 -04:00
euromark
8a070ca3dd
doc block
2012-09-20 01:45:05 +02:00
euromark
3fa6b96ad0
adding CakeNumber::formatDelta() and fixing issue with near-zero values and format()
2012-09-20 01:41:41 +02:00
mark_story
99cbd22969
Fix coding standards.
2012-09-18 14:52:46 -04:00
Ceeram
ff676b5ea4
allow for lowercase as well, also strip the unit part off before pow()
2012-09-18 17:15:33 +02:00
Ceeram
90c32add9c
opmitisation of fromReadableSize
2012-09-18 09:34:05 +02:00
Mark Story
07c5102de5
Merge pull request #850 from ceeram/2.2-filesize
...
Add CakeNumber::fromReadableSize() and Validation::filesize()
2012-09-17 17:55:23 -07:00
Ceeram
9530e68ae6
add default return value as parameter to use when size can not be determined
2012-09-17 13:21:50 +02:00
dogmatic69
aa87791432
replacing is_integer() with is_int()
2012-09-15 11:15:01 +01:00
dogmatic69
a38a616cba
changing join() to implode() for consistency
2012-09-15 11:06:02 +01:00
dogmatic69
cfadc4dbb0
strict type checks and removing some duplicate count() calls by setting a variable
2012-09-14 19:26:00 +01:00
dogmatic69
22a2e1b51e
converting $foo == / $foo == 0 to !$foo (and a few $foo === 0)
2012-09-14 18:42:25 +01:00
dogmatic69
cf8fccae96
converting $foo == null / $foo == false to !$foo
2012-09-14 18:26:30 +01:00
mark_story
c13ed3366b
Fix whitespace errors.
2012-09-13 21:06:14 -04:00
Mark Story
5081be171f
Merge pull request #821 from dereuromark/2.3-folder-merge
...
allow Folder to merge recursivly and add scheme option
2012-09-13 18:00:02 -07:00
mark_story
921c2c67ab
Fix strict error in 5.4
2012-09-13 20:59:17 -04:00
mark_story
ec54fa57c5
Merge branch 'simplify-cake-time' into 2.3
...
Conflicts:
lib/Cake/Utility/CakeTime.php
2012-09-13 20:45:59 -04:00
Mark Story
31ca237709
Merge pull request #831 from dogmatic69/sanitize-regex-cleanup
...
adjusting the way the regex is done so its easier to read
2012-09-13 14:41:36 -07:00
Mark Story
0f8262ec45
Merge pull request #833 from dogmatic69/simplify-class-registry
...
Simplify the ClassRegistry by removing else, and adding early returns
2012-09-13 14:39:37 -07:00
Mark Story
051362a734
Merge pull request #836 from dogmatic69/simplify-object-collection
...
PHP 5.4 strict error fix
2012-09-13 14:37:40 -07:00
dogmatic69
95b895b19a
Simplify the cake time class
...
Removed a lot of nested ?: code and nested if/else statements broken down
with early return. Moving a few variables lower down the function calls as
there are times when they are not even needed.
Also removed setting variables that are returned on the next line.
2012-09-13 22:17:01 +01:00
dogmatic69
173524ade2
PHP 5.4 strict error fix
2012-09-13 21:12:04 +01:00
dogmatic69
50333a2866
adjusting the way the regex is done so its easier to read
2012-09-13 21:03:38 +01:00
dogmatic69
dc3995f939
Simplify the ClassRegistry by removing else, early returns
2012-09-13 14:00:51 +01:00
José Lorenzo Rodríguez
395e5bab58
Merge pull request #832 from dogmatic69/cake-time-unused-var
...
adding the timezone as it was not being used
2012-09-13 00:10:22 -07:00
dogmatic69
cf361040a4
adding the timezone as it was not being used
2012-09-13 06:45:44 +01:00
dogmatic69
b1db2aeb31
fixing the missing space on the if
2012-09-13 06:24:36 +01:00
Mark Story
25b447149d
Merge pull request #827 from dogmatic69/simplify-object-collection
...
simplify the code for object collection
2012-09-12 18:36:28 -07:00
Mark Story
5d8ca79b00
Merge pull request #825 from dogmatic69/sanitize-simplify-code
...
Simplify the code for sanitize class
2012-09-12 18:23:10 -07:00
dogmatic69
b84224804e
that change did make wonky uuids
2012-09-12 23:52:04 +01:00
dogmatic69
91c09d87bc
simplify the code for object collection
...
Fixed up some abreviated variables, removing extra long lines and removed
variables that were not used.
2012-09-12 21:56:59 +01:00
dogmatic69
44f8f84cd7
Simplify the code for sanitize class
...
removing else statements and variables that are not needed.
eg: return something(); vs $foo = something(); return $foo;
2012-09-12 21:29:40 +01:00
dogmatic69
f886d874a6
simplify the code in the string class
...
removing else statements and variables that are not needed.
eg: return something(); vs $foo = something(); return $foo;
2012-09-12 18:10:50 +01:00
euromark
2d9d400ecb
correct spelling
2012-09-10 23:08:14 +02:00
euromark
37068539bd
allow Folder to merge recursivly and add scheme option
2012-09-10 10:23:52 +02:00
Mark Story
93004fcf2f
Merge pull request #818 from shama/patch-unused-vars
...
Remove unused variables and code
2012-09-05 17:50:06 -07:00
Kyle Robinson Young
bc40ac7d3f
Remove unused variables and code
2012-09-05 17:19:13 -07:00
mark_story
6664acba79
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/VERSION.txt
2012-09-05 20:15:36 -04:00
Kyle Robinson Young
a214fcd992
Remove never reached code in Debugger::trimPath and test more results
2012-09-05 15:57:53 -07:00
Kyle Robinson Young
200dd2dc9b
Code standards fixes, unneeded break statements
2012-09-04 11:30:52 -07:00
mark_story
728300786b
Merge branch 'master' into 2.3
2012-08-30 19:43:11 +01:00
Ber Clausen
63548267e9
Refactor Validator::decimal() to be more flexible with decimal
...
separators and PHP magic.
Lots of testing added.
2012-08-27 23:25:17 -03:00
mark_story
b68a2ed84d
Update API docs.
2012-08-26 22:15:18 -04:00
mark_story
d66d37c92b
Merge branch 'master' into 2.3
2012-08-24 22:50:29 -04:00
Ber Clausen
b75a6b440a
Treat float numbers with trailing zeroes removed by PHP, accordingly.
...
Revert #2800 (28bd6880df
) regex changes. Also add more tests.
Signed-off-by: mark_story <mark@mark-story.com>
2012-08-24 22:22:12 -04:00
mark_story
24b68ec1db
Ensure = is removed from generated salt values.
2012-08-24 09:35:33 -04:00
euromark
7969062614
legacy support with test cases
2012-08-17 13:57:47 +02:00
euromark
f201684873
use html ellipsis if possible (only a single char and therefore does not line break or mess up the strlen count for length)
2012-08-17 13:31:01 +02:00
Mark Story
9e96c473f4
Merge pull request #752 from dereuromark/2.3-truncate-tail
...
String::tail()
2012-08-16 11:02:06 -07:00
mark_story
4487673060
Merge branch 'master' into 2.3
2012-08-09 20:43:47 -04:00
mark_story
b29cc6a9b6
Try again at fixing errors in 5.2
2012-08-08 23:09:44 -04:00
mark_story
c94a684be8
Try to fix recursion issues in PHP5.2.
2012-08-08 22:42:44 -04:00
mark_story
dca050fbd6
Fix errors with recursion in debug()
...
Fixes #3102
2012-08-08 22:30:27 -04:00
mark_story
57c495f53a
Enabled Debugger::exportVar() to display private & protected properties.
...
This will only work in PHP >= 5.3. Patch originally created
by 'dereuromark'.
2012-08-06 13:32:52 -04:00
euromark
2a570e639c
ellipsis instead of ending/beginning for core wide consistency
2012-08-04 19:58:23 +02:00
euromark
853fa7d95b
doc block correction
2012-08-03 10:54:16 +02:00
euromark
917d912a43
String::tail()
2012-08-02 13:21:31 +02:00
mark_story
d94cdc67fe
Merge branch 'master' into 2.3
2012-07-27 22:38:24 -04:00
mark_story
7d74f3e598
Increase context depth in error messages.
...
Fixes #3063
2012-07-24 23:39:48 -04:00
mark_story
70c714d600
Fix incorrect context being used for excerpt.
...
Fixes #3064
2012-07-24 23:37:37 -04:00
mark_story
2359fb7e2e
Simplify number formatting.
2012-07-22 21:28:49 -04:00
Heath Nail
434d3a7137
Add bcrypt support to Security::hash()
2012-07-22 21:15:00 -04:00
mark_story
468302b526
Merge branch 'master' into 2.3
2012-07-21 20:59:56 -04:00
U-Zyn Chua
e7c4064a69
Fix URL validation to allow underscores in subdomain.
2012-07-19 20:51:33 +08:00
mark_story
3c6b50953b
Merge branch 'master' into 2.3
...
Conflicts:
lib/Cake/VERSION.txt
2012-07-18 22:12:51 -04:00
euromark
3945c0e6a8
rtim files
2012-07-18 03:55:29 +02:00
mark_story
6c905411ba
Fix XML decoding attack via external entities.
2012-07-14 11:53:37 -04:00
Ceeram
6ec0afcf5d
Add CakeNumber::fromReadableSize() and Validation::filesize()
2012-06-26 12:17:25 +02:00
ADmad
76f93178a8
Tweaked Validation::extension()
2012-06-25 19:15:52 +05:30
mark_story
3f78216e96
Revert changes in behavior made to timeAgoInWords()
...
Changes made in [0729aca706
] changed
the generated text to not match the behavior in 2.1.
2012-06-24 20:54:47 -04:00
Juan Basso
ecdf0e6c6c
Optimization for Hash method
2012-06-24 12:47:30 -04:00
Jelle Henkens
db7d5426ec
CakeTime no longer sets the timezone out of its scope on the date object
2012-06-24 11:10:55 +01:00
Ceeram
03e2263b69
Merge branch '2.1' into 2.2
2012-06-19 18:35:36 +02:00
mark_story
001e89bf3f
Fix formatting with locales using , as decimal separator
...
Fixes #2958
2012-06-18 23:13:09 -04:00
Ceeram
74a0bd98c2
throw exception in Validation::mimeType() if PHP has nothing to provide the mimetype
2012-06-14 19:01:41 +02:00
mark_story
76dd49145a
Merge branch '2.1' into 2.2
2012-06-10 20:34:20 -04:00
mark_story
c31858635f
Don't OR options together.
...
By default FILTER_VALIDATE_IP does both.
2012-06-10 20:29:48 -04:00
mark_story
963f1ca449
Don't |= with null.
2012-06-10 20:21:59 -04:00
mark_story
7ae660c779
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Cache/Engine/XcacheEngine.php
2012-06-10 20:05:25 -04:00
mark_story
0a182b918f
Fix $depth being decremented by 2.
...
$depth should only be decremented once for each step-in.
Add special text when values are being elided by maximum nesting level.
Fixes #2946
2012-06-10 20:00:34 -04:00
mark_story
454fae9bd0
Fix Validation::ip() not respecting type.
...
Apply patch from 'Xavier Franquet' to fix ip(), so that
it does not always validate both IP versions.
Fixes #2944
2012-06-10 19:37:44 -04:00
Jose Lorenzo Rodriguez
2a90baae0c
Forgot to include complete patch in last commit :(
...
Note: It's not good to commit while watching tv
2012-06-09 15:01:27 -04:30
Jose Lorenzo Rodriguez
d13deb7da2
Fixing param usage introduced in previous commit
2012-06-09 14:52:03 -04:30
Jose Lorenzo Rodriguez
a2c2902dd6
Renaming param in CakeTime::format() to make its purpose more obvious,
...
added some examples in doc block
2012-06-09 08:45:46 -04:30
Jose Lorenzo Rodriguez
0d013f8da5
Fixing CakeTime, the actual params for format() is $date and $format,
...
and not the other way around :)
2012-06-09 08:28:39 -04:30
Mark Story
085ad0bb42
Merge pull request #672 from sitedyno/cookie-encryption-#471
...
Add stronger encryption, and make it available in cookiecomponent.
Fixes #471
Fixes #176
Fixes #2043
Fixes #1524
2012-05-31 17:44:49 -07:00
mark_story
01b3135a63
You should be able to regex match null/''
...
Fixes #2926
2012-05-30 21:28:18 -04:00
mark_story
9a8ceaeba6
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Test/Case/View/XmlViewTest.php
2012-05-30 21:20:56 -04:00
mark_story
fb0cc50700
Allow Set::extract() to match null.
...
Fixes #2926
2012-05-30 21:19:46 -04:00
Heath Nail
304d001dfb
Implement rijndael optional cookie encryption.
2012-05-30 03:49:25 -04:00
Florian Krämer
fea4ae6523
Changing File->info() to File->mime() in Validation::mimeType()
2012-05-28 00:48:22 +02:00
Florian Krämer
e3a6e9e169
Adding uploadError() and mimeType() to the Validation class
2012-05-28 00:32:30 +02:00
Mark Story
4485f597b7
Merge pull request #662 from jellehenkens/2.2-validation-natural-number
...
Adding validation rule for natural numbers
2012-05-27 11:01:31 -07:00
mark_story
4b8c469004
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/VERSION.txt
2012-05-26 21:11:36 -04:00
Jelle Henkens
f6a6e3381e
Fixing typo in the docblock
2012-05-24 20:07:48 +01: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
ecd869d4e3
Changing int to integer
2012-05-22 16:34:07 +01:00
Jelle Henkens
f7ce5262b7
Updating mixed @param documentation to seperate list of accepted types
2012-05-21 21:55:10 +01:00
ADmad
e58e3c5314
Fix regex for failing test on 5.2
2012-05-21 19:48:47 +05:30
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
Rachman Chavik
e6860fb856
changing LOG_ERROR to LOG_ERR in core files
2012-05-13 18:51:57 +07:00
mark_story
64f03acd4c
Fix code standards errors.
2012-05-12 23:28:43 -04:00
mark_story
14bfd83dad
Reduce complexity in timeAgoInWords.
...
All the special cases were handled by the deeply
nested if.
2012-05-12 22:26:34 -04:00
mark_story
ca8046bfea
Fix whitespace and formatting.
2012-05-12 22:26:33 -04:00
Magnus Johansson
352fbde2ec
Move out HTML logic to Helper/TimeHelper.php. The Utility/CakeTime.php timeAgoInWords() now returns a string with the time, while the same function in Helper/TimeHelper.php may return an HTML element.
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
Magnus Johansson
0729aca706
Added some more intelligence to the CakeTime class
2012-05-12 22:25:48 -04:00
ADmad
14b7210d2b
Fixed server offset calculation
2012-05-13 06:20:29 +05:30
mark_story
7695da637c
Use correct argument order.
2012-05-10 20:55:45 -04:30
Ceeram
fe0c7d348a
add strict parameter to inList() and multiple()
2012-05-07 16:29:13 +02:00
mark_story
ed1a64ca04
Use correct argument order.
2012-05-04 08:16:43 -04: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
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
ADmad
061483d03e
Added missing keyword
2012-04-25 11:03:26 +05:30
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
3800029c9a
Fix docblock
2012-04-22 02:22:48 +05:30
ADmad
d26f869455
Added function to get timezone object
2012-04-22 01:59:26 +05:30
ADmad
058d57a85a
Added function to convert time from user timezone to server timezone.
2012-04-22 01:59:26 +05:30
ADmad
a96de99388
Tweak docblocks
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
mark_story
21ba5bf04a
Merge branch '2.1' into 2.2
2012-04-17 21:47:24 -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
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
f8966a64f2
Merge branch '2.1' into 2.2
...
Conflicts:
lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
2012-04-09 21:55:02 -04:00
mark_story
3c9e79737d
Update doc blocks for CakeNumber.
2012-04-08 12:35:44 -04:00
mark_story
eeec362741
Merge remote-tracking branch 'ceeram/2.2-hash' into 2.2-hash
2012-04-07 14:28:40 -04:00
mark_story
83789915a3
Update docs about PHP5.4 constant.
2012-04-04 21:36:56 -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
6677127c8e
Fix coding standard error.
2012-03-31 21:38:39 -04:00
mark_story
432d00de19
Another small optimization.
2012-03-31 21:37:10 -04:00
mark_story
7d098fa5f0
Some small performance optimizations.
2012-03-31 21:25:02 -04:00
mark_story
6a9fdd841a
Fix failing tests.
...
Set::merge() accepts anything even non-array values.
2012-03-31 13:38:09 -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
6e0e15682f
Remove duplication where possible.
2012-03-26 22:33:46 -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
e55927c007
Update the doc links.
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
19e0d8d946
Switch usage to Hash where possible.
2012-03-26 22:32:53 -04:00
mark_story
2231087ba3
Rename Set2 -> Hash.
2012-03-26 22:25:40 -04:00