Commit graph

18895 commits

Author SHA1 Message Date
Sebastien Barre
3ad91204b9 Merge branch '2.x' of https://github.com/cakephp/cakephp into duplicate_primary 2017-03-14 11:11:14 -04:00
Mark Story
fc28eced6b Merge pull request #10403 from tenkoma/2.x-update-url-in-docs
Update URL in Docs and composer.json (2.x branch)
2017-03-11 22:41:37 -05:00
Mark Story
8f6cf96cca Merge pull request #10389 from cakephp/issue-10385
Hash::filter() should not exclude 0.0
2017-03-11 13:10:13 -05:00
Koji Tanaka
bea806e98a Update URL in *.md, *.json 2017-03-12 03:04:59 +09:00
mark_story
173f927ef3 Try again to get apcu install step working. 2017-03-11 12:33:11 -05:00
mark_story
8559403c17 echo not print. 2017-03-11 08:07:31 -05:00
mark_story
c4aac6234d Try apcu install again. 2017-03-10 21:22:10 -05:00
mark_story
92aac61830 Attempt to fix apcu install issues. 2017-03-10 20:58:31 -05:00
Sebastien Barre
1ebdc61fdc clean up assertions now that we are dropping the fixture early 2017-03-09 23:11:17 -05:00
mark_story
e698891d09 Hash::filter() should not exclude 0.0
Refs #10385
2017-03-09 21:29:44 -05:00
Sebastien Barre
a0e023d3a9 fix coding standard, skip Postgres 2017-03-06 15:58:03 -05:00
Sebastien Barre
3849df0f2f fix duplicate primary keys for tables without models 2017-03-05 21:47:00 -05:00
Mark Story
8d0e1fadf7 Merge pull request #10113 from bancer/request-url-to-array
implemented Router::reverseToArray()
2017-03-02 23:07:40 -05:00
mark_story
03e7fa0710 Update version number to 2.9.6 2017-02-28 22:27:17 -05:00
Mark Story
6648ee0a3c Merge pull request #10322 from kanonji/fix
Fix FormHelper to get work fine with numeric label of optgroup
2017-02-28 20:46:31 -05:00
kanonji
3978f87c58 Stringify values to avoid trap of in_array() type juggling 2017-02-28 03:33:50 +09:00
Mark Story
beff1176b0 Merge pull request #10213 from cakephp/issue-10196
Allow false/true to be read as keys in Hash::get().
2017-02-20 11:54:17 -05:00
Mark Story
c5828eecca Merge pull request #10251 from tersmitten/phan-fixes
PHPDoc fixes
2017-02-17 15:57:33 -05:00
Mischa ter Smitten
2304ca379a PHPDoc fixes
Found with Phan
2017-02-17 16:59:35 +01:00
José Lorenzo Rodríguez
9de424cba0 Merge pull request #10227 from cakephp/issue-10221
Exit early if SMTP connection fails.
2017-02-15 10:16:26 +01:00
mark_story
84a15dc9df Fix short-array usage. 2017-02-14 14:12:38 -05:00
mark_story
34158407b2 Exit early if SMTP connection fails.
If the SMTP connection is disconnected (read() returns false) we should
exit early and not wait for the read timeout. This has the added benefit
of making the mocks much simpler.

Refs #10221
2017-02-13 22:37:44 -05:00
mark_story
3f10a0227a Allow false/true to be read as keys in Hash::get().
While these are not values within the documented types, there exist use
cases in CakeSession that necessitate these to be supported types.

Refs #10196
2017-02-13 21:50:51 -05:00
Mark Sch
aa8d708b9a Merge pull request #10186 from liviascapin/patch-1
Fix invalid return value hint
2017-02-08 13:50:46 +01:00
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
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
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