Merge pull request #2949 from briannesbitt/refactor/simplify-get-inst…

…ance Simplify FactoryImmutable::getInstance
briannesbitt · Feb 17, 2024 · a5831d2 · a5831d2
2 parents 9703f87 + d7972ac
commit a5831d2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Carbon/FactoryImmutable.php b/src/Carbon/FactoryImmutable.php
@@ -148,7 +148,7 @@ public static function getDefaultInstance(): self
      */
     public static function getInstance(): Factory
     {
-        return self::$currentClock?->getFactory() ?? self::$defaultInstance ??= new self();
+        return self::$currentClock?->getFactory() ?? self::getDefaultInstance();
     }
 
     /**

diff --git a/src/Carbon/Traits/Timestamp.php b/src/Carbon/Traits/Timestamp.php
@@ -35,7 +35,7 @@ public static function createFromTimestamp(
     }
 
     /**
-     * Create a Carbon instance from an timestamp keeping the timezone to UTC.
+     * Create a Carbon instance from a timestamp keeping the timezone to UTC.
      *
      * Timestamp input can be given as int, float or a string containing one or more numbers.
      */
-Original file line number
+Diff line change
@@ Expand Up / @@ -148,7 +148,7 @@ public static function getDefaultInstance(): self @@
          */
         public static function getInstance(): Factory
         {
-            return self::$currentClock?->getFactory() ?? self::$defaultInstance ??= new self();
+            return self::$currentClock?->getFactory() ?? self::getDefaultInstance();
         }
         /**
@@ Expand Down @@