Commit graph

7145 commits

Author SHA1 Message Date
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
Edgaras Janušauskas
f389231058 Improve ExtractTask when CakePHP installed via Composer 2016-02-03 14:52:15 +02: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
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
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
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
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
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
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
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
José Lorenzo Rodríguez
dc83669e9b using the right superglobal 2016-01-19 10:43:12 -04:30
José Lorenzo Rodríguez
93ba85b8b8 Fixed failing test 2016-01-19 08:37:36 -04:30
mark_story
57f620fc22 Make the session cacheLimiter a configuration option.
Instead of hardcoding to must-revalidate, developers can use a more
suitable option if they do not have to support IE8.

Refs #7096
2016-01-18 22:18:38 -05:00
Jose Lorenzo Rodriguez
bd53ef01a6 Better method overriding emulation for GET 2016-01-18 20:34:32 -04:30
mark_story
a530414a88 Update version number to 2.8.0-RC1 2016-01-12 23:49:25 -05:00
mark_story
d773644232 Merge branch '2.7' into 2.8 2016-01-12 22:14:16 -05:00
Mischa ter Smitten
8d472a5d78 Memcached can not connect using a socket
Fixes #8018
2016-01-12 21:01:14 +01:00
Mark Story
eaac1bf31c Merge pull request #7979 from cakephp/2.8-url-false
2.8 Url false for FormHelper::create()
2016-01-07 21:51:23 -05:00
@zuborawka
3d0bda0df8 Update comment block
Add an annotation for FlashComponent
2016-01-07 23:12:01 +09:00
Mark Scherer
3fb752a577 Fix CS 2016-01-07 11:09:48 +01:00
Mark Scherer
8423c004b9 Invert condition to avoid else. 2016-01-07 10:51:34 +01:00
Mark Scherer
b1f1003ebe Allow 3.x backport of url=>false in 2.x 2016-01-07 10:48:20 +01:00
Mark Story
6fbc029b9b Merge pull request #7961 from cakephp/2.8-deprecate-action
Deprecate action in Form::create()
2016-01-06 21:54:42 -05:00
Mark S
daca52e37c Use is_array() check 2016-01-06 18:05:01 +01:00
Gareth Ellis
af487e7f89 Fix spacing 2016-01-05 16:39:07 +00:00
Gareth Ellis
54b4170022 Add doc block for testAction magic method to enable IDE autocompletion in test classes 2016-01-05 11:57:40 +00:00
Mark Scherer
55ca2ddabd Fix CS. 2016-01-04 15:53:48 +01:00
Mark Scherer
cd59ab9c40 Fix tests 2016-01-04 15:08:31 +01:00
Mark Scherer
7076e6d481 Add missing test that is present in 3.x. 2016-01-04 14:29:00 +01:00
Mark Scherer
a2ce6c8c1f Deprecate action in Form::create() 2016-01-04 14:22:40 +01:00
mark_story
4de92123fa Back port fixes from #7899 to 2.x
Fix XmlView failing when return => domdocument is used.
2016-01-03 22:08:09 -05:00