Mark Story
187272c06a
Merge pull request #3824 from NickBeeuwsaert/element_events
...
Added view type getter and ensured element render events would get the proper type
2014-06-28 06:21:46 -04:00
Nick Beeuwsaert
733a610bf7
More coding standard fixes
2014-06-27 18:03:29 +00:00
Nick Beeuwsaert
6623a8a7f4
Adhering to CakePHP coding standards
2014-06-27 17:28:43 +00:00
Nick Beeuwsaert
f9aa954562
Changed Event names back, added view type getter
...
Changed `Element.beforeRender` and `Element.afterRender` back to
`View.beforeRender` and `View.afterRender` Also added a getter for
`View::_currentType`.
Added more tests to make sure that things were getting reset right
And also that View::render and View::element events were working
As expected
Changed Event names back, added view type getter
Changed `Element.beforeRender` and `Element.afterRender` back to
`View.beforeRender` and `View.afterRender` Also added a getter and
setter for `View::_currentType`.
Added more tests to make sure that things were getting reset right
And also that View::render and View::element events were working
As expected
2014-06-27 15:40:12 +00:00
Mark Story
e9da7b8f80
Merge pull request #3596 from zeroasterisk/2.6
...
MySQL DbdSource alter field support 'after'
2014-06-25 23:10:29 -04:00
Nick Beeuwsaert
7cef19fe96
Changed View::element() to have an appropriately named event
...
And also made it so when the event fires the subjects type is
`View::TYPE_ELEMENT`. Wrote some tests which I hope are done right I
don't really know the bes way to write a test for a event listener
2014-06-25 22:08:59 -05:00
mark_story
a2673d8bf0
Merge branch 'master' into 2.6
...
Conflicts:
lib/Cake/Core/App.php
2014-06-25 09:22:10 -04:00
mark_story
a40fa5cae9
Add test for #3754
2014-06-25 09:19:24 -04:00
Dan Voyce
239af0322e
Raise an exception when Hash::get() receives invalid parameters
...
I'm not sure on whether this is a problem with my local app but I have
seen it a couple of times in a couple of projects: Warning (2): Invalid
argument supplied for foreach() [CORE/Cake/Utility/Hash.php, line 52]
I think Hash::get should be able to handle this better rather than
throwing an error in a core Util file.
Refs #3754
2014-06-25 09:15:46 -04:00
euromark
b3507b199a
Update doc blocks regarding return $this
2014-06-25 00:06:51 +02:00
José Lorenzo Rodríguez
bf33e1cf57
Merge pull request #3761 from aka-toxa/master
...
improving acl perfomance
2014-06-24 21:58:30 +02:00
José Lorenzo Rodríguez
3df972faa2
Merge pull request #3782 from cakephp/issue-3779
...
Whitelist more URL-y characters in digest parsing.
2014-06-24 21:56:40 +02:00
José Lorenzo Rodríguez
e9e09bf19a
Merge pull request #3788 from dereuromark/master-composer
...
Fix composer app issues with cake.php
2014-06-24 21:56:01 +02:00
euromark
05709908a7
Fix composer app issues with cake.php
2014-06-24 17:49:18 +02:00
suzuki86
8f9589f7c8
Fix typo
2014-06-25 00:20:54 +09:00
euromark
26fe1265ab
Mark App::pluginPath as deprecated and don't use it anymore.
2014-06-24 11:52:29 +02:00
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
6bacc5bb46
Merge branch 'master' into 2.6
2014-06-22 21:25:06 -04: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
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
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
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
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
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
Bryan Crowe
d8b4c3967c
Fix typo
2014-06-10 23:31:42 -04:00
