Commit graph

18926 commits

Author SHA1 Message Date
José Lorenzo Rodríguez
396725dc8c Merge pull request #3880 from markstory/incorrect-validation
Fix issues with Validation::inList() and SecurityComponent
2014-07-05 14:41:15 +02:00
euromark
009138b326 Fix CS 2014-07-05 13:49:50 +02:00
Mark Story
eb485f82b8 Merge pull request #3878 from ceeram/optimize
minor optimisation, refs comments on 81875cfeb1b8e5c414cf9de3c96dd2dde50...
2014-07-04 13:11:17 -04:00
Ceeram
a266a9493d minor optimisation, refs comments on 81875cfeb1 2014-07-04 17:25:41 +02:00
ADmad
1eccec02e4 Merge pull request #3872 from CostaC/response-sharable-fix
Fix for CakeResponse::sharable() header to include private caches
2014-07-04 10:32:51 +05:30
mark_story
3936cce4b8 Disallow hexadecimal input with inList.
Instead of turning on/off strict mode based on the user supplied input,
cast everything to strings and always use a strict check. This avoids
the potential issue of a bad user using hexadecimal when they should not
be allowed to do so. Thanks to 'Kurita Takashi' for pointing this out.
2014-07-03 22:10:49 -04:00
mark_story
1988e89e73 Add an upper bound to the POST data SecurityComponent will consider.
'Kurita Takashi' has let us know that the previous patterns could be
abused by an evil doer. One could potentially send a very large deeply
nested POST data structure. Matching that structure could overflow the
PCRE limits causing a segmentation fault. Adding an upper bound will
solve the problem and I doubt anyone is doing POST data structures with
more than 10 levels of nesting.
2014-07-03 22:02:00 -04:00
mark_story
765be87d88 Overwrite the schemaName property if it is not defined in the class.
If a model class does not define a schemaName we should use the
datasource's schemaName. We can assume that people using schemaName want
to lock the model onto a specific schema given the changes in #3210

Fixes #3720
2014-07-03 21:53:54 -04:00
Costa Caruso
8bfebd64fb Fix for failing test "Whitespace found at end of line" 2014-07-03 15:45:03 -04:00
Costa Caruso
4f559f5cc9 Fixed failing test for CakeResponse::sharable + spacing 2014-07-03 15:03:48 -04:00
ADmad
e410501791 Fix CS errors. 2014-07-03 23:13:55 +05:30
mark_story
2bcd817367 Merge branch 'master' into 2.6 2014-07-03 11:13:06 -04:00
Mark Story
fb15fb6001 Merge pull request #3866 from dereuromark/master-cs-guidelines
Correct doc blocks according to cs guidelines
2014-07-03 11:10:23 -04:00
euromark
974ca851c2 Correct doc blocks according to cs guidelines.
Remove superfluous empty lines.
2014-07-03 15:36:42 +02:00
mark_story
65d14c7e97 Remove mention of Role/default as it doesn't exist.
The default role merging was removed in
3abfaeecf3 and shouldn't be mentioned in
the docs.

Fixes #3871
2014-07-03 09:10:20 -04:00
mark_story
3a06e1f638 Update code examples to be consistent with other docs. 2014-07-03 09:09:25 -04:00
mark_story
b1610c145e Merge branch 'master' into 2.6 2014-07-02 23:39:16 -04:00
mark_story
cee56eaef7 Make PHPCS build passing again. 2014-07-02 23:38:49 -04:00
mark_story
33a5b6e451 Fix additional missing API doc tags. 2014-07-02 23:38:34 -04:00
Costa Caruso
1164c0bcad Fix for CakeResponse::sharable() header to include private caches 2014-07-02 17:34:09 -04:00
Mark Story
2c53bc8a1b Merge pull request #3838 from cakephp/revert-3646-no-truncate-fixture
Revert "No truncate when drop table."

Not truncating tables when they are created causes a number of 
issues in ControllerTestCases as indicated by the comments in #3646 post merge.
2014-07-01 22:02:57 -04:00
Mark Story
2577ca92a8 Merge pull request #3840 from cakephp/issue-3742-relax-email
Relax email validation rules even more.

Fixes #3742
2014-06-30 14:55:15 -04:00
mark_story
adcf9ab723 Fix failing test.
CakeEmail now has a default validation pattern.

Refs #3742
2014-06-30 13:29:39 -04:00
mark_story
dc34d80f6f Relax email validation rules even more.
While filter_var() allows a number of email addresses that
Validation::email() does not, it misses out of email address that
contain IDN host names, and unicode mailboxes. Both of these are
generally deliverable, and should be permitted. filter_var() also fails
on local mailboxes like `root@localhost` which is useful in the context
of cron jobs.

Fixes #3742
2014-06-30 10:42:37 -04:00
Mark
1686edf016 Revert "No truncate when drop table." 2014-06-30 14:14:20 +02:00
mark_story
30952f2b64 Merge branch '2.6' of github.com:cakephp/cakephp into 2.6 2014-06-29 22:57:59 -04:00
mark_story
b06d297216 Merge branch 'request-set-input' into 2.6
Fixes #3764
2014-06-29 22:57:35 -04:00
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