Merge pull request #2663 from driesvints/patch-1

Fix PHP 8.2 issue with false for lastErrors
briannesbitt · Sep 2, 2022 · 01bc4cd · 01bc4cd
2 parents d63266f + bb7a70f
commit 01bc4cd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/Carbon/Traits/Creator.php b/src/Carbon/Traits/Creator.php
@@ -921,13 +921,20 @@ public static function make($var)
     /**
      * Set last errors.
      *
-     * @param array $lastErrors
+     * @param array|bool $lastErrors
      *
      * @return void
      */
-    private static function setLastErrors(array $lastErrors)
+    private static function setLastErrors($lastErrors)
     {
-        static::$lastErrors = $lastErrors;
+        if (\is_array($lastErrors) || $lastErrors === false) {
+            static::$lastErrors = \is_array($lastErrors) ? $lastErrors : [
+                'warning_count' => 0,
+                'warnings' => [],
+                'error_count' => 0,
+                'errors' => [],
+            ];
+        }
     }
 
     /**

diff --git a/tests/Carbon/LastErrorTest.php b/tests/Carbon/LastErrorTest.php
@@ -57,9 +57,7 @@ public function testCreateHandlesLastErrors()
         $this->assertSame($carbon->getLastErrors(), $datetime->getLastErrors());
 
         $carbon = new Carbon('2017-02-15');
-        $datetime = new DateTime('2017-02-15');
 
         $this->assertSame($this->noErrors, $carbon->getLastErrors());
-        $this->assertSame($carbon->getLastErrors(), $datetime->getLastErrors());
     }
 }
diff --git a/tests/CarbonImmutable/LastErrorTest.php b/tests/CarbonImmutable/LastErrorTest.php
@@ -57,9 +57,7 @@ public function testCreateHandlesLastErrors()
         $this->assertSame($carbon->getLastErrors(), $datetime->getLastErrors());
 
         $carbon = new Carbon('2017-02-15');
-        $datetime = new DateTime('2017-02-15');
 
         $this->assertSame($this->noErrors, $carbon->getLastErrors());
-        $this->assertSame($carbon->getLastErrors(), $datetime->getLastErrors());
     }
 }