Eccube/feature/fix php74 deprecated type declarations

src/Eccube/Command/ComposerInstallCommand.php

@@ -33,15 +33,15 @@ public function __construct(ComposerApiService $composerService)
         $this->composerService = $composerService;
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this->addOption('dry-run');
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->composerService->execInstall($input->getOption('dry-run'), $output);
 
-        return 0;
+        return Command::SUCCESS;
     }
 }

src/Eccube/Command/ComposerRemoveCommand.php

@@ -36,12 +36,12 @@ public function __construct(ComposerApiService $composerService)
         $this->composerService = $composerService;
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this->addArgument('package', InputArgument::REQUIRED);
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->composerService->execRemove($input->getArgument('package'), $output);
 
@@ -57,7 +57,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         } catch (\Exception $e) {
             $io->error($e->getMessage());
 
-            return 1;
+            return Command::FAILURE;
         }
     }
 }

src/Eccube/Command/ComposerRequireAlreadyInstalledPluginsCommand.php

@@ -59,12 +59,12 @@ public function __construct(
         $this->pluginRepository = $pluginRepository;
     }
 
-    public function initialize(InputInterface $input, OutputInterface $output)
+    public function initialize(InputInterface $input, OutputInterface $output): void
     {
         $this->io = new SymfonyStyle($input, $output);
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $packageNames = [];
         $unSupportedPlugins = [];
@@ -90,14 +90,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
             ]);
             $question = new ConfirmationQuestion($message);
             if (!$this->io->askQuestion($question)) {
-                return;
+                return Command::FAILURE;
             }
         }
 
         if ($packageNames) {
             $this->composerService->execRequire(implode(' ', $packageNames), $this->io);
         }
 
-        return 0;
+        return Command::SUCCESS;
     }
 }

src/Eccube/Command/ComposerRequireCommand.php

@@ -35,14 +35,14 @@ public function __construct(ComposerApiService $composerService)
         $this->composerService = $composerService;
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this->addArgument('package', InputArgument::REQUIRED)
             ->addArgument('version', InputArgument::OPTIONAL)
             ->addOption('from', null, InputOption::VALUE_OPTIONAL, 'Path of composer repository');
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $packageName = $input->getArgument('package');
         if ($input->getArgument('version')) {
@@ -51,6 +51,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $this->composerService->execRequire($packageName, $output, $input->getOption('from'));
 
-        return 0;
+        return Command::SUCCESS;
     }
 }

src/Eccube/Command/ComposerUpdateCommand.php

@@ -33,15 +33,15 @@ public function __construct(ComposerApiService $composerService)
         $this->composerService = $composerService;
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this->addOption('dry-run');
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->composerService->execUpdate($input->getOption('dry-run'), $output);
 
-        return 0;
+        return Command::SUCCESS;
     }
 }

src/Eccube/Command/DeleteCartsCommand.php

@@ -69,14 +69,14 @@ public function __construct(EccubeConfig $eccubeConfig, EntityManagerInterface $
         $this->cartRepository = $cartRepository;
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setDescription('Delete Carts from the database')
             ->addArgument('date', InputArgument::REQUIRED, 'Deletes carts before the specified date');
     }
 
-    protected function interact(InputInterface $input, OutputInterface $output)
+    protected function interact(InputInterface $input, OutputInterface $output): void
     {
         if (null !== $input->getArgument('date')) {
             return;
@@ -102,15 +102,15 @@ protected function interact(InputInterface $input, OutputInterface $output)
         $input->setArgument('date', $dateStr);
     }
 
-    protected function initialize(InputInterface $input, OutputInterface $output)
+    protected function initialize(InputInterface $input, OutputInterface $output): void
     {
         $this->io = new SymfonyStyle($input, $output);
         $this->locale = $this->eccubeConfig->get('locale');
         $this->timezone = new \DateTimeZone($this->eccubeConfig->get('timezone'));
         $this->formatter = $this->createIntlFormatter();
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $dateStr = $input->getArgument('date');
         $timestamp = $this->formatter->parse($dateStr);
@@ -120,7 +120,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $this->io->success('Delete carts successful.');
 
-        return 0;
+        return Command::SUCCESS;
     }
 
     protected function deleteCarts(\DateTime $dateTime)

src/Eccube/Command/GenerateDummyDataCommand.php

@@ -57,7 +57,7 @@ public function __construct(Generator $generator = null, EntityManagerInterface
         $this->productRepository = $productRepository;
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setDescription('Dummy data generator')
@@ -81,7 +81,7 @@ protected function configure()
             );
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $locale = $input->getOption('with-locale');
         $notImage = $input->getOption('without-image');
@@ -189,6 +189,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $output->writeln('');
         $output->writeln(sprintf('%s <info>success</info>', 'eccube:fixtures:generate'));
 
-        return 0;
+        return Command::SUCCESS;
     }
 }

src/Eccube/Command/GenerateProxyCommand.php

@@ -41,13 +41,13 @@ public function __construct(EntityProxyService $entityProxyService, EccubeConfig
         $this->eccubeConfig = $eccubeConfig;
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setDescription('Generate entity proxies');
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $projectDir = $this->eccubeConfig->get('kernel.project_dir');
         $includeDirs = [$projectDir.'/app/Customize/Entity'];
@@ -66,6 +66,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $output
         );
 
-        return 0;
+        return Command::SUCCESS;
     }
 }

src/Eccube/Command/InstallerCommand.php

@@ -105,13 +105,13 @@ public function updateEnvFile()
         };
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setDescription('Install EC-CUBE');
     }
 
-    protected function interact(InputInterface $input, OutputInterface $output)
+    protected function interact(InputInterface $input, OutputInterface $output): void
     {
         $this->io->title('EC-CUBE Installer Interactive Wizard');
         $this->io->text([
@@ -209,12 +209,12 @@ protected function interact(InputInterface $input, OutputInterface $output)
         $this->envFileUpdater->updateEnvFile();
     }
 
-    protected function initialize(InputInterface $input, OutputInterface $output)
+    protected function initialize(InputInterface $input, OutputInterface $output): void
     {
         $this->io = new SymfonyStyle($input, $output);
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         // Process実行時に, APP_ENV/APP_DEBUGが子プロセスに引き継がれてしまうため,
         // 生成された.envをロードして上書きする.
@@ -254,13 +254,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
             } catch (ProcessFailedException $e) {
                 $this->io->error($e->getMessage());
 
-                return 1;
+                return Command::FAILURE;
             }
         }
 
         $this->io->success('EC-CUBE installation successful.');
 
-        return 0;
+        return Command::SUCCESS;
     }
 
     protected function getDatabaseName($databaseUrl)

src/Eccube/Command/LoadDataFixturesEccubeCommand.php

@@ -18,6 +18,7 @@
 use Eccube\Common\EccubeConfig;
 use Eccube\Entity\Member;
 use Eccube\Security\PasswordHasher\PasswordHasher;
+use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Filesystem\Filesystem;
@@ -44,7 +45,7 @@ public function __construct(ManagerRegistry $registry, EccubeConfig $eccubeConfi
         $this->passwordHasher = $passwordHasher;
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setDescription('Load data fixtures to your database.')
@@ -56,7 +57,7 @@ protected function configure()
             );
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $em = $this->getEntityManager(null);
 
@@ -142,6 +143,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $output->writeln(sprintf('  <comment>></comment> <info>%s</info>', 'Finished Successful!'));
 
-        return 0;
+        return Command::SUCCESS;
     }
 }

src/Eccube/Command/PluginDisableCommand.php

@@ -24,13 +24,13 @@ class PluginDisableCommand extends Command
     use PluginCommandTrait;
     protected static $defaultName = 'eccube:plugin:disable';
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->addOption('code', null, InputOption::VALUE_OPTIONAL, 'plugin code');
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $io = new SymfonyStyle($input, $output);
 
@@ -39,21 +39,21 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if (empty($code)) {
             $io->error('code is required.');
 
-            return 1;
+            return Command::FAILURE;
         }
 
         $plugin = $this->pluginRepository->findByCode($code);
         if (is_null($plugin)) {
             $io->error("Plugin `$code` is not found.");
 
-            return 1;
+            return Command::FAILURE;
         }
 
         $this->pluginService->disable($plugin);
         $this->clearCache($io);
 
         $io->success('Plugin Disabled.');
 
-        return 0;
+        return Command::SUCCESS;
     }
 }

src/Eccube/Command/PluginEnableCommand.php

@@ -24,13 +24,13 @@ class PluginEnableCommand extends Command
     use PluginCommandTrait;
     protected static $defaultName = 'eccube:plugin:enable';
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->addOption('code', null, InputOption::VALUE_OPTIONAL, 'plugin code');
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $io = new SymfonyStyle($input, $output);
 
@@ -39,14 +39,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if (empty($code)) {
             $io->error('code is required.');
 
-            return 1;
+            return Command::FAILURE;
         }
 
         $plugin = $this->pluginRepository->findByCode($code);
         if (is_null($plugin)) {
             $io->error("Plugin `$code` is not found.");
 
-            return 1;
+            return Command::FAILURE;
         }
 
         if (!$plugin->isInitialized()) {
@@ -58,6 +58,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $io->success('Plugin Enabled.');
 
-        return 0;
+        return Command::SUCCESS;
     }
 }