Commit graph

18962 commits

Author SHA1 Message Date
Livia Scapin
f7360266f0 Fix invalid return value hint 2017-02-08 13:48:22 +01:00
Mark Story
1b63d3eaff Merge pull request #10180 from gmponos/patch-3
Cakephp should be in the required packages
2017-02-07 13:18:04 -05:00
Mponos George
4335048bf8 Cakephp should be in the required packages
Cakephp should be in the required packages
2017-02-07 13:13:35 +02:00
chinpei215
e18029064c Split tests of buildStatement() 2017-02-05 21:27:06 +09:00
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
be87a157b6 Merge pull request #10126 from chinpei215/2.x-min-length-bytes
Add Validation::minBytes() and Validation::maxBytes()

Resolve build errors in #9882
2017-01-29 21:31:58 -05:00
chinpei215
7944f512ad Fix ModelTaskTest for tests passing 2017-01-30 03:22:50 +09:00
Mischa ter Smitten
043858d9e6 Fixed typo 2017-01-30 03:22:49 +09:00
Mischa ter Smitten
6818268a27 New Validation::(min|max)ByteLength() addition 2017-01-30 03:22:48 +09:00
Mark Story
9999d368c9 Merge pull request #10116 from tersmitten/phan-fix-phpdoc-return
Fix for incorrect @return phpdoccomment
2017-01-27 10:07:07 -05:00
Mischa ter Smitten
259972a785 Fix for incorrect @return phpdoccomment 2017-01-27 10:33:49 +01:00
Val Bancer
eb00f9aa7d fixed code style 2017-01-26 23:52:14 +01:00
Val Bancer
0c8e3f1977 fixed unit tests 2017-01-26 23:39:47 +01:00
Val Bancer
0bf49966db fixed unit test 2017-01-26 22:39:38 +01:00
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
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
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
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
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
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