Merge pull request #393 from greg0ire/drop-psalm-4.0.x

Drop Psalm

.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/static-analysis.yml

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

composer.json

@@ -30,8 +30,7 @@
         "phpstan/phpstan-strict-rules": "^1.1",
         "doctrine/coding-standard": "^12",
         "phpunit/phpunit": "^9.6",
-        "symfony/cache": "^4.4 || ^5.4 || ^6.0 || ^7.0",
-        "vimeo/psalm": "4.30.0 || 5.26.1"
+        "symfony/cache": "^4.4 || ^5.4 || ^6.0 || ^7.0"
     },
     "conflict": {
         "doctrine/common": "<2.10"

src/Persistence/AbstractManagerRegistry.php

@@ -18,7 +18,7 @@ abstract class AbstractManagerRegistry implements ManagerRegistry
     /**
      * @param array<string, string> $connections
      * @param array<string, string> $managers
-     * @psalm-param class-string $proxyInterfaceName
+     * @phpstan-param class-string $proxyInterfaceName
      */
     public function __construct(
         private readonly string $name,
@@ -204,7 +204,7 @@ public function resetManager(string|null $name = null): ObjectManager
         return $this->getManager($name);
     }
 
-    /** @psalm-param class-string $persistentObject */
+    /** @phpstan-param class-string $persistentObject */
     private function selectManager(
         string $persistentObject,
         string|null $persistentManagerName = null,

src/Persistence/Event/LifecycleEventArgs.php

@@ -15,7 +15,7 @@
  */
 class LifecycleEventArgs extends EventArgs
 {
-    /** @psalm-param TObjectManager $objectManager */
+    /** @phpstan-param TObjectManager $objectManager */
     public function __construct(
         private readonly object $object,
         private readonly ObjectManager $objectManager,
@@ -31,7 +31,7 @@ public function getObject(): object
     /**
      * Retrieves the associated ObjectManager.
      *
-     * @psalm-return TObjectManager
+     * @phpstan-return TObjectManager
      */
     public function getObjectManager(): ObjectManager
     {

src/Persistence/Event/LoadClassMetadataEventArgs.php

@@ -17,8 +17,8 @@
 class LoadClassMetadataEventArgs extends EventArgs
 {
     /**
-     * @psalm-param TClassMetadata $classMetadata
-     * @psalm-param TObjectManager $objectManager
+     * @phpstan-param TClassMetadata $classMetadata
+     * @phpstan-param TObjectManager $objectManager
      */
     public function __construct(
         private readonly ClassMetadata $classMetadata,
@@ -29,7 +29,7 @@ public function __construct(
     /**
      * Retrieves the associated ClassMetadata.
      *
-     * @psalm-return TClassMetadata
+     * @phpstan-return TClassMetadata
      */
     public function getClassMetadata(): ClassMetadata
     {
@@ -39,7 +39,7 @@ public function getClassMetadata(): ClassMetadata
     /**
      * Retrieves the associated ObjectManager.
      *
-     * @psalm-return TObjectManager
+     * @phpstan-return TObjectManager
      */
     public function getObjectManager(): ObjectManager
     {

src/Persistence/Event/ManagerEventArgs.php

@@ -14,7 +14,7 @@
  */
 class ManagerEventArgs extends EventArgs
 {
-    /** @psalm-param TObjectManager $objectManager */
+    /** @phpstan-param TObjectManager $objectManager */
     public function __construct(
         private readonly ObjectManager $objectManager,
     ) {
@@ -23,7 +23,7 @@ public function __construct(
     /**
      * Retrieves the associated ObjectManager.
      *
-     * @psalm-return TObjectManager
+     * @phpstan-return TObjectManager
      */
     public function getObjectManager(): ObjectManager
     {

src/Persistence/Event/OnClearEventArgs.php

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

src/Persistence/Event/PreUpdateEventArgs.php

@@ -22,7 +22,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

@@ -62,9 +62,9 @@ public function getManagerNames(): array;
      *
      * @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
      *
-     * @psalm-return ObjectRepository<T>
+     * @phpstan-return ObjectRepository<T>
      *
      * @template T of object
      */