mscherer 3 年 前
コミット
e05db12352
2 ファイル変更2 行追加4 行削除
  1. 2 3
      src/Utility/DateTime.php
  2. 0 1
      tests/TestCase/Model/Table/TableTest.php

+ 2 - 3
src/Utility/DateTime.php

@@ -3,10 +3,9 @@
 namespace Tools\Utility;
 namespace Tools\Utility;
 
 
 use Cake\Core\Configure;
 use Cake\Core\Configure;
-use Cake\I18n\Date;
+use Cake\I18n\Date as CakeDate;
 use Cake\I18n\DateTime as CakeDateTime;
 use Cake\I18n\DateTime as CakeDateTime;
 use DateInterval;
 use DateInterval;
-use DateTime;
 use DateTimeInterface;
 use DateTimeInterface;
 use DateTimeZone;
 use DateTimeZone;
 use IntlDateFormatter;
 use IntlDateFormatter;
@@ -540,7 +539,7 @@ class DateTime extends CakeDateTime {
 			}
 			}
 		}
 		}
 
 
-		if (!($date instanceof Date) && !($date instanceof DateTime)) {
+		if (!($date instanceof CakeDate) && !($date instanceof CakeDateTime)) {
 			$date = $date->timezone($options['timezone']);
 			$date = $date->timezone($options['timezone']);
 		}
 		}
 		$ret = $date->format($format);
 		$ret = $date->format($format);

+ 0 - 1
tests/TestCase/Model/Table/TableTest.php

@@ -2,7 +2,6 @@
 
 
 namespace Tools\Test\TestCase\Model\Table;
 namespace Tools\Test\TestCase\Model\Table;
 
 
-use Cake\I18n\Time;
 use Cake\Utility\Hash;
 use Cake\Utility\Hash;
 use Shim\TestSuite\TestCase;
 use Shim\TestSuite\TestCase;
 use Tools\Utility\DateTime;
 use Tools\Utility\DateTime;