Commit graph

17214 commits

Author SHA1 Message Date
Mark Story
c089a7b5bb Merge pull request #3773 from ADmad/2.6-folder-streamwrapper
Update isAbsolute() to recognize stream wrapper paths.
2014-06-22 09:20:34 -04:00
ADmad
9a1a965b1c Update isAbsolute() to recognize stream wrapper paths.
This has the benefit that the realpath() method is not applied to a
registered stream wrapper in the constructor of the Folder class.
Using the realpath() method will break the stream.

Thank "davalb" for the original patch.
2014-06-22 13:43:14 +05:30
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
José Lorenzo Rodríguez
6a8033aea2 Merge pull request #3759 from dereuromark/master-core-dispatcher
make coredispatcher fully BC again
2014-06-20 14:48:14 +02:00
euromark
d81d568cc0 make coredispatcher fully BC again 2014-06-20 14:05:18 +02:00
mark_story
497ecd3f80 Merge branch 'master' into 2.6
Conflicts:
	lib/Cake/VERSION.txt
2014-06-19 21:41:02 -04:00
José Lorenzo Rodríguez
5f81a745c4 Merge pull request #3744 from markstory/2.6-missing-views
2.6 Improve missing view error pages
2014-06-19 20:40:02 +02:00
mark_story
8f3ce9c9c4 Filter out core paths from missing view/layout errors.
End developers shouldn't be dropping files in /lib/Cake so lets not tell
them to.
2014-06-19 10:03:00 -04:00
Mark Story
27247a4cee Merge pull request #3745 from dereuromark/2.6-tolist
2.6 toList() localization
2014-06-19 09:41:02 -04:00
euromark
9c035ff315 doc block corrections 2014-06-19 13:25:36 +02:00
euromark
53a544d9f0 Improve toList to allow localization 2014-06-18 17:56:35 +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
31956c2abb Remove dead code.
The list of paths is now output on the default error page, we don't need
to make an educated guess here anymore.
2014-06-18 09:26:38 -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
mark_story
fecc687f81 Cleanup missing view/layout errors.
Fix formatting issues and make path listings correct.
2014-06-17 23:20:49 -04:00
Dan Voyce
4915639efb Update Inflector.php
Added Research
2014-06-18 11:48:16 +10:00
mark_story
e548dfcaea First pass at making MissingView/MissingLayout exceptions show all
paths.

Showing all the paths a template file could be located help expose
developers to the view path cascade and helps ensure we don't tell
people the wrong place to put a view file.

Refs #3712
2014-06-17 16:30:50 -04:00
euromark
6161aae54e also bring template one in sync. 2014-06-17 13:08:13 +02:00
ADmad
4a7c3582d0 Merge pull request #3727 from cakephp/master-fix
remove wrong App::uses() call
2014-06-17 11:06:53 +05:30
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
7d8dcd020e Merge pull request #3704 from cakephp/hash-matches
Fix Hash::extract() not matching 1/0 to true/false.
2014-06-13 15:21:10 -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
Melvin Ross
ad4dbdcee5 Fix HttpSocket test to actually reset protocols for correct test. Modify HttpSocket so that Https with non-passed in protocol doesn't set it to tcp and fail test. 2014-06-12 09:37:03 -05:00
Melvin Ross
460cc29fff Remove unneeded comment out line that I just saw in compare view on GH 2014-06-12 08:51:35 -05:00
Melvin Ross
361531509e Fix coding standard violations 2014-06-12 08:47:40 -05:00
Mark Story
7ea6626a15 Merge pull request #3692 from MMS-Projects/i18n-refactor
Refactor i18n basics
2014-06-12 08:10:46 -04:00
Marlin Cremers
4f91e14cab Refactor translation functions arguments handeling 2014-06-12 08:48:28 +02:00
mark_story
8e14b2f807 Merge branch 'master' into 2.6 2014-06-11 23:05:59 -04:00
Melvin Ross
86923e3593 Modify CakeSocket and HttpSocket so that the "protocol" parameter can be used to specify which protocol to use for creating sockets. These are protcols in the php "[a-z]://" wrapper sense. I also modified the test for these two files respectively to accomodate these new changes.
Unrelated to this bug, I added a "head" function inside of HttpSocket to go along with the GET/POST/PUT/DELETE/PATCH combination that's already present. Came in handy for me for deciding if I wanted to hit a resource with HttpSocket or not.
2014-06-11 19:04:58 -05:00
Bryan Crowe
d8b4c3967c Fix typo 2014-06-10 23:31:42 -04:00
Mark Story
73189acb76 Merge pull request #3681 from cakephp/api-doc-comments
Fix api docblocks for behaviors.
2014-06-09 15:13:19 -04:00
ADmad
0b4ba0b049 Fix api docblocks for behaviors. 2014-06-10 00:38:44 +05:30
José Lorenzo Rodríguez
729e528eb0 Merge pull request #3666 from ADmad/2.5-basic-auth
Remove lies from API docblock for BasicAuthenticate class.
2014-06-08 10:41:35 +02:00
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
José Lorenzo Rodríguez
461aa34739 Merge pull request #3668 from ADmad/2.6-app-pluginpath
Deprecate App::pluginPath()
2014-06-08 10:10:43 +02:00
ADmad
4c83563501 Deprecate App::pluginPath() 2014-06-07 22:59:02 +05:30
ADmad
92a89d7f5d Merge pull request #3661 from cakephp/api-docs
Api docs
2014-06-06 23:57:31 +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
9e744113f0 Merge pull request #3659 from dogmatic69/patch-3
simplify connect code for redis
2014-06-06 10:08:36 -04:00