Commit graph

18859 commits

Author SHA1 Message Date
Val Bancer
e0b0da86bf fixed unit tests 2017-01-26 22:21:09 +01:00
Val Bancer
ebde8fdfb5 implemented Router::reverseToArray() 2017-01-26 21:52:26 +01:00
Mark Story
8ee5259323 Merge pull request #10103 from tersmitten/phan-fix-phpdoc-return
Fix for incorrect @return phpdoccomment
2017-01-25 14:32:10 -05:00
Mischa ter Smitten
2b4b2ef2c8 Fix for incorrect @return phpdoccomment 2017-01-25 16:44:24 +01:00
mark_story
7de6cf0aa5 Update version number to 2.9.5 2017-01-23 20:47:14 -05:00
Mark Story
0c1bda2046 Merge pull request #10069 from berarma/server-fix
2.x: Built-in server doesn't accept query string parameters for the base path
2017-01-22 09:31:48 -05:00
Mark Story
e4142e2f8b Merge pull request #10077 from gemal/2.x
add ru-ru locale
2017-01-21 21:31:07 -05:00
Henrik Gemal
95e0820d62 add ru-ru 2017-01-21 19:58:50 +01:00
Bernat Arlandis
6a3c4887f9 Fix base path with query params in builtin server 2017-01-20 10:14:14 +01:00
José Lorenzo Rodríguez
7ba160bf95 Merge pull request #10055 from MarkusBauer/v2.x/mail-error-message
Fixing a broken error message in MailTransport
2017-01-17 20:35:51 +01:00
Markus Bauer
9b13381b0a Fix error messages if PHP's mail() function fails 2017-01-17 19:42:57 +01:00
José Lorenzo Rodríguez
541fb03438 Merge pull request #10034 from cakephp/issue-10031
Add support for the parseHuge option.
2017-01-15 11:19:52 +01:00
mark_story
273a8a2d7d Add support for the parseHuge option.
Sometimes people need to load huge XML files. Add an option to enable
people to enable this flag.

Refs #10031
2017-01-13 21:26:54 -05:00
Mark Story
d40b39f18b Merge pull request #9970 from cakephp/issue-9962
Fix query string parsing on requestAction()
2017-01-06 13:47:42 -05:00
Mark Story
f62d2a84ea Merge pull request #9972 from chinpei215/2.x-flash-helper
Fix FlashHelper::render() cannot render `default` messages
2017-01-05 09:30:29 -05:00
chinpei215
94d9bcd674 Fix FlashHelper::render() cannot render default messages
Fixes #9910
2017-01-05 19:00:52 +09:00
mark_story
304117d228 Fix query string parsing on requestAction()
This also fixes a long standing oddity around string URLs that include
a query string where the query string data would be duplicated.

Refs #9962
2017-01-04 22:34:19 -05:00
José Lorenzo Rodríguez
7e187a4e41 Merge pull request #9932 from cakephp/issue-9927
Use array conditions for joins.
2016-12-30 00:02:58 +01:00
mark_story
e01f5989af Use array conditions for joins.
Use array style conditions instead of using lower-level DboSource API
methods to create safe SQL.

Refs #9927
2016-12-28 23:18:30 -05:00
mark_story
95cafaec3b Update version number to 2.9.4 2016-12-23 13:27:15 -05:00
mark_story
53bcc1550f Fix PHPCS error. 2016-12-13 22:50:07 -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
domingues
4d77cb059d Fix a bug in Xml::fromArray()
When creating from an array with elements like this: `[ "a" => [ 0 ] ]` or `[ "a" => [ '0' ] ]` it fails and produces XML like this `<a/>` instant of `<a>0</a>`.

The problem is that in PHP `empty('0')` is true, so an exception to this case is needed.
2016-12-13 16:16:12 +00: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
cdef76eeda Merge pull request #9867 from chinpei215/2.x-tree-behavior
[2.x] Fix TreeBehavior does access property/method via model
2016-12-12 21:24:47 -05:00
chinpei215
21502db34a Fix TreeBehavior does access property/method via model 2016-12-13 07:15:48 +09: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
mark_story
caaf748883 Add PHP7.1 to test matrix. 2016-12-05 09:22:48 -05:00
Mark Story
14192ba1e8 Merge pull request #9840 from chinpei215/2.x-blank-redir
Fix redirectUrl issue when loginRedirect is empty
2016-12-04 09:26:19 -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
Mark Story
307ad80358 Merge pull request #9826 from gemal/2.x
add new locales fixes #9825
2016-12-01 20:37:34 -05:00
Henrik Gemal
75bb30f6b2 add new locales fixes #9825 2016-12-01 12:39:47 +01:00
mark_story
410df003e6 Update version number to 2.9.3 2016-11-27 21:25:11 -05:00
Mark Story
1152cbcd2d Merge pull request #9807 from cakephp/2.x-pages-controller
Fix directory traversal of .ctp files
2016-11-27 21:11:17 -05:00
chinpei215
74c2ded872 Fix directory traversal of .ctp files 2016-11-27 18:14:44 +09:00
Mark Sch
02df9ff72e Add a note about $boot 2016-11-26 18:10:37 +01:00
Mark Sch
43aa5dd502 Merge pull request #9803 from chinpei215/revert-9577
Revert #9577
2016-11-26 18:08:40 +01:00
chinpei215
f9d2a52152 Revert "Remove dead code"
This reverts commit bf908762db.
2016-11-27 01:25:01 +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