SUPESC-811 Added compatibility with module Country version 4.

.github/workflows/ci.yml

@@ -25,11 +25,11 @@ on:
 jobs:
     ci:
         name: "Computop"
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-20.04
         strategy:
             fail-fast: false
             matrix:
-                php: ['7.4', '8.1']
+                php: ['8.1', '8.2']
 
         steps:
             - uses: actions/checkout@v2
@@ -93,7 +93,7 @@ jobs:
 
     lowest:
         name: Prefer Lowest
-        runs-on: ubuntu-18.04
+        runs-on: ubuntu-20.04
 
         steps:
             - name: Checkout@v2
@@ -118,7 +118,7 @@ jobs:
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '7.4'
+                  php-version: '8.1'
                   extensions: mbstring, intl, bcmath
 
             - name: Composer prefer lowest

README.md

@@ -3,7 +3,7 @@
 [![CI](https://github.com/spryker-eco/computop/actions/workflows/ci.yml/badge.svg)](https://github.com/spryker-eco/computop/actions/workflows/ci.yml)
 [![Latest Stable Version](https://poser.pugx.org/spryker-eco/computop/v/stable.svg)](https://packagist.org/packages/spryker-eco/computop)
 [![License](https://img.shields.io/github/license/spryker-eco/computop.svg?b=master)](https://github.com/spryker-eco/computop)
-[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.4-8892BF.svg)](https://php.net/)
+[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%208.1-8892BF.svg)](https://php.net/)
 
 Computop module provides main business logic for [Computop](https://computop.com/) payment system integration.
 
@@ -15,4 +15,4 @@ composer require spryker-eco/computop
 
 ## Documentation
 
-[Documentation](https://docs.spryker.com/docs/scos/user/technology-partners/202108.0/payment-partners/computop/computop.html)
+[Documentation](https://docs.spryker.com/)

codeception.yml

@@ -7,7 +7,7 @@ include:
 paths:
     tests: tests
     support: .
-    log: tests/_output
+    output: tests/_output
     data: tests/_data
     envs: tests/_envs
 

composer.json

@@ -4,15 +4,15 @@
     "description": "Computop module",
     "license": "MIT",
     "require": {
-        "php": ">=7.4",
+        "php": ">=8.1",
         "spryker-eco/computop-api": "^1.2.0",
         "spryker-eco/computop-extension": "^1.0.0",
         "spryker-shop/checkout-page": "^3.0.0",
         "spryker/application": "^3.0.0",
         "spryker/calculation": "^4.0.0",
         "spryker/checkout-extension": "^1.0.0",
         "spryker/config": "^3.0.0",
-        "spryker/country": "^3.2.0",
+        "spryker/country": "^3.2.0 || ^4.0.0",
         "spryker/kernel": "^3.30.0",
         "spryker/messenger": "^3.0.0",
         "spryker/money": "^2.0.0",

phpstan.neon

@@ -10,7 +10,6 @@ parameters:
         - 'src//SprykerEco//Yves//Computop//CheckoutWidget'
     ignoreErrors:
         - '#Call to method .+\(\) on an unknown class Generated\\.+\\Ide\\AutoCompletion.#'
-        - '#Call to an undefined method Propel\\.+#'
         - '#Call to an undefined method Spryker\\Shared\\Kernel\\Transfer\\.+#'
         - '#Call to an undefined method SprykerEco\\Zed\\Computop\\Business\\Oms\\Command\\Manager\\ManagerInterface.+#'
         - '#Parameter .+ of method .+ expects Generated\\Shared\\Transfer\\.+Transfer, Spryker\\Shared\\Kernel\\Transfer\\.+ given.#'

src/SprykerEco/Yves/Computop/Form/CreditCardSubForm.php

@@ -11,6 +11,9 @@
 use Generated\Shared\Transfer\PaymentTransfer;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
+/**
+ * @method \SprykerEco\Yves\Computop\ComputopConfig getConfig()
+ */
 class CreditCardSubForm extends AbstractSubForm
 {
     /**

src/SprykerEco/Yves/Computop/Form/DirectDebitSubForm.php

@@ -11,6 +11,9 @@
 use Generated\Shared\Transfer\PaymentTransfer;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
+/**
+ * @method \SprykerEco\Yves\Computop\ComputopConfig getConfig()
+ */
 class DirectDebitSubForm extends AbstractSubForm
 {
     /**

src/SprykerEco/Yves/Computop/Form/EasyCreditSubForm.php

@@ -11,6 +11,9 @@
 use Generated\Shared\Transfer\PaymentTransfer;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
+/**
+ * @method \SprykerEco\Yves\Computop\ComputopConfig getConfig()
+ */
 class EasyCreditSubForm extends AbstractSubForm
 {
     /**

src/SprykerEco/Yves/Computop/Form/IdealSubForm.php

@@ -11,6 +11,9 @@
 use Generated\Shared\Transfer\PaymentTransfer;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
+/**
+ * @method \SprykerEco\Yves\Computop\ComputopConfig getConfig()
+ */
 class IdealSubForm extends AbstractSubForm
 {
     /**

src/SprykerEco/Yves/Computop/Form/PayNowSubForm.php

@@ -11,6 +11,9 @@
 use Generated\Shared\Transfer\PaymentTransfer;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
+/**
+ * @method \SprykerEco\Yves\Computop\ComputopConfig getConfig()
+ */
 class PayNowSubForm extends AbstractSubForm
 {
     /**

src/SprykerEco/Yves/Computop/Form/PayPalSubForm.php

@@ -11,6 +11,9 @@
 use Generated\Shared\Transfer\PaymentTransfer;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
+/**
+ * @method \SprykerEco\Yves\Computop\ComputopConfig getConfig()
+ */
 class PayPalSubForm extends AbstractSubForm
 {
     /**

src/SprykerEco/Yves/Computop/Form/PaydirektSubForm.php

@@ -11,6 +11,9 @@
 use Generated\Shared\Transfer\PaymentTransfer;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
+/**
+ * @method \SprykerEco\Yves\Computop\ComputopConfig getConfig()
+ */
 class PaydirektSubForm extends AbstractSubForm
 {
     /**

src/SprykerEco/Yves/Computop/Form/PayuCeeSingleSubForm.php

@@ -11,6 +11,9 @@
 use Generated\Shared\Transfer\PaymentTransfer;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
+/**
+ * @method \SprykerEco\Yves\Computop\ComputopConfig getConfig()
+ */
 class PayuCeeSingleSubForm extends AbstractSubForm
 {
     /**

src/SprykerEco/Yves/Computop/Form/SofortSubForm.php

@@ -11,6 +11,9 @@
 use Generated\Shared\Transfer\PaymentTransfer;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
+/**
+ * @method \SprykerEco\Yves\Computop\ComputopConfig getConfig()
+ */
 class SofortSubForm extends AbstractSubForm
 {
     /**

src/SprykerEco/Zed/Computop/Business/Oms/Command/Manager/CancelManager.php

@@ -10,7 +10,7 @@
 use Generated\Shared\Transfer\OrderTransfer;
 use Orm\Zed\Sales\Persistence\SpySalesOrderItem;
 use Propel\Runtime\ActiveQuery\Criteria;
-use Propel\Runtime\Collection\ObjectCollection;
+use Propel\Runtime\Collection\Collection;
 
 class CancelManager extends AbstractManager implements CancelManagerInterface
 {
@@ -35,9 +35,9 @@ function () use ($orderItems): void {
     /**
      * @param \Generated\Shared\Transfer\OrderTransfer $orderTransfer
      *
-     * @return \Propel\Runtime\Collection\ObjectCollection|\Orm\Zed\Sales\Persistence\SpySalesOrderItem[]
+     * @return \Propel\Runtime\Collection\Collection<\Orm\Zed\Sales\Persistence\SpySalesOrderItem>
      */
-    public function getCanceledItems(OrderTransfer $orderTransfer): ObjectCollection
+    public function getCanceledItems(OrderTransfer $orderTransfer): Collection
     {
         return $this
             ->queryContainer

src/SprykerEco/Zed/Computop/Business/Oms/Command/Manager/CancelManagerInterface.php

@@ -8,7 +8,7 @@
 namespace SprykerEco\Zed\Computop\Business\Oms\Command\Manager;
 
 use Generated\Shared\Transfer\OrderTransfer;
-use Propel\Runtime\Collection\ObjectCollection;
+use Propel\Runtime\Collection\Collection;
 
 interface CancelManagerInterface
 {
@@ -22,7 +22,7 @@ public function changeComputopItemsStatus(array $orderItems): array;
     /**
      * @param \Generated\Shared\Transfer\OrderTransfer $orderTransfer
      *
-     * @return \Propel\Runtime\Collection\ObjectCollection
+     * @return \Propel\Runtime\Collection\Collection
      */
-    public function getCanceledItems(OrderTransfer $orderTransfer): ObjectCollection;
+    public function getCanceledItems(OrderTransfer $orderTransfer): Collection;
 }

src/SprykerEco/Zed/Computop/Business/Oms/Command/Manager/CaptureManager.php

@@ -8,16 +8,16 @@
 namespace SprykerEco\Zed\Computop\Business\Oms\Command\Manager;
 
 use Generated\Shared\Transfer\OrderTransfer;
-use Propel\Runtime\Collection\ObjectCollection;
+use Propel\Runtime\Collection\Collection;
 
 class CaptureManager extends AbstractManager
 {
     /**
      * @param \Generated\Shared\Transfer\OrderTransfer $orderTransfer
      *
-     * @return \Propel\Runtime\Collection\ObjectCollection|\Orm\Zed\Sales\Persistence\SpySalesOrderItem[]
+     * @return \Propel\Runtime\Collection\Collection<\Orm\Zed\Sales\Persistence\SpySalesOrderItem>
      */
-    public function getItemsBeforeCaptureState(OrderTransfer $orderTransfer): ObjectCollection
+    public function getItemsBeforeCaptureState(OrderTransfer $orderTransfer): Collection
     {
         return $this
             ->queryContainer
@@ -31,9 +31,9 @@ public function getItemsBeforeCaptureState(OrderTransfer $orderTransfer): Object
     /**
      * @param \Generated\Shared\Transfer\OrderTransfer $orderTransfer
      *
-     * @return \Propel\Runtime\Collection\ObjectCollection|\Orm\Zed\Sales\Persistence\SpySalesOrderItem[]
+     * @return \Propel\Runtime\Collection\Collection<\Orm\Zed\Sales\Persistence\SpySalesOrderItem>
      */
-    public function getAllItems(OrderTransfer $orderTransfer): ObjectCollection
+    public function getAllItems(OrderTransfer $orderTransfer): Collection
     {
         return $this
             ->queryContainer

src/SprykerEco/Zed/Computop/Business/Oms/Command/Manager/RefundManager.php

@@ -8,7 +8,7 @@
 namespace SprykerEco\Zed\Computop\Business\Oms\Command\Manager;
 
 use Generated\Shared\Transfer\OrderTransfer;
-use Propel\Runtime\Collection\ObjectCollection;
+use Propel\Runtime\Collection\Collection;
 
 class RefundManager extends AbstractManager
 {
@@ -47,9 +47,9 @@ protected function isShipmentRefundNeeded(OrderTransfer $orderTransfer): bool
     /**
      * @param \Generated\Shared\Transfer\OrderTransfer $orderTransfer
      *
-     * @return \Propel\Runtime\Collection\ObjectCollection|\Orm\Zed\Sales\Persistence\SpySalesOrderItem[]
+     * @return \Propel\Runtime\Collection\Collection<\Orm\Zed\Sales\Persistence\SpySalesOrderItem>
      */
-    protected function getItemsBeforeRefundState(OrderTransfer $orderTransfer): ObjectCollection
+    protected function getItemsBeforeRefundState(OrderTransfer $orderTransfer): Collection
     {
         return $this
             ->queryContainer

src/SprykerEco/Zed/Computop/Communication/Controller/GatewayController.php

@@ -14,6 +14,8 @@
 
 /**
  * @method \SprykerEco\Zed\Computop\Business\ComputopFacadeInterface getFacade()
+ * @method \SprykerEco\Zed\Computop\Persistence\ComputopRepositoryInterface getRepository()
+ * @method \SprykerEco\Zed\Computop\Communication\ComputopCommunicationFactory getFactory()
  */
 class GatewayController extends AbstractGatewayController
 {

src/SprykerEco/Zed/Computop/Communication/Plugin/Oms/Command/AuthorizePlugin.php

@@ -13,6 +13,8 @@
 
 /**
  * @method \SprykerEco\Zed\Computop\Business\ComputopFacadeInterface getFacade()
+ * @method \SprykerEco\Zed\Computop\ComputopConfig getConfig()
+ * @method \SprykerEco\Zed\Computop\Communication\ComputopCommunicationFactory getFactory()
  */
 class AuthorizePlugin extends AbstractComputopPlugin implements CommandByOrderInterface
 {

src/SprykerEco/Zed/Computop/Communication/Plugin/Oms/Command/CancelPlugin.php

@@ -13,6 +13,8 @@
 
 /**
  * @method \SprykerEco\Zed\Computop\Business\ComputopFacadeInterface getFacade()
+ * @method \SprykerEco\Zed\Computop\ComputopConfig getConfig()
+ * @method \SprykerEco\Zed\Computop\Communication\ComputopCommunicationFactory getFactory()
  */
 class CancelPlugin extends AbstractComputopPlugin implements CommandByOrderInterface
 {

src/SprykerEco/Zed/Computop/Communication/Plugin/Oms/Command/CapturePlugin.php

@@ -13,6 +13,8 @@
 
 /**
  * @method \SprykerEco\Zed\Computop\Business\ComputopFacadeInterface getFacade()
+ * @method \SprykerEco\Zed\Computop\ComputopConfig getConfig()
+ * @method \SprykerEco\Zed\Computop\Communication\ComputopCommunicationFactory getFactory()
  */
 class CapturePlugin extends AbstractComputopPlugin implements CommandByOrderInterface
 {

src/SprykerEco/Zed/Computop/Communication/Plugin/Oms/Command/EasyCreditAuthorizePlugin.php

@@ -13,6 +13,8 @@
 
 /**
  * @method \SprykerEco\Zed\Computop\Business\ComputopFacadeInterface getFacade()
+ * @method \SprykerEco\Zed\Computop\ComputopConfig getConfig()
+ * @method \SprykerEco\Zed\Computop\Communication\ComputopCommunicationFactory getFactory()
  */
 class EasyCreditAuthorizePlugin extends AbstractComputopPlugin implements CommandByOrderInterface
 {

src/SprykerEco/Zed/Computop/Communication/Plugin/Oms/Command/RefundPlugin.php

@@ -13,6 +13,8 @@
 
 /**
  * @method \SprykerEco\Zed\Computop\Business\ComputopFacadeInterface getFacade()
+ * @method \SprykerEco\Zed\Computop\ComputopConfig getConfig()
+ * @method \SprykerEco\Zed\Computop\Communication\ComputopCommunicationFactory getFactory()
  */
 class RefundPlugin extends AbstractComputopPlugin implements CommandByOrderInterface
 {

src/SprykerEco/Zed/Computop/Persistence/Propel/Mapper/ComputopMapper.php

@@ -17,7 +17,7 @@
 use Orm\Zed\Computop\Persistence\SpyPaymentComputopDetail;
 use Orm\Zed\Computop\Persistence\SpyPaymentComputopOrderItem;
 use Orm\Zed\Sales\Persistence\SpySalesOrderItem;
-use Propel\Runtime\Collection\ObjectCollection;
+use Propel\Runtime\Collection\Collection;
 
 class ComputopMapper
 {
@@ -52,13 +52,13 @@ public function mapComputopPaymentTransferToComputopPaymentEntity(
     }
 
     /**
-     * @param \Propel\Runtime\Collection\ObjectCollection $salesOrderItemEntityCollection
+     * @param \Propel\Runtime\Collection\Collection $salesOrderItemEntityCollection
      * @param \Generated\Shared\Transfer\ComputopSalesOrderItemCollectionTransfer $computopSalesOrderItemCollectionTransfer
      *
      * @return \Generated\Shared\Transfer\ComputopSalesOrderItemCollectionTransfer
      */
     public function mapSalesOrderItemEntityCollectionToComputopSalesOrderItemCollectionTransfer(
-        ObjectCollection $salesOrderItemEntityCollection,
+        Collection $salesOrderItemEntityCollection,
         ComputopSalesOrderItemCollectionTransfer $computopSalesOrderItemCollectionTransfer
     ): ComputopSalesOrderItemCollectionTransfer {
         foreach ($salesOrderItemEntityCollection as $salesOrderItemEntity) {
@@ -86,13 +86,13 @@ public function mapSalesOrderItemToComputopSalesOrderItemTransfer(
     }
 
     /**
-     * @param \Propel\Runtime\Collection\ObjectCollection $paymentComputopOrderItemEntityCollection
+     * @param \Propel\Runtime\Collection\Collection $paymentComputopOrderItemEntityCollection
      * @param \Generated\Shared\Transfer\ComputopPaymentComputopOrderItemCollectionTransfer $computopPaymentComputopOrderItemCollectionTransfer
      *
      * @return \Generated\Shared\Transfer\ComputopPaymentComputopOrderItemCollectionTransfer
      */
     public function mapPaymentComputopOrderItemEntityCollectionToComputopPaymentComputopOrderItemTransferCollection(
-        ObjectCollection $paymentComputopOrderItemEntityCollection,
+        Collection $paymentComputopOrderItemEntityCollection,
         ComputopPaymentComputopOrderItemCollectionTransfer $computopPaymentComputopOrderItemCollectionTransfer
     ): ComputopPaymentComputopOrderItemCollectionTransfer {
         foreach ($paymentComputopOrderItemEntityCollection as $paymentComputopOrderItemEntity) {

tests/SprykerEcoTest/Yves/Computop/Mapper/Init/PrePlace/PayPalExpressToQuoteMapperTest.php

@@ -7,11 +7,11 @@
 
 namespace SprykerEcoTest\Yves\Computop\Mapper\Init\PrePlace;
 
-use Codeception\TestCase\Test;
+use Codeception\Test\Unit;
 use SprykerEco\Yves\Computop\Mapper\Init\PrePlace\PayPalExpressToQuoteMapper;
 use SprykerEcoTest\Yves\Computop\Mapper\PayPalExpressToQuoteMapperTestConstants;
 
-class PayPalExpressToQuoteMapperTest extends Test
+class PayPalExpressToQuoteMapperTest extends Unit
 {
     /**
      * @var \SprykerEcoTest\Yves\Computop\ComputopYvesTester

tests/SprykerEcoTest/Yves/Computop/codeception.yml

@@ -4,7 +4,6 @@ paths:
     tests: .
     data: ../../../_data
     support: _support
-    log: ../../../_output
     output: ../../../_output
 
 coverage:

tests/SprykerEcoTest/Zed/Computop/Business/AbstractSetUpTest.php

@@ -7,12 +7,12 @@
 
 namespace SprykerEcoTest\Zed\Computop\Business;
 
-use Codeception\TestCase\Test;
+use Codeception\Test\Unit;
 use SprykerEcoTest\Zed\Computop\Business\Oms\OmsPaymentTestHelper;
 use SprykerEcoTest\Zed\Computop\Module\FunctionalModule;
 use SprykerEcoTest\Zed\Computop\Order\OrderPaymentTestHelper;
 
-abstract class AbstractSetUpTest extends Test
+abstract class AbstractSetUpTest extends Unit
 {
     /**
      * @var \SprykerEcoTest\Zed\Computop\Module\FunctionalModule