Derek Perkins
b1a3ab9e64
Added unit test for CakeRequest::setInput
...
Don't use mocks as the tests weren't really testing anything when mocks
were involved.
Refs #3764
2014-06-29 22:55:38 -04:00
Derek Perkins
6bf0b22195
Add setInput function to CakeRequest
...
Modify data originally from `php://input`. Useful for altering json/xml
data in middleware or DispatcherFilters before it gets to
RequestHandlerComponent or other controllers.
2014-06-29 22:55:29 -04:00
Mark Story
a966f089d2
Merge pull request #3832 from ADmad/2.5-inflector
...
Add pluralization rule for "stadia" to uninflected list.
2014-06-29 09:34:09 -04:00
ADmad
607200fa7b
Add pluralization rule for "stadia".
...
Refs #3830
2014-06-29 14:51:23 +05:30
ADmad
153f530a01
Merge pull request #3829 from cakephp/api-doc-fixes
...
API doc fixes
2014-06-29 11:51:41 +05:30
mark_story
48c799812e
Tidy up and simplify travis.yml file.
2014-06-28 21:23:23 -04:00
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
mark_story
91721244a4
Fix more doc block errors in lib/
2014-06-27 22:58:34 -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
Bryan Crowe
a1ae31e554
Fix identifier typos
2014-06-26 23:06:08 -04:00
euromark
73dcb2cb91
cs correction
2014-06-26 14:22:34 +02:00
José Lorenzo Rodríguez
8e9c85ef61
Merge pull request #3809 from renan/2.5-non-integer-exception-code
...
Exiting with 1 when Exception::getCode() returns non-integer values.
2014-06-26 14:09:26 +02:00
Renan Gonçalves
1a89a3cb9d
Exiting with 1 when Exception::getCode() returns non-integer values.
...
From php.net/exception.getcode
> Returns the exception code as integer in Exception but possibly as other type in Exception descendants (for example as string in PDOException).
2014-06-26 13:26:20 +02: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
88f42eb362
Merge branch 'patch-2' into 2.6
...
Refs #3754
2014-06-25 09:19:31 -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
Mark Story
e8ee25f40d
Merge pull request #3792 from dereuromark/master-docblocks
...
Update doc blocks regarding return $this
2014-06-24 23:39:44 -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
Mark
9365913abe
Merge pull request #3789 from suzuki86/fix-typo
...
Fix typo
2014-06-24 17:30:24 +02:00
suzuki86
8f9589f7c8
Fix typo
2014-06-25 00:20:54 +09:00
Mark Story
044065df6f
Merge pull request #3783 from dereuromark/master-cakeplugin-path
...
Mark App::pluginPath as deprecated and don't use it anymore.
2014-06-24 07:38:57 -04: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
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