Stephen Young
b55fa98a2d
Updated documentation
...
* Removed references to nonexistent `AclBase` class
* Added references to `AclInterface` requirements
2014-04-11 15:10:56 -04:00
mark_story
3e579571aa
Merge branch 'hash-fix' from glaforge/patch-1 into master.
...
Closes #3288
2014-04-10 20:37:34 -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
Mark Story
f9a6c1905b
Merge pull request #3210 from ubermaniac/Sqlserver-schema-prefix
...
Sqlserver schema prefix #3208
2014-04-09 14:31:09 -04:00
José Lorenzo Rodríguez
37aee6a40b
Merge pull request #3247 from cakephp/master-docblocks
...
Correct doc blocks
2014-04-06 22:31:40 +02:00
euromark
6f53529520
Correct doc blocks
2014-04-06 22:27:51 +02:00
Jose Lorenzo Rodriguez
0d80c92ffb
Revert "Merge pull request #3002 from moberemk/patch-2"
...
This reverts commit 8e3d6cffb792800889a6
2014-04-06 21:48:59 +02:00
José Lorenzo Rodríguez
8e3d6cffb7
Merge pull request #3002 from moberemk/patch-2
...
Allow chaining in the addCrumb method
2014-04-06 21:09:10 +02:00
mark_story
92800889a6
Update version number to 2.4.7
2014-04-04 22:25:48 -04:00
mark_story
7fb920c256
Add file missed in last commit.
2014-04-04 22:22:38 -04:00
mark_story
4ec81542db
Fix email rendering when using 2 different plugins.
...
When an email template and layout are in different plugins the incorrect
plugin would be used for the layout.
Fixes #3062
2014-04-04 21:45:04 -04:00
mark_story
b8e21c99ee
Only count _id if it is the last 3 characters in the field name.
...
This prevents issues when baking models for tables containing `_id`.
Fixes #3230
2014-04-04 21:26:31 -04:00
Mark Story
c92769c980
Merge pull request #3224 from dereuromark/master-deprecations
...
correct deprecation notices
2014-04-04 14:04:53 -04: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
Ceeram
5c31641ea8
Change argument type to mixed in docblock, as debug() and pr() accept not just a single type
2014-04-02 23:53:54 +02:00
Joseph Woodruff
8536371501
Sqlserver Datasource how properly appends the schemaName prefix in the describe() method
2014-04-02 13:59:04 -06:00
Joseph Woodruff
d526fdadc1
Base model class no longer changes an already defined schemaName value
2014-04-02 13:58:29 -06:00
José Lorenzo Rodríguez
bf28e69501
Merge pull request #3197 from dereuromark/master-cs
...
cs
2014-04-02 08:32:26 +02:00
euromark
b150e33472
correct missed cs errors
2014-04-02 03:16:03 +02:00
euromark
e544340d67
fix indentation
2014-04-02 03:12:22 +02:00
euromark
bbe3b6a439
more cs
2014-04-02 03:09:42 +02:00
euromark
0d09a54033
more missing doc block tags added
2014-04-02 03:02:37 +02:00
euromark
44952b06a4
cs
2014-04-02 02:23:43 +02:00
ADmad
7a4a806db1
Merge pull request #3193 from beporter/feature/phpunit-required-version
...
Adds phpunit required version to TestShell "not found" error message.
2014-04-01 21:54:28 +05:30
Brian Porter
e5dd8acb60
Adds phpunit required version to TestShell "not found" error message.
2014-04-01 11:08:46 -05:00
Mark
997154565f
Merge pull request #3186 from bcrowe/hotfix-yoda-test
...
Fix yoda condition in File test
2014-04-01 00:56:29 +02:00
Bryan Crowe
b93f373f16
Fix yoda condition in File test
2014-03-31 17:40:35 -04:00
Mark Story
d3855f869a
Merge pull request #3156 from sam-at-github/acl-shell-delete-all
...
Make `cake acl delete <acl-object>` delete all matching records.
2014-03-29 08:58:04 -04:00
sam-at-github
dbbf6c6ad9
No array short syntax in 2.4\!
2014-03-29 22:40:58 +11:00
sam-at-github
863a8555d9
Fixed CS issues. Fixed bug - added missing condition to find.
2014-03-29 22:36:06 +11:00
sam-at-github
a3fe7cd245
on cake acl delete <> delete all matching records. Makes more sense than deleting one of possibly many.
2014-03-29 13:37:08 +11:00
Mark Story
77db212b38
Merge pull request #3146 from sam-at-github/baseauthorize-crud
...
Removed arbitrary restriction on crud operations in BaseAuthorize.
2014-03-28 07:10:36 -04:00
sam-at-github
5ceb4abe1a
Removed arbitrary restriction on crud operations. Added some comments to explain parameters to mapActions() better.
2014-03-28 13:35:08 +11:00
mark_story
6bf21c4a43
Update doc blocks to not be lies.
2014-03-27 11:55:54 -04:00
mark_story
de9a5a5845
Add deprecated flag to methods that are removed in 3.0.
...
A few methods in Controller were not marked as deprecated, but already
removed in 3.0. Shore up that difference.
Refs #3105
2014-03-23 20:40:17 -04:00
mark_story
75fcc7c2f8
Don't use count() in a loop.
...
Use do while so the count does not happen in a loop statement. This
makes the code linter happier.
2014-03-23 11:00:59 -04:00
Mark Story
90ca41d436
Merge pull request #2941 from lucasff/master
...
Allow the passing parameter escape of the getCrumbList method
2014-03-23 09:23:06 -04:00
mark_story
a801be30d9
Use alternate quoting in assertTags()
...
When a preg pattern contains no `.` it probably doesn't need quote
anchors.
2014-03-21 22:53:25 -04:00
mark_story
f12b272758
Fix a few flaky/bad attribute matchers.
2014-03-21 22:52:52 -04:00
mark_story
af68f61e7a
Make assertTags() run much faster.
...
Generating the various permutations a priori is incredibly expensive
with sets of attributes. Using nested loops that look for matches is
more efficient.
Add replacments for `.*` and `.+` in preg:/ prefixed attribute matchers
so they do not greedily eat all content. This also requires that preg:/
based attribute matchers *must* be quoted.
Fixes #3072
2014-03-21 22:52:52 -04:00
mark_story
c1b2b560bb
Fix typo.
2014-03-21 22:52:52 -04:00
mark_story
a827b96804
Clean up doc blocks for assertTags.
2014-03-21 22:52:52 -04:00
Mark Story
7f96a772be
Merge pull request #3089 from jameswatts/feature/dbosource-circular-reference
...
Update in_array() check to avoid fatal error
2014-03-21 14:41:13 -04:00
James Watts
2eadb89ff6
Update in_array() check to avoid fatal error
...
Enabling the $strict parameter to true avoids PHP's default behavior when search for an array in an array, which throws a fatal error if circular references exist - http://php.net/in_array#refsect1-function.in-array-parameters
2014-03-21 16:16:32 +01:00
Mark Story
514974900f
Merge pull request #3021 from wvdongen/master
...
Fixed bug where select query in deleteAll could return wrong table name
2014-03-21 08:21:24 -04:00
Mark Story
8c81cec904
Merge pull request #3069 from wbkostan/master
...
Modifications to singulizer rules for Inflector.php. Supported with test cases
2014-03-19 20:32:28 -04:00
wbkostan
fea60bfe51
Update InflectorTest.php
...
Added test cases for changes to inflector which affected words ending -aves. Author acknowledges the homonym conflict with 'leaves' and 'leaves', but preferences the word whose singular avoids an exception to the inflection rule.
2014-03-19 19:17:52 -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
