Make types generation compatible with Carbon 3

kylekatarnls · Mar 24, 2024 · fe1b12f · fe1b12f
1 parent c4d5501
commit fe1b12f
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/Types/Generator.php b/src/Types/Generator.php
@@ -3,6 +3,7 @@
 namespace Types;
 
 use Carbon\Carbon;
+use Carbon\FactoryImmutable;
 use Cmixin\BusinessDay;
 use ReflectionClass;
 use ReflectionException;
@@ -26,11 +27,15 @@ protected function getMethods($boot)
             BusinessDay::enable('\Carbon\Carbon');
         });
 
-        $c = new ReflectionClass(Carbon::now());
-        $macros = $c->getProperty('globalMacros');
-        $macros->setAccessible(true);
+        try {
+            $c = new ReflectionClass(Carbon::now());
+            $macros = $c->getProperty('globalMacros');
+            $macros->setAccessible(true);
 
-        return $macros->getValue();
+            return $macros->getValue();
+        } catch (ReflectionException $exception) {
+            return FactoryImmutable::getInstance()->getSettings()['macros'] ?? [];
+        }
     }
 
     /**