Merge pull request #392 from greg0ire/4.0.x

Merge commit right before dropping Psalm into 4.0.x

Author: greg0ire

.github/workflows/coding-standards.yml

@@ -12,4 +12,4 @@ on:
 jobs:
   coding-standards:
     name: "Coding Standards"
-    uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.1.0"
+    uses: "doctrine/.github/.github/workflows/coding-standards.yml@5.2.0"

.github/workflows/continuous-integration.yml

@@ -12,7 +12,7 @@ on:
 jobs:
   phpunit:
     name: "PHPUnit"
-    uses: "doctrine/.github/.github/workflows/continuous-integration.yml@5.1.0"
+    uses: "doctrine/.github/.github/workflows/continuous-integration.yml@5.2.0"
     with:
       php-versions: '["8.1", "8.2", "8.3"]'
     secrets:

.github/workflows/release-on-milestone-closed.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   release:
     name: "Git tag, release & create merge-up PR"
-    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@5.1.0"
+    uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@5.2.0"
     secrets:
       GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }}
       GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }}

.github/workflows/static-analysis.yml

@@ -12,4 +12,4 @@ on:
 jobs:
   static-analysis:
     name: "Static Analysis"
-    uses: "doctrine/.github/.github/workflows/static-analysis.yml@5.1.0"
+    uses: "doctrine/.github/.github/workflows/static-analysis.yml@5.2.0"

composer.json

@@ -25,13 +25,13 @@
         "psr/cache": "^1.0 || ^2.0 || ^3.0"
     },
     "require-dev": {
-        "phpstan/phpstan": "1.11.1",
+        "phpstan/phpstan": "1.12.7",
         "phpstan/phpstan-phpunit": "^1",
         "phpstan/phpstan-strict-rules": "^1.1",
         "doctrine/coding-standard": "^12",
         "phpunit/phpunit": "^9.6",
-        "symfony/cache": "^4.4 || ^5.4 || ^6.0",
-        "vimeo/psalm": "4.30.0 || 5.24.0"
+        "symfony/cache": "^4.4 || ^5.4 || ^6.0 || ^7.0",
+        "vimeo/psalm": "4.30.0 || 5.26.1"
     },
     "conflict": {
         "doctrine/common": "<2.10"

tests/Persistence/Mapping/AbstractClassMetadataFactoryTest.php

@@ -84,7 +84,7 @@ public function testItGetsTheSameMetadataForBackslashedClassName(): void
             ->method('newClassMetadataInstance')
             ->with(SomeOtherEntity::class)
             ->willReturn(
-                $this->createStub(ClassMetadata::class),
+                self::createStub(ClassMetadata::class),
             );
 
         /** @psalm-suppress ArgumentTypeCoercion */