Run static analysis on PHP 8.0

doctrine · Dec 28, 2020 · 7692b3c · 7692b3c
1 parent ef3aa4f
commit 7692b3c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -87,7 +87,7 @@ jobs:
           restore-keys: "php-${{ matrix.php-version }}-composer-locked-"
 
       - name: "Prepare PHP 8 dependencies"
-        run: "composer remove --no-update --ignore-platform-req=php --dev doctrine/coding-standard phpstan/phpstan squizlabs/php_codesniffer"
+        run: "composer remove --no-update --ignore-platform-req=php --dev doctrine/coding-standard squizlabs/php_codesniffer"
         if: "${{ matrix.php-version == '8.0' }}"
 
       - name: "Install dependencies with composer"

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.4"
+          - "8.0"
 
     steps:
       - name: "Checkout code"
@@ -54,6 +54,9 @@ jobs:
           key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
           restore-keys: "php-${{ matrix.php-version }}-composer-locked-"
 
+      - name: "Prepare PHP 8 dependencies"
+        run: "composer remove --no-update --ignore-platform-req=php --dev doctrine/coding-standard squizlabs/php_codesniffer"
+
       - name: "Install dependencies with composer"
         run: "composer install --no-interaction --no-progress"
 
@@ -67,7 +70,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.4"
+          - "8.0"
 
     steps:
       - name: "Checkout code"
@@ -87,6 +90,9 @@ jobs:
           key: "php-${{ matrix.php-version }}-composer-locked-${{ hashFiles('composer.lock') }}"
           restore-keys: "php-${{ matrix.php-version }}-composer-locked-"
 
+      - name: "Prepare PHP 8 dependencies"
+        run: "composer remove --no-update --ignore-platform-req=php --dev doctrine/coding-standard squizlabs/php_codesniffer"
+
       - name: "Install dependencies with composer"
         run: "composer install --no-interaction --no-progress"
 

diff --git a/lib/Doctrine/ODM/MongoDB/PersistentCollection/DefaultPersistentCollectionGenerator.php b/lib/Doctrine/ODM/MongoDB/PersistentCollection/DefaultPersistentCollectionGenerator.php
@@ -8,6 +8,7 @@
 use ReflectionClass;
 use ReflectionException;
 use ReflectionMethod;
+use ReflectionNamedType;
 use ReflectionParameter;
 use ReflectionType;
 use ReflectionUnionType;
@@ -24,7 +25,6 @@
 use function interface_exists;
 use function is_dir;
 use function is_writable;
-use function method_exists;
 use function mkdir;
 use function rename;
 use function sprintf;
@@ -305,7 +305,8 @@ function (ReflectionType $unionedType) use ($method, $parameter) {
             ));
         }
 
-        $name      = method_exists($type, 'getName') ? $type->getName() : (string) $type;
+        assert($type instanceof ReflectionNamedType);
+        $name      = $type->getName();
         $nameLower = strtolower($name);
         if ($nameLower === 'self') {
             $name = $method->getDeclaringClass()->getName();

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -6,3 +6,6 @@ parameters:
   paths:
     - %rootDir%/../../../benchmark
     - %rootDir%/../../../lib
+  excludes_analyse:
+    - lib/Doctrine/ODM/MongoDB/Aggregation/Stage/GraphLookup/Match.php
+    - lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Match.php