Fix DependencyInjection using service name instead of class FQCN & remove last autowire annotation

Author: njoubert-cleverage

config/services/controller.yaml

@@ -10,5 +10,6 @@ services:
             $messageBus: '@messenger.default_bus'
             $uploadDirectory: '%upload_directory%'
             $context: '@EasyCorp\Bundle\EasyAdminBundle\Context\AdminContext'
+            $logDirectory: '%kernel.logs_dir%'
         tags:
             - { name: 'controller.service_arguments' }

src/Controller/Admin/Process/LaunchAction.php

@@ -21,7 +21,6 @@
 use EasyCorp\Bundle\EasyAdminBundle\Config\Asset;
 use EasyCorp\Bundle\EasyAdminBundle\Context\AdminContext;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\HttpFoundation\File\UploadedFile;

src/Controller/Admin/ProcessExecutionCrudController.php

@@ -25,7 +25,6 @@
 use EasyCorp\Bundle\EasyAdminBundle\Field\DateTimeField;
 use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
 use EasyCorp\Bundle\EasyAdminBundle\Router\AdminUrlGenerator;
-use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -116,11 +115,11 @@ public function showLogs(AdminContext $adminContext): RedirectResponse
 
     public function downloadLogFile(
         AdminContext $context,
-        #[Autowire(param: 'kernel.logs_dir')] string $directory,
+        string $logDirectory,
     ): Response {
         /** @var ProcessExecution $processExecution */
         $processExecution = $context->getEntity()->getInstance();
-        $filepath = $directory.\DIRECTORY_SEPARATOR.$processExecution->code.\DIRECTORY_SEPARATOR
+        $filepath = $logDirectory.\DIRECTORY_SEPARATOR.$processExecution->code.\DIRECTORY_SEPARATOR
             .$processExecution->logFilename;
         $basename = basename($filepath);
         $content = file_get_contents($filepath);

src/DependencyInjection/CleverAgeProcessUiExtension.php

@@ -17,8 +17,6 @@
 use CleverAge\ProcessUiBundle\Controller\Admin\UserCrudController;
 use CleverAge\ProcessUiBundle\Entity\User;
 use CleverAge\ProcessUiBundle\Message\ProcessExecuteMessage;
-use CleverAge\ProcessUiBundle\Monolog\Handler\DoctrineProcessHandler;
-use CleverAge\ProcessUiBundle\Monolog\Handler\ProcessHandler;
 use Monolog\Level;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -37,7 +35,7 @@ public function load(array $configs, ContainerBuilder $container): void
         $config = $this->processConfiguration($configuration, $configs);
         $container->getDefinition(UserCrudController::class)
             ->setArgument('$roles', array_combine($config['security']['roles'], $config['security']['roles']));
-        $container->getDefinition(ProcessHandler::class)
+        $container->getDefinition('cleverage_ui_process.monolog_handler.process')
             ->addMethodCall('setReportIncrementLevel', [$config['logs']['report_increment_level']]);
         $container->getDefinition(ProcessDashboardController::class)
             ->setArgument('$logoPath', $config['design']['logo_path']);
@@ -55,11 +53,11 @@ public function prepend(ContainerBuilder $container): void
                 'handlers' => [
                     'pb_ui_file' => [
                         'type' => 'service',
-                        'id' => ProcessHandler::class,
+                        'id' => 'cleverage_ui_process.monolog_handler.process',
                     ],
                     'pb_ui_orm' => [
                         'type' => 'service',
-                        'id' => DoctrineProcessHandler::class,
+                        'id' => 'cleverage_ui_process.monolog_handler.doctrine_process',
                     ],
                 ],
             ]

src/Monolog/Handler/DoctrineProcessHandler.php

@@ -25,7 +25,7 @@ class DoctrineProcessHandler extends AbstractProcessingHandler
 {
     /** @var ArrayCollection<int, LogRecord> */
     private ArrayCollection $records;
-    private ?ProcessExecutionManager $processExecutionManager;
+    private ?ProcessExecutionManager $processExecutionManager = null;
     private ?EntityManagerInterface $em = null;
 
     public function __construct(int|string|Level $level = Level::Debug, bool $bubble = true)

src/Monolog/Handler/ProcessHandler.php

@@ -29,6 +29,14 @@ public function __construct(
         parent::__construct($this->directory);
     }
 
+    /**
+     * @param 'ALERT'|'Alert'|'alert'|'CRITICAL'|'Critical'|'critical'|'DEBUG'|'Debug'|'debug'|'EMERGENCY'|'Emergency'|'emergency'|'ERROR'|'Error'|'error'|'INFO'|'Info'|'info'|'NOTICE'|'Notice'|'notice'|'WARNING'|'Warning'|'warning' $level
+     */
+    public function setReportIncrementLevel(string $level): void
+    {
+        $this->reportIncrementLevel = Level::fromName($level);
+    }
+
     public function hasFilename(): bool
     {
         return $this->directory !== $this->url;
@@ -57,12 +65,4 @@ public function write(LogRecord $record): void
             $this->processExecutionManager->increment($record->level->name);
         }
     }
-
-    /**
-     * @param 'ALERT'|'Alert'|'alert'|'CRITICAL'|'Critical'|'critical'|'DEBUG'|'Debug'|'debug'|'EMERGENCY'|'Emergency'|'emergency'|'ERROR'|'Error'|'error'|'INFO'|'Info'|'info'|'NOTICE'|'Notice'|'notice'|'WARNING'|'Warning'|'warning' $level
-     */
-    public function setReportIncrementLevel(string $level): void
-    {
-        $this->reportIncrementLevel = Level::fromName($level);
-    }
 }