Merge branch 'composer-update' into improve/php7.4

src/Eccube/Controller/ShoppingController.php

@@ -33,6 +33,7 @@
 use Eccube\Service\PurchaseFlow\PurchaseFlow;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
 use Symfony\Component\Form\FormInterface;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\RouterInterface;
@@ -283,7 +284,7 @@ public function confirm(Request $request)
                 }
 
                 $response = $PaymentResult->getResponse();
-                if ($response && ($response->isRedirection() || $response->getContent())) {
+                if ($response instanceof Response && ($response->isRedirection() || $response->isSuccessful())) {
                     $this->entityManager->flush();
 
                     log_info('[注文確認] PaymentMethod::verifyが指定したレスポンスを表示します.');
@@ -736,7 +737,7 @@ protected function executeApply(PaymentMethodInterface $paymentMethod)
             $this->entityManager->flush();
 
             // dispatcherがresponseを保持している場合はresponseを返す
-            if ($response && ($response->isRedirection() || $response->getContent())) {
+            if ($response instanceof Response && ($response->isRedirection() || $response->isSuccessful())) {
                 log_info('[注文処理] PaymentMethod::applyが指定したレスポンスを表示します.');
 
                 return $response;
@@ -771,7 +772,7 @@ protected function executeCheckout(PaymentMethodInterface $paymentMethod)
         $PaymentResult = $paymentMethod->checkout();
         $response = $PaymentResult->getResponse();
         // PaymentResultがresponseを保持している場合はresponseを返す
-        if ($response && ($response->isRedirection() || $response->getContent())) {
+        if ($response instanceof Response && ($response->isRedirection() || $response->isSuccessful())) {
             $this->entityManager->flush();
             log_info('[注文処理] PaymentMethod::checkoutが指定したレスポンスを表示します.');