Cleanup after Symfony 7.4 upgrade

phpstan-baseline.neon

@@ -48,24 +48,6 @@ parameters:
 			count: 1
 			path: src/bundle/Lock/Store/DoctrineDbalStore.php
 
-		-
-			message: '#^Parameter \#1 \$data \(array\{key\: mixed, ttl\?\: float\|null, only_deduplicate_in_queue\?\: bool\|null\}\) of method Ibexa\\Bundle\\Messenger\\Serializer\\Normalizer\\DeduplicateStampNormalizer\:\:denormalize\(\) should be contravariant with parameter \$data \(mixed\) of method Symfony\\Component\\Serializer\\Normalizer\\DenormalizerInterface\:\:denormalize\(\)$#'
-			identifier: method.childParameterType
-			count: 1
-			path: src/bundle/Serializer/Normalizer/DeduplicateStampNormalizer.php
-
-		-
-			message: '#^Cannot access offset string on mixed\.$#'
-			identifier: offsetAccess.nonOffsetAccessible
-			count: 1
-			path: src/bundle/Serializer/Normalizer/LockKeyNormalizer.php
-
-		-
-			message: '#^Variable property access on Symfony\\Component\\Lock\\Key\.$#'
-			identifier: property.dynamicName
-			count: 1
-			path: src/bundle/Serializer/Normalizer/LockKeyNormalizer.php
-
 		-
 			message: '#^Method Ibexa\\Bundle\\Messenger\\Transport\\Sender\\SendersLocator\:\:listTypes\(\) should return array\<class\-string\> but returns array\.$#'
 			identifier: return.type

src/bundle/DependencyInjection/IbexaMessengerExtension.php

@@ -8,9 +8,7 @@
 
 namespace Ibexa\Bundle\Messenger\DependencyInjection;
 
-use Ibexa\Bundle\Messenger\Middleware\DeduplicateMiddleware;
 use Ibexa\Bundle\Messenger\Middleware\SudoMiddleware;
-use Ibexa\Bundle\Messenger\Serializer\Normalizer\LockKeyNormalizer;
 use Ibexa\Contracts\Messenger\Transport\MessageProviderInterface;
 use LogicException;
 use Symfony\Component\Config\FileLocator;
@@ -21,7 +19,6 @@
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\ConfigurableExtension;
 use Symfony\Component\Lock\PersistingStoreInterface;
-use Symfony\Component\Lock\Serializer\LockNormalizer as SymfonyLockNormalizer;
 use Symfony\Component\Lock\Store\StoreFactory;
 use Symfony\Component\Stopwatch\Stopwatch;
 
@@ -57,7 +54,6 @@ protected function loadInternal(array $mergedConfig, ContainerBuilder $container
         $loader->load('services.yaml');
 
         $this->configureLockStorage($mergedConfig['deduplication_lock_storage'], $container);
-        $this->configureLockNormalizerBackport($container);
         $this->registerMessengerConfiguration($mergedConfig, $container);
 
         if ($this->shouldLoadTestServices($container)) {
@@ -124,7 +120,7 @@ private function registerMessengerConfiguration(
         ];
 
         if ($mergedConfig['deduplication_lock_storage']['enabled'] === true) {
-            $middleware[] = ['id' => DeduplicateMiddleware::class];
+            $middleware[] = ['id' => 'ibexa.messenger.middleware.deduplicate_middleware'];
         }
 
         $middleware = array_merge(
@@ -147,7 +143,7 @@ private function registerMessengerConfiguration(
     private function configureLockStorage(array $lockStorageConfig, ContainerBuilder $container): void
     {
         if ($lockStorageConfig['enabled'] === false) {
-            $container->removeDefinition(DeduplicateMiddleware::class);
+            $container->removeDefinition('ibexa.messenger.middleware.deduplicate_middleware');
             $container->removeDefinition('ibexa.messenger.lock_factory');
             $container->removeDefinition('ibexa.messenger.lock_store.dbal');
 
@@ -193,15 +189,4 @@ private function configureLockStorage(array $lockStorageConfig, ContainerBuilder
             $lockStorageType,
         ));
     }
-
-    private function configureLockNormalizerBackport(ContainerBuilder $container): void
-    {
-        // Symfony 7.4 contains proper implementation
-        if (class_exists(SymfonyLockNormalizer::class)) {
-            $container->removeDefinition(LockKeyNormalizer::class);
-            $definition = new Definition(SymfonyLockNormalizer::class);
-            $definition->addTag('ibexa.messenger.serializer.normalizer', ['priority' => -60]);
-            $container->setDefinition('ibexa.messenger.lock_normalizer', $definition);
-        }
-    }
 }

src/bundle/Resources/config/services/buses.yaml

@@ -25,7 +25,8 @@ services:
 
     Ibexa\Bundle\Messenger\Middleware\SudoMiddleware: ~
 
-    Ibexa\Bundle\Messenger\Middleware\DeduplicateMiddleware:
+    ibexa.messenger.middleware.deduplicate_middleware:
+        class: Symfony\Component\Messenger\Middleware\DeduplicateMiddleware
         arguments:
             - '@ibexa.messenger.lock_factory'
 

src/bundle/Resources/config/services/serializer/normalizers.yaml

@@ -4,11 +4,8 @@ services:
         autoconfigure: false
         public: false
 
-    Ibexa\Bundle\Messenger\Serializer\Normalizer\DeduplicateStampNormalizer:
-        tags:
-            - { name: ibexa.messenger.serializer.normalizer, priority: -60 }
-
-    Ibexa\Bundle\Messenger\Serializer\Normalizer\LockKeyNormalizer:
+    ibexa.messenger.serializer.normalizer.lock_key_normalizer:
+        class: Symfony\Component\Lock\Serializer\LockKeyNormalizer
         tags:
             - { name: ibexa.messenger.serializer.normalizer, priority: -60 }
 

src/bundle/Serializer/SerializerFactory.php

@@ -8,7 +8,6 @@
 
 namespace Ibexa\Bundle\Messenger\Serializer;
 
-use function Ibexa\PolyfillPhp82\iterator_to_array;
 use Symfony\Component\Messenger\Transport\Serialization\Serializer;
 use Symfony\Component\Serializer\Encoder\JsonEncoder;
 use Symfony\Component\Serializer\Encoder\XmlEncoder;

tests/bundle/DependencyInjection/IbexaMessengerExtensionTest.php

@@ -9,7 +9,6 @@
 namespace Ibexa\Tests\Bundle\Messenger\DependencyInjection;
 
 use Ibexa\Bundle\Messenger\DependencyInjection\IbexaMessengerExtension;
-use Ibexa\Bundle\Messenger\Middleware\DeduplicateMiddleware;
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\AbstractExtensionTestCase;
 
 final class IbexaMessengerExtensionTest extends AbstractExtensionTestCase
@@ -33,7 +32,7 @@ public function testConfigurationDefaults(): void
     {
         $this->load();
 
-        self::assertTrue($this->container->hasDefinition(DeduplicateMiddleware::class));
+        self::assertTrue($this->container->hasDefinition('ibexa.messenger.middleware.deduplicate_middleware'));
         self::assertTrue($this->container->hasDefinition('ibexa.messenger.lock_factory'));
         self::assertTrue($this->container->hasDefinition('ibexa.messenger.lock_store.dbal'));
     }
@@ -46,7 +45,7 @@ public function testConfigurationWithDisabledLocks(): void
             ],
         ]);
 
-        self::assertFalse($this->container->hasDefinition(DeduplicateMiddleware::class));
+        self::assertFalse($this->container->hasDefinition('ibexa.messenger.middleware.deduplicate_middleware'));
         self::assertFalse($this->container->hasDefinition('ibexa.messenger.lock_factory'));
         self::assertFalse($this->container->hasDefinition('ibexa.messenger.lock_store.dbal'));
     }