Merge pull request #188 from odan/master

Fix Error: debugInfo must return an array #164
cakephp · Feb 11, 2019 · 8ee5ec5 · 8ee5ec5
2 parents 3951101 + 71d3a29
commit 8ee5ec5
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 16 deletions.
diff --git a/src/Chronos.php b/src/Chronos.php
@@ -44,8 +44,8 @@
  * @property-read bool $dst daylight savings time indicator, true if DST, false otherwise
  * @property-read bool $local checks if the timezone is local, true if local, false otherwise
  * @property-read bool $utc checks if the timezone is UTC, true if UTC, false otherwise
- * @property-read string  $timezoneName
- * @property-read string  $tzName
+ * @property-read string $timezoneName
+ * @property-read string $tzName
  */
 class Chronos extends DateTimeImmutable implements ChronosInterface
 {
@@ -190,12 +190,20 @@ public static function hasTestNow()
      */
     public function __debugInfo()
     {
+        $vars = get_object_vars($this);
+
         $properties = [
-            'time' => $this->format('Y-m-d H:i:s.u'),
-            'timezone' => $this->getTimezone()->getName(),
-            'hasFixedNow' => self::hasTestNow()
+            'hasFixedNow' => static::hasTestNow(),
         ];
 
+        if (isset($vars['date'])) {
+            $properties['time'] = $this->format('Y-m-d H:i:s.u');
+        }
+
+        if (isset($vars['timezone'])) {
+            $properties['timezone'] = $this->getTimezone()->getName();
+        }
+
         return $properties;
     }
 }
diff --git a/src/Date.php b/src/Date.php
@@ -9,6 +9,7 @@
  * @link          http://cakephp.org CakePHP(tm) Project
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
+
 namespace Cake\Chronos;
 
 use DateTimeImmutable;
@@ -44,8 +45,8 @@
  * @property-read bool $dst daylight savings time indicator, true if DST, false otherwise
  * @property-read bool $local checks if the timezone is local, true if local, false otherwise
  * @property-read bool $utc checks if the timezone is UTC, true if UTC, false otherwise
- * @property-read string  $timezoneName
- * @property-read string  $tzName
+ * @property-read string $timezoneName
+ * @property-read string $tzName
  */
 class Date extends DateTimeImmutable implements ChronosInterface
 {
@@ -132,11 +133,16 @@ public function toMutable()
      */
     public function __debugInfo()
     {
+        $vars = get_object_vars($this);
+
         $properties = [
-            'date' => $this->format('Y-m-d'),
             'hasFixedNow' => static::hasTestNow(),
         ];
 
+        if (isset($vars['date'])) {
+            $properties['date'] = $this->format('Y-m-d');
+        }
+
         return $properties;
     }
 }
diff --git a/src/MutableDate.php b/src/MutableDate.php
@@ -44,8 +44,8 @@
  * @property-read bool $dst daylight savings time indicator, true if DST, false otherwise
  * @property-read bool $local checks if the timezone is local, true if local, false otherwise
  * @property-read bool $utc checks if the timezone is UTC, true if UTC, false otherwise
- * @property-read string  $timezoneName
- * @property-read string  $tzName
+ * @property-read string $timezoneName
+ * @property-read string $tzName
  */
 class MutableDate extends DateTime implements ChronosInterface
 {
@@ -132,11 +132,16 @@ public function toImmutable()
      */
     public function __debugInfo()
     {
+        $vars = get_object_vars($this);
+
         $properties = [
-            'date' => $this->format('Y-m-d'),
-            'hasFixedNow' => static::hasTestNow()
+            'hasFixedNow' => static::hasTestNow(),
         ];
 
+        if (isset($vars['date'])) {
+            $properties['date'] = $this->format('Y-m-d');
+        }
+
         return $properties;
     }
 }
diff --git a/src/MutableDateTime.php b/src/MutableDateTime.php
@@ -45,8 +45,8 @@
  * @property-read bool $dst daylight savings time indicator, true if DST, false otherwise
  * @property-read bool $local checks if the timezone is local, true if local, false otherwise
  * @property-read bool $utc checks if the timezone is UTC, true if UTC, false otherwise
- * @property-read string  $timezoneName
- * @property-read string  $tzName
+ * @property-read string $timezoneName
+ * @property-read string $tzName
  */
 class MutableDateTime extends DateTime implements ChronosInterface
 {
@@ -175,12 +175,20 @@ public function __set($name, $value)
      */
     public function __debugInfo()
     {
+        $vars = get_object_vars($this);
+
         $properties = [
-            'time' => $this->format('Y-m-d H:i:s.u'),
-            'timezone' => $this->getTimezone()->getName(),
             'hasFixedNow' => static::hasTestNow(),
         ];
 
+        if (isset($vars['date'])) {
+            $properties['time'] = $this->format('Y-m-d H:i:s.u');
+        }
+
+        if (isset($vars['timezone'])) {
+            $properties['timezone'] = $this->getTimezone()->getName();
+        }
+
         return $properties;
     }
 }