Merge pull request #5093 from nanasess/composer2.1-update

Apply composer update
EC-CUBE · Jul 21, 2021 · b51348f · b51348f
2 parents c2a3e78 + ffdfb36
commit b51348f
Show file tree

Hide file tree

Showing 28 changed files with 814 additions and 643 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Eccube/Command/ComposerInstallCommand.php b/src/Eccube/Command/ComposerInstallCommand.php
@@ -41,5 +41,7 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $this->composerService->execInstall($input->getOption('dry-run'), $output);
+
+        return 0;
     }
 }
diff --git a/src/Eccube/Command/ComposerRemoveCommand.php b/src/Eccube/Command/ComposerRemoveCommand.php
@@ -49,12 +49,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
         try {
             /* @var Command $command */
             $command = $this->getApplication()->get('cache:clear');
-            $command->run(new ArrayInput([
+            return $command->run(new ArrayInput([
                 'command' => 'cache:clear',
                 '--no-warmup' => true,
             ]), $io);
         } catch (\Exception $e) {
             $io->error($e->getMessage());
+
+            return 1;
         }
     }
 }
diff --git a/src/Eccube/Command/ComposerRequireAlreadyInstalledPluginsCommand.php b/src/Eccube/Command/ComposerRequireAlreadyInstalledPluginsCommand.php
@@ -97,5 +97,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if ($packageNames) {
             $this->composerService->execRequire(implode(' ', $packageNames), $this->io);
         }
+
+        return 0;
     }
 }
diff --git a/src/Eccube/Command/ComposerRequireCommand.php b/src/Eccube/Command/ComposerRequireCommand.php
@@ -47,5 +47,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $packageName .= ':'.$input->getArgument('version');
         }
         $this->composerService->execRequire($packageName, $output);
+
+        return 0;
     }
 }
diff --git a/src/Eccube/Command/ComposerUpdateCommand.php b/src/Eccube/Command/ComposerUpdateCommand.php
@@ -41,5 +41,7 @@ protected function configure()
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $this->composerService->execUpdate($input->getOption('dry-run'), $output);
+
+        return 0;
     }
 }
diff --git a/src/Eccube/Command/DeleteCartsCommand.php b/src/Eccube/Command/DeleteCartsCommand.php
@@ -119,6 +119,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $this->deleteCarts($dateTime);
 
         $this->io->success('Delete carts successful.');
+
+        return 0;
     }
 
     protected function deleteCarts(\DateTime $dateTime)

diff --git a/src/Eccube/Command/GenerateDummyDataCommand.php b/src/Eccube/Command/GenerateDummyDataCommand.php
@@ -190,5 +190,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
         $output->writeln('');
         $output->writeln(sprintf('%s <info>success</info>', 'eccube:fixtures:generate'));
+
+        return 0;
     }
 }
diff --git a/src/Eccube/Command/GenerateProxyCommand.php b/src/Eccube/Command/GenerateProxyCommand.php
@@ -62,5 +62,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             $projectDir.'/app/proxy/entity',
             $output
         );
+
+        return 0;
     }
 }
diff --git a/src/Eccube/Command/InstallerCommand.php b/src/Eccube/Command/InstallerCommand.php
@@ -244,6 +244,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $this->io->success('EC-CUBE installation successful.');
+
+        return 0;
     }
 
     protected function getDatabaseName($databaseUrl)

diff --git a/src/Eccube/Command/LoadDataFixturesEccubeCommand.php b/src/Eccube/Command/LoadDataFixturesEccubeCommand.php
@@ -135,5 +135,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $output->writeln(sprintf('  <comment>></comment> <info>%s</info>', 'Finished Successful!'));
+
+        return 0;
     }
 }
diff --git a/src/Eccube/Command/PluginDisableCommand.php b/src/Eccube/Command/PluginDisableCommand.php
@@ -39,19 +39,21 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if (empty($code)) {
             $io->error('code is required.');
 
-            return;
+            return 1;
         }
 
         $plugin = $this->pluginRepository->findByCode($code);
         if (is_null($plugin)) {
             $io->error("Plugin `$code` is not found.");
 
-            return;
+            return 1;
         }
 
         $this->pluginService->disable($plugin);
         $this->clearCache($io);
 
         $io->success('Plugin Disabled.');
+
+        return 0;
     }
 }
diff --git a/src/Eccube/Command/PluginEnableCommand.php b/src/Eccube/Command/PluginEnableCommand.php
@@ -39,14 +39,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if (empty($code)) {
             $io->error('code is required.');
 
-            return;
+            return 1;
         }
 
         $plugin = $this->pluginRepository->findByCode($code);
         if (is_null($plugin)) {
             $io->error("Plugin `$code` is not found.");
 
-            return;
+            return 1;
         }
 
         if (!$plugin->isInitialized()) {
@@ -57,5 +57,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $this->clearCache($io);
 
         $io->success('Plugin Enabled.');
+
+        return 0;
     }
 }
diff --git a/src/Eccube/Command/PluginGenerateCommand.php b/src/Eccube/Command/PluginGenerateCommand.php
@@ -120,6 +120,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $this->createGithubActions($pluginDir);
 
         $this->io->success(sprintf('Plugin was successfully created: %s %s %s', $name, $code, $version));
+
+        return 0;
     }
 
     public function validateCode($code)

diff --git a/src/Eccube/Command/PluginInstallCommand.php b/src/Eccube/Command/PluginInstallCommand.php
@@ -58,5 +58,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $io->error('path or code is required.');
+
+        return 1;
     }
 }
diff --git a/src/Eccube/Command/PluginSchemaUpdateCommand.php b/src/Eccube/Command/PluginSchemaUpdateCommand.php
@@ -52,5 +52,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $this->clearCache($io);
 
         $io->success('Schema Updated.');
+
+        return 0;
     }
 }
diff --git a/src/Eccube/Command/PluginUninstallCommand.php b/src/Eccube/Command/PluginUninstallCommand.php
@@ -42,19 +42,21 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if (empty($code)) {
             $io->error('code is required.');
 
-            return;
+            return 1;
         }
 
         $plugin = $this->pluginRepository->findByCode($code);
         if (is_null($plugin)) {
             $io->error("Plugin `$code` is not installed.");
 
-            return;
+            return 1;
         }
 
         $this->pluginService->uninstall($plugin, $uninstallForce);
         $this->clearCache($io);
 
         $io->success('Uninstalled.');
+
+        return 0;
     }
 }
diff --git a/src/Eccube/Command/PluginUpdateCommand.php b/src/Eccube/Command/PluginUpdateCommand.php
@@ -52,5 +52,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $this->clearCache($io);
 
         $io->success('Updated.');
+
+        return 0;
     }
 }
diff --git a/src/Eccube/Command/UpdateSchemaDoctrineCommand.php b/src/Eccube/Command/UpdateSchemaDoctrineCommand.php
@@ -115,7 +115,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 }
             }, $generateAllFiles, $tmpProxyOutputDir, $tmpMetaDataOutputDir);
 
-            return $result;
+            return (int) $result;
         } finally {
             $this->removeOutputDir($tmpMetaDataOutputDir);
             $this->removeOutputDir($tmpProxyOutputDir);

diff --git a/src/Eccube/Controller/AbstractShoppingController.php b/src/Eccube/Controller/AbstractShoppingController.php
@@ -17,6 +17,7 @@
 use Eccube\Service\PurchaseFlow\PurchaseContext;
 use Eccube\Service\PurchaseFlow\PurchaseFlow;
 use Eccube\Service\PurchaseFlow\PurchaseFlowResult;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 
 class AbstractShoppingController extends AbstractController
 {
@@ -38,7 +39,7 @@ public function setPurchaseFlow(PurchaseFlow $shoppingPurchaseFlow)
      * @param ItemHolderInterface $itemHolder
      * @param bool $returnResponse レスポンスを返すかどうか. falseの場合はPurchaseFlowResultを返す.
      *
-     * @return PurchaseFlowResult|\Symfony\Component\HttpFoundation\RedirectResponse
+     * @return PurchaseFlowResult|RedirectResponse|null
      */
     protected function executePurchaseFlow(ItemHolderInterface $itemHolder, $returnResponse = true)
     {
@@ -66,5 +67,7 @@ protected function executePurchaseFlow(ItemHolderInterface $itemHolder, $returnR
 
             return $this->redirectToRoute('shopping');
         }
+
+        return null;
     }
 }
diff --git a/src/Eccube/Controller/Admin/Order/EditController.php b/src/Eccube/Controller/Admin/Order/EditController.php
@@ -46,6 +46,7 @@
 use Knp\Component\Pager\PaginatorInterface;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\RouterInterface;
@@ -413,7 +414,7 @@ public function index(Request $request, $id = null, RouterInterface $router)
      * @param Request $request
      * @param integer $page_no
      *
-     * @return \Symfony\Component\HttpFoundation\JsonResponse
+     * @return array
      */
     public function searchCustomerHtml(Request $request, $page_no = null, PaginatorInterface $paginator)
     {
@@ -497,6 +498,8 @@ public function searchCustomerHtml(Request $request, $page_no = null, PaginatorI
                 'pagination' => $pagination,
             ];
         }
+
+        throw new BadRequestHttpException();
     }
 
     /**
@@ -560,6 +563,8 @@ public function searchCustomerById(Request $request)
 
             return $this->json($data);
         }
+
+        throw new BadRequestHttpException();
     }
 
     /**
@@ -685,5 +690,7 @@ public function searchOrderItemType(Request $request)
                 'OrderItemTypes' => $OrderItemTypes,
             ];
         }
+
+        throw new BadRequestHttpException();
     }
 }
diff --git a/src/Eccube/Controller/Admin/Setting/Shop/PaymentController.php b/src/Eccube/Controller/Admin/Setting/Shop/PaymentController.php
@@ -288,5 +288,7 @@ public function moveSortNo(Request $request)
 
             return new Response();
         }
+
+        throw new BadRequestHttpException();
     }
 }
diff --git a/src/Eccube/Controller/CartController.php b/src/Eccube/Controller/CartController.php
@@ -130,7 +130,7 @@ public function index(Request $request)
     /**
      * @param $Carts
      *
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse
+     * @return \Symfony\Component\HttpFoundation\RedirectResponse|null
      */
     protected function execPurchaseFlow($Carts)
     {
@@ -170,6 +170,8 @@ protected function execPurchaseFlow($Carts)
                 }
             }
         }
+
+        return null;
     }
 
     /**

diff --git a/src/Eccube/Controller/ShoppingController.php b/src/Eccube/Controller/ShoppingController.php
@@ -768,7 +768,7 @@ protected function executeApply(PaymentMethodInterface $paymentMethod)
      *
      * @param PaymentMethodInterface $paymentMethod
      *
-     * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
+     * @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response|null
      */
     protected function executeCheckout(PaymentMethodInterface $paymentMethod)
     {
@@ -793,5 +793,7 @@ protected function executeCheckout(PaymentMethodInterface $paymentMethod)
 
             return $this->redirectToRoute('shopping_error');
         }
+
+        return null;
     }
 }
diff --git a/src/Eccube/Service/Payment/Method/Cash.php b/src/Eccube/Service/Payment/Method/Cash.php
@@ -77,6 +77,8 @@ public function apply()
     public function setFormType(FormInterface $form)
     {
         $this->form = $form;
+
+        return $this;
     }
 
     /**
@@ -93,5 +95,7 @@ public function verify()
     public function setOrder(Order $Order)
     {
         $this->Order = $Order;
+
+        return $this;
     }
 }
diff --git a/src/Eccube/Service/Payment/Method/CreditCard.php b/src/Eccube/Service/Payment/Method/CreditCard.php
@@ -55,5 +55,7 @@ abstract public function setFormType(FormInterface $form);
     public function setOrder(Order $Order)
     {
         $this->Order = $Order;
+
+        return $this;
     }
 }
diff --git a/src/Eccube/Twig/Template.php b/src/Eccube/Twig/Template.php
@@ -55,6 +55,7 @@ public function getTemplateName()
     public function getDebugInfo()
     {
         // Templateのキャッシュ作成時に動的に作成されるメソッド
+        return [];
     }
 
     protected function doDisplay(array $context, array $blocks = [])

diff --git a/symfony.lock b/symfony.lock
@@ -32,6 +32,9 @@
     "composer/composer": {
         "version": "1.5.5"
     },
+    "composer/metadata-minifier": {
+        "version": "1.0.0"
+    },
     "composer/semver": {
         "version": "1.4.2"
     },
@@ -233,6 +236,9 @@
     "php": {
         "version": "7.1.3"
     },
+    "php-coveralls/php-coveralls": {
+        "version": "v2.4.3"
+    },
     "php-cs-fixer/diff": {
         "version": "v1.2.0"
     },