Commit graph

16958 commits

Author SHA1 Message Date
Mark Story
e9c9e9697d Merge pull request #3319 from dogmatic69/patch-1
Fix closing non resource
2014-04-14 11:41:44 -04:00
Carl Sutton
5ac60288fd Fix closing non resource
I get a load of these errors when running tests in the shell, this check stops the errors from happening

Warning: 2 :: fclose() expects parameter 1 to be resource, integer given on line 298 of CORE\Cake\Console\ConsoleOutput.php
Trace:
fclose - [internal], line ??
ConsoleOutput::__destruct() - CORE\Cake\Console\ConsoleOutput.php, line 298
ToolbarComponent::_saveState() - APP\Plugin\DebugKit\Controller\Component\ToolbarComponent.php, line 307
ToolbarComponent::beforeRedirect() - APP\Plugin\DebugKit\Controller\Component\ToolbarComponent.php, line 307
ObjectCollection::trigger() - CORE\Cake\Utility\ObjectCollection.php, line 132
call_user_func - [internal], line ??
CakeEventManager::dispatch() - CORE\Cake\Event\CakeEventManager.php, line 247
Controller::redirect() - CORE\Cake\Controller\Controller.php, line 765
AuthComponent::_unauthenticated() - CORE\Cake\Controller\Component\AuthComponent.php, line 364
AuthComponent::startup() - CORE\Cake\Controller\Component\AuthComponent.php, line 304
ObjectCollection::trigger() - CORE\Cake\Utility\ObjectCollection.php, line 132
call_user_func - [internal], line ??
CakeEventManager::dispatch() - CORE\Cake\Event\CakeEventManager.php, line 247
Controller::startupProcess() - CORE\Cake\Controller\Controller.php, line 675
Dispatcher::_invoke() - CORE\Cake\Routing\Dispatcher.php, line 182
Dispatcher::dispatch() - CORE\Cake\Routing\Dispatcher.php, line 160
2014-04-14 14:15:46 +01:00
José Lorenzo Rodríguez
b9b1e85ff2 Merge pull request #3316 from bcrowe/hotfix-controller-template
Add newline after actions in controller template
2014-04-14 09:10:39 +02:00
ADmad
3f88709513 Merge pull request #3308 from cakephp/asset-dispatcher-fix
Don't 404 extensions that could be handled by routing.
2014-04-14 10:45:49 +05:30
Bryan Crowe
1a73906a50 Fix failing NoActions comparison test 2014-04-13 23:28:13 -04:00
Bryan Crowe
f7cc0c1802 Add newline after actions in controller template 2014-04-13 21:56:27 -04:00
mark_story
f1b57d14ab Revert changed added in #2750.
While the had the potential to make 404s going through AssetDispatcher
much faster, they broke plugins + extension routing. While explicit
extensions could be fixed, routing all extensions could not. Because we
are trying to keep 2.x as API compatible as possible it makes sense to
revert the previous changes.
2014-04-13 20:00:34 -04:00
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