fix: resolve phpstan matrix failures

Author: ckrack

src/DependencyInjection/Compiler/RegisterStampNormalizersPass.php

@@ -13,7 +13,6 @@
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\Messenger\Stamp\StampInterface;
 
-use function array_unique;
 use function array_values;
 use function is_string;
 
@@ -88,15 +87,14 @@ private function supportedStampClasses(ContainerBuilder $container, string $serv
 
         $this->assertNormalizerClass($class);
 
-        $stampClasses = [];
+        /** @var array<class-string<StampInterface>, class-string<StampInterface>> $uniqueStampClasses */
+        $uniqueStampClasses = [];
 
         foreach ($tags as $tag) {
-            $stampClasses[] = isset($tag['stamp_class'])
+            $stampClass = isset($tag['stamp_class'])
                 ? $tag['stamp_class']
                 : $class::getSupportedStampClass();
-        }
 
-        foreach ($stampClasses as $stampClass) {
             if (!is_string($stampClass)) {
                 throw new InvalidArgumentException(sprintf(
                     'Stamp normalizer service "%s" must declare stamp classes as strings.',
@@ -105,16 +103,13 @@ private function supportedStampClasses(ContainerBuilder $container, string $serv
             }
 
             $this->assertStampClass($stampClass);
-        }
-
-        $uniqueStampClasses = [];
-
-        foreach ($stampClasses as $stampClass) {
             $uniqueStampClasses[$stampClass] = $stampClass;
         }
 
-        /** @var list<class-string<StampInterface>> */
-        return array_values($uniqueStampClasses);
+        /** @var list<class-string<StampInterface>> $supportedStampClasses */
+        $supportedStampClasses = array_values($uniqueStampClasses);
+
+        return $supportedStampClasses;
     }
 
     private function assertStampClass(string $stampClass): void

src/Logging/MessengerLogContextBuilder.php

@@ -17,7 +17,6 @@
 use Symfony\Component\Messenger\Stamp\TransportMessageIdStamp;
 use Symfony\Component\DependencyInjection\ServiceLocator;
 use Symfony\Component\Uid\Uuid;
-use Symfony\Contracts\Service\ServiceProviderInterface;
 use Throwable;
 use UnitEnum;
 
@@ -35,18 +34,17 @@
 
 final class MessengerLogContextBuilder
 {
-    /** @var ServiceProviderInterface<StampNormalizerInterface> */
-    private readonly ServiceProviderInterface $stampNormalizers;
+    /** @var ServiceLocator<StampNormalizerInterface> */
+    private readonly ServiceLocator $stampNormalizers;
 
     /**
-     * @param ServiceProviderInterface<StampNormalizerInterface>|null $stampNormalizers
+     * @param ServiceLocator<StampNormalizerInterface>|null $stampNormalizers
      */
     public function __construct(
-        ServiceProviderInterface|null $stampNormalizers = null,
+        ServiceLocator|null $stampNormalizers = null,
     ) {
-        /** @var ServiceProviderInterface<StampNormalizerInterface> $resolvedStampNormalizers */
+        /** @var ServiceLocator<StampNormalizerInterface> $resolvedStampNormalizers */
         $resolvedStampNormalizers = $stampNormalizers ?? new ServiceLocator([]);
-
         $this->stampNormalizers = $resolvedStampNormalizers;
     }
 

tests/Fixtures/MonologTestLoggerTrait.php

@@ -26,6 +26,9 @@ private function lastRecord(TestHandler $handler): LogRecord
         $records = $handler->getRecords();
         Assert::assertNotSame([], $records, 'No log records captured.');
 
-        return $records[array_key_last($records)];
+        $lastKey = array_key_last($records);
+        Assert::assertNotNull($lastKey);
+
+        return $records[$lastKey];
     }
 }