ADmad
2d10707d18
Added regex support to Validation::mimeType().
2014-01-30 21:05:04 +05:30
mark_story
75dd2ff1fb
Merge branch 'master' into 2.5
2014-01-16 15:20:40 -05:00
Christian Winther
ace586e367
Merge pull request #2656 from makusu/fix-debugger-templates-array
...
fix multiple log array key definition on templates property in Debugger
2014-01-14 23:29:05 -08:00
Max Meiden Dasuki
9cc7c465d1
fix multiple log array key definition on templates property in Debugger
2014-01-15 15:14:00 +08:00
Bryan Crowe
cd27012405
Simple docblock updates to CakeTime
2014-01-08 21:38:45 -05:00
mark_story
99e4dbd827
Merge branch 'master' into 2.5
2013-12-23 11:58:07 -05:00
Saleh Souzanchi
328125ad43
Merge branch 'master' into master-phpcs-error-fix
2013-12-23 11:43:54 +03:30
Mark Story
321347e52b
Merge pull request #2532 from bar/patch-2
...
Trivial continue.
fix phpcs error "Missing @throws tag in function comment"
2013-12-23 11:21:18 +03:30
mark_story
62e89734ab
Throw exceptions from Hash::combine()
...
When the key + value counts do not match Hash should throw an exception.
Silently doing the wrong thing is generally not a good idea. While this
change could break existing applications, those applications were
probably behaving incorrectly anyways.
Fixes #2470
2013-12-21 17:46:05 -05:00
José Lorenzo Rodríguez
60d2ece035
Merge pull request #2506 from dereuromark/2.5-string
...
Correct tokenize for empty strings.
2013-12-21 10:31:52 -08:00
mark_story
7e5c0f7185
Merge branch 'master' into 2.5
2013-12-20 14:15:35 -05:00
euromark
3ecce19732
Correct tokenize for empty strings.
2013-12-19 15:58:08 +01:00
Mark Story
ca2fb6fcfc
Merge pull request #2503 from dereuromark/master-string
...
Correct doc block
2013-12-18 09:27:00 -08:00
euromark
3100118a4e
Correct doc block
2013-12-18 12:10:23 +01:00
mark_story
44b7d013ae
Fix whitespace error.
2013-12-16 21:39:06 -05:00
ADmad
8a666fb37e
Don't throw exception when trying to encrypt falsey value.
2013-12-15 19:28:56 +05:30
mark_story
ef899f0c93
Make API docs easier to read.
2013-12-14 23:08:07 -05:00
mark_story
47497029bb
Fix mixed tabs/spaces.
2013-12-14 23:03:34 -05:00
mark_story
e15d1652ed
Relax the 'my' and 'ym' date validation formats.
...
All other formats that include 'y' allow 2006 or 06. These formats are
now conformant with the other formats available.
Closes #2436
2013-12-14 23:02:12 -05:00
mark_story
15c390586f
Pull out some re-used subpatterns.
...
Having smaller segments makes reading the larger patterns simpler, and
allows for less duplication across the various patterns.
Refs #2436
2013-12-14 18:20:20 -05:00
mark_story
c2b8778ce8
Merge branch 'master' into 2.5
2013-12-14 17:45:49 -05:00
mark_story
79701af501
Make Hash::numeric() accept more numeric things.
...
Negative numbers and other stringy forms of numbers should be accepted.
The name Hash::numeric implies is_numeric which it now uses.
Fixes #2478
2013-12-12 17:41:38 -05:00
Gombos Lorand
764e368dc3
Check if the item is an array.
2013-12-05 12:03:07 +02:00
mark_story
430ef88118
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/VERSION.txt
2013-11-25 23:15:15 -05:00
mark_story
37e387fed2
Replace non-breaking spaces with Inflector::slug().
...
Fixes #2363
2013-11-22 10:13:10 -05:00
ADmad
dda6080579
Merge branch 'master' into 2.5
2013-11-19 00:27:12 +05:30
Marc Würth
229bd69903
Added link to three hash methods
2013-11-17 03:40:39 +01:00
mark_story
cee2801700
Add 'metadata' to the uninflected list.
...
Fixes #2332
2013-11-15 21:49:05 -05:00
Marc Würth
7cfa0116f4
Removed "PHP 5" from file header DocBlocks
...
This statement does not serve a purpose anymore.
In a long forgotten world it indicated the main version number of PHP which the code in the file was compatible to.
http://pear.php.net/manual/en/standards.sample.php
But since PHP 5.1 and later this is only marginally true.
Thus I propose to remove it from CakePHP.
2013-11-13 22:58:39 +01:00
Kim Egede Jakobsen
18e0dc95dd
Remove @return from docblock (for __construct && __destruct methods)
2013-11-11 14:54:48 +01:00
mark_story
3c1f775ab2
Merge branch 'master' into 2.5
2013-11-09 09:37:27 -05:00
mark_story
ada0ec4c77
Fix formatting of decimal values when there is no fractionSymbol.
...
When a currency format does not include a fractionSymbol it should be
able to format fractional values.
Fixes #2253
2013-11-09 09:36:38 -05:00
davidsteinsland
e68a61c375
Added configurable default value to Hash::get()
2013-10-31 23:31:48 +01:00
mark_story
aaac360833
Merge branch 'master' into 2.5
2013-10-30 14:58:20 -04:00
Mark Story
d6f5f2f0bb
Merge pull request #2244 from dereuromark/2.5-debugger
...
Pass depth through for Debugger::dump().
2013-10-30 11:26:28 -07:00
euromark
fecbef5949
Pass depth through for Debugger::dump().
2013-10-30 18:31:48 +01:00
Bryan Crowe
507bb44301
Update date comparisons to be strict in CakeTime
2013-10-29 23:02:14 -04:00
Bryan Crowe
00c5e88570
Make use of timezone parameter in CakeTime::dayAsSql()
2013-10-29 20:29:01 -04:00
ADmad
d9ca148499
Merge branch 'master' into 2.5
...
Conflicts:
CONTRIBUTING.md
lib/Cake/Model/Model.php
lib/Cake/VERSION.txt
2013-10-30 02:34:09 +05:30
Phally
9260a78ea3
Fixes last items for #1665 .
...
- Changes double quotes to single quotes.
- Documents and tests array-based string replace.
- Rewrites test case.
Rewrites the test case because the tests didn't work as well as
they should be. The test file copied itself to the tmp directory,
did some string replace stuff on it and then loaded the data to
test its contents. However in those contents were also the
expectations, so assertContains() would always see the string in
the file... even if the replacing didn't work.
Closes #1665 .
2013-10-26 14:50:42 +02:00
rooseveltrp
98e11cea5d
Adds File::replaceText().
...
Added File::replace()
Searches for a given text and replaces the text if found
Renamed File::replace() to File::replaceText()
Updated the replaceText() method to utilize File Locking
Updated File::replaceText()
1. Method now checks if the lock is not identical to null
2. Since the method uses File::read() to get the contents of the file,
there is no need for a temporary file. Removed the temporary file
creation
File::replaceText() update
Opening file with r+ mode
2013-10-26 14:05:12 +02:00
Bryan Crowe
a943ea5c34
Add space between classname(s)
2013-10-22 22:59:50 -04:00
Bryan Crowe
d39ced8381
Correct 'an URL' to 'a URL' in docblocks
2013-10-22 00:09:34 -04:00
euromark
c08df2a7f9
Correct wording of Hash::expand()
2013-10-19 17:54:43 +02:00
mark_story
1ae470a284
Fix inflection rules for curves.
...
Remove curve from the uninflected list and update rules so it, wolves,
and lives are still properly handled.
Fixes #2148
2013-10-17 12:15:56 -04:00
mark_story
5a394c379a
Merge branch 'master' into 2.5
2013-10-14 22:57:50 -04:00
euromark
ed2054f4f2
Allow international domains to pass validation. Fixes #1763
2013-10-13 23:43:29 +02:00
Jose Lorenzo Rodriguez
df549898ad
Merge remote-tracking branch 'origin/2.5' into k-halaburda-master
2013-10-12 01:05:02 +02:00
mark_story
5aa8a458b1
Update UUID pattern to accept the 'nil' UUID.
...
Fixes #4133
2013-10-10 21:11:55 -04:00
Bryan Crowe
81c2e9db84
Capitalize UUID acronym
2013-10-08 21:46:30 -04:00
