Fixed psalm and integration tests

symfony · andythorne · Jul 21, 2023 · Jul 21, 2023 · Jul 21, 2023 · Jul 21, 2023
commit db5023391bd60f8b29b7c9a417bc69ca86ed6553
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
@@ -22,10 +22,21 @@ jobs:
     env:
       php-version: '8.1'
     steps:
+      - name: Install system dependencies
+        run: |
+          echo "::group::apt-get update"
+          sudo apt-get update
+          echo "::endgroup::"
+
+          echo "::group::install tools & libraries"
+          sudo apt-get install librdkafka-dev
+          echo "::endgroup::"
+
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ env.php-version }}
+          extensions: "rdkafka"
           ini-values: "memory_limit=-1"
           coverage: none
 

diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php
@@ -15,6 +15,8 @@
 use Symfony\Component\Messenger\Bridge\AmazonSqs\Transport\AmazonSqsTransportFactory;
 use Symfony\Component\Messenger\Bridge\Amqp\Transport\AmqpTransportFactory;
 use Symfony\Component\Messenger\Bridge\Beanstalkd\Transport\BeanstalkdTransportFactory;
+use Symfony\Component\Messenger\Bridge\Kafka\Transport\KafkaFactory;
+use Symfony\Component\Messenger\Bridge\Kafka\Transport\KafkaTransportFactory;
 use Symfony\Component\Messenger\Bridge\Redis\Transport\RedisTransportFactory;
 use Symfony\Component\Messenger\EventListener\AddErrorDetailsStampListener;
 use Symfony\Component\Messenger\EventListener\DispatchPcntlSignalListener;

diff --git a/src/Symfony/Component/Messenger/Bridge/Kafka/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Kafka/Transport/Connection.php
@@ -74,7 +74,6 @@ private function __construct(
         $this->kafkaFactory = $kafkaFactory ?? new KafkaFactory($logger);
     }
 
-    /** @psalm-param array<string, bool|float|int|string|array<string>> $options */
     public static function fromDsn(string $dsn, array $options, LoggerInterface $logger, KafkaFactory $kafkaFactory): self
     {
         $options = self::setupOptions($dsn, $options);
@@ -109,7 +108,6 @@ private static function setupOptions(string $dsn, array $options): array
         ];
     }
 
-    /** @psalm-param array<string, bool|float|int|string|array<string>> $options */
     private static function setupConsumerOptions(string $brokerList, array $configOptions): array
     {
         if (0 === \count($configOptions)) {
@@ -152,7 +150,6 @@ private static function setupConsumerOptions(string $brokerList, array $configOp
         return $options;
     }
 
-    /** @psalm-param array<string, bool|float|int|string|array<string>> $options */
     private static function setupProducerOptions(string $brokerList, array $configOptions): array
     {
         if (0 === \count($configOptions)) {

diff --git a/src/Symfony/Component/Messenger/Bridge/Kafka/Transport/KafkaTransportFactory.php b/src/Symfony/Component/Messenger/Bridge/Kafka/Transport/KafkaTransportFactory.php
@@ -37,17 +37,11 @@ public function __construct(
         }
     }
 
-    /**
-     * @psalm-param array<string, bool|float|int|string|array<string>> $options
-     */
     public function createTransport(#[\SensitiveParameter] string $dsn, array $options, SerializerInterface $serializer): TransportInterface
     {
         return new KafkaTransport(Connection::fromDsn($dsn, $options, $this->logger, $this->kafkaFactory), $serializer);
     }
 
-    /**
-     * @psalm-param array<string, bool|float|int|string|array<string>> $options
-     */
     public function supports(#[\SensitiveParameter] string $dsn, array $options): bool
     {
         return str_starts_with($dsn, 'kafka://');