#40 - Mise à jour de la configuration pour PHP 8.5 et ajustements divers

.docker/php/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.4-fpm-alpine
+FROM php:8.5-fpm-alpine
 
 ARG UID
 ARG GID
@@ -13,8 +13,7 @@ RUN apk update && apk add \
     bash \
     icu-dev \
     && docker-php-ext-configure intl \
-    && docker-php-ext-install intl opcache \
-    && docker-php-ext-enable opcache
+    && docker-php-ext-install intl
 
 RUN ln -s /usr/share/zoneinfo/Europe/Paris /etc/localtime \
     && sed -i "s/^;date.timezone =.*/date.timezone = Europe\/Paris/" $PHP_INI_DIR/php.ini

.php-cs-fixer.dist.php

@@ -24,9 +24,8 @@
 
 return (new PhpCsFixer\Config())
     ->setRules([
-        '@PHP71Migration' => true,
-        '@PHP82Migration' => true,
-        '@PHPUnit75Migration:risky' => true,
+        '@PHP8x2Migration' => true,
+        '@PHPUnit7x5Migration:risky' => true,
         '@Symfony' => true,
         '@Symfony:risky' => true,
         '@DoctrineAnnotation' => true,

composer.json

@@ -22,7 +22,7 @@
     {
       "name": "Xavier Marchegay",
       "email": "[email protected]",
-      "role": "Developer"
+      "role": "Lead Developer"
     }
   ],
   "autoload": {
@@ -36,24 +36,24 @@
     }
   },
   "require": {
-    "php": ">=8.1",
+    "php": ">=8.2",
     "ext-ctype": "*",
     "ext-iconv": "*",
-    "cleverage/process-bundle": "^4.0",
-    "doctrine/common": "^3.0",
-    "doctrine/dbal": "^2.9 || ^3.0",
-    "doctrine/doctrine-bundle": "^2.5",
-    "doctrine/doctrine-migrations-bundle": "^3.2",
-    "doctrine/orm": "^2.9 || ^3.0",
-    "dragonmantank/cron-expression": "^3.4",
-    "easycorp/easyadmin-bundle": "^4.8",
-    "symfony/doctrine-messenger": "^6.4|^7.3",
-    "symfony/dotenv": "^6.4|^7.3",
-    "symfony/messenger": "^6.4|^7.3",
-    "symfony/runtime": "^6.4|^7.3",
-    "symfony/scheduler": "^6.4|^7.3",
-    "symfony/string": "^6.4|^7.3",
-    "symfony/uid": "^6.4|^7.3"
+    "cleverage/process-bundle": "^5.0",
+    "doctrine/common": "^3.5",
+    "doctrine/dbal": "^3.10 || ^4.4",
+    "doctrine/doctrine-bundle": "^2.18 || ^3.1",
+    "doctrine/doctrine-migrations-bundle": "^3.7 || ^4",
+    "doctrine/orm": "^2.20 || ^3.5",
+    "dragonmantank/cron-expression": "^3.6",
+    "easycorp/easyadmin-bundle": "^4.27",
+    "symfony/doctrine-messenger": "^6.4 || ^7.4 || ^8",
+    "symfony/dotenv": "^6.4 || ^7.4 || ^8",
+    "symfony/messenger":"^6.4 || ^7.4 || ^8",
+    "symfony/runtime": "^6.4 || ^7.4 || ^8",
+    "symfony/scheduler": "^6.4 || ^7.4 || ^8",
+    "symfony/string":"^6.4 || ^7.4 || ^8",
+    "symfony/uid": "^6.4 || ^7.4 || ^8"
   },
   "require-dev": {
     "doctrine/doctrine-fixtures-bundle": "^3.4",
@@ -62,15 +62,15 @@
     "phpstan/phpstan": "*",
     "phpstan/phpstan-doctrine": "*",
     "phpstan/phpstan-symfony": "*",
-    "phpunit/phpunit": "<10.0",
+    "phpunit/phpunit": "*",
     "rector/rector": "*",
     "roave/security-advisories": "dev-latest",
-    "symfony/browser-kit": "^6.4|^7.3",
-    "symfony/css-selector": "^6.4|^7.3",
-    "symfony/debug-bundle": "^6.4|^7.3",
+    "symfony/browser-kit": "^6.4 || ^7.4 || ^8",
+    "symfony/css-selector": "^6.4 || ^7.4 || ^8",
+    "symfony/debug-bundle": "^6.4 || ^7.4 || ^8",
     "symfony/maker-bundle": "^1.31",
-    "symfony/web-profiler-bundle": "^6.4|^7.3",
-    "vincentlanglet/twig-cs-fixer": "^3.3"
+    "symfony/web-profiler-bundle": "^6.4 || ^7.4 || ^8",
+    "vincentlanglet/twig-cs-fixer": "^3.11"
   },
   "conflict": {
     "symfony/twig-bridge": "7.2.0",

config/routes/easyadmin.yaml

@@ -0,0 +1,3 @@
+easyadmin:
+  resource: .
+  type: easyadmin.routes

phpunit.xml.dist

@@ -1,27 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.0/phpunit.xsd"
          bootstrap="vendor/autoload.php"
-         cacheResultFile=".phpunit.cache/test-results"
+         cacheDirectory=".phpunit.cache"
          executionOrder="depends,defects"
-         forceCoversAnnotation="true"
-         beStrictAboutCoversAnnotation="true"
+         requireCoverageMetadata="true"
+         beStrictAboutCoverageMetadata="true"
          beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
-         convertDeprecationsToExceptions="true"
          failOnRisky="true"
-         failOnWarning="true"
-         verbose="true">
+         failOnWarning="true">
     <testsuites>
         <testsuite name="default">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
-
-    <coverage cacheDirectory=".phpunit.cache/code-coverage"
-              processUncoveredFiles="true">
+    <source>
         <include>
             <directory suffix=".php">src</directory>
         </include>
-    </coverage>
-</phpunit>
+    </source>
+</phpunit>

rector.php

@@ -8,18 +8,18 @@
 use Rector\ValueObject\PhpVersion;
 
 return RectorConfig::configure()
-    ->withPhpVersion(PhpVersion::PHP_84)
+    ->withPhpVersion(PhpVersion::PHP_85)
     ->withPaths([
         __DIR__.'/src',
         __DIR__.'/tests',
     ])
-    ->withPhpSets(php81: true)
+    ->withPhpSets(php82: true)
     // here we can define, what prepared sets of rules will be applied
     ->withComposerBased(doctrine: true)
     ->withPreparedSets(deadCode: true, codeQuality: true, doctrineCodeQuality: true, symfonyCodeQuality: true)
     ->withAttributesSets(symfony: true, doctrine: true)
     ->withSets([
-        LevelSetList::UP_TO_PHP_81,
+        LevelSetList::UP_TO_PHP_85,
         SymfonySetList::SYMFONY_64,
         SymfonySetList::SYMFONY_CODE_QUALITY,
         SymfonySetList::SYMFONY_CONSTRUCTOR_INJECTION,

src/Controller/Admin/Process/LaunchAction.php

@@ -50,8 +50,8 @@ public function __invoke(
         ProcessConfigurationsManager $processConfigurationsManager,
         AdminContext $context,
     ): Response {
-        $processCode = $requestStack->getMainRequest()?->get('process');
-        if (null === $processCode) {
+        $processCode = (string) $requestStack->getMainRequest()?->request->get('process');
+        if ('' === $processCode) {
             throw new MissingProcessException();
         }
         $uiOptions = $processConfigurationsManager->getUiOptions($processCode);

src/Controller/Admin/Process/UploadAndExecuteAction.php

@@ -49,7 +49,7 @@ public function __invoke(
         $form = $this->createForm(
             ProcessUploadFileType::class,
             null,
-            ['process_code' => $requestStack->getMainRequest()?->get('process')]
+            ['process_code' => $requestStack->getMainRequest()?->request->get('process')]
         );
         $form->handleRequest($requestStack->getMainRequest());
         if ($form->isSubmitted() && $form->isValid()) {

src/Entity/ProcessSchedule.php

@@ -87,12 +87,7 @@ public function setContext(array $context): void
         $this->context = $context;
     }
 
-    /**
-     * PHP 8.1 Fatal error: Null can not be used as a standalone type.
-     *
-     * @phpstan-ignore missingType.return
-     */
-    public function getNextExecution()
+    public function getNextExecution(): null
     {
         return null;
     }

src/EventSubscriber/ProcessEventSubscriber.php

@@ -22,15 +22,12 @@
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Uid\Uuid;
 
-/**
- * PHP 8.2 : Replace by readonly class.
- */
-final class ProcessEventSubscriber implements EventSubscriberInterface
+readonly final class ProcessEventSubscriber implements EventSubscriberInterface
 {
     public function __construct(
-        private readonly ProcessHandler $processHandler,
-        private readonly DoctrineProcessHandler $doctrineProcessHandler,
-        private readonly ProcessExecutionManager $processExecutionManager,
+        private ProcessHandler $processHandler,
+        private DoctrineProcessHandler $doctrineProcessHandler,
+        private ProcessExecutionManager $processExecutionManager,
     ) {
     }
 

src/Http/Model/HttpProcessExecution.php

@@ -20,21 +20,18 @@
 use Symfony\Component\Validator\Constraints\Sequentially;
 use Symfony\Component\Validator\Constraints\Type;
 
-/**
- * PHP 8.2 : Replace by readonly class.
- */
-final class HttpProcessExecution
+final readonly class HttpProcessExecution
 {
     /**
      * @param string|array<string|int, mixed> $context
      */
     public function __construct(
         #[Sequentially(constraints: [new NotNull(message: 'Process code is required.'), new IsValidProcessCode()])]
-        public readonly ?string $code = null,
-        public readonly ?string $input = null,
+        public ?string $code = null,
+        public ?string $input = null,
         #[AtLeastOneOf(constraints: [new Json(), new Type('array')])]
-        public readonly string|array $context = [],
-        public readonly bool $queue = true,
+        public string|array $context = [],
+        public bool $queue = true,
     ) {
     }
 }

src/Http/ValueResolver/HttpProcessExecuteValueResolver.php

@@ -22,13 +22,10 @@
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
 use Symfony\Component\Serializer\SerializerInterface;
 
-/**
- * PHP 8.2 : Replace by readonly class.
- */
 #[AsTargetedValueResolver('http_process_execution')]
-class HttpProcessExecuteValueResolver implements ValueResolverInterface
+readonly class HttpProcessExecuteValueResolver implements ValueResolverInterface
 {
-    public function __construct(private readonly string $storageDir, private readonly SerializerInterface $serializer)
+    public function __construct(private string $storageDir, private SerializerInterface $serializer)
     {
     }
 
@@ -46,16 +43,16 @@
                     'json'
                 );
             } else {
                 $input = $request->get('input', $request->files->get('input'));
                 if ($input instanceof UploadedFile) {
                     $uploadFileName = $this->storageDir.\DIRECTORY_SEPARATOR.date('YmdHis').'_'.uniqid().'_'.$input->getClientOriginalName();
                     (new Filesystem())->dumpFile($uploadFileName, $input->getContent());
                     $input = $uploadFileName;
                 }
                 $httpProcessExecution = new HttpProcessExecution(
                     $request->get('code'),
                     $input,
                     $request->get('context', []),
                     $request->request->getBoolean('queue', true),
                 );
             }

src/Http/ValueResolver/ProcessConfigurationValueResolver.php

@@ -20,13 +20,10 @@
 use Symfony\Component\HttpKernel\Controller\ValueResolverInterface;
 use Symfony\Component\HttpKernel\ControllerMetadata\ArgumentMetadata;
 
-/**
- * PHP 8.2 : Replace by readonly class.
- */
 #[AsTargetedValueResolver('process')]
-class ProcessConfigurationValueResolver implements ValueResolverInterface
+readonly class ProcessConfigurationValueResolver implements ValueResolverInterface
 {
-    public function __construct(private readonly ProcessConfigurationRegistry $registry)
+    public function __construct(private ProcessConfigurationRegistry $registry)
     {
     }
 
@@ -35,6 +32,6 @@ public function __construct(private readonly ProcessConfigurationRegistry $regis
      */
     public function resolve(Request $request, ArgumentMetadata $argument): iterable
     {
-        return [$this->registry->getProcessConfiguration($request->get('process'))];
+        return [$this->registry->getProcessConfiguration((string)$request->request->get('process'))];
     }
 }

src/Manager/ProcessConfigurationsManager.php

@@ -20,9 +20,6 @@
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraint;
 
-/**
- * PHP 8.2 : Replace by readonly class.
- */
 /**
  * @phpstan-type UiOptions array{
  *      'source': ?string,
@@ -35,9 +32,9 @@
  *      'default': array{'input': mixed, 'context': array{array{'key': 'int|text', 'value':'int|text'}}}
  *  }
  */
-final class ProcessConfigurationsManager
+readonly final class ProcessConfigurationsManager
 {
-    public function __construct(private readonly ProcessConfigurationRegistry $registry)
+    public function __construct(private ProcessConfigurationRegistry $registry)
     {
     }
 

src/Message/CronProcessMessage.php

@@ -15,12 +15,9 @@
 
 use CleverAge\UiProcessBundle\Entity\ProcessSchedule;
 
-/**
- * PHP 8.2 : Replace by readonly class.
- */
-final class CronProcessMessage
+readonly final class CronProcessMessage
 {
-    public function __construct(public readonly ProcessSchedule $processSchedule)
+    public function __construct(public ProcessSchedule $processSchedule)
     {
     }
 }

src/Message/CronProcessMessageHandler.php

@@ -16,13 +16,10 @@
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 use Symfony\Component\Messenger\MessageBusInterface;
 
-/**
- * PHP 8.2 : Replace by readonly class.
- */
 #[AsMessageHandler]
-final class CronProcessMessageHandler
+readonly final class CronProcessMessageHandler
 {
-    public function __construct(private readonly MessageBusInterface $bus)
+    public function __construct(private MessageBusInterface $bus)
     {
     }
 

src/Message/ProcessExecuteHandler.php

@@ -17,13 +17,10 @@
 use CleverAge\UiProcessBundle\Monolog\Handler\ProcessHandler;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 
-/**
- * PHP 8.2 : Replace by readonly class.
- */
 #[AsMessageHandler]
-class ProcessExecuteHandler
+readonly class ProcessExecuteHandler
 {
-    public function __construct(private readonly ProcessManager $manager, private readonly ProcessHandler $processHandler)
+    public function __construct(private ProcessManager $manager, private ProcessHandler $processHandler)
     {
     }
 

src/Message/ProcessExecuteMessage.php

@@ -13,15 +13,12 @@
 
 namespace CleverAge\UiProcessBundle\Message;
 
-/**
- * PHP 8.2 : Replace by readonly class.
- */
-class ProcessExecuteMessage
+readonly class ProcessExecuteMessage
 {
     /**
      * @param mixed[] $context
      */
-    public function __construct(public readonly string $code, public readonly mixed $input, public readonly array $context = [])
+    public function __construct(public string $code, public mixed $input, public array $context = [])
     {
     }
 }

src/Scheduler/CronScheduler.php

@@ -22,15 +22,12 @@
 use Symfony\Component\Scheduler\ScheduleProviderInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
-/**
- * PHP 8.2 : Replace by readonly class.
- */
-class CronScheduler implements ScheduleProviderInterface
+readonly class CronScheduler implements ScheduleProviderInterface
 {
     public function __construct(
-        private readonly ProcessScheduleRepository $repository,
-        private readonly ValidatorInterface $validator,
-        private readonly LoggerInterface $logger,
+        private ProcessScheduleRepository $repository,
+        private ValidatorInterface $validator,
+        private LoggerInterface $logger,
     ) {
     }