IBX-8470: Upgraded codebase to Symfony 6

.gitignore

@@ -1,3 +1,3 @@
 /vendor/
-.php_cs.cache
+.php-cs-fixer.cache
 /composer.lock

composer.json

@@ -24,11 +24,11 @@
         "php": " >=8.3",
         "cron/cron": "^1.4",
         "ibexa/core": "~5.0.x-dev",
-        "symfony/config": "^5.0",
-        "symfony/console": "^5.0",
-        "symfony/dependency-injection": "^5.0",
-        "symfony/http-kernel": "^5.0",
-        "symfony/process": "^5.0"
+        "symfony/config": "^6.4",
+        "symfony/console": "^6.4",
+        "symfony/dependency-injection": "^6.4",
+        "symfony/http-kernel": "^6.4",
+        "symfony/process": "^6.4"
     },
     "require-dev": {
         "ibexa/code-style": "~2.0.0",

src/bundle/Command/CronRunCommand.php

@@ -21,11 +21,9 @@
 
 final class CronRunCommand extends Command
 {
-    /** @var \Ibexa\Bundle\Cron\Registry\CronJobsRegistry */
-    private $cronJobsRegistry;
+    private CronJobsRegistry $cronJobsRegistry;
 
-    /** @var \Psr\Log\LoggerInterface */
-    private $logger;
+    private LoggerInterface $logger;
 
     public function __construct(LoggerInterface $logger, CronJobsRegistry $cronJobsRegistry, ?string $name = null)
     {
@@ -42,7 +40,6 @@ protected function configure(): void
                 new InputOption('category', null, InputOption::VALUE_REQUIRED, 'Job category to run', 'default'),
             ])
             ->setName('ibexa:cron:run')
-            ->setAliases(['ezplatform:cron:run'])
             ->setDescription('Perform one-time cron tasks run.')
             ->setHelp(
                 <<<EOT
@@ -70,10 +67,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             usleep(10000);
         }
 
-        if ($this->logger) {
-            /** @var \Cron\Report\CronReport $reports */
-            $this->logReportsOutput($reports);
-        }
+        /** @var \Cron\Report\CronReport $reports */
+        $this->logReportsOutput($reports);
 
         return Command::SUCCESS;
     }

src/bundle/DependencyInjection/Compiler/CronJobCompilerPass.php

@@ -14,12 +14,7 @@
 
 class CronJobCompilerPass implements CompilerPassInterface
 {
-    /**
-     * You can modify the container here before it is dumped to PHP code.
-     *
-     * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container
-     */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (!$container->has(CronJobsRegistry::class)) {
             return;
@@ -32,13 +27,11 @@ public function process(ContainerBuilder $container)
             foreach ($tags as $cronJob) {
                 $reference = new Reference($id);
 
-                if (!isset($cronJob['schedule']) || empty($cronJob['schedule'])) {
+                if (empty($cronJob['schedule'])) {
                     throw new \RuntimeException(sprintf('Invalid %s cron job configuration, schedule argument missing', $id));
                 }
 
-                $cronJob['category'] = isset($cronJob['category'])
-                    ? $cronJob['category']
-                    : CronJobsRegistry::DEFAULT_CATEGORY;
+                $cronJob['category'] = $cronJob['category'] ?? CronJobsRegistry::DEFAULT_CATEGORY;
 
                 $registry->addMethodCall('addCronJob', [
                     $reference,

src/bundle/DependencyInjection/IbexaCronExtension.php

@@ -20,20 +20,18 @@
 class IbexaCronExtension extends Extension implements PrependExtensionInterface
 {
     /**
-     * {@inheritdoc}
+     * @throws \Exception
      */
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
         $loader->load('services.yaml');
     }
 
     /**
      * Allow an extension to prepend the extension configurations.
-     *
-     * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container
      */
-    public function prepend(ContainerBuilder $container)
+    public function prepend(ContainerBuilder $container): void
     {
         $config = Yaml::parse(file_get_contents(__DIR__ . '/../Resources/config/monolog.yml'));
         $container->prependExtensionConfig('monolog', $config);

src/bundle/IbexaCronBundle.php

@@ -13,7 +13,7 @@
 
 class IbexaCronBundle extends Bundle
 {
-    public function build(ContainerBuilder $container)
+    public function build(ContainerBuilder $container): void
     {
         parent::build($container);
 

src/bundle/Registry/CronJobsRegistry.php

@@ -9,57 +9,55 @@
 
 use Cron\Job\ShellJob;
 use Cron\Schedule\CrontabSchedule;
-use Ibexa\Core\MVC\Symfony\SiteAccess;
+use Ibexa\Core\MVC\Symfony\SiteAccess\SiteAccessServiceInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Process\PhpExecutableFinder;
 
 class CronJobsRegistry
 {
-    public const DEFAULT_CATEGORY = 'default';
+    public const string DEFAULT_CATEGORY = 'default';
 
     /**
-     * @var array
+     * @var array<string, \Cron\Job\ShellJob[]>
      */
-    protected $cronJobs = [];
+    protected array $cronJobs = [];
 
-    /**
-     * @var false|string
-     */
-    protected $executable;
+    protected string $executable;
 
-    /**
-     * @var string
-     */
-    protected $environment;
+    protected string $environment;
 
-    /**
-     * @var \Ibexa\Core\MVC\Symfony\SiteAccess
-     */
-    protected $siteaccess;
+    protected SiteAccessServiceInterface $siteAccessService;
 
-    /**
-     * @var string
-     */
-    protected $options;
+    protected string $options;
 
-    public function __construct(string $environment, SiteAccess $siteaccess)
+    public function __construct(string $environment, SiteAccessServiceInterface $siteAccessService)
     {
         $finder = new PhpExecutableFinder();
 
-        $this->executable = $finder->find();
+        $phpBinary = $finder->find();
+        if (false === $phpBinary) {
+            throw new \LogicException('CronJobsRegistry: Unable to find PHP binary');
+        }
+
+        $this->executable = $phpBinary;
         $this->environment = $environment;
-        $this->siteaccess = $siteaccess;
+        $this->siteAccessService = $siteAccessService;
     }
 
     public function addCronJob(Command $command, string $schedule = null, string $category = self::DEFAULT_CATEGORY, string $options = ''): void
     {
+        $commandName = $command->getName();
+        if (null === $commandName) {
+            throw new \LogicException('CronJobsRegistry: Unable to get a command name');
+        }
+
         $command = sprintf(
             '%s %s %s %s --siteaccess=%s --env=%s',
             $this->executable,
             $_SERVER['SCRIPT_NAME'],
-            $command->getName(),
+            $commandName,
             $options,
-            $this->siteaccess->name,
+            $this->siteAccessService->getCurrent()->name,
             $this->environment
         );
 
@@ -75,10 +73,6 @@ public function addCronJob(Command $command, string $schedule = null, string $ca
      */
     public function getCategoryCronJobs(string $category): array
     {
-        if (!isset($this->cronJobs[$category])) {
-            return [];
-        }
-
-        return $this->cronJobs[$category];
+        return $this->cronJobs[$category] ?? [];
     }
 }

src/bundle/Resources/config/services.yaml

@@ -8,8 +8,7 @@ services:
     Ibexa\Bundle\Cron\Registry\CronJobsRegistry:
         lazy: true
         arguments:
-            - '%kernel.environment%'
-            - '@Ibexa\Core\MVC\Symfony\SiteAccess'
+            $environment: '%kernel.environment%'
 
     Ibexa\Bundle\Cron\Command\CronRunCommand:
         arguments: