Merge pull request #390 from greg0ire/3.4.x

Merge 3.3x up into 3.4.x

.gitattributes

@@ -12,7 +12,4 @@
 /phpcs.xml.dist export-ignore
 /phpstan.neon export-ignore
 /phpstan-baseline.neon export-ignore
-/psalm.xml export-ignore
-/psalm-baseline.xml export-ignore
-/psalm.phpstub export-ignore
 /composer.lock export-ignore

.github/workflows/coding-standards.yml

@@ -12,6 +12,6 @@ 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"
     with:
       composer-root-version: "3.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:
       composer-root-version: "3.0"
       php-versions: '["7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3"]'

.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,6 +12,6 @@ on:
 jobs:
   static-analysis:
     name: "Static Analysis"
-    uses: "doctrine/.github/.github/workflows/static-analysis.yml@5.1.0"
+    uses: "doctrine/.github/.github/workflows/phpstan.yml@5.2.0"
     with:
       composer-root-version: "3.0"

composer.json

@@ -25,14 +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",
         "doctrine/common": "^3.0",
         "phpunit/phpunit": "^8.5.38 || ^9.5",
-        "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"
     },
     "conflict": {
         "doctrine/common": "<2.10"

src/Persistence/AbstractManagerRegistry.php

@@ -32,14 +32,14 @@ abstract class AbstractManagerRegistry implements ManagerRegistry
 
     /**
      * @var string
-     * @psalm-var class-string
+     * @phpstan-var class-string
      */
     private $proxyInterfaceName;
 
     /**
      * @param array<string, string> $connections
      * @param array<string, string> $managers
-     * @psalm-param class-string $proxyInterfaceName
+     * @phpstan-param class-string $proxyInterfaceName
      */
     public function __construct(
         string $name,
@@ -255,7 +255,7 @@ public function resetManager(?string $name = null)
         return $this->getManager($name);
     }
 
-    /** @psalm-param class-string $persistentObject */
+    /** @phpstan-param class-string $persistentObject */
     private function selectManager(
         string $persistentObject,
         ?string $persistentManagerName = null

src/Persistence/Event/LifecycleEventArgs.php

@@ -17,14 +17,14 @@ class LifecycleEventArgs extends EventArgs
 {
     /**
      * @var ObjectManager
-     * @psalm-var TObjectManager
+     * @phpstan-var TObjectManager
      */
     private $objectManager;
 
     /** @var object */
     private $object;
 
-    /** @psalm-param TObjectManager $objectManager */
+    /** @phpstan-param TObjectManager $objectManager */
     public function __construct(object $object, ObjectManager $objectManager)
     {
         $this->object        = $object;
@@ -45,7 +45,7 @@ public function getObject()
      * Retrieves the associated ObjectManager.
      *
      * @return ObjectManager
-     * @psalm-return TObjectManager
+     * @phpstan-return TObjectManager
      */
     public function getObjectManager()
     {

src/Persistence/Event/LoadClassMetadataEventArgs.php

@@ -18,19 +18,19 @@ class LoadClassMetadataEventArgs extends EventArgs
 {
     /**
      * @var ClassMetadata
-     * @psalm-var TClassMetadata
+     * @phpstan-var TClassMetadata
      */
     private $classMetadata;
 
     /**
      * @var ObjectManager
-     * @psalm-var TObjectManager
+     * @phpstan-var TObjectManager
      */
     private $objectManager;
 
     /**
-     * @psalm-param TClassMetadata $classMetadata
-     * @psalm-param TObjectManager $objectManager
+     * @phpstan-param TClassMetadata $classMetadata
+     * @phpstan-param TObjectManager $objectManager
      */
     public function __construct(ClassMetadata $classMetadata, ObjectManager $objectManager)
     {
@@ -42,7 +42,7 @@ public function __construct(ClassMetadata $classMetadata, ObjectManager $objectM
      * Retrieves the associated ClassMetadata.
      *
      * @return ClassMetadata
-     * @psalm-return TClassMetadata
+     * @phpstan-return TClassMetadata
      */
     public function getClassMetadata()
     {

src/Persistence/Event/ManagerEventArgs.php

@@ -16,11 +16,11 @@ class ManagerEventArgs extends EventArgs
 {
     /**
      * @var ObjectManager
-     * @psalm-var TObjectManager
+     * @phpstan-var TObjectManager
      */
     private $objectManager;
 
-    /** @psalm-param TObjectManager $objectManager */
+    /** @phpstan-param TObjectManager $objectManager */
     public function __construct(ObjectManager $objectManager)
     {
         $this->objectManager = $objectManager;
@@ -30,7 +30,7 @@ public function __construct(ObjectManager $objectManager)
      * Retrieves the associated ObjectManager.
      *
      * @return ObjectManager
-     * @psalm-return TObjectManager
+     * @phpstan-return TObjectManager
      */
     public function getObjectManager()
     {

src/Persistence/Event/OnClearEventArgs.php

@@ -16,13 +16,13 @@ class OnClearEventArgs extends EventArgs
 {
     /**
      * @var ObjectManager
-     * @psalm-var TObjectManager
+     * @phpstan-var TObjectManager
      */
     private $objectManager;
 
     /**
      * @param ObjectManager $objectManager The object manager.
-     * @psalm-param TObjectManager $objectManager
+     * @phpstan-param TObjectManager $objectManager
      */
     public function __construct(ObjectManager $objectManager)
     {
@@ -33,7 +33,7 @@ public function __construct(ObjectManager $objectManager)
      * Retrieves the associated ObjectManager.
      *
      * @return ObjectManager
-     * @psalm-return TObjectManager
+     * @phpstan-return TObjectManager
      */
     public function getObjectManager()
     {

src/Persistence/Event/PreUpdateEventArgs.php

@@ -23,7 +23,7 @@ class PreUpdateEventArgs extends LifecycleEventArgs
 
     /**
      * @param array<string, array<int, mixed>> $changeSet
-     * @psalm-param TObjectManager $objectManager
+     * @phpstan-param TObjectManager $objectManager
      */
     public function __construct(object $entity, ObjectManager $objectManager, array &$changeSet)
     {

src/Persistence/ManagerRegistry.php

@@ -66,10 +66,10 @@ public function getManagerNames();
      *
      * @param string      $persistentObject      The name of the persistent object.
      * @param string|null $persistentManagerName The object manager name (null for the default one).
-     * @psalm-param class-string<T> $persistentObject
+     * @phpstan-param class-string<T> $persistentObject
      *
      * @return ObjectRepository
-     * @psalm-return ObjectRepository<T>
+     * @phpstan-return ObjectRepository<T>
      *
      * @template T of object
      */