adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
18882 commits 7 branches 0 tags 44 MiB
Commit graph

18882 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Mark Story
4f98f01427 Merge pull request #10096 from coryjthompson/ticket-8872 
SQL JSON expression in virtual field and conditions
 2017-01-24 10:55:22 -05: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
ADmad
a641d6a1eb Merge pull request #9998 from xavier83ar/2.next.fix-phpdoc 
Wrong return type hint in Controller::redirect #9987
 2017-01-09 16:56:53 +05:30
Javier Melero
ba121d8c32 Wrong return type hint in Controller::redirect #9987 2017-01-09 07:38:41 -03:00
mark_story
cceeb34d1d Fix docblock formatting. 2017-01-03 11:01:41 -05:00
mark_story
1a8f2202c0 Merge branch '2.x' into 2.next 2017-01-03 11:01:04 -05:00
Mark Story
46bb71a536 Merge pull request #9896 from w1zardhead/add-crumb-prepend 
Allow the prepend the addCrumb method
 2017-01-03 11:00:33 -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
Shunsuke Takahashi
3f38318802 Updating doc for options prepend 2016-12-21 19:08:32 +09:00
Shunsuke Takahashi
e19a7b2594 Check for options parameter is array 2016-12-21 18:33:58 +09: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
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