Fix crush when intersection types used + Fix psalm + Kill mutants (#86)

Co-authored-by: Alexander Makarov <[email protected]>
yiisoft · Feb 18, 2024 · f262d5d · f262d5d
1 parent 9512d94
commit f262d5d
Show file tree

Hide file tree

Showing 20 changed files with 311 additions and 137 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,6 +10,8 @@ on:
       - 'psalm.xml'
 
   push:
+    branches:
+      - master
     paths-ignore:
       - 'docs/**'
       - 'README.md'
@@ -28,4 +30,4 @@ jobs:
       os: >-
         ['ubuntu-latest', 'windows-latest']
       php: >-
-        ['8.0', '8.1']
+        ['8.0', '8.1', '8.2', '8.3']
diff --git a/.github/workflows/composer-require-checker.yml b/.github/workflows/composer-require-checker.yml
@@ -11,6 +11,8 @@ on:
       - 'psalm.xml'
 
   push:
+    branches:
+      - master
     paths-ignore:
       - 'docs/**'
       - 'README.md'
@@ -30,4 +32,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0']
+        ['8.0', '8.1', '8.2', '8.3']
diff --git a/.github/workflows/mutation.yml b/.github/workflows/mutation.yml
@@ -9,6 +9,8 @@ on:
       - 'psalm.xml'
 
   push:
+    branches:
+      - master
     paths-ignore:
       - 'docs/**'
       - 'README.md'
@@ -23,9 +25,10 @@ jobs:
   mutation:
     uses: yiisoft/actions/.github/workflows/roave-infection.yml@master
     with:
+      min-covered-msi: 100
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.1']
+        ['8.3']
     secrets:
       STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}
diff --git a/.github/workflows/rector.yml b/.github/workflows/rector.yml
@@ -14,8 +14,10 @@ name: rector
 jobs:
   rector:
     uses: yiisoft/actions/.github/workflows/rector.yml@master
+    secrets:
+      token: ${{ secrets.YIISOFT_GITHUB_TOKEN }}
     with:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0']
+        ['8.3']
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -10,6 +10,8 @@ on:
       - 'phpunit.xml.dist'
 
   push:
+    branches:
+      - master
     paths-ignore:
       - 'docs/**'
       - 'README.md'
@@ -28,4 +30,12 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0', '8.1']
+        ['8.1', '8.2', '8.3']
+  psalm80:
+    uses: yiisoft/actions/.github/workflows/psalm.yml@master
+    with:
+      psalm-config: psalm80.xml
+      os: >-
+        ['ubuntu-latest']
+      php: >-
+        ['8.0']
diff --git a/.styleci.yml b/.styleci.yml
@@ -1,7 +1,7 @@
 preset: psr12
 risky: true
 
-version: 8.1
+version: 8.2
 
 finder:
   exclude:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## 3.2.1 under development
 
-- no changes in this release.
+- Bug #86: Fix crash when intersection types are used (@vjik)
 
 ## 3.2.0 February 12, 2023
 

diff --git a/composer.json b/composer.json
@@ -35,7 +35,7 @@
         "rector/rector": "^1.0.0",
         "roave/infection-static-analysis-plugin": "^1.18",
         "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^4.30|^5.6",
+        "vimeo/psalm": "^4.30|^5.21",
         "yiisoft/test-support": "^1.4"
     },
     "autoload": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -19,6 +19,7 @@
         <testsuite name="Yii Definitions tests">
             <directory>./tests/Unit</directory>
             <directory phpVersion="8.1" phpVersionOperator=">=">./tests/Php8_1</directory>
+            <directory phpVersion="8.2" phpVersionOperator=">=">./tests/Php8_2</directory>
         </testsuite>
     </testsuites>
 

diff --git a/psalm.xml b/psalm.xml
@@ -15,6 +15,7 @@
     </projectFiles>
     <issueHandlers>
         <MixedAssignment errorLevel="suppress" />
+        <RiskyTruthyFalsyComparison errorLevel="suppress" />
         <InvalidThrow>
             <errorLevel type="suppress">
                 <referencedClass name="Psr\Container\ContainerExceptionInterface" />

diff --git a/psalm80.xml b/psalm80.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="1"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+>
+    <projectFiles>
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+    <issueHandlers>
+        <MixedAssignment errorLevel="suppress" />
+        <InvalidThrow>
+            <errorLevel type="suppress">
+                <referencedClass name="Psr\Container\ContainerExceptionInterface" />
+                <referencedClass name="Psr\Container\NotFoundExceptionInterface" />
+            </errorLevel>
+        </InvalidThrow>
+    </issueHandlers>
+</psalm>
diff --git a/src/DefinitionStorage.php b/src/DefinitionStorage.php
@@ -155,22 +155,27 @@ private function isResolvable(string $id, array $building): bool
                     $isUnionTypeResolvable = false;
                     $unionTypes = [];
                     foreach ($type->getTypes() as $unionType) {
-                        if (!$unionType->isBuiltin()) {
-                            $typeName = $unionType->getName();
-                            /**
-                             * @psalm-suppress TypeDoesNotContainType
-                             *
-                             * @link https://github.com/vimeo/psalm/issues/6756
-                             */
-                            if ($typeName === 'self') {
-                                continue;
-                            }
-                            $unionTypes[] = $typeName;
-                            if ($this->isResolvable($typeName, $building)) {
-                                $isUnionTypeResolvable = true;
-                                /** @infection-ignore-all Mutation don't change behaviour, but degrade performance. */
-                                break;
-                            }
+                        /**
+                         * @psalm-suppress DocblockTypeContradiction Need for PHP 8.0 and 8.1 only
+                         */
+                        if (!$unionType instanceof ReflectionNamedType || $unionType->isBuiltin()) {
+                            continue;
+                        }
+
+                        $typeName = $unionType->getName();
+                        /**
+                         * @psalm-suppress TypeDoesNotContainType
+                         *
+                         * @link https://github.com/vimeo/psalm/issues/6756
+                         */
+                        if ($typeName === 'self') {
+                            continue;
+                        }
+                        $unionTypes[] = $typeName;
+                        if ($this->isResolvable($typeName, $building)) {
+                            $isUnionTypeResolvable = true;
+                            /** @infection-ignore-all Mutation don't change behaviour, but degrade performance. */
+                            break;
                         }
                     }