Commit graph

19648 commits

Author SHA1 Message Date
Mark Story
5019cbddfe Merge pull request #9249 from ravage84/2.x-docblocks-superfluous
Remove superfluous "Class" from doc blocks
2016-08-10 16:22:46 -04:00
Marc Würth
f2638b3e38 Remove superfluous "Class" from doc blocks 2016-08-10 12:22:09 +02:00
mark_story
61b3fbd605 Merge branch '2.x' into 2.next 2016-08-09 22:12:26 -04:00
mark_story
eaa2bbbcae Merge branch 'auth-header' into 2.x
Refs #9229
2016-08-09 22:07:46 -04:00
mark_story
20a2af8c16 Fix casing issues with Authorization header.
We need to check the upper case versions of headers in $_SERVER.
Also fix lint issues.
2016-08-09 22:06:49 -04:00
Mark Story
dd6191186e Merge pull request #9231 from nojimage/patch-testshell
Improve TestShell
2016-08-08 09:21:03 -04:00
nojimage
9a5d5705cd TestShell support --coverage-text option 2016-08-08 20:13:40 +09:00
nojimage
e71d83c612 TestShell passes the 'directive' option to PHPUnit correctly 2016-08-08 20:09:37 +09:00
Sebastien Barre
345375b6b6 add test 2016-08-07 23:08:55 -04:00
Sebastien Barre
acc32f5c58 Work around Apache handling the Authorization: header differently 2016-08-07 19:50:23 -04:00
mark_story
0a22058e35 Update version number to 2.8.6 2016-08-02 22:15:04 -04:00
ADmad
ba829f758f Merge pull request #9204 from cakephp/fix-api
fix api generation
2016-08-03 01:40:16 +05:30
antograssiot
6dbd5c659d fix api generation 2016-08-02 22:01:35 +02:00
Mark Story
0a38dbdd09 Merge pull request #9201 from Linnk/2.x
Consistency improvement: Type declaration of CakeEmail parameter.
2016-08-02 10:40:27 -04:00
Juan I. Benavides
60bd98a593 Consistency with other methods: Type declaration of CakeEmail parameter. 2016-08-02 02:30:43 -05:00
Mark Story
8818b9094c Merge pull request #9199 from Linnk/2.x
Avoiding circular object reference in SmptTransport
2016-08-01 19:42:16 -04:00
Juan I. Benavides
d37f88b20e Documentation and declaration of object type in method's parameter
This should make pass the phpcs check. #9199
2016-08-01 16:46:25 -05:00
Juan I. Benavides
93db51cf10 Avoiding circular object reference in SmptTransport
This fixes a memory leak while sending multiple emails.

Fixes: #9198
2016-08-01 13:09:45 -05:00
Mark Story
774af90830 Merge pull request #9180 from mvdriel/prevent-unnecessary-joins-in-delete
Prevent unnecessary joins / complex conditions in delete
2016-07-27 17:35:18 -04:00
Mark van Driel
4dc8e54131 Fixed typo 2016-07-27 20:27:15 +02:00
Mark van Driel
5caac5f340 Prevent unnecessary joins / complex conditions in delete 2016-07-27 16:31:57 +02:00
Mark Story
b17d580ec2 Merge pull request #9175 from CakeDC/issue/9174
Fix CakeSchema compare when changing field length to the default one
2016-07-26 21:56:05 -04:00
Andrej Griniuk
e7f3365d8b fix on php < 5.5 2016-07-26 23:57:14 +03:00
Andrej Griniuk
147693618c refs #9174 fix CakeSchema compare when changing field length to the default one 2016-07-26 23:39:09 +03:00
Mark Story
a73a707231 Merge pull request #9165 from mvdriel/prevent-unnecessary-joins-complex-conditions-in-delete
Prevent unnecessary joins / complex conditions in delete
2016-07-26 09:22:27 -04:00
Mark van Driel
c01525f2cc Make check more strict to respect existing queries 2016-07-26 11:25:27 +02:00
Mark van Driel
d6e45131ad Prevent unnecessary joins / complex conditions in delete 2016-07-25 17:15:18 +02:00
Mark Story
b50c06423d Merge pull request #9115 from biesbjerg/ticket-7488
Fire Controller.shutdown and Dispatcher.afterDispatch events when exceptions are thrown
2016-07-19 22:49:02 -04:00
Mark Story
ade7ff7051 Merge pull request #9138 from ravage84/patch-5
Add fix for the httpoxy vulnerability
2016-07-19 13:11:02 -04:00
Marc Würth
46e8fd1eb7 Add fix for the httpoxy vulnerability
Refs https://github.com/cakephp/cakephp/issues/9137#issuecomment-233637635
2016-07-19 16:23:27 +02:00
Mark Story
876b508797 Merge pull request #9108 from cakephp/issue-9106
Don't split strings headers that lack a ':'.
2016-07-15 22:20:13 -04:00
Kim Biesbjerg
cbdc89ddee Fix CS error 2016-07-14 05:50:37 +02:00
Kim Biesbjerg
38cad279d1 Updated test method name and description 2016-07-14 04:57:25 +02:00
Kim Biesbjerg
c77b628841 Dispatch Controller.shutdown instead of calling afterFilter directly. Updated test 2016-07-14 04:51:49 +02:00
Kim Biesbjerg
a05639a30e Don't save buffered output to var since it is not used 2016-07-14 00:20:33 +02:00
Kim Biesbjerg
5a63ee4e3e Added tests to prove that Dispatcher.afterDispatch event is dispatched by exception renderer on error response 2016-07-14 00:17:02 +02:00
Kim Biesbjerg
bddff7d2b0 Dispatch afterDispatch event when exception is thrown 2016-07-13 23:40:27 +02:00
mark_story
4e1b601ed8 Don't split strings headers that lack a ':'.
Refs #9106
2016-07-12 22:46:47 -04:00
Mark Story
7763e5d6bc Merge pull request #9086 from psaintjust/association-plugin-classname
Association plugin classname
2016-07-10 10:18:32 -04:00
Philippe Saint-Just
be7cecbb00 Removed whitespace 2016-07-10 14:02:55 +01:00
Philippe Saint-Just
b0e5e39e45 Added test case 2016-07-10 09:57:24 +01:00
Philippe Saint-Just
7edcdb0799 Handle plugin association consistently 2016-07-09 16:08:16 +01:00
Philippe Saint-Just
ae42debeff Merge remote-tracking branch 'cakephp/2.x' into 2.x 2016-07-09 16:03:15 +01:00
Mark Story
0a0ded16ad Merge pull request #9072 from biesbjerg/ticket-9070
Store user data in memory on login for stateless auth adapters
2016-07-07 22:40:05 -04:00
Kim Biesbjerg
1d7a4da903 Fixed wrong assertion 2016-07-07 09:24:33 +02:00
Kim Biesbjerg
0ea315b2e0 Add assertion to prove session is not started on stateless login 2016-07-07 08:58:51 +02:00
Kim Biesbjerg
c63de8d9f5 Added test to prove stateless login sets user 2016-07-06 12:34:23 +02:00
Kim Biesbjerg
f22129b9c7 Store user data in memory on login for stateless auth adapters 2016-07-06 00:25:46 +02:00
Mark Story
feea55dc22 Merge pull request #9061 from cakemojo/feature/add-missing-element
add missing Flash default element
2016-07-04 07:24:59 -04:00
Mark Story
6bccfe9f40 Merge pull request #9063 from cakephp/issue-8968
Add test showing that niceShort translates month names.
2016-07-01 22:18:50 -04:00