Mark S
6413610e76
Merge pull request #8223 from garas/2.8-AuthComponent-user
...
Use mixed return type for AuthComponent::user()
2016-02-09 23:54:03 +01:00
Edgaras Janušauskas
5b10e3cac2
Use mixed return type for AuthComponent::user()
2016-02-09 23:04:26 +02:00
ADmad
8b15cf1455
Merge pull request #8209 from cakephp/issue-8201
...
Backport fix for Validation::uploadedFile to 2.x
2016-02-09 12:05:41 +05:30
mark_story
e4b939bba0
Backport fix for Validation::uploadedFile to 2.x
...
Don't fail validation when the keys are not the expected order.
Refs #8201
2016-02-08 22:37:25 -05:00
Mark Story
e9f133121d
Merge pull request #8208 from cakephp/2.x-tree
...
Fix bool check and also some doc blocks.
2016-02-08 21:18:02 -05:00
Mark Scherer
f1bea77d74
Fix bool check and also some doc blocks.
2016-02-09 01:18:43 +01:00
mark_story
82206691ac
Bump version for 2.9.0
2016-02-06 21:00:40 -05:00
mark_story
7043bb430e
Merge branch '2.x' into 2.next
2016-02-06 21:00:22 -05:00
mark_story
80f18448b5
Update version number to 2.8.0
2016-02-06 20:59:33 -05:00
mark_story
c0d897b45c
Merge branch '2.x' into 2.8
2016-02-06 20:55:08 -05:00
mark_story
f5608226ce
Merge branch '2.7' into 2.x
2016-02-06 20:34:55 -05:00
mark_story
0309c483fb
Don't make variables we never use.
2016-02-06 20:34:19 -05:00
Mark Story
41a12e9aa2
Merge pull request #8067 from cakephp/issue-7906
...
Make the session cacheLimiter a configuration option.
2016-02-06 20:30:48 -05:00
mark_story
42ebfe8881
Update version number to 2.7.10
2016-02-05 21:38:51 -05:00
Mark Story
76f86b96bb
Merge pull request #8186 from tersmitten/fatal-error-uncaught-exception-configureexception-27
...
Expand path before is_file check
2016-02-05 12:34:22 -05:00
Mischa ter Smitten
5c8c22cf19
Expand path before is_file check
...
To allow symlinks to config files
2016-02-05 11:11:28 +01:00
Mark Story
ddb021ff2a
Merge pull request #8172 from garas/i18n-extract-improvements
...
Improve ExtractTask when CakePHP installed via Composer
2016-02-04 12:52:17 -05:00
Edgaras Janušauskas
f389231058
Improve ExtractTask when CakePHP installed via Composer
2016-02-03 14:52:15 +02:00
Mark Story
3a51018792
Merge pull request #8141 from cakephp/session-index-error
...
Use safer methods to read session configuration.
2016-02-01 21:52:23 -05:00
mark_story
d9992bcaca
Use safer methods to read session configuration.
...
Avoid potential undefined index warnings by using read() to safely fetch
data.
Refs #8101
2016-01-30 16:21:33 -05:00
Jorge M. González Martín
3ca3ffeeee
fix phpcs
2016-01-29 08:56:36 +00:00
mark_story
4b1be44678
Don't make variables we never use.
2016-01-28 21:53:09 -05:00
mark_story
3b5a71df37
Merge branch '2.7' into 2.8
2016-01-28 21:51:59 -05:00
mark_story
fc57dee72f
Fix error in PHP 5.3
2016-01-28 21:50:56 -05:00
Mark Story
aa449b194d
Merge pull request #8125 from CakeDC/issue/7978
...
Add support for NOT IN in Model::find() conditions.
Refs #7978 fixing regex to take in account IN operator
2016-01-28 21:48:04 -05:00
Mark Story
48fd12c350
Merge pull request #8126 from garas/phpdoc-fixes
...
Phpdoc fixes
2016-01-28 17:50:15 -05:00
Edgaras Janušauskas
6e54a7391c
Use more specific datatypes in PHPDoc
2016-01-28 23:10:51 +02:00
Edgaras Janušauskas
fde1d08b43
Fix PHPDoc @return by replacing $this to self
2016-01-28 23:10:42 +02:00
Yevgeny Tomenko
70c4e40532
Fix value check and formatting.
2016-01-28 23:36:07 +03:00
Pedro Fernandes Steimbruch
bf8e6ce576
Refs #7978 fixing code standard
2016-01-28 17:55:19 -02:00
Pedro Fernandes Steimbruch
eaeb7cea9e
Refs #7978 fixing regex to take in account IN operator
2016-01-28 17:34:08 -02:00
Yevgeny Tomenko
e83a532af0
Fixed array syntax.
2016-01-28 22:12:24 +03:00
Yevgeny Tomenko
06853a137a
Merge remote-tracking branch 'remotes/origin/2.8' into feature/uuid
2016-01-28 22:08:10 +03:00
Yevgeny Tomenko
209cdd71a9
code formatting fixes
2016-01-28 21:54:49 +03:00
Yevgeny Tomenko
296f698db3
Added test cases covering native uuid field usage for Postgres class
2016-01-28 21:13:33 +03:00
ADmad
a890d76990
Merge pull request #8107 from ndm2/2.7-fix-post-link-description
...
2.7 - Fix `FormHelper::postLink()` description.
2016-01-26 18:38:29 +05:30
ndm2
4e58d595ae
Fix FormHelper::postLink() description.
...
Update description with a short explanation that considers the
`inline` and `block` options.
2016-01-26 10:59:03 +01:00
mark_story
0edec3cfc6
Update version number to 2.7.9
2016-01-24 21:48:49 -05:00
mark_story
3e67685c7c
Merge branch '2.7' into 2.8
2016-01-21 21:46:51 -05:00
Mark Story
109d604c79
Merge pull request #8075 from cakephp/security-method-2x
...
Backport SecurityComponent fixes from #8071 to 2.x
2016-01-21 18:56:21 -05:00
mark_story
4b8d628a2e
Backport SecurityComponent fixes from #8071 to 2.x
...
If the request manages to have data set outside of post/put we should
still validate the request body. This expands SecurityComponent to cover
PATCH and DELETE methods, as well as request methods that should be
safe, but somehow end up not safe.
2016-01-20 21:34:58 -05:00
mark_story
91109c33b2
Merge branch '2.7' into 2.8
2016-01-19 21:15:08 -05:00
Larry E. Masters
2751f4482d
Merge pull request #8069 from cakephp/issue-#8062
...
Using _cookieName() instead session_name()
2016-01-19 16:57:49 -06:00
Mark Story
983a2f65e8
Merge pull request #8068 from cakephp/2.7-backport-shell-corrections
...
Backport CODE_ERROR constant and return as per expectation.
2016-01-19 17:38:18 -05:00
Larry E. Masters
7c37cf5b5f
Using _cookieName() instead session_name()
2016-01-19 16:29:56 -06:00
José Lorenzo Rodríguez
1b2fcda4d2
Merge pull request #8065 from cakephp/2.7-method-override
...
2.7- Better method overriding emulation for GET
2016-01-19 14:07:44 -04:30
José Lorenzo Rodríguez
835fc9ce01
More CS fixes
2016-01-19 13:52:16 -04:30
mscherer
c06bde34d6
Backport CODE_ERROR constant and return as per expectation.
2016-01-19 16:53:23 +01:00
José Lorenzo Rodríguez
2962b387d7
Fixed CS error
2016-01-19 11:17:06 -04:30
José Lorenzo Rodríguez
3ee9f97826
Trying to fix tests
2016-01-19 11:03:07 -04:30
