Fix direct deprecations in tests for Symfony 6.4

doctrine · Jul 23, 2023 · 0e6b32b · 0e6b32b
1 parent e2909e9
commit 0e6b32b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/ConnectionFactory.php b/ConnectionFactory.php
@@ -25,9 +25,7 @@
 /** @psalm-import-type Params from DriverManager */
 class ConnectionFactory
 {
-    /**
-     * @internal
-     */
+    /** @internal */
     public const DEFAULT_SCHEME_MAP = [
         'db2'        => 'ibm_db2',
         'mssql'      => 'pdo_sqlsrv',

diff --git a/EventSubscriber/EventSubscriberInterface.php b/EventSubscriber/EventSubscriberInterface.php
@@ -4,9 +4,7 @@
 
 use Doctrine\Common\EventSubscriber;
 
-/**
- * @deprecated use the {@see AsDoctrineListener} attribute instead
- */
+/** @deprecated use the {@see AsDoctrineListener} attribute instead */
 interface EventSubscriberInterface extends EventSubscriber
 {
 }
diff --git a/Tests/DependencyInjection/Compiler/IdGeneratorPassTest.php b/Tests/DependencyInjection/Compiler/IdGeneratorPassTest.php
@@ -16,6 +16,7 @@
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\FrameworkExtension;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+use Symfony\Component\HttpKernel\Kernel;
 
 use function assert;
 use function class_exists;
@@ -92,7 +93,7 @@ public function testRepositoryServiceWiring(): void
             'framework' => [
                 'http_method_override' => false,
                 'annotations' => [
-                    'enabled' => class_exists(AnnotationReader::class),
+                    'enabled' => class_exists(AnnotationReader::class) && Kernel::VERSION_ID < 64000,
                 ],
             ],
         ], $container);

diff --git a/Tests/ServiceRepositoryTest.php b/Tests/ServiceRepositoryTest.php
@@ -19,6 +19,7 @@
 use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+use Symfony\Component\HttpKernel\Kernel;
 
 use function class_exists;
 use function interface_exists;
@@ -72,7 +73,7 @@ public function testRepositoryServiceWiring(): void
             'framework' => [
                 'http_method_override' => false,
                 'annotations' => [
-                    'enabled' => class_exists(AnnotationReader::class),
+                    'enabled' => class_exists(AnnotationReader::class) && Kernel::VERSION_ID < 64000,
                 ],
             ],
         ], $container);