Mark Story
14d338c276
Merge pull request #11194 from lustyrain/2.x
...
fixed basic.php miss PHPDocs
2017-09-15 15:37:39 -04:00
LustyRain
715dca8701
fixed basic.php
...
The return value is incorrect
2017-09-15 11:42:54 +09:00
Mark Story
73e3c3f90d
Merge pull request #11124 from jeremyharris/flash-stacking
...
Stacking messages in SessionComponent::setFlash
2017-08-31 14:03:18 -04:00
Jeremy Harris
0558c253f6
Replaced short array syntax with longer form
2017-08-31 09:02:08 -05:00
Jeremy Harris
f9f06e68b1
Stacking messages in SessionComponent::setFlash
2017-08-30 10:06:56 -05:00
mark_story
81d824077a
Update version number to 2.10.2
2017-08-29 21:19:36 -04:00
Mark Story
45b14133d4
Merge pull request #11077 from jeremyharris/sessionhelper-regression
...
Fixed SessionHelper not handling stacked messages
2017-08-22 13:41:12 -04:00
Jeremy Harris
2e75f12a4f
Fixed SessionHelper not handling stacked messages
2017-08-22 10:06:37 -05:00
Mark Story
cdf00a9956
Merge pull request #11056 from MCF/sql_server_ignore_persistent_2.x
...
Sqlserver DboSource does not allow the persistent option to be true.
2017-08-16 15:15:01 -04:00
Mike Fellows
0b658697f2
Sqlserver DboSource does not allow the persistent option to be true.
...
This is backported from CakePHP 3. The SQL Server PHP PDO driver does not
support the PDO::ATTR_PERSISTENT attribute. So throw an exception if the
'persistent' option is set in the database config. Also removes that
option from the Sqlserver base config.
2017-08-16 11:23:42 -07:00
Mark Story
12a2909e71
Merge pull request #11000 from bancer/truncate-performance-2
...
Improved performance of CakeFixtureManager.
2017-08-11 21:48:01 -04:00
Mark Story
38ea2fc7cd
Merge pull request #11021 from cakephp/issue-11002
...
Fix hiddenField option not working for radio (2.x)
2017-08-09 19:02:46 -04:00
mark_story
be534eacef
Fix hiddenField option not working for radio.
...
The hiddenField option was not working as documented for radio buttons.
Instead of using the provided value, the hidden input's value was
hardcoded to ''
Refs #11002
2017-08-08 22:02:07 -04:00
Mark Story
dca1289eef
Merge pull request #11017 from peloncano/2.x
...
PHPUnit_Util_Diff class not found fix
2017-08-08 21:34:32 -04:00
Luis Cano
1e5ea2451a
Fixes "Whitespace found at end of line"
2017-08-08 14:42:57 -04:00
Luis Cano
3307665cbb
Fixed syntax to work with PHP5.3
2017-08-08 14:28:11 -04:00
Luis Cano
9f175f22f4
Abiding to code standards
2017-08-08 12:59:33 -04:00
Luis Cano
90f14bc07b
fixes cakephp/cakephp#11016
2017-08-08 12:28:57 -04:00
mark_story
95e0a21439
Update version number to 2.10.1
2017-08-07 21:21:35 -04:00
Val Bancer
d91059460b
Improved performance of CakeFixtureManager.
2017-08-05 22:15:10 +02:00
Mark Story
895f6cac2a
Merge pull request #10994 from watermark/cakeemail_mimetype
...
Address CakeEmail regression when data is defined with no mimetype
2017-08-04 10:09:32 -04:00
bclay
8f92a87558
remove extra whitespace
2017-08-04 09:22:16 -04:00
bclay
38161917eb
Address CakeEmail regression when data is defined with no mimetype
2017-08-03 17:00:58 -04:00
mark_story
7c2ad08da5
Clean up formatting.
...
Refs #10912
2017-08-03 13:17:05 -04:00
Mark Story
b47e445c33
Merge pull request #10912 from bancer/phpunit-5.7
...
adapter for the getMock() depricated in phpunit
2017-08-03 13:14:11 -04:00
Val Bancer
746bb4619e
Merge pull request #2 from cakephp/2.x
...
2.x to phpunit-5.7
2017-08-03 02:10:37 +02:00
Mark Story
47bc13a43e
Merge pull request #10938 from cakephp/revert-10739-unnecessary-joins-delete-all
...
Revert "Takes into account the current recursive value in deleteAll()."
2017-07-29 12:20:09 -04:00
Val Bancer
ac227f35a7
Merge pull request #1 from cakephp/2.x
...
2.x to phpunit-5.7
2017-07-28 09:18:37 +02:00
mark_story
06712abc38
Try precise instead of trusty.
2017-07-27 22:06:14 -04:00
Val Bancer
ddcca8cebc
removed vendor autoload
2017-07-27 21:10:26 +02:00
mark_story
0974f7bc9f
Fix db credentials.
2017-07-26 23:49:59 -04:00
mark_story
83a7b7b785
Fix vendors dir.
2017-07-26 23:20:03 -04:00
mark_story
b7b9b067bb
Use localhost not 0.0.0.0
2017-07-26 23:17:48 -04:00
mark_story
51b48c9e45
Fix path.
2017-07-26 22:58:09 -04:00
mark_story
4bd49eeb15
Attempt to fix travis for 2.x
...
There has been a distrubance in the force, and our travis builds no
longer work.
2017-07-26 22:42:19 -04:00
Mark Story
cd6fba1361
Revert "Takes into account the current recursive value in deleteAll()."
2017-07-24 00:09:01 -04:00
mark_story
fef1029f98
Update version number to 2.10.0
2017-07-22 15:06:53 -04:00
mark_story
aa6770fa45
Merge branch '2.x' into 2.next
2017-07-22 14:59:41 -04:00
Mark Story
314a2c0c4f
Merge pull request #10863 from bancer/paginator-i18n-not
...
Pagination 'NOT' notation fails with i18n
2017-07-22 13:33:43 -04:00
Mark Story
1eb4b0fdf7
Merge pull request #10916 from tenkoma/2.x-console-unknown-option
...
2.x Console: Display error message when unknown option is specified
2017-07-21 21:47:22 -04:00
Val Bancer
5765f4e72a
adjusted phpunit version in composer config
2017-07-20 22:25:56 +02:00
Val Bancer
7dae9e24da
improved loading of composer autoload
2017-07-20 22:21:01 +02:00
Koji Tanaka
7e50fc9ee6
Add test for shell unknown option
2017-07-21 00:46:02 +09:00
Val Bancer
31489a75d6
Adjusted phpunit version in composer.json
2017-07-19 23:51:27 +02:00
Val Bancer
5e92034ad8
improved code style
2017-07-18 22:31:28 +02:00
Koji Tanaka
65841081e9
2.x Console: Display error message when unknown option is specified
2017-07-18 00:27:39 +09:00
Val Bancer
15f0fe31b1
Fixed PHPUnit 5.7 warnings
2017-07-16 16:02:31 +02:00
Val Bancer
7ba52d0c53
Fixed code style.
2017-07-16 00:27:20 +02:00
Val Bancer
93696b65e4
Fixed indefinite loop in getMock().
2017-07-16 00:09:36 +02:00
Val Bancer
eefd3ac847
adapter for the getMock() depricated in phpunit
2017-07-15 23:23:14 +02:00