Merge pull request #10 from kylekatarnls/carbon-3

Add support for Carbon 3

.github/workflows/tests.yaml

@@ -39,6 +39,10 @@ jobs:
           path: ~/.composer/cache
           key: ${{ runner.os }}-${{ matrix.php }}-${{ matrix.setup }}-composer-${{ hashFiles('**/composer.lock') }}
 
+      - name: Set PHPUnit version
+        if: matrix.php >= 8.1
+        run: composer require "phpunit/phpunit:^8.5.41" --no-update
+
       - name: Install Dependencies
         run: composer update --prefer-dist --prefer-${{ matrix.setup }} --no-interaction --no-suggest
 

composer.json

@@ -14,10 +14,10 @@
     "require": {
         "php": "^7.1 || ^8.0",
         "simple-cli/simple-cli": "^1.1",
-        "nesbot/carbon": "^2.20"
+        "nesbot/carbon": "^2.72.6 || ^3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.5 || ^8.2"
+        "phpunit/phpunit": "^7.5.20 || ^8.5.41"
     },
     "autoload": {
         "psr-4": {

src/Carbon/Types/Generator.php

@@ -3,6 +3,7 @@
 namespace Carbon\Types;
 
 use Carbon\Carbon;
+use Carbon\FactoryImmutable;
 use Closure;
 use ReflectionClass;
 use ReflectionException;
@@ -51,11 +52,17 @@ protected function getMethods($boots)
             $this->runBoot($boot);
         }
 
-        $c = new ReflectionClass(Carbon::now());
-        $macros = $c->getProperty('globalMacros');
-        $macros->setAccessible(true);
+        if (method_exists(FactoryImmutable::class, 'getDefaultInstance')) {
+            // Carbon 3
+            return FactoryImmutable::getDefaultInstance()->getSettings()['macros'] ?? [];
+        } else {
+            // Carbon 2
+            $c = new ReflectionClass(Carbon::now());
+            $macros = $c->getProperty('globalMacros');
+            $macros->setAccessible(true);
 
-        return $macros->getValue();
+            return $macros->getValue();
+        }
     }
 
     /**