Mark Sch
b68f1cbb1f
Fix notice when passing false.
2018-03-14 17:07:08 +01:00
Mark Sch
68de980972
Merge pull request #11809 from WrDX/WrDX-removing-non-existing-rule
...
Don't break on removing a non-existing rule
2018-03-14 17:01:46 +01:00
Wouter
b225443166
Test removing a rule on a previously removed field
2018-03-14 11:32:58 +01:00
Mark Story
5d7f3a67c5
Merge pull request #11811 from Khigashiguchi/fix/issue-11810
...
[2.x]In getMockForModel, place useDbConfig test_xxx
2018-03-10 13:55:35 +00:00
Kazuki Higashiguchi
0e4a1d76ab
test modified getMockForModelSecondaryDatasource
2018-03-10 12:59:10 +09:00
Kazuki Higashiguchi
722a2b3286
In getMockForModel, place useDbConfig test_xxx
2018-03-10 10:51:30 +09:00
Wouter
1f0c973681
Don't break on removing a non-existing rule
2018-03-09 16:51:08 +01:00
ADmad
fb5c3ecd71
Merge pull request #11756 from tenkoma/patch-1
...
[2.x]Fix typo in PhpDoc
2018-02-25 15:08:47 +05:30
Koji Tanaka
61f608abc7
Fix typo
2018-02-25 16:52:34 +09:00
mark_story
8744e53d0e
Update version number to 2.10.8
2018-02-24 22:32:53 -05:00
Mark Story
e0e4a3b0d6
Merge pull request #11643 from chinpei215/2.x-make-mcrypt-optional
...
[2.x] Make mcrypt optional
2018-02-25 01:57:10 +00:00
chinpei215
a6b0271560
Remove Security::engine()
...
We disscussed and decided to avoid auto selecting which extension to use.
Instead, call Configure::write('Security.useOpenSsl', true) manually.
2018-02-24 12:17:51 +09:00
Val Bancer
9185fb10e2
fixes Error: Class 'PHP_CodeCoverage' not found error
2018-02-23 16:21:33 +01:00
Mark Story
f1db01395b
Merge pull request #11695 from bancer/issue-11694-web-test-runner
...
Issue 11694 web test runner
2018-02-05 16:59:52 +00:00
Val Bancer
1b11fa7a7a
Constructs the default fixture manager if 'fixtureManager' parameter is an empty string.
2018-02-05 16:07:33 +01:00
Val Bancer
f0abce55f2
Merge pull request #6 from cakephp/2.x
...
sync with 2.x upstream
2018-02-05 16:00:07 +01:00
Mark Sch
df9c7fd96e
Merge pull request #11616 from cakephp/issue-11186
...
Fix missing field identifier quoting for COUNT(DISTINCT in SQLServer.
2018-02-05 14:48:22 +01:00
mark_story
5816143493
Fix usage of non-existant property.
...
Use the declared `_result` property instead. I would normally add
a test, but getting to this path requires a query to fail which is not
simple to simulate in the test harness.
Fixes #11615
2018-02-04 11:48:31 -05:00
mark_story
49725a8f86
Merge branch 'issue-11661' into 2.x
2018-01-24 21:18:17 -05:00
mark_story
5d9a3cb2ba
Fix phpcs error.
2018-01-24 21:17:52 -05:00
Mark Story
46dacd597b
Merge pull request #11660 from davidyell/2.x-phpunit37
...
2.x - Change PHPUnit version as requested by test shell
2018-01-24 13:38:17 -05:00
David Yell
bcae20029c
Fixed the PHPCS warnings
2018-01-24 10:33:45 +00:00
David Yell
230066a14b
Added a test case for the helper with no params. Relates to #11658
2018-01-24 10:13:56 +00:00
David Yell
5c5ec45215
Fixed PHP Unit version so running tests using the Console works
2018-01-24 10:01:03 +00:00
mark_story
41e3bd82d8
Update version number to 2.10.7
2018-01-20 18:55:27 -05:00
Mark Story
1e87526a16
Merge pull request #11619 from tenkoma/2.x-build-php72
...
2.x Build and Pass with PHP7.2
2018-01-19 13:18:42 -05:00
chinpei215
fc397bd481
Pass MCRYPT_DEV_URANDOM to mcrypt_create_iv() explicitly
2018-01-20 00:25:35 +09:00
chinpei215
5289aae64e
Change Security::randomBytes() to fallback to mcrypt_create_iv()
2018-01-19 23:54:58 +09:00
chinpei215
d7ed0339b1
Make mcrypt optional
...
Now Security::encrypt() and Security::decrypt() works with openssl
if the mcrypt extension is unavailable.
Note that Security::rijndael() doesn't work with openssl.
2018-01-19 23:54:53 +09:00
Koji Tanaka
2a14e65b43
Fixed: use $var === null instead of is_null($var)
2018-01-19 13:39:35 +09:00
Koji Tanaka
d3d0501414
Uncountable null convert to array(), revert ControllerTask::bake() signature for backward compatibility.
2018-01-18 15:25:41 +09:00
Koji Tanaka
88c015f6d3
exclude PHP7.2 + PHPUnit 3.7.33
2018-01-17 23:36:44 +09:00
Koji Tanaka
e1897a8498
Pass PaginatorComponentTest::testPaginateExtraParams()
2018-01-17 23:27:20 +09:00
Koji Tanaka
7099c9d513
Fix Multibyte::strtolower()
2018-01-17 23:02:13 +09:00
Koji Tanaka
aa14c68497
Fix some count() Error in PHP 7.2
2018-01-17 03:35:00 +09:00
Koji Tanaka
f4315d8ba4
When the PHP version is 7.2 or higher ini_set('session.save_handler', 'user') can't be executed, so delete.
2018-01-17 02:30:04 +09:00
Koji Tanaka
701519c637
Execute CakeSession::destroy() on a tearDown with implicit use session test
2018-01-16 00:47:34 +09:00
Koji Tanaka
f07d193ded
Travis CI Allow failure: PHP7.2 + mysql + PHPUnit3.7
2018-01-16 00:28:12 +09:00
Koji Tanaka
1769df745c
remove cannot run test matrix: PHPUnit 3.7 + PHP7.2
2018-01-11 00:50:13 +09:00
Koji Tanaka
de0719272d
2.x Build with PHP7.2
2018-01-11 00:11:37 +09:00
mark_story
45695b6b5c
Fix missing field identifier quoting for COUNT(DISTINCT in SQLServer.
...
Refs #11186
2018-01-09 17:01:00 -05:00
Mark Story
ab272b09c7
Merge pull request #11581 from bancer/issue-11131-long-cache-key
...
Hash group cache keys to prevent key overflows in some cache engines
2018-01-06 22:05:39 -05:00
Mark Story
83928f9d74
Merge pull request #11590 from cakephp/issue-11588
...
Buffer contents of HtmlReporter.
2017-12-31 21:13:28 -05:00
Mark Story
7713433180
Merge pull request #11592 from tenkoma/2.x-controller-test-using-aliased-component
...
[2.x]Fix can't mock aliased component on ControllerTestCase
2017-12-31 09:13:20 -05:00
Koji Tanaka
400d45f56c
fix code style
2017-12-31 17:05:26 +09:00
Koji Tanaka
74a8611eef
[2.x]Fix can't load aliased component on ControllerTestCase
2017-12-31 15:44:05 +09:00
mark_story
d2c4bf2bb2
Buffer contents of HtmlReporter.
...
Collect HTML output into a buffer so we can provide compatibility across
PHPUnit 3.x and 4.x
Refs #11588
2017-12-30 23:47:11 -05:00
Val Bancer
0f51c75157
replaced vsprintf to implode
2017-12-28 16:15:14 +01:00
Val Bancer
7ae84e3d5d
Makes the cache key shorter by using md5()
2017-12-28 10:02:35 +01:00
Val Bancer
92caf71db5
Merge pull request #5 from cakephp/2.x
...
sync 2.x
2017-12-28 09:51:36 +01:00
