Merge pull request #4 from ostrolucky/eqs-improvements

Remove hidden symfony/messenger dependency
CHECK24-CP · Sep 29, 2024 · ce96692 · ce96692
2 parents c2c9eb9 + 018d4d8
commit ce96692
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/config/services.php b/config/services.php
@@ -28,6 +28,8 @@
 
 use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
 
+use Symfony\Component\Messenger\Middleware\MiddlewareInterface;
+
 return static function (ContainerConfigurator $container): void {
     $services = $container->services();
 
@@ -57,7 +59,9 @@
     $services->set('check24.new_relic.transaction_name.messenger.message_name', MessageNameStrategy::class);
 
     // Messenger
-    $services->set('check24.new_relic.messenger_middleware', NewRelicMiddleware::class)->autowire();
+    if (interface_exists(MiddlewareInterface::class)) {
+        $services->set('check24.new_relic.messenger_middleware', NewRelicMiddleware::class)->autowire();
+    }
 
     // Trace ID
     $services->set('check24.new_relic.trace_id.uuid_factory', TraceUuidFactory::class)

diff --git a/src/DependencyInjection/Check24NewRelicExtension.php b/src/DependencyInjection/Check24NewRelicExtension.php
@@ -85,7 +85,9 @@ public function load(array $configs, ContainerBuilder $container): void
 
         $container->getDefinition(ConsoleErrorListener::class)
             ->setArguments(['$excludedExceptions' => $config['excluded_exceptions']]);
-        $container->getDefinition('check24.new_relic.messenger_middleware')
-            ->setArguments(['$excludedExceptions' => $config['excluded_exceptions']]);
+        if ($container->hasDefinition('check24.new_relic.messenger_middleware')) {
+            $container->getDefinition('check24.new_relic.messenger_middleware')
+                ->setArguments(['$excludedExceptions' => $config['excluded_exceptions']]);
+        }
     }
 }
diff --git a/src/Monolog/Handler/Curl/Util.php b/src/Monolog/Handler/Curl/Util.php
@@ -50,7 +50,7 @@ public static function execute(\CurlHandle $ch, int $retries = 5): bool|string
 
                     curl_close($ch);
 
-                    throw new \RuntimeException(sprintf('Curl error (code %d): %s', $curlErrno, $curlError));
+                    throw new \RuntimeException(\sprintf('Curl error (code %d): %s', $curlErrno, $curlError));
                 }
 
                 continue;