Update SF

fotografde · Jan 16, 2025 · b77ca25 · b77ca25
1 parent e1f5bc4
commit b77ca25
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 12 deletions.
diff --git a/psalm.xml b/psalm.xml
@@ -17,7 +17,6 @@
     <projectFiles>
         <directory name="src"/>
         <ignoreFiles>
-            <directory name="src/Symfony/DependencyInjection"/>
         </ignoreFiles>
     </projectFiles>
 

diff --git a/src/Symfony/DependencyInjection/Compiler/ExceptionContextPass.php b/src/Symfony/DependencyInjection/Compiler/ExceptionContextPass.php
@@ -1,8 +1,9 @@
-<?php declare(strict_types=1);
+<?php
+declare(strict_types=1);
 
 namespace Gotphoto\Logging\Symfony\DependencyInjection\Compiler;
 
-use Gotphoto\Logging\Formatter;
+use Gotphoto\Logging\LogstashFormatter;
 use Gotphoto\Logging\OtelFormatter;
 use ReflectionClass;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
@@ -19,21 +20,35 @@ public function process(ContainerBuilder $container)
         foreach ($container->findTaggedServiceIds('gotphoto_logging.exception_context') as $id => $_tags) {
             $definition = $container->getDefinition($id);
             $className = $definition->getClass();
+            /** @psalm-suppress ArgumentTypeCoercion, PossiblyNullArgument */
             $reflectionClass = new ReflectionClass($className);
             if (!$reflectionClass->hasMethod('__invoke')) {
+                /** @psalm-suppress PossiblyNullOperand */
                 throw new \Exception($definition->getClass() . ' has to have __invoke method.');
             }
             $reflectionMethod = $reflectionClass->getMethod('__invoke');
-            $typehintClassName = $reflectionMethod->getParameters()[0]->getClass()->getName();
+
+            /** @psalm-suppress UndefinedMethod, PossiblyNullReference, PossiblyUndefinedIntArrayOffset */
+            $typehintClassName = $reflectionMethod->getParameters()[0]->getType()->getName();
+            /** @psalm-suppress MixedArgument */
             if (!is_subclass_of($typehintClassName, Throwable::class)) {
-                throw new \Exception($definition->getClass() . ' has to have __invoke method with argument "is_subclass_of Throwable".');
+                /** @psalm-suppress PossiblyNullOperand */
+                throw new \Exception(
+                    $definition->getClass() . ' has to have __invoke method with argument "is_subclass_of Throwable".',
+                );
             }
 
             $exceptionContextMap[$typehintClassName][] = new Reference($id);
         }
 
-        $container->getDefinition(Formatter::class)->setArgument('$exceptionContextProviderMap', $exceptionContextMap);
+        $container->getDefinition(LogstashFormatter::class)->setArgument(
+            '$exceptionContextProviderMap',
+            $exceptionContextMap,
+        );
 
-        $container->getDefinition(OtelFormatter::class)->setArgument('$exceptionContextProviderMap', $exceptionContextMap);
+        $container->getDefinition(OtelFormatter::class)->setArgument(
+            '$exceptionContextProviderMap',
+            $exceptionContextMap,
+        );
     }
 }
diff --git a/src/Symfony/DependencyInjection/Configuration.php b/src/Symfony/DependencyInjection/Configuration.php
@@ -8,11 +8,12 @@
 
 class Configuration implements ConfigurationInterface
 {
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('symfony_logging');
 
         $rootNode = $treeBuilder->getRootNode();
+        /** @psalm-suppress MixedMethodCall, UndefinedMethod */
         $rootNode
             ->children()
                 ->scalarNode('app_name')

diff --git a/src/Symfony/DependencyInjection/SymfonyLoggingExtension.php b/src/Symfony/DependencyInjection/SymfonyLoggingExtension.php
@@ -5,7 +5,7 @@
 namespace Gotphoto\Logging\Symfony\DependencyInjection;
 
 use Gotphoto\Logging\ExceptionContext\ExceptionContext;
-use Gotphoto\Logging\Formatter;
+use Gotphoto\Logging\LogstashFormatter;
 use Symfony\Component\Config\Exception\FileLocatorFileNotFoundException;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -21,18 +21,21 @@ protected function loadInternal(array $mergedConfig, ContainerBuilder $container
     {
         $loader = new PhpFileLoader(
             $container,
-            new FileLocator(__DIR__.'/../config')
+            new FileLocator(__DIR__ . '/../config'),
         );
         $loader->load('services.php');
         $env = $container->getParameter('kernel.environment');
         try {
+            /** @psalm-suppress PossiblyInvalidCast */
             $loader->load("services_{$env}.php");
         } catch (FileLocatorFileNotFoundException $e) {
             //ignore if no file for env
         }
 
-        $container->getDefinition(Formatter::class)
-            ->setArgument('$applicationName', $configs['app_name'])
+        /** @psalm-suppress PossiblyUndefinedStringArrayOffset */
+        $container
+            ->getDefinition(LogstashFormatter::class)
+            ->setArgument('$applicationName', $mergedConfig['app_name'])
             ->setArgument('$environment', $env);
 
         $container