chinpei215
26731b93bf
Use ternary operator
2016-12-04 21:55:29 +09:00
chinpei215
b7481096c8
Fix redirectUrl issue when loginRedirect is empty
...
Fixes #9819
2016-12-04 20:06:24 +09:00
chinpei215
74c2ded872
Fix directory traversal of .ctp files
2016-11-27 18:14:44 +09:00
mark_story
bbb87b3e87
Use null instead of false for failure.
...
null is better to indicate that a thing doesn't exist.
2016-11-26 10:38:28 -05:00
Mark Story
ba9f62a7a0
Merge pull request #9747 from tersmitten/cache-does-not-expose-configured-engines
...
Expose Cache engines
2016-11-26 10:16:20 -05:00
mark_story
e057b5572c
Fix PHPCS.
2016-11-21 20:51:12 -05:00
mark_story
71b7d6211b
Fix AclNode constructor.
...
It should forward the settings from ClassRegistry::init() so that
aliases can be customized as needed.
Refs #9766
2016-11-19 22:30:18 -04:00
mark_story
66363e6bea
Add tests for #9766
...
I'm not able to reproduce incorrect aliases coming out of ClassRegistry.
As reported.
2016-11-19 10:02:09 -04:00
Mischa ter Smitten
e71afa225e
Merge remote-tracking branch 'upstream/2.x' into make-it-possible-to-configure-cachemethodhashalgo-in-dbosource
2016-11-14 16:26:48 +01:00
Mischa ter Smitten
936b9924b3
Add tests for overridden cacheMethodFilter
2016-11-14 12:51:57 +01:00
Mischa ter Smitten
1952d2ee17
Add tests for cacheMethodFilter
2016-11-14 11:44:35 +01:00
Mischa ter Smitten
5947c2346b
Fix failing test
2016-11-14 10:53:33 +01:00
Mischa ter Smitten
7ffb5c3600
Add tests for cacheMethodHasher
2016-11-14 10:00:47 +01:00
Mischa ter Smitten
94572ae384
Do not use deprecated assertIsA
2016-11-11 21:41:23 +01:00
Mischa ter Smitten
175503fafa
Expose engines
...
By implementing the `engine` method just like in version 3
2016-11-11 13:42:22 +01:00
Val Bancer
467ee851bf
some refactoring to fix failed shell dispatcher tests
2016-11-08 10:03:46 +01:00
mark_story
9d94487b23
Fix PHPCS
...
Refs MATES-9698
2016-11-04 09:31:05 -04:00
mark_story
6a201696dd
Fix HttpSocket emitting errors when nameless cookies are encountered.
...
Refs #9698
2016-11-03 19:07:25 -04:00
Val Bancer
744b455de1
fixed configuration of 'enabled' setting in components inside a
...
component
2016-10-28 22:14:20 +02:00
mark_story
c935bed8f6
Fix PHPCS
2016-10-21 18:35:05 -04:00
mark_story
816801902e
Allow '' to be a valid key for Hash, and Session
...
By removing a bunch of empty() guards we can make '' behave like all the
other key names. This does change the existing behavior/tests around ''
key, but I think that is ok given the need to manipulate ''.
Refs #9632
2016-10-21 10:54:39 -04:00
mark_story
ecd270d04b
Tweak/Add doc blocks.
2016-10-09 11:05:35 -04:00
David Maicher
a932bce3de
[Bugfix] use Model::$cacheQueries as default for ->query(...)
2016-10-09 13:43:27 +02:00
José Lorenzo Rodríguez
9425234b87
Merge pull request #9550 from cakephp/issue-9526
...
Fix enum column length detection.
2016-10-06 09:29:25 +02:00
Andrej Griniuk
2d6e85ed14
validate table name before generating schema file
2016-10-03 00:23:05 +08:00
mark_story
e41ccdb701
Fix enum column length detection.
...
Use simpler code to calculate the length of fields. Include more tests
for DboSource as there weren't any before.
Refs #9526
2016-09-30 22:25:25 -04:00
Mischa ter Smitten
197c2f4e60
Make use of assertAttributeEquals
2016-09-22 21:30:18 +02:00
Mischa ter Smitten
4c9f1cc154
_lastAction() should also work with named parameters in the url
2016-09-20 15:07:36 +02:00
mark_story
ad5130cd31
Merge branch '2.next' into 2.x
2016-09-18 22:22:56 -04:00
mark_story
4f70bdb3b8
The _lastAction property should not double include the base path.
...
FormHelper should not run URLs through Router twice when determining the
the form's lastAction attribute. However, because we're using the helper
method (see #9414 ) we do need to HTML decode the URL before using it in
form token generation.
Refs #9455
2016-09-13 22:21:01 -04:00
mark_story
dc2fa498ef
PHPCS.
2016-09-12 23:19:08 -04:00
mark_story
9d1fbb95b3
Allow datasource access in constructors of mocked models.
...
When mock objects are created from models that access their datasource
in the constructor, an exception would be raised for the missing default
datasource. By changing how configuration data is handled in the mock
creation we can avoid this issue and not reopen #4867
Refs #8225
2016-09-12 22:15:55 -04:00
Val Bancer
98cd278c02
improved performance of insertMulti() in Mysql
2016-09-05 21:28:07 +02:00
mark_story
e8d63725d8
Merge branch '2.x' into 2.next
2016-09-04 23:54:22 -04:00
mark_story
2ffde69d5b
Skip test that always fails on PHP5.3
2016-08-29 21:56:30 -04:00
mark_story
d1cfe203c4
Fix PHPCS error.
2016-08-29 21:53:47 -04:00
Mark Story
51963ab8fc
Merge pull request #9349 from cakephp/2.x-sort-locale
...
2.x sort locale backport
2016-08-26 11:13:21 -04:00
Mark Sch
ee319baec1
Backport skip
2016-08-26 16:15:39 +02:00
mscherer
03df288e78
Re-add spacing.
2016-08-26 14:45:59 +02:00
mscherer
dab4b85596
Backport Hash::sort() support for type locale.
2016-08-26 14:32:21 +02:00
ndm2
87d86aaed9
Fix/tighten Folder::inPath()
checks.
...
The current checks are way too relaxed, and are more like testing
for a substring, which makes it easy for invalid paths to slip
trough, for example `/foo/var/www` is falsely tested to reside in
`/var/www`.
Passing an empty path never worked properly, it was triggering a
warning, didn't worked on Windows, and the behavior that the current
top level directory would be assumed for empty paths wasn't
documented.
Similar is true for relative paths. While they did match at one point,
this was incorrect behavior, and matching actual path fragments seems
out of scope for this method.
This change makes the `$path` argument required, requires it to be an
absolute path, and throws an exception in case a non-absolute path is
being passed.
2016-08-26 13:45:45 +02:00
Mark van Driel
e3b0aca95e
Removed bug fix for Helper::_confirm to keep the code compatible
2016-08-21 17:09:43 +02:00
Mark van Driel
34afc377ec
Added support for confirm (message) option to submit in FormHelper
2016-08-20 12:51:13 +02:00
José Lorenzo Rodríguez
3937a4f02e
Merge pull request #9255 from cakephp/issue-9229-restore
...
Restore header() behavior inadvertantely removed.
2016-08-15 09:51:10 +02:00
mark_story
3e16f8911d
Add tests covering basic use of <> in deleteAll()
...
Refs #9253
2016-08-13 22:48:02 -04:00
mark_story
bc73e928b6
Restore header() behavior inadvertantely removed.
...
In eaa2bbbcae
I changed the behavior to
now use the TitleCased name as I didn't understand the intended behavior
or how apache was working in the reporter's specific case.
Refs #9229
2016-08-11 21:54:24 -04:00
Marc Würth
f2638b3e38
Remove superfluous "Class" from doc blocks
2016-08-10 12:22:09 +02:00
mark_story
61b3fbd605
Merge branch '2.x' into 2.next
2016-08-09 22:12:26 -04:00
mark_story
eaa2bbbcae
Merge branch 'auth-header' into 2.x
...
Refs #9229
2016-08-09 22:07:46 -04:00
mark_story
20a2af8c16
Fix casing issues with Authorization header.
...
We need to check the upper case versions of headers in $_SERVER.
Also fix lint issues.
2016-08-09 22:06:49 -04:00