chinpei215
abd7a257fe
Fix mysql test
2017-02-03 21:13:51 +09:00
chinpei215
923b73a7ba
Add support for having/lock options
2017-02-03 17:51:22 +09:00
Cory Thompson
e1fac3bf5b
Fix whitespace
2017-01-24 21:51:54 +11:00
Cory Thompson
55324c0b2a
Allow SQL json selects without defining table name
2017-01-24 20:54:07 +11:00
Cory Thompson
990d0a962f
Allow database JSON operations in conditions
2017-01-24 19:33:12 +11:00
Cory Thompson
82a64a3729
Merge remote-tracking branch 'doublemap/exclude-column-trailing-hyphen' into ticket-8872
2017-01-24 19:25:24 +11:00
mark_story
1a8f2202c0
Merge branch '2.x' into 2.next
2017-01-03 11:01:04 -05:00
Shunsuke Takahashi
6f5b16b31f
Allow the prepend the addCrumb method
2016-12-21 16:34:35 +09:00
mark_story
53bcc1550f
Fix PHPCS error.
2016-12-13 22:50:07 -05:00
mark_story
4c3e9356ba
Merge branch '2.next' of github.com:cakephp/cakephp into 2.next
2016-12-13 22:48:57 -05:00
mark_story
837741db66
Merge branch '2.x' into 2.next
2016-12-13 22:48:44 -05:00
mark_story
99af4bba83
Merge branch 'domingues-2x' into 2.x
...
Refs #9870
2016-12-13 22:48:12 -05:00
mark_story
3c44ddd10b
Add tests for #9870
2016-12-13 22:47:57 -05:00
Mark Story
4a4c83c3e9
Merge pull request #9859 from cakephp/debugger-encoding
...
2.x - Debugger encoding
2016-12-13 19:26:52 -05:00
mark_story
ee7739a3bf
Try another approach to get the same error in all php versions.
2016-12-13 00:46:13 -05:00
mark_story
69afeb08af
Skip error encoding test in PHP5.3
...
Index errors work funny in PHP5.3, which makes testing them not work
like other versions of PHP.
2016-12-12 21:28:20 -05:00
mark_story
edfda47cf4
Fix missing HTML encoding in Debugger
...
Fix missing HTML encoding when error messages contain HTML. This can
happen when user data is used as an offset in an array in an unchecked
way.
Thanks to Teppei Fukuda for reporting this issue via the responsible
security disclosure process.
2016-12-10 08:47:13 -05:00
Mark Story
420336f536
Merge pull request #9843 from cakephp/php71
...
Add PHP7.1 to test matrix.
2016-12-07 21:40:54 -05:00
mark_story
12cdc247ac
Fix PHPCS errors.
2016-12-07 00:38:55 -05:00
mark_story
0a2a400ea4
Fix type error tests to work in PHP5 & PHP7.1
...
Catch the TypeErrors that are raised and make the match the PHP5
behavior of a converted error.
2016-12-06 21:21:52 -05:00
Mark Story
9e6e08704e
Merge pull request #9838 from cakephp/issue-9779
...
Fix CookieComponent erroring on corrupted data.
2016-12-05 16:44:24 -05:00
mark_story
e3221b1c38
Fix errors in php7.1
...
* The constructor of errors has changed in PHP 7.1
* mcrypt is no longer available in PHP 7.1 by default.
2016-12-05 16:14:33 -05:00
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
mark_story
934bb00b36
Add tests showing recent changes fix #9784
2016-12-03 14:14:57 -05:00
mark_story
27f951fb41
Don't emit errors when operating on corrupted cookie data.
...
When deleting from corrupted cookie data, there shouldn't be any errors.
Refs #9779
2016-12-03 14:10:47 -05: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
3837f40394
Autodetect content-types for email attachments (2.x)
...
This ports the safe parts of #9619 and updates the tests. Because
existing tests had to change and I was concerned about changing people's
email messages in a bugfix release I'm targetting 2.next with this
change.
2016-11-06 21:49:15 -05:00
mark_story
c0150f62ed
Merge branch '2.x' into 2.next
2016-11-06 21:42:31 -05: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
xhs345
e1c5ef9e7a
Add clear option to Flash Message
...
To give user the option to disable Stacking of messages and being consistent with 3.x
2016-10-30 20:39:00 -07:00
Val Bancer
744b455de1
fixed configuration of 'enabled' setting in components inside a
...
component
2016-10-28 22:14:20 +02:00
xhs345
924d382bb3
Fix tests
2016-10-28 09:10:01 -07:00
xhs345
c59fb85da8
Add support for stacking Flash messages
...
See Issue #7830
2016-10-28 09:10:01 -07:00
mark_story
135a24e0f1
Merge branch '2.x' into 2.next
2016-10-28 00:29:46 -04:00
mark_story
c935bed8f6
Fix PHPCS
2016-10-21 18:35:05 -04:00
