adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 2.6

Browse source
This commit is contained in:
mark_story 2014-08-23 09:20:19 +02:00
commit 4a805af5c6
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/Cake/Test/Case/Utility/CakeTimeTest.php
View file

@ -597,6 +597,12 @@ class CakeTimeTest extends CakeTestCase {
$result = $this->Time->format('Y-m-d', null, 'never'); $result = $this->Time->format('Y-m-d', null, 'never');
$this->assertEquals('never', $result); $this->assertEquals('never', $result);
$result = $this->Time->format('Y-m-d', '');
$this->assertSame('', $result);
$result = $this->Time->format('Y-m-d', false);
$this->assertSame('', $result);
$result = $this->Time->format('2012-01-13', '%d-%m-%Y', 'invalid'); $result = $this->Time->format('2012-01-13', '%d-%m-%Y', 'invalid');
$this->assertEquals('13-01-2012', $result); $this->assertEquals('13-01-2012', $result);

2
lib/Cake/Test/Fixture/AfterTreeFixture.php
View file

@ -18,7 +18,7 @@
*/ */
/** /**
* AdFixture class * AfterTreeFixture class
* *
* @package Cake.Test.Fixture * @package Cake.Test.Fixture
*/ */

3
lib/Cake/Utility/CakeTime.php
View file

@ -1053,6 +1053,9 @@ class CakeTime {
if ($date === false && $default !== false) { if ($date === false && $default !== false) {
return $default; return $default;
} }
if ($date === false) {
return '';
}
if (empty($format)) { if (empty($format)) {
$format = '%x'; $format = '%x';
} }