adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
17235 commits 7 branches 0 tags 44 MiB
Commit graph

6187 commits

Author SHA1 Message Date
mark_story
b4bcd74e60 Whitelist more URL-y characters in digest parsing. 
Android clients include a full URL instead of just the URI. Also handle
situations where URLencoded bytes and document fragments are used.

Refs #3779
 2014-06-23 14:39:35 -04:00
Anatoliy Petrovskiy
ad678e3988 improving acl perfomance 2014-06-23 13:51:52 +03:00
mark_story
59c3b73f7a Skip autoloaders for APCIterator 
We can skip autoloaders for this class as it is provided by
a C extension and will never come from userland code.
 2014-06-22 21:22:00 -04:00
mark_story
ffe811935c Remove else. 
By returning early we can avoid the else statement entirely.
 2014-06-20 16:07:47 -04:00
mark_story
e683616329 Apply patch from 'biesbjerg' to ApcEngine 
This set of changes allows ApcEngine to work with APCu and newer
versions of APC.

Fixes #3749
 2014-06-20 13:59:05 -04:00
Anatoliy Petrovskiy
bb15271622 improving acl perfomance by adding indexes on acl tables and reorganization joins in getting acl node function 2014-06-20 20:49:02 +03:00
euromark
d81d568cc0 make coredispatcher fully BC again 2014-06-20 14:05:18 +02:00
Mark Story
282a5d1cb5 Merge pull request #3731 from cakephp/issue-3656 
Fix TextHelper::autoLinkEmail() near HTML

Refs #3656
 2014-06-18 09:53:30 -04:00
Mark Story
163cacbd1d Merge pull request #3734 from voycey/patch-1 
Add 'research' to the list of uninflected words.
 2014-06-18 09:31:54 -04:00
Mark Story
c99c68684b Merge pull request #3646 from nanapi/no-truncate-fixture 
Don't truncate test fixtures when the table has been freshly created.
 2014-06-18 09:18:24 -04:00
Mark Story
562ed73562 Merge pull request #3726 from dereuromark/master-console-cake-unification 
DS console cake unification
 2014-06-18 08:55:53 -04:00
Dan Voyce
4915639efb Update Inflector.php 
Added Research
 2014-06-18 11:48:16 +10:00
euromark
6161aae54e also bring template one in sync. 2014-06-17 13:08:13 +02:00
euromark
a927f5d954 remove wrong App::uses() call 2014-06-17 05:10:19 +02:00
Bryan Crowe
1db10b4dd1 Basic grammar update to BasicAuthenticate docblock 2014-06-16 21:48:35 -04:00
mark_story
9136f63874 Fix autoLinkEmail() not working when emails are adjacent to HTML. 
When an email address is adjacent to HTML it should be autolinked
correctly.

Refs #3656
 2014-06-16 21:48:30 -04:00
mark_story
74d8e9ea40 Convert test to use a dataprovider instead of multiple calls. 
Dataproviders are generally a bit easier to work with in the future.
 2014-06-16 21:46:34 -04:00
euromark
a9de83daeb console cake cleanup and unification 
remove duplicate define
 2014-06-17 02:28:52 +02:00
mark_story
96df2c4b68 Update version number to 2.5.2 2014-06-14 21:36:39 -04: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
Bryan Crowe
d8b4c3967c Fix typo 2014-06-10 23:31:42 -04:00
ADmad
0b4ba0b049 Fix api docblocks for behaviors. 2014-06-10 00:38:44 +05:30
ADmad
4ee7cf6564 Remove lies from API docblock for BasicAuthenticate class. 
Add info on how to configure for cookieless/stateless operation without redirection.
 2014-06-08 14:05:08 +05:30
mark_story
146053c980 Update datasource API docs. 2014-06-06 14:06:32 -04:00
mark_story
d8b0083632 Fix api doc errors in TestSuite/ 2014-06-06 13:57:48 -04:00
mark_story
07b43403fb Fix doc errors in Component/Acl. 2014-06-06 13:57:15 -04:00
mark_story
849ad9a4f5 Remove dead, untested and unreachable code in FormHelper. 
Closes #3650
 2014-06-06 08:17:49 -04:00
akiyan
6d2402fbf6 No truncate when drop table. 2014-06-05 13:37:22 +09:00
mark_story
ab5da2a09f Fix the test suite package doc block errors. 2014-06-05 00:24:01 -04:00
mark_story
7058921275 Fix doc comment errors in Acl classes. 2014-06-05 00:15:45 -04:00
ADmad
1d40f3e685 Fix API docblock CS errors. 2014-06-05 00:28:55 +05:30
mark_story
55672b6df3 Merge branch 'router-stars' from Hikkijp 
Refs #3582, #3581
 2014-06-02 22:38:27 -04:00
mark_story
4362f7bf8b Add tests for CakeRoute::match() and trailing * routes. 
Add tests for /pages/** routes, and fix coding standards errors.

Refs #3581
 2014-06-02 22:37:37 -04:00
mark_story
9ba7abd89f Merge branch 'FormAuthenticate_empty_fix' from KeinBaum 
Closes #3624
 2014-06-02 22:03:40 -04:00
mark_story
975e4c3af0 Allow username of 0 in basic authentication. 
Refs #3624
 2014-06-02 22:02:28 -04:00
mark_story
d1e4dfac47 Add tests for #3624 
The username of '0' should be accepted by FormAuthenticate.

Refs #3624
 2014-06-02 21:58:50 -04:00
KeinBaum
88b3629f4f #3623: Allow username "0" with FormAuthenticate 2014-06-02 19:11:02 +02:00
ADmad
e7debd8692 More API docblock CS fixes. 2014-06-02 18:27:11 +05:30
Stefan Dickmann
91907b5c6c correct docblock 
invalid certificate domain
 2014-06-01 13:23:47 +02:00
mark_story
47ce5928e1 Fix api doc errors in Cache. 2014-05-31 22:02:55 -04:00
mark_story
86a071353d Fix api doc comment errors in Error/ 2014-05-31 21:57:17 -04:00
mark_story
fe2003888b Fix api doc errors in basics.php 2014-05-31 21:53:54 -04:00
mark_story
15f63e9c81 Removing peer verification failure test. 
Since we are not running a domain with an invalid certificate relying on
someone else to do that is quite unreliable.
 2014-05-31 21:51:03 -04:00
Mark Story
e467457319 Merge pull request #3612 from cakephp/api-doc-comments 
More API docblock fixes.
 2014-05-31 19:12:20 -04:00
ADmad
3d9b2b80cb More API docblock fixes. 2014-06-01 03:06:05 +05:30
MaziyarMK
596c1c27cb added HTML for styling tables 
added <thead> and <tbody> to table for easier styling of generated templates.
 2014-05-31 20:50:29 +00:00
ADmad
543066f34a Set default sort direction to 'asc'. 2014-05-30 19:43:09 +05:30
ADmad
16df061d66 Fix api docblocks for View layer classes. 2014-05-30 01:23:12 +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
mark_story
f6c868d706 Fix remaining doc block errors in Console/ 2014-05-27 23:34:53 -04:00
mark_story
8f5acb0932 Fix CS errors in skel/ 2014-05-27 23:21:32 -04:00
mark_story
bb58bbe642 Fix API doc errors in Console/ 2014-05-27 23:16:05 -04:00
Mark Story
f287bc76c0 Force .bat files to have CRLF endings. 
Newer versions of git convert line endings on checkout. This also causes
these files to show up as always modified when the repo is cloned
because the index and working copy have different line endings.

Hopefully this fixes the issue.

Fixes #3585
 2014-05-27 19:06:08 -04:00
Hikkijp
c622a9dfc2 Fixes bug #3581 
Fixes bug #3581 and the issue noticed by markstory
 2014-05-27 17:30:38 -03:00
Hikkijp
f7e98e7427 Revert "Fixes bug described in #3581" 
This reverts commit e6c6e0bf2c.
 2014-05-27 17:25:28 -03:00
Hikkijp
e6c6e0bf2c Fixes bug described in #3581 
Routes with '/**' are now correctly handled by the HtmlHelper->link()
 2014-05-27 14:03:56 -03:00
Hikkijp
952c7192f4 Revert "Fixes bug described in #3581" 
This reverts commit 6c75e3697d.
 2014-05-27 14:00:20 -03:00
Hikkijp
6c75e3697d Fixes bug described in #3581 
Routes with '/**' are now correctly handled when called by
$this->Html->link() in a view.
 2014-05-27 13:50:08 -03:00
Mischa ter Smitten
329fd3fe4c Consistent use of Shell::err for errors 2014-05-27 12:29:09 +02:00
mark_story
db86b0c050 Don't disable the entire select when disabled is array(1) 
When the disabled attribute is just array(1), then the attribute should
be filtered out of select element attributes. This is kind of a hacky
workaround but changing the underlying attribute handling is going to be
pretty tricky and far more dangerous.

Fixes #3546
 2014-05-23 13:26:11 -04:00
mark_story
81875cfeb1 Optimize renew(). 
Don't call session_id() twice when we can use a local variable to store
the current session id.

Fixes #3531
 2014-05-22 14:28:56 -04:00
mark_story
cd68002246 Add additional test case for named parameters. 
Refs #3525
 2014-05-22 14:14:35 -04:00
akiyan
781430c4af Removed unnecessary conditional branch, fixed test and comment. 2014-05-22 14:08:18 -04:00
akiyan
67f256297d Fixed secure form hash for special url. 
No htmlspecialchars encode and without fragment identifer.
 2014-05-22 14:08:11 -04:00
mark_story
270e8774e4 Fix incorrect status line parsing in HttpSocketResponse. 
Allow for multi-word status reasons.

Closes #3545
 2014-05-21 21:53:18 -04:00
Mark Story
b1fe9134c6 Merge pull request #3528 from Marlinc/patch-1 
Add 'feedback' to uninflected single and plurals
 2014-05-19 16:46:16 -04:00
Marlin Cremers
1977d51a49 Add 'feedback' to uninflected single and plurals 2014-05-19 20:57:11 +02:00
Brian Porter
9452d5e1b6 Harden the bin/cake script to avoid breakage when local shell environment has a CDPATH set. 2014-05-19 11:05:28 -05:00
mark_story
0fd12c7a68 Update version number to 2.5.1 2014-05-17 22:39:27 -04:00
mark_story
153141a6c7 Make help clearer around how to use UpgradeShell. 
Closes #3504
 2014-05-15 11:32:32 -04:00
euromark
143e8e4c56 Make sure invalid arrays return empty array instead of throwing notices. 2014-05-14 23:53:58 +02:00
James Watts
992ab5ea11 Removed the little doc that lied 
View::get() never looked up blocks
 2014-05-14 20:06:37 +02:00
mark_story
20ef10aca2 Fix inline attachments being broken when only sending an HTML text body. 
The rel boundary was closed too early causing inline images to be
incorrectly included in the email message.

Refs #3474
 2014-05-14 09:42:25 -04:00
José Lorenzo Rodríguez
5ab02a0ed1 Merge pull request #3493 from Schlaefer/fix-failingModelTaskTest 
fixes failing test cases in ModelTaskTest if not run in test-suite
 2014-05-14 11:47:28 +02:00
José Lorenzo Rodríguez
73f725e7ff Merge pull request #3489 from rchavik/2.5-composer 
Updated the test suite dispatcher to allow use of PHPUnit from Composer
 2014-05-14 10:34:21 +02:00
Schlaefer
bf0edd1112 fixes failing test cases in ModelTaskTest if not run in test-suite 
Tests 'testSkipTablesAndAll' and 'testExecuteIntoAll' didn't took fixture
table 'core.number_tree' into account.
 2014-05-14 10:34:09 +02:00
mark_story
66e733f8b1 Fix test I forgot to fix in b8fa7ce134 2014-05-13 22:12:39 -04:00
David Yell
140e0bbbd3 Updated the test suite dispatcher to allow use of PHPUnit from Composer 
Closes #3479
 2014-05-14 09:09:53 +07:00
mark_story
b8fa7ce134 Fix issues where emails would have multipart/mixed when they should not. 
When sending multi-part emails with no attachments we shouldn't include
the outer multipart/mixed header as it confuses Outlook and causes it to
show the email as having attachments even though there are none.

A bunch of tests need to be adjusted as the empty multipart/mixed
container has been removed.

Fixes #3474
 2014-05-13 22:03:06 -04:00
euromark
8af76a3705 Hotfix for older baked templates regarding postLink() 2014-05-13 20:51:39 +02:00
Mark Story
418c0a7b7c Merge pull request #3481 from okinaka/master 
Unset $db in DboSource::read().
 2014-05-13 14:01:33 -04:00
mark_story
e9ecfe0936 Remove x bit on files. 
PHP files should not have executable permission set.
 2014-05-13 12:30:14 -04:00
euromark
aefc459907 Fixes baked postLink()s 2014-05-13 17:14:11 +02:00
Kenshin Okinaka
91cb3ddc27 Unset $db in DboSource::read(). 
After calling $db->queryAssociatin(), it is necessary to unset db. 
This reverts commit 52d425737a.
 2014-05-13 21:17:34 +09:00
Schlaefer
e10e8fcb15 fixes failing test case ValidationTest::testDecimalLocaleSet() on OS X 
thousand separator isn't set in de_DE but in da_DK
 2014-05-13 13:25:53 +02:00
mark_story
780132f892 Update version number to 2.5.0 2014-05-12 22:17:12 -04:00
mark_story
a34d5f733d Fix PaginatorComponent tests. 
Because count() queries don't happen in many cases now, the lastQueries
index needs to shift up by one because a query isn't happening anymore.

Refs #3333
 2014-05-12 22:10:27 -04:00
mark_story
b2207c1ca8 Reverse conditions to make the cheapest condition first. 
We don't need to do a count() if the page is not 1.

Refs #3333
 2014-05-12 22:09:27 -04:00
Toby Cox
823f01601d enhancement to paginator 
As pointed out, we need to make sure that we are also on the first page
to make this conditional clause valid
 2014-05-12 21:49:08 -04:00
Toby Cox
296ea215b1 Enhancement to paginator 
No point in finding the count (via model) if the returned result count
is less than our limit. We then know that the count is the count of our
results
 2014-05-12 21:49:07 -04: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
Dominik
cd445f2526 Add unix socket support to Redis cache engine 
Refs #3438
 2014-05-11 21:49:32 -04:00
Stephen Cuppett
ed83df5bed Fixes #3469, explicit isset check for counterCache 2014-05-11 19:17:18 -04:00
mark_story
cc49d28ef8 Fix double / in missing component error page. 
Fixes #3466
 2014-05-10 22:02:22 -04:00
mark_story
cd37810b02 Merge branch 'fix-formhelper' 
Fix failing tests on PHP5.2.x
 2014-05-09 17:17:23 -04:00
mark_story
51909ae738 Only parse URLs when they contain :// 
Parsing incomplete URLs fails in PHP5.2.
 2014-05-09 17:01:24 -04:00
euromark
8f0e203fb5 test failed. reverted and corrected doc block instead for BC. 2014-05-08 01:52:48 +02:00
euromark
1caf1cac4b Remove wrong return. 2014-05-08 01:46:08 +02:00
José Lorenzo Rodríguez
751d2d8f2d Merge pull request #3448 from dereuromark/master-controller 
Controller::referer() and local URL
 2014-05-07 22:42:28 +02:00
mark_story
5469840c80 Fix incorrectly generated URL path. 
Refs #3442
 2014-05-07 08:52:42 -04:00
mark_story
1103ca7816 Ensure that only the path and query are used to make the hash. 
While including the entire protocol, host, port, path and query would be
even better in theory, it gets complicated when proxies and load
balancers are involved.

Fixes #3442
 2014-05-06 23:00:11 -04:00
mark_story
559d9d39e7 Make test names match the rest of the tests. 2014-05-06 22:13:44 -04:00
Renan Gonçalves
87683b10f1 Allowing same Authenticate object to be setup with different settings. 2014-05-06 22:10:41 +02:00
Walther Lalk
2dd3cecfaa Fixes issue with Sql Server driver when loading fixtures 
Sqlserver::describe is expecting a model object (Unlike other drivers which work with either a object or string). While this does work under normal conditions, it causes a "Trying to get property of non-object" notice when using fixtures. The same problem also causes the testLimitOffsetHack test to fail.

This change does a simple test to ensure that the $model variable is an object before trying to access a property of it. All SqlServer tests are now passing.
 2014-05-06 12:43:36 +02: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
57cb7ea260 Correct documentation. 2014-05-02 13:48:39 +02:00
euromark
fecf321cce This is a hotfix for TextHelper which seems to have gone wrong in a merge. tail() is missing completly and the docs for truncate() are the ones for tail(). This fixes it. 2014-05-02 13:33:57 +02:00
Mathew Foscarini
2244e02017 remove constructor return value. 
Not sure why this was here, but constructors shouldn't return a value. Nothing in the docs says that a controller's implementation of appError should return a value either. So I figure this was a mistake.
 2014-04-30 16:25:01 -04:00
Mathew Foscarini
f7453500b9 fixed case. 2014-04-30 16:19:15 -04:00
Mathew Foscarini
bb726d58ba Grammar fixes 
@return will accept the `|` or operator to define multiple return types. Don't use the word `or`.
 2014-04-30 16:09:53 -04:00
Mathew Foscarini
ceab9f185f Removed incorrect usage of @deprecated phpDoc 
@deprecated is flagging the function element as deprecated in all IDE's that support phpDOC tags. There is no phpDoc tag to deprecate a function parameter.
 2014-04-30 09:55:27 -04:00
mark_story
4b5e3c176e Update version number to 2.4.9 2014-04-29 21:52:10 -04:00
mark_story
e1057e3e6b Fix FormHelper::postLink() not working when SecurityComponent is enabled. 
The action attribute value was not being included in the generated hash,
so postLink() forms never worked properly.

Fixes #3418
 2014-04-29 11:23:52 -04:00
euromark
7a287a6942 More coding standard corrections. 2014-04-29 14:19:33 +02:00
mark_story
1d1a2f859c Fix coding standards error. 2014-04-28 20:56:06 -04:00
mark_story
a0eb736151 Update version number to 2.4.8 2014-04-28 20:35:20 -04:00
euromark
8679c5cd18 Fix test 2014-04-28 17:33:56 +02:00
euromark
43d359b1d7 Make referer() behave as expected. 2014-04-28 17:23:26 +02:00
mark_story
99a7ddf195 Update version number to 2.5.0-RC2 2014-04-26 22:04:40 -04:00
mark_story
cf96e9f54f Merge branch 'master' into 2.5 2014-04-26 22:04:19 -04:00
mark_story
a28158d614 Add additional test for f23d811ff5 
I neglected to put a negative test to ensure validatePost fails when the
URL differs.
 2014-04-26 10:23:27 -04:00
Mark Story
5b46eb71ec Merge pull request #3397 from steinkel/fix-formhelper-with-model-mock 
fixed FormHelper to allow create() on Mock Models without errors
 2014-04-26 08:53:43 -04:00
ADmad
68572d8046 Cannot use php 5.4+ array syntax for 2.x. 2014-04-26 17:30:31 +05:30
Jorge González
5cf2ce723c fixed FormHelper to allow create() on Mock Models without errors 2014-04-26 10:33:58 +01:00
mark_story
de0062de77 Merge branch 'master' into 2.5 2014-04-25 22:10:02 -04:00
mark_story
f23d811ff5 Use the form action URL in generated form hashes. 
By including the URL in generated hash for secured forms we prevent
a class of abuse where a user uses one secured form to post into a
controller action the form was not originally intended for. These cross
action requests could potentially violate developer's mental model of
how SecurityComponent works and produce unexpected/undesirable outcomes.

Thanks to Kurita Takashi for pointing this issue out, and suggesting
a fix.
 2014-04-25 22:05:58 -04:00
ADmad
27699d1f12 Fix auto linking urls with subdomain with underscore. 
Closes #3392
 2014-04-25 22:28:34 +05:30
Mark Story
00be120e7a Merge pull request #3381 from planardothum/shell-requires-cli 
Add check to abort if $argv is undefined.
 2014-04-24 12:32:54 -04:00
Harold Putman
d62e5e1b00 Prevent infinite loop caused when argv not set. 
If shell is invoked with the wrong PHP executable (not CLI) and argv is not an array,  array_search on null causes infinite number of error messages.
 2014-04-24 11:48:19 -04:00
mark_story
9d19801cfa Clear data and validationErrors *after* calling clearCache(). 
Having both properties cleaned after clearCache() means that you can use
the model data in specialized clearCache() implementations.

Fixes #3386
 2014-04-24 09:19:00 -04:00
Stefan Dickmann
f90f718e11 change parameter order 2014-04-24 12:54:45 +02:00
ADmad
971a845eb1 Merge pull request #3379 from dereuromark/2.5-inflector 
2.5 inflector
 2014-04-24 13:13:59 +05:30
mark_story
04edb547f3 Merge branch 'master' into 2.5 2014-04-23 22:21:57 -04:00
mark_story
6f68049bf5 Reject file paths containing ... 
Paths containing `..` are generally up to no good. Throw an exception,
as developers can use realpath() if they really need to get relative
paths.

Fixes #3370
 2014-04-23 22:20:14 -04:00
mark_story
2333c3d535 Update docs for file(). 
Mention that relative paths will be prepended with APP.

Refs #3370
 2014-04-23 22:15:10 -04: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
ADmad
ead494eec1 Allow setting only default layout without specifying template in email config. 
Closes #3336
 2014-04-22 20:02:36 +05:30
ADmad
6bdfdfd436 Optimize view paths caching for plugins. 
Closes #2047
 2014-04-20 02:02:07 +05:30
mark_story
d54fbe6f60 Merge branch 'master' into 2.5 2014-04-18 22:13:56 -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
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
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
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
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
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
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
euromark
c321ee5fec correct doc block 2014-04-09 03:07:19 +02: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
euromark
ad5e62515f Use Hash instead of Set class 2014-04-07 03:23:51 +02:00
euromark
cb0ac6f9f3 Add a note to offsetSet() on why it cannot chain. 2014-04-06 22:59:18 +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
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
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
Saleh Souzanchi
40b7694891 adding options for react to response when asset not exists 2014-04-04 19:50:37 +04:30
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
Brian Porter
e5dd8acb60 Adds phpunit required version to TestShell "not found" error message. 2014-04-01 11:08:46 -05:00
Bryan Crowe
b93f373f16 Fix yoda condition in File test 2014-03-31 17:40:35 -04:00
mark_story
7419ac35b0 Merge branch '2.5' of github.com:cakephp/cakephp into 2.5 2014-03-30 21:25:19 -04:00