php cs fixer

Author: xaviermarchegay

.gitignore

@@ -28,3 +28,8 @@ yarn-error.log
 /phpcs.xml
 /.php-cs-fixer.cache
 ###< squizlabs/php_codesniffer ###
+
+###> friendsofphp/php-cs-fixer ###
+/.php-cs-fixer.php
+/.php-cs-fixer.cache
+###< friendsofphp/php-cs-fixer ###

.php-cs-fixer.dist.php

@@ -1,10 +1,10 @@
 <?php
 
 $finder = PhpCsFixer\Finder::create()
-    ->in(__DIR__)
+    ->in(__DIR__.'/src')
     ->ignoreDotFiles(true)
     ->ignoreVCS(true)
-    ->exclude(array('build', 'vendor'))
+    ->exclude(['build', 'vendor'])
     ->files()
     ->name('*.php')
 ;
@@ -15,19 +15,17 @@
     ->setUsingCache(true)
     ->setRiskyAllowed(true)
     ->setFinder($finder)
-    ->setRules(array(
+    ->setRules([
+        '@PHP80Migration' => true,
+        '@PHP80Migration:risky' => true,
         '@Symfony' => true,
         '@Symfony:risky' => true,
         'array_syntax' => ['syntax' => 'short'],
         'fopen_flags' => false,
         'ordered_imports' => true,
         'protected_to_private' => false,
-        // Part of @Symfony:risky in PHP-CS-Fixer 2.13.0. To be removed from the config file once upgrading
-        'native_function_invocation' => ['include' => ['@compiler_optimized'], 'scope' => 'namespaced', 'strict' => true],
-        // Part of future @Symfony ruleset in PHP-CS-Fixer To be removed from the config file once upgrading
-        'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
         'single_line_throw' => false,
         // this must be disabled because the output of some tests include NBSP characters
         'non_printable_character' => false,
-    ))
+    ])
     ;

composer.json

@@ -56,7 +56,7 @@
   },
   "require-dev": {
     "doctrine/doctrine-fixtures-bundle": "^3.4",
-    "phpmd/phpmd": "^2.10",
+    "friendsofphp/php-cs-fixer": "^3.6",
     "phpstan/phpstan": "^1",
     "rector/rector": "^0.12.13",
     "roave/security-advisories": "dev-latest",

src/CleverAgeProcessUiBundle.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CleverAge\ProcessUiBundle;
 
 use CleverAge\ProcessUiBundle\DependencyInjection\Compiler\RegisterLogHandlerCompilerPass;
@@ -18,7 +20,6 @@ class CleverAgeProcessUiBundle extends Bundle
     public const CLASS_EDIT = 'text-warning';
     public const CLASS_DELETE = '';
 
-
     public function build(ContainerBuilder $container): void
     {
         parent::build($container);

src/Command/PurgeProcessExecution.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CleverAge\ProcessUiBundle\Command;
 
 use CleverAge\ProcessUiBundle\Entity\ProcessExecution;
@@ -54,7 +56,7 @@ protected function configure(): void
                     InputOption::VALUE_NEGATABLE,
                     'Remove log files ? (default false)',
                     false
-                )
+                ),
             ])
         );
     }
@@ -68,7 +70,7 @@ public function execute(InputInterface $input, OutputInterface $output): int
         if ($removeFiles) {
             $finder = new Finder();
             $fs = new Filesystem();
-            $finder->in($this->processLogDir)->date("before " . $date->format(DateTimeInterface::ATOM));
+            $finder->in($this->processLogDir)->date('before '.$date->format(DateTimeInterface::ATOM));
             $count = $finder->count();
             $fs->remove($finder);
             $output->writeln("<info>$count log files are deleted on filesystem.</info>");
@@ -78,8 +80,9 @@ public function execute(InputInterface $input, OutputInterface $output): int
         $repository->deleteBefore($date);
 
         $output->writeln(<<<EOT
-<info>Process Execution before {$date->format(DateTimeInterface::ATOM)} are deleted into database.</info>
-EOT);
+            <info>Process Execution before {$date->format(DateTimeInterface::ATOM)} are deleted into database.</info>
+            EOT);
+
         return Command::SUCCESS;
     }
 }

src/Command/UserCreateCommand.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CleverAge\ProcessUiBundle\Command;
 
 use CleverAge\ProcessUiBundle\Entity\User;
@@ -10,13 +12,12 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
 use Symfony\Component\Validator\Constraints\Email;
-use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Validator\Constraints\Length;
+use Symfony\Component\Validator\Constraints\NotBlank;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 /**
- * Class UserCreateCommand
- * @package App\Command
+ * Class UserCreateCommand.
  */
 final class UserCreateCommand extends Command
 {
@@ -45,7 +46,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $style = new SymfonyStyle($input, $output);
         $username = $this->ask('Please enter the email.', $style, [new Email()]);
-        $password = $this->ask('Please enter the user password.', $style, [new NotBlank(), new Length(min:8)]);
+        $password = $this->ask('Please enter the user password.', $style, [new NotBlank(), new Length(min: 8)]);
 
         $user = new User();
         $user->setEmail($username);
@@ -61,10 +62,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     }
 
     /**
-     * @param string $question
-     * @param SymfonyStyle $style
      * @param array <int, mixed> $constraints
-     * @return mixed
      */
     private function ask(string $question, SymfonyStyle $style, array $constraints = []): mixed
     {

src/Controller/Crud/ProcessCrudController.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CleverAge\ProcessUiBundle\Controller\Crud;
 
 use CleverAge\ProcessUiBundle\Entity\Process;
@@ -58,7 +60,7 @@ public function configureFields(string $pageName): array
             'target',
             'lastExecutionDate',
             IntegerField::new('lastExecutionStatus')->formatValue(static function (?int $value) {
-                /** @phpstan-ignore-next-line */
+                /* @phpstan-ignore-next-line */
                 return match ($value) {
                     ProcessExecution::STATUS_FAIL => '<button class="btn btn-danger btn-lm">failed</button>',
                     ProcessExecution::STATUS_START => '<button class="btn btn-warning btn-lm">started</button>',
@@ -77,9 +79,7 @@ public function configureActions(Actions $actions): Actions
         $runProcess = Action::new('run', '', 'fa fa-rocket')
             ->linkToCrudAction('runProcessAction');
         $runProcess->setHtmlAttributes(['data-toggle' => 'tooltip', 'title' => 'Run process in background']);
-        $runProcess->displayIf(function (Process $process) {
-            return $this->processUiConfigurationManager->canRun($process);
-        });
+        $runProcess->displayIf(fn (Process $process) => $this->processUiConfigurationManager->canRun($process));
         $viewHistoryAction = Action::new('viewHistory', '', 'fa fa-history')
             ->linkToCrudAction('viewHistoryAction');
         $viewHistoryAction->setHtmlAttributes(['data-toggle' => 'tooltip', 'title' => 'View executions history']);
@@ -133,8 +133,8 @@ public function viewHistoryAction(AdminContext $adminContext): RedirectResponse
                 ->setAction(Action::INDEX)
                 ->setAll([
                     'filters' => [
-                        'processCode' => ['comparison' => ComparisonType::EQ, 'value' => $process->getProcessCode()]
-                    ]
+                        'processCode' => ['comparison' => ComparisonType::EQ, 'value' => $process->getProcessCode()],
+                    ],
                 ])
                 ->generateUrl()
         );

src/Controller/Crud/ProcessExecutionCrudController.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CleverAge\ProcessUiBundle\Controller\Crud;
 
 use CleverAge\ProcessUiBundle\Entity\ProcessExecution;
@@ -57,7 +59,7 @@ public function configureCrud(Crud $crud): Crud
         $crud->showEntityActionsInlined();
         $crud->setDefaultSort(['startDate' => SortOrder::DESC]);
         $crud->setEntityPermission('ROLE_ADMIN');
-        $crud->setSearchFields($this->indexLogs === true ? ['logRecords.message'] : null);
+        $crud->setSearchFields(true === $this->indexLogs ? ['logRecords.message'] : null);
 
         return $crud;
     }
@@ -67,15 +69,14 @@ public function configureCrud(Crud $crud): Crud
      */
     public function configureFields(string $pageName): array
     {
-
         return [
             Field::new('processCode', 'Process'),
             'source',
             'target',
             'startDate',
             'endDate',
             IntegerField::new('status')->formatValue(static function (int $value) {
-                /** @phpstan-ignore-next-line */
+                /* @phpstan-ignore-next-line */
                 return match ($value) {
                     ProcessExecution::STATUS_FAIL => '<button class="btn btn-danger btn-lm">failed</button>',
                     ProcessExecution::STATUS_START => '<button class="btn btn-warning btn-lm">started</button>',
@@ -88,17 +89,17 @@ public function configureFields(string $pageName): array
     public function configureFilters(Filters $filters): Filters
     {
         $processCodeChoices = $this->processUiConfigurationManager->getProcessChoices();
-        if (count($processCodeChoices) > 0) {
+        if (\count($processCodeChoices) > 0) {
             $filters->add(ChoiceFilter::new('processCode', 'Process')->setChoices($processCodeChoices));
         }
 
         $sourceChoices = $this->processUiConfigurationManager->getSourceChoices();
-        if (count($sourceChoices) > 0) {
+        if (\count($sourceChoices) > 0) {
             $filters->add(ChoiceFilter::new('source')->setChoices($sourceChoices));
         }
 
         $targetChoices = $this->processUiConfigurationManager->getTargetChoices();
-        if (count($targetChoices) > 0) {
+        if (\count($targetChoices) > 0) {
             $filters->add(ChoiceFilter::new('target')->setChoices($targetChoices));
         }
         $filters->add(ChoiceFilter::new('status')->setChoices([
@@ -130,11 +131,11 @@ public function downloadLog(AdminContext $context): Response
     {
         /** @var ProcessExecution $processExecution */
         $processExecution = $context->getEntity()->getInstance();
-        $filepath = $this->processLogDir . DIRECTORY_SEPARATOR . $processExecution->getLog();
+        $filepath = $this->processLogDir.\DIRECTORY_SEPARATOR.$processExecution->getLog();
         $basename = basename($filepath);
         $content = file_get_contents($filepath);
         if (false === $content) {
-            throw new NotFoundHttpException("Log file not found.");
+            throw new NotFoundHttpException('Log file not found.');
         }
         $response = new Response($content);
         $response->headers->set('Content-Type', 'text/plain; charset=utf-8');

src/Controller/Crud/UserCrudController.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CleverAge\ProcessUiBundle\Controller\Crud;
 
 use CleverAge\ProcessUiBundle\CleverAgeProcessUiBundle;
@@ -114,7 +116,7 @@ public function createNewFormBuilder(
 
     protected function addEncodePasswordEventListener(FormBuilderInterface $formBuilder): void
     {
-        $formBuilder->addEventListener(FormEvents::SUBMIT, function (FormEvent $event) {
+        $formBuilder->addEventListener(FormEvents::SUBMIT, function (FormEvent $event): void {
             /** @var User $user */
             $user = $event->getData();
             $password = $user->getPassword();

src/Controller/DashboardController.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace CleverAge\ProcessUiBundle\Controller;
 
 use CleverAge\ProcessUiBundle\Controller\Crud\ProcessCrudController;