Commit graph

18384 commits

Author SHA1 Message Date
Marc Würth
1267586f23 Re-add closing tags to ctp files
Refs https://github.com/cakephp/cakephp/pull/7447#discussion_r40444715
2015-09-25 18:10:18 +02:00
Marc Würth
f7c472ea1e Add note to param
Refs: https://github.com/cakephp/cakephp/pull/7447#discussion_r40444483
2015-09-25 18:03:36 +02:00
Marc Würth
bd461910e9 Correct return type
Refs https://github.com/cakephp/cakephp/pull/7447#discussion_r40444444
2015-09-25 18:02:44 +02:00
Marc Würth
5eedc0f2bb Fix broken test 2015-09-25 17:55:01 +02:00
Marc Würth
dbfd2c44e9 App & skel folder sync + some improvements
Mostly CS, doc blocks and some CSS
2015-09-25 17:25:35 +02:00
Marc Würth
1ede742d92 Various improvements to the CakePHP test files
Mostly CS, doc blocks and unused variables.
2015-09-25 17:22:00 +02:00
Marc Würth
e690662f0e Various improvments to the CakePH Plib files
Mostly CS, doc blocks and explicit returning nulls.
2015-09-25 17:11:20 +02:00
Marc Würth
fd2dd41330 Add cakephp/cakephp-codesniffer as dev dependency 2015-09-25 16:51:47 +02:00
Mark Story
b8b7282264 Merge pull request #7436 from cakephp/2.8-fix-order-merge
Only array-wrap 'order' if it's not already an array.
2015-09-22 12:24:02 -04:00
Mark Story
872f7b9b07 Merge pull request #7437 from ravage84/2.8-quiet-testshell
Swallow the "--quiet" shell parameter before calling PHPUnit.
2015-09-22 12:22:51 -04:00
Marc Würth
5b41a9b52d Swallow the "--quiet" shell parameter before calling PHPUnit.
PHPUnit does not provide a silent or quiet mode, so we cannot pass it along:
https://phpunit.de/manual/3.7/en/phpunit-book.html#textui.clioptions

Resolves #7432
2015-09-22 14:25:53 +02:00
Mark Scherer
8909b2ed42 Fix remaining test. 2015-09-22 14:21:04 +02:00
Mark Scherer
81cbb52f74 Only array-wrap 'order' if it's not already an array. 2015-09-22 13:04:28 +02:00
mark_story
c14d1ffe93 Add tests for #7428 2015-09-21 21:39:51 -04:00
Mark Story
9208a0857e Merge pull request #7428 from burriko/fix-dbo-connection-issues
Fix use of $_connection in DboSource in 2.x
2015-09-21 21:38:20 -04:00
Graeme Tait
dc856b8508 Switch out is_null() 2015-09-21 17:00:20 +01:00
Graeme Tait
1b33efaad3 Check $_connection is not null before trying to use it
Stops a fatal error if calling isConnected() after disconnect().
2015-09-21 14:08:07 +01:00
Graeme Tait
8fae10a971 Set DboSource::$_connection to null on disconnect 2015-09-21 14:05:56 +01:00
ADmad
da969bbb80 Merge pull request #7427 from cakephp/2.7-cs
Fix CS
2015-09-21 18:15:06 +05:30
Mark Scherer
97b6f8674c Fix CS 2015-09-21 13:45:18 +02:00
Mark Story
e176e2f4e1 Merge pull request #7408 from cakephp/2.7-mysql-datetime
Allow CURRENT_TIMESTAMP for datetime columns - MySQL5.6+.
2015-09-17 14:56:47 -04:00
Mark S.
c87de2a069 Fix CS 2015-09-17 11:33:59 +02:00
mark
e7d6319d59 Skip test for versions of < MySQL5.6. 2015-09-17 10:43:43 +02:00
mark
d8a55ad065 Allow CURRENT_TIMESTAMP for datetime columns - MySQL5.6+. 2015-09-16 14:16:58 +02:00
Mark Story
4a316b158e Merge pull request #7387 from cakephp/2.7-fixture
Backport 3.x limit of fixture data generation.
2015-09-13 16:14:05 -04:00
Mark Scherer
450a544eb4 Backport 3.x limit of fixture data generation. 2015-09-13 13:12:53 +02:00
mark_story
e8ce841ffb Merge branch '2.7-sander' into 2.7
Refs #7384
2015-09-12 15:28:41 -04:00
Sander Visser
5a7507df4f Fix issue "Debugger class not found"
App::uses('Debugger') not needed because it's allready defined in top of file
2015-09-12 15:28:30 -04:00
José Lorenzo Rodríguez
a4a63bfabd Merge pull request #7379 from cakephp/issue-7365
Set the `key` variable in the SessionHelper.
2015-09-11 09:55:50 +02:00
adam1010
20c22444ba Increase memory during shutdown for Fatal Error handling 2015-09-10 22:01:59 -05:00
mark_story
9eafde13d2 Set the key variable in the SessionHelper.
This fixes cross template compatibility between the Flash and Session
helpers.

Refs #7365
2015-09-09 22:08:49 -04:00
Mark Story
851ff44b4c Merge pull request #7377 from thomasvnl/patch-1
Update DatabaseSession.php
2015-09-09 22:01:34 -04:00
thomasv
1dbb6dd0e4 Update DatabaseSession.php
To prevent error: "Integrity constraint violation: 1052 Column 'id' in where clause is ambiguous" when using a custom Session object in relationship with another object (belongsTo <-| hasMany)
2015-09-10 00:25:39 +02:00
José Lorenzo Rodríguez
2d2c5be543 Merge pull request #7357 from cakephp/issue-7076
Always update updated/modified columns when a fieldList is used.
2015-09-07 22:27:02 +02:00
mark_story
e4cce7a441 Fix errors in PHP <5.4 2015-09-06 22:14:04 -04:00
mark_story
60d7bbaa10 Always update updated/modified columns when a fieldList is used.
When a fieldList is used, and updated is not in the fieldList, the
column should continue to be updated even if the column has a value from
the user. Because the field is not in the fieldList, we must assume that
the intent is for the field to update automatically, as it would have if
the updated column was not present in the save data.

Refs #7076
2015-09-05 22:01:33 -04:00
mark_story
6722a8d8ea Merge branch '2.7' into 2.8 2015-09-02 22:18:10 -04:00
mark_story
77f2c8cb42 Use mb_strtolower in case-insensitive sorting.
We should try to support unicode everywhere people might use it.
2015-08-25 21:49:10 -04:00
mark_story
9b910dff31 Merge branch '2.8-hash-sort-ignore-case' into 2.8
Refs #7217
2015-08-25 21:46:08 -04:00
mark_story
a9ef1f8aea Simplify branching and add default options.
Use fewer conditionals by merging defaults and avoid exceptions
by setting defaults as well.

Refs #7217
2015-08-25 21:39:02 -04:00
Mark Story
ec48019d8e Merge pull request #7296 from cakephp/2.8-cleanup
Fix merge to + operator.
2015-08-24 12:15:23 -04:00
Mark Scherer
3cfc46db38 Fix merge to + operator. 2015-08-24 06:33:04 +02:00
mark_story
0dbabce792 Update version number to 2.7.3 2015-08-23 22:22:27 -04:00
mark_story
51d8f74c50 Merge branch '2.7' into 2.8 2015-08-23 16:29:07 -04:00
José Lorenzo Rodríguez
c2d94e8699 Merge pull request #7289 from cakephp/issue-7274
Handle case where a visible input shares a name with an invisible one.
2015-08-23 21:01:33 +02:00
mark_story
143c34bdc1 Handle case where a visible input shares a name with an invisible one.
If a visible input is created *after* a hidden input was created, the
form would always blackhole unless the visible input had the same value
as the hidden input.

Refs #7274
2015-08-22 23:10:44 -04:00
Mark Story
a44d17dbfa Merge pull request #7277 from cakephp/2.7-mediaview
Fix MediaView extension handling as documented and expected.
2015-08-21 12:40:21 -04:00
Mark Scherer
f154a8f4d7 Fix MediaView extension handling as documented and expected. 2015-08-21 12:35:49 +02:00
Jose Lorenzo Rodriguez
d11656ad03 Merge branch 'rchavik-2.7-tz-abbr' into 2.8 2015-08-21 10:57:16 +02:00
Jose Lorenzo Rodriguez
3c7f022fa8 Merge branch '2.7-tz-abbr' of https://github.com/rchavik/cakephp into rchavik-2.7-tz-abbr 2015-08-21 10:56:48 +02:00