Merge pull request #2 from kylekatarnls/patch-1

Fix compatibility with Carbon >= 1.26
KristofMorva · Jan 24, 2019 · 0e4e0f9 · 0e4e0f9
2 parents 424453b + 29e44b3
commit 0e4e0f9
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/Console/MacrosCommand.php b/src/Console/MacrosCommand.php
@@ -17,6 +17,10 @@ class MacrosCommand extends Command
         '\Illuminate\Database\Schema\Blueprint',
         '\Illuminate\Support\Arr',
         '\Illuminate\Support\Carbon',
+        '\Carbon\Carbon',
+        '\Carbon\CarbonImmutable',
+        '\Carbon\CarbonInterval',
+        '\Carbon\CarbonPeriod',
         '\Illuminate\Support\Collection',
         '\Illuminate\Console\Scheduling\Event',
         '\Illuminate\Database\Eloquent\FactoryBuilder',
@@ -66,11 +70,15 @@ public function handle()
             }
 
             $reflection = new \ReflectionClass($class);
-            if (!$reflection->hasProperty('macros')) {
-                continue;
+            $propertyName = 'macros';
+            if (!$reflection->hasProperty($propertyName)) {
+                $propertyName = 'globalMacros';
+                if (!$reflection->hasProperty($propertyName)) {
+                    continue;
+                }
             }
 
-            $property = $reflection->getProperty('macros');
+            $property = $reflection->getProperty($propertyName);
             $property->setAccessible(true);
             $macros = $property->getValue();