Merge 2.10.x into 2.11.x (doctrine#9298)

* Bump reusable workflows * Fix union type on QueryExpressionVisitorTest::testWalkComparison() (doctrine#9294) * Synchronize Psalm baseline (doctrine#9296) * Fix return type (doctrine#9295) Co-authored-by: Grégoire Paris <postmaster@greg0ire.fr>
derrabus · Dec 28, 2021 · c94a9b1 · c94a9b1
2 parents 92ff9c9 + 6a9393e
commit c94a9b1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/coding-standard.yml b/.github/workflows/coding-standard.yml
@@ -10,6 +10,6 @@ on:
 
 jobs:
   coding-standards:
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@1.1.1"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@1.4.1"
     with:
       php-version: "7.4"
diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml
@@ -7,9 +7,8 @@ on:
 
 jobs:
   release:
-    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@1.1.1"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@1.4.1"
     secrets:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}
       ORGANIZATION_ADMIN_TOKEN: ${{ secrets.ORGANIZATION_ADMIN_TOKEN }}

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -3654,11 +3654,6 @@
       <code>$indexName</code>
     </TypeDoesNotContainType>
   </file>
-  <file src="lib/Doctrine/ORM/Tools/SchemaValidator.php">
-    <PossiblyNullReference occurrences="1">
-      <code>isAbstract</code>
-    </PossiblyNullReference>
-  </file>
   <file src="lib/Doctrine/ORM/Tools/Setup.php">
     <DeprecatedClass occurrences="3">
       <code>new ClassLoader('Doctrine', $directory)</code>

diff --git a/tests/Doctrine/Tests/ORM/ORMInvalidArgumentExceptionTest.php b/tests/Doctrine/Tests/ORM/ORMInvalidArgumentExceptionTest.php
@@ -30,7 +30,7 @@ public function testInvalidEntityName($value, string $expectedMessage): void
     }
 
     /**
-     * @return string[][]
+     * @psalm-return list<array{mixed, string}>
      */
     public function invalidEntityNames(): array
     {

diff --git a/tests/Doctrine/Tests/ORM/Query/QueryExpressionVisitorTest.php b/tests/Doctrine/Tests/ORM/Query/QueryExpressionVisitorTest.php
@@ -27,7 +27,7 @@ protected function setUp(): void
     }
 
     /**
-     * @param QueryBuilder\Comparison|string $queryExpr
+     * @param QueryBuilder\Comparison|QueryBuilder\Func|string $queryExpr
      *
      * @dataProvider comparisonData
      */
@@ -39,7 +39,13 @@ public function testWalkComparison(CriteriaComparison $criteriaExpr, $queryExpr,
         }
     }
 
-    /** @psalm-return list<array{CriteriaComparison, QueryBuilder\Comparison|string, ?Parameter} */
+    /**
+     * @psalm-return list<array{
+     *                   0: CriteriaComparison,
+     *                   1: QueryBuilder\Comparison|QueryBuilder\Func|string,
+     *                   2?: Parameter,
+     *               }>
+     */
     public function comparisonData(): array
     {
         $cb = new CriteriaBuilder();
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         /**
-         * @return string[][]
+         * @psalm-return list<array{mixed, string}>
          */
         public function invalidEntityNames(): array
         {
@@ Expand Down @@