CC-14473: Fixed notifications while redirecting fails after successfu…

…l payment. (#4) CC-14473 COMPUTOP: Issues during checkout with older browser versions
spryker-eco · Mar 18, 2022 · 677d2c4 · 677d2c4
1 parent 3269b2a
commit 677d2c4
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 33 deletions.
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,4 +1,7 @@
 parameters:
+    level: 7
+    paths:
+        - src/
     checkGenericClassInNonGenericObjectType: false
     checkMissingIterableValueType: false
     excludePaths:

diff --git a/psalm-report.json b/psalm-report.json
diff --git a/...co/Client/ComputopShipment/Dependency/Client/ComputopShipmentToZedRequestClientBridge.php b/...co/Client/ComputopShipment/Dependency/Client/ComputopShipmentToZedRequestClientBridge.php
@@ -31,7 +31,7 @@ public function __construct($zedRequestClient)
      *
      * @return \Spryker\Shared\Kernel\Transfer\TransferInterface
      */
-    public function call($url, TransferInterface $object, $requestOptions = null)
+    public function call(string $url, TransferInterface $object, ?array $requestOptions = null): TransferInterface
     {
         return $this->zedRequestClient->call($url, $object, $requestOptions);
     }

diff --git a/...Client/ComputopShipment/Dependency/Client/ComputopShipmentToZedRequestClientInterface.php b/...Client/ComputopShipment/Dependency/Client/ComputopShipmentToZedRequestClientInterface.php
@@ -18,5 +18,5 @@ interface ComputopShipmentToZedRequestClientInterface
      *
      * @return \Spryker\Shared\Kernel\Transfer\TransferInterface
      */
-    public function call($url, TransferInterface $object, $requestOptions = null);
+    public function call(string $url, TransferInterface $object, ?array $requestOptions = null): TransferInterface;
 }
diff --git a/src/SprykerEco/Shared/ComputopShipment/Transfer/computop_shipment.transfer.xml b/src/SprykerEco/Shared/ComputopShipment/Transfer/computop_shipment.transfer.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<transfers xmlns="spryker:transfer-01"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="spryker:transfer-01 http://static.spryker.com/transfer-01.xsd">
+
+    <transfer name="Quote">
+        <property name="items" type="Item[]" singular="item"/>
+        <property name="defaultShipmentSelected" type="bool"/>
+    </transfer>
+
+    <transfer name="Item">
+        <property name="shipment" type="Shipment"/>
+    </transfer>
+
+    <transfer name="ShipmentMethod">
+        <property name="isActive" type="bool"/>
+        <property name="idShipmentMethod" type="int"/>
+    </transfer>
+
+    <transfer name="Shipment">
+        <property name="shipmentSelection" type="string"/>
+        <property name="method" type="ShipmentMethod"/>
+        <property name="shippingAddress" type="Address"/>
+    </transfer>
+
+    <transfer name="Address">
+    </transfer>
+</transfers>
diff --git a/src/SprykerEco/Zed/ComputopShipment/Business/ComputopShipmentBusinessFactory.php b/src/SprykerEco/Zed/ComputopShipment/Business/ComputopShipmentBusinessFactory.php
@@ -25,7 +25,7 @@ public function createQuoteDefaultShipmentExpander(): QuoteShipmentExpanderInter
     {
         return new QuoteDefaultShipmentExpander(
             $this->getConfig(),
-            $this->getShipmentFacade()
+            $this->getShipmentFacade(),
         );
     }
 

diff --git a/...rEco/Zed/ComputopShipment/Business/QuoteShipmentExpander/QuoteDefaultShipmentExpander.php b/...rEco/Zed/ComputopShipment/Business/QuoteShipmentExpander/QuoteDefaultShipmentExpander.php
@@ -52,7 +52,7 @@ public function expand(QuoteTransfer $quoteTransfer): QuoteTransfer
         $defaultShipmentMethodTransfer = $this->shipmentFacade->findShipmentMethodByKey($defaultShipmentMethodKey);
         if ($defaultShipmentMethodTransfer === null || $defaultShipmentMethodTransfer->getIsActive() === false) {
             throw new ComputopDefaultShipmentException(
-                sprintf('Default shipment method "%s" is not available!', $defaultShipmentMethodKey)
+                sprintf('Default shipment method "%s" is not available!', $defaultShipmentMethodKey),
             );
         }
 
@@ -86,7 +86,7 @@ protected function addShipmentToQuoteItems(QuoteTransfer $quoteTransfer, Shipmen
     protected function createShipmentTransfer(ShipmentMethodTransfer $shipmentMethodTransfer): ShipmentTransfer
     {
         return (new ShipmentTransfer())
-            ->setShipmentSelection($shipmentMethodTransfer->getIdShipmentMethod())
+            ->setShipmentSelection((string)$shipmentMethodTransfer->getIdShipmentMethod())
             ->setMethod($shipmentMethodTransfer)
             ->setShippingAddress(new AddressTransfer());
     }

diff --git a/tests/SprykerEcoTest/Zed/ComputopShipment/codeception.yml b/tests/SprykerEcoTest/Zed/ComputopShipment/codeception.yml
@@ -28,4 +28,5 @@ suites:
                       coreNamespaces:
                           - Spryker
                           - SprykerEco
+                          - SprykerEcoTest
                 - \SprykerTest\Zed\Testify\Helper\BusinessHelper