Merge pull request #11 from paul-thebaud/features/php-8.1

PHP 8.0 fix and PHP 8.1 support
paul-thebaud · Nov 8, 2021 · 8a63f20 · 8a63f20
2 parents 0e99e04 + e9f06cd
commit 8a63f20
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -2,6 +2,8 @@ name: CI
 
 on:
   push:
+  pull_request:
+    branches: [master, develop]
   schedule:
     - cron: '0 0 1 * *'
 
@@ -11,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [ 8.0 ]
+        php: [ 8.0, 8.1 ]
         os: [ ubuntu-latest, windows-latest ]
 
     name: PHP${{ matrix.php }} - ${{ matrix.os }}
@@ -21,10 +23,12 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.11.0
+        uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
           coverage: xdebug
+        env:
+          update: true
 
       - name: Install dependencies
         run: |

diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
     }
   ],
   "require": {
-    "php": "^8.0",
+    "php": "~8.0.12 || ~8.1.0",
     "league/container": "^3.2",
     "phpdocumentor/reflection-docblock": "^4.0|^5.0",
     "roave/better-reflection": "^3.3|^4.0|^5.0",

diff --git a/src/Parsers/CodeParser.php b/src/Parsers/CodeParser.php
@@ -9,7 +9,7 @@
 use PhpUnitGen\Core\Exceptions\InvalidArgumentException;
 use Roave\BetterReflection\BetterReflection;
 use Roave\BetterReflection\Reflection\ReflectionClass;
-use Roave\BetterReflection\Reflector\ClassReflector;
+use Roave\BetterReflection\Reflector\DefaultReflector;
 use Roave\BetterReflection\SourceLocator\Ast\Exception\ParseToAstFailure;
 use Roave\BetterReflection\SourceLocator\Ast\Locator;
 use Roave\BetterReflection\SourceLocator\Type\StringSourceLocator;
@@ -43,12 +43,12 @@ public function __construct(BetterReflection $betterReflection)
      */
     public function parse(Source $source): ReflectionClass
     {
-        $reflector = new ClassReflector(
+        $reflector = new DefaultReflector(
             new StringSourceLocator($source->toString(), $this->astLocator)
         );
 
         try {
-            $classes = $reflector->getAllClasses();
+            $classes = $reflector->reflectAllClasses();
         } catch (ParseToAstFailure $exception) {
             throw new InvalidArgumentException(
                 'code might have an invalid syntax because AST failed to parse it'