mark_story
749f2b99d9
Don't 404 extensions that could be handled by routing.
...
Fixes an error in #2750 where routed extensions would always return
404's for plugin requests. When a file extenion could be handled by
router, AssetDispatcher cannot 404 the request.
Refs #3305
2014-04-13 06:48:51 -04:00
mark_story
d4ae2b0b88
Correct types for Validation::range().
...
Refs #3304
2014-04-13 06:16:24 -04:00
Mark Story
4b1d2b06c9
Merge pull request #3302 from dereuromark/2.5-webtestrunner
...
Fix CakeHtmlReporter output for HTML
2014-04-12 08:07:09 -04:00
euromark
4f3578ebda
Fix CakeHtmlReporter output for HTML
2014-04-12 13:37:36 +02:00
Mark Story
d2fa1b444f
Merge pull request #3301 from ubermaniac/Sqlserver-trim
...
Trim $sql before checking for SELECT
2014-04-11 18:48:41 -04:00
Joseph Woodruff
9aeea2fcc3
Trim $sql before checking for SELECT
2014-04-11 15:25:07 -06:00
Mark Story
fc1c686c31
Merge pull request #3297 from young-steveo/AclComponent-documentation-fix
...
Updated AclComponent documentation
2014-04-11 16:17:55 -04:00
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
0fb1f82416
Bump version for 2.6.0-dev.
2014-04-10 22:28:17 -04:00
mark_story
6122869d89
Update version number to 2.5.0-RC1
2014-04-10 20:54:20 -04:00
mark_story
bf9c3029cb
Merge branch 'master' into 2.5
2014-04-10 20:51:49 -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
Mark Story
c24304fc53
Merge pull request #3287 from dereuromark/2.5-bc-fix
...
Revert the removal of a BC relevant part.
2014-04-10 20:29:16 -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
8e0f15b3d6
Revert the removal of a BC relevant part.
2014-04-10 20:11:58 +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
Mark Story
fd2b0abfbd
Merge pull request #3271 from dereuromark/2.5-string
...
correct doc block
2014-04-08 21:21:42 -04:00
euromark
c321ee5fec
correct doc block
2014-04-09 03:07:19 +02:00
Mark Story
879d0d4369
Merge pull request #3261 from dereuromark/2.5-load-all
...
2.5 load all
2014-04-08 10:28:43 -04:00
euromark
4679a30b37
move cast up
2014-04-08 12:22:29 +02:00
euromark
e948598277
update doc block
2014-04-08 12:19:29 +02:00
euromark
9058f0f6f1
Make CakePlugin::loadAll behave correctly regarding merging of settings.
2014-04-08 12:18:17 +02:00
mark_story
debdc6bccc
Merge branch '2.5' of github.com:cakephp/cakephp into 2.5
2014-04-07 21:46:11 -04:00
mark_story
ac66c2c03a
Merge branch 'master' into 2.5
2014-04-07 21:45:57 -04: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
Mark Story
caf0217fe0
Merge pull request #3259 from dereuromark/2.5-array-merge
...
microptimize options and default merge and other string key array merges
2014-04-07 21:44:38 -04:00
mark_story
b05ab740d6
Merge branch '2.5-AssetDispatcher-404' into 2.5
...
Return a 404 much earlier when handling missing theme/plugin assets.
Fixes #2750
2014-04-07 21:43:37 -04:00
euromark
fdc42a24ca
Without any params this method does not make sense
2014-04-08 03:27:45 +02:00
mark_story
513f7bfe86
Cleanup file header.
2014-04-07 21:26:35 -04:00
mark_story
7eb569c439
Add test case for #2750
2014-04-07 21:26:11 -04: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
Mark Story
8d47ef43e5
Merge pull request #3250 from dereuromark/2.5-hash
...
Use Hash instead of Set class
2014-04-06 21:52:25 -04:00
mark_story
3a28041b8f
Merge branch '2.5' of github.com:cakephp/cakephp into 2.5
2014-04-06 21:27:00 -04:00
mark_story
66bfce4062
Merge branch 'moberemk/patch-2' into 2.5
...
Make HtmlHelper::addCrumb() chainable.
Refs #3002
2014-04-06 21:25:57 -04:00
euromark
ad5e62515f
Use Hash instead of Set class
2014-04-07 03:23:51 +02:00
Mark Oberemk
e3a0795bed
Update HtmlHelper.php
...
Updated documentation to include the chained $this return
2014-04-06 21:23:42 -04:00
Mark Oberemk
d5721f10fd
Allow chaining in the addCrumb method
...
For convenience I think it might be valuable to allow addCrumb (and possibly other similar functions) to return $this to permit chained calls such as this:
$this->Html->addCrumb('Admin', '/admin')->addCrumb('Blogs', '/admin/users')->addCrumb('Add');
as opposed to the considerably more verbose version that needs to be used now:
$this->Html->addCrumb('Admin', '/admin');
$this->Html->addCrumb('Blogs', '/admin/users');
$this->Html->addCrumb('Add');
I'm not sure if this violates some API conventions for helpers but it does seem rather more convenient to work with to me.
2014-04-06 21:23:42 -04:00
José Lorenzo Rodríguez
7c3390b0d7
Merge pull request #3248 from dereuromark/2.5-validation
...
2.5 validation method chaining
2014-04-06 23:02:10 +02:00
euromark
cb0ac6f9f3
Add a note to offsetSet() on why it cannot chain.
2014-04-06 22:59:18 +02: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
José Lorenzo Rodríguez
2dd57c7191
Merge pull request #3246 from cakephp/2.5-event
...
Make dispatch return CakeEvent - resolves #2819
2014-04-06 21:51:48 +02:00
Jose Lorenzo Rodriguez
925db9e25e
Revert "Revert "Merge pull request #3002 from moberemk/patch-2""
...
This reverts commit 0d80c92ffb
.
2014-04-06 21:51:03 +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
Jose Lorenzo Rodriguez
0d80c92ffb
Revert "Merge pull request #3002 from moberemk/patch-2"
...
This reverts commit 8e3d6cffb7
, reversing
changes made to 92800889a6
.
2014-04-06 21:48:59 +02:00
euromark
5d4bb9c2e0
Make dispatch return CakeEvent - resolves #2819
2014-04-06 21:17:51 +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