Run psalm under php 8.2

doctrine · Nov 16, 2023 · 5b1cbb8 · 5b1cbb8
1 parent c9c29de
commit 5b1cbb8
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 14 deletions.
diff --git a/DependencyInjection/DoctrineExtension.php b/DependencyInjection/DoctrineExtension.php
@@ -549,7 +549,6 @@ protected function ormLoad(array $config, ContainerBuilder $container)
 
         if ($config['enable_lazy_ghost_objects'] ?? false) {
             // available in Symfony 6.2 and higher
-            /** @psalm-suppress UndefinedClass */
             if (! trait_exists(LazyGhostTrait::class)) {
                 throw new LogicException(
                     'Lazy ghost objects cannot be enabled because the "symfony/var-exporter" library'

diff --git a/Repository/ServiceEntityRepositoryProxy.php b/Repository/ServiceEntityRepositoryProxy.php
@@ -124,7 +124,6 @@ public function matching(Criteria $criteria): AbstractLazyCollection&Selectable
 
     private function resolveRepository(): EntityRepository
     {
-        /** @psalm-suppress UndefinedThisPropertyFetch We should adjust when https://github.com/vimeo/psalm/issues/8984 is fixed */
         $manager = $this->registry->getManagerForClass($this->entityClass);
 
         if ($manager === null) {

diff --git a/Tests/CacheSchemaSubscriberTest.php b/Tests/CacheSchemaSubscriberTest.php
@@ -95,8 +95,6 @@ public function getSchemaSubscribers(): Generator
     {
         /**
          * available in Symfony 6.3
-         *
-         * @psalm-suppress UndefinedClass
          */
         yield ['cache.adapter.doctrine_dbal', 'doctrine.orm.listeners.doctrine_dbal_cache_adapter_schema_listener', DoctrineDbalCacheAdapterSchemaListener::class];
 

diff --git a/Tests/DependencyInjection/DoctrineExtensionTest.php b/Tests/DependencyInjection/DoctrineExtensionTest.php
@@ -1229,8 +1229,7 @@ public function testAsEntityListenerAttribute()
 
         $reflector  = new ReflectionClass(Php8EntityListener::class);
         $definition = new ChildDefinition('');
-        /** @psalm-suppress UndefinedMethod */
-        $attribute = $reflector->getAttributes(AsEntityListener::class)[0]->newInstance();
+        $attribute  = $reflector->getAttributes(AsEntityListener::class)[0]->newInstance();
 
         $attributes[AsEntityListener::class]($definition, $attribute);
 
@@ -1267,8 +1266,7 @@ public function testAsDoctrineListenerAttribute()
 
         $reflector  = new ReflectionClass(Php8EventListener::class);
         $definition = new ChildDefinition('');
-        /** @psalm-suppress UndefinedMethod */
-        $attribute = $reflector->getAttributes(AsDoctrineListener::class)[0]->newInstance();
+        $attribute  = $reflector->getAttributes(AsDoctrineListener::class)[0]->newInstance();
 
         $attributes[AsDoctrineListener::class]($definition, $attribute);
 

diff --git a/Tests/RegistryTest.php b/Tests/RegistryTest.php
@@ -155,9 +155,7 @@ public function testResetLazyObject(): void
             self::markTestSkipped('This test requires ORM and VarExporter 6.2+');
         }
 
-        /** @psalm-suppress MissingDependency https://github.com/vimeo/psalm/issues/8258 */
         $ghostManager = $this->createMock(LazyObjectEntityManagerInterface::class);
-        /** @psalm-suppress MissingDependency https://github.com/vimeo/psalm/issues/8258 */
         $ghostManager->expects($this->once())->method('resetLazyObject')->willReturn(true);
 
         $container = new Container();

diff --git a/Tests/Repository/ServiceEntityRepositoryTest.php b/Tests/Repository/ServiceEntityRepositoryTest.php
@@ -41,10 +41,7 @@ public function testConstructInitializesWhenImplementingLazyObjectInterface(): v
         $registry = $this->getMockBuilder(ManagerRegistry::class)->getMock();
         $this->expectException(LogicException::class);
 
-        /**
-         * @psalm-suppress MissingDependency
-         * @psalm-suppress UndefinedClass
-         */
+        /** @psalm-suppress UndefinedClass */
         new class ($registry, TestEntity::class) extends ServiceEntityRepository implements LazyObjectInterface {
             use LazyGhostTrait;
         };