euromark
974ca851c2
Correct doc blocks according to cs guidelines.
...
Remove superfluous empty lines.
2014-07-03 15:36:42 +02:00
ADmad
607200fa7b
Add pluralization rule for "stadia".
...
Refs #3830
2014-06-29 14:51:23 +05:30
suzuki86
8f9589f7c8
Fix typo
2014-06-25 00:20:54 +09:00
Dan Voyce
4915639efb
Update Inflector.php
...
Added Research
2014-06-18 11:48:16 +10:00
mark_story
fa19c34580
Fix Hash::extract() not matching 1/0 to true/false.
...
Historically [prop=1] has matched prop=true as well. This restores that
and also fixes [prop=0] not finding falsey values.
This makes the typing less strict in Hash::extract() but I don't think
it is unreasonable given PHP's type juggling.
Refs #3288
2014-06-12 11:30:48 -04:00
ADmad
1d40f3e685
Fix API docblock CS errors.
2014-06-05 00:28:55 +05:30
ADmad
543066f34a
Set default sort direction to 'asc'.
2014-05-30 19:43:09 +05:30
mark_story
390441d3b9
Accept older blowfish hashes.
...
Both `2a` and `2x` are valid types of blowfish hashes, that while being
older should be accepted.
Backport 00c94bd582b83f8b92228b750aea0e8816a4ea89 from 3.x to 2.5.x,
I see this as a bug fix as it fixes incompatibilities with hashes
created by hash_password().
Refs #3575
2014-05-28 22:53:21 -04:00
ADmad
7a4244d0a6
More docblock CS fixes.
2014-05-28 22:09:54 +05:30
Marlin Cremers
1977d51a49
Add 'feedback' to uninflected single and plurals
2014-05-19 20:57:11 +02:00
euromark
143e8e4c56
Make sure invalid arrays return empty array instead of throwing notices.
2014-05-14 23:53:58 +02:00
mark_story
89cd114e6f
Merge branch 'master' into 2.5
2014-05-12 14:30:02 -04:00
mark_story
92e6c138c5
Add missing static on Debugger::output()
...
This method should have been static the whole time, and the lack of
static was causing tests to fail on PHP 5.6
2014-05-12 14:29:10 -04:00
ADmad
d466e00644
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/Model/Datasource/DboSource.php
lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
lib/Cake/Utility/Folder.php
lib/Cake/VERSION.txt
2014-05-04 14:35:36 +05:30
euromark
7a287a6942
More coding standard corrections.
2014-04-29 14:19:33 +02:00
euromark
0c036f6370
Remove unncessary language support.
2014-04-23 18:07:08 +02:00
euromark
7e6bc48ef2
Complete Inflector transliterations.
2014-04-23 16:43:44 +02:00
mark_story
d54fbe6f60
Merge branch 'master' into 2.5
2014-04-18 22:13:56 -04:00
mark_story
d4ae2b0b88
Correct types for Validation::range().
...
Refs #3304
2014-04-13 06:16:24 -04:00
mark_story
bf9c3029cb
Merge branch 'master' into 2.5
2014-04-10 20:51:49 -04:00
mark_story
c6173a0054
Add tests for #3288 and remove nested ternaries.
...
Nested ternaries are complicated to maintain and hard to read. Break
down the nested ternary into two conditionals.
2014-04-10 20:37:08 -04:00
Guillaume Lafarge
db450a96e9
Fix Hash type casting
...
When using comparison with a boolean, as the filter is a string, we have to convert the data boolean to "boolean string" to avoid type-casting troubles.
## Example
```php
$users = [
[
'id' => 2,
'username' => 'johndoe',
'active' => true
],
[ 'id' => 5,
'username' => 'kevin',
'active' => true
],
[
'id' => 9,
'username' => 'samantha',
'active' => false
],
];
$unactiveUsers = Hash::extract($users, '{n}[active=false]');
print_r($unactiveUsers);
```
This example returns the two unwanted active users because `"false"` is `true` but not `false` :)
I think this pull request will fix this issue by converting true/false boolean to string (to match with our filter).
2014-04-10 20:19:32 +02:00
euromark
c321ee5fec
correct doc block
2014-04-09 03:07:19 +02:00
Mark Story
bb7b450404
Merge pull request #3260 from dereuromark/2.5-count-dim
...
Without any params this method does not make sense
2014-04-07 21:45:31 -04:00
euromark
fdc42a24ca
Without any params this method does not make sense
2014-04-08 03:27:45 +02:00
euromark
a7744e6ff4
a few more corrections
2014-04-08 01:49:33 +02:00
euromark
0ece694a75
microptimize options and default merge and other string key array merges
2014-04-08 01:25:14 +02:00
Jose Lorenzo Rodriguez
343d3279b9
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/Test/Case/Utility/FileTest.php
lib/Cake/VERSION.txt
2014-04-06 21:50:41 +02:00
euromark
854a53b3cb
generalize sentence
2014-04-04 19:19:10 +02:00
euromark
823909603a
correct deprecation notices
2014-04-04 19:18:02 +02:00
mark_story
8acb75425d
Merge branch 'master' into 2.5
...
Conflicts:
CONTRIBUTING.md
lib/Cake/Model/Datasource/DboSource.php
2014-03-21 22:55:28 -04:00
wbkostan
9a36ed5785
Update Inflector.php
...
Modified singularizer inside inflector to accurately inflect most words ending in -aves. Removed irregular cases solved by this fix.
2014-03-19 19:12:44 -04:00
mark_story
c5b6dda82f
Merge branch 'master' into 2.5
2014-03-11 21:02:27 -04:00
Jorge González
4d51092259
fixing Set docblocks
2014-03-08 10:26:03 +00:00
Jorge González
6049009cac
improving docblock for Set::extract and Set::classicExtract return types
2014-03-07 19:33:02 +00:00
mark_story
0f584c0e8b
Merge branch 'master' into 2.5
2014-02-24 21:19:17 -05:00
AD7six
4e0627232c
account for localized floats more robustly.
...
Normalize floats, strings too, so that they are validated as
dddddddddd.dd
ref #2853
2014-02-19 15:04:25 +00:00
mark_story
b8c94fa5d4
Merge branch 'master' into 2.5
2014-02-18 22:19:12 -05:00
mark_story
0a51458ffd
Fix Validation::decimal() not working with localized floats.
...
Use similar workarounds as DboSource::value() for accepting localized
floats.
Fixes #2853
2014-02-18 22:18:56 -05:00
Mark Story
c325a93998
Merge pull request #2741 from ADmad/2.5-mimetype
...
Added regex support to Validation::mimeType().
2014-02-17 10:10:48 -05:00
ADmad
9ae7f11a2a
Made mimetype check case insensitive.
2014-02-17 11:48:00 +05:30
mark_story
7a4cabe5d3
Add depth to log().
...
Much like dump() it is handy to be able to control the depth variables
are dumped out when logged.
Refs #2834
2014-02-16 14:35:32 -05:00
mark_story
2c5d96e916
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/Model/Datasource/DboSource.php
2014-02-16 14:24:19 -05:00
José Lorenzo Rodríguez
4f424007fa
Merge pull request #2822 from dereuromark/master-validation
...
Fix uploadError validation rule
2014-02-13 19:58:40 +01:00
ADmad
54a395cc3e
Updated docblock.
...
BlowfishAuthenticate is deprecated.
2014-02-13 17:54:53 +05:30
euromark
1725386c16
Fix uploadError validation rule to work with OS Win. Here the error is string, not integer.
2014-02-12 21:52:18 +01:00
mark_story
a5d50da040
Remove dead and unused code.
2014-02-11 16:38:24 -05:00
ADmad
9de3418079
Merge branch 'master' into 2.5
...
Conflicts:
lib/Cake/Model/Permission.php
2014-02-11 18:17:59 +05:30
Eric Martins
2793dca671
Fix ApiGen errors
2014-02-07 18:29:54 -02:00
ADmad
2d10707d18
Added regex support to Validation::mimeType().
2014-01-30 21:05:04 +05:30
