Merge branch 'refs/heads/master' into fix/CS-5639

sequra · Jul 19, 2024 · 12a0ab0 · 12a0ab0
2 parents 26983fb + df628aa
commit 12a0ab0
Show file tree

Hide file tree

Showing 174 changed files with 667 additions and 598 deletions.
diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
@@ -33,8 +33,8 @@ jobs:
     - name: PHP_CodeSniffer
       run: docker run --rm -v "$(pwd)":/app -w /app php:7.2-cli-alpine php vendor/bin/phpcs --standard=.phpcs.xml.dist --warning-severity=0 . # Ignore Warnings for now...
 
-    - name: PHPStan
-      run: docker run --rm -v "$(pwd)":/app -w /app php:7.2-cli-alpine php vendor/bin/phpstan analyse -c phpstan.neon --memory-limit=512M  --error-format github --no-progress
-
     - name: Run Tests
       run: docker run --rm -v "$(pwd)":/app -w /app php:7.2-cli-alpine php vendor/bin/phpunit --configuration phpunit.xml --testdox
+
+    - name: PHPStan
+      run: docker run --rm -v "$(pwd)":/app -w /app php:7.2-cli-alpine php vendor/bin/phpstan analyse -c phpstan.neon --memory-limit=512M  --error-format github --no-progress
diff --git a/src/BusinessLogic/AdminAPI/Aspects/StoreContextAspect.php b/src/BusinessLogic/AdminAPI/Aspects/StoreContextAspect.php
@@ -16,7 +16,7 @@ class StoreContextAspect implements Aspect
     /**
      * @var string
      */
-    private $storeId;
+    protected $storeId;
 
     public function __construct(string $storeId)
     {

diff --git a/src/BusinessLogic/AdminAPI/Connection/ConnectionController.php b/src/BusinessLogic/AdminAPI/Connection/ConnectionController.php
@@ -29,12 +29,12 @@ class ConnectionController
     /**
      * @var ConnectionService
      */
-    private $connectionService;
+    protected $connectionService;
 
     /**
      * @var StatisticalDataService
      */
-    private $statisticalDataService;
+    protected $statisticalDataService;
 
     /**
      * @param ConnectionService $connectionService

diff --git a/src/BusinessLogic/AdminAPI/Connection/Requests/ConnectionRequest.php b/src/BusinessLogic/AdminAPI/Connection/Requests/ConnectionRequest.php
@@ -17,22 +17,22 @@ class ConnectionRequest extends Request
     /**
      * @var string
      */
-    private $environment;
+    protected $environment;
 
     /**
      * @var string
      */
-    private $merchantId;
+    protected $merchantId;
 
     /**
      * @var string
      */
-    private $username;
+    protected $username;
 
     /**
      * @var string
      */
-    private $password;
+    protected $password;
 
     /**
      * @param string $environment

diff --git a/src/BusinessLogic/AdminAPI/Connection/Requests/OnboardingRequest.php b/src/BusinessLogic/AdminAPI/Connection/Requests/OnboardingRequest.php
@@ -13,27 +13,27 @@ class OnboardingRequest extends Request
     /**
      * @var string
      */
-    private $environment;
+    protected $environment;
 
     /**
      * @var string
      */
-    private $username;
+    protected $username;
 
     /**
      * @var string
      */
-    private $password;
+    protected $password;
 
     /**
      * @var bool
      */
-    private $sendStatisticalData;
+    protected $sendStatisticalData;
 
     /**
      * @var string|null
      */
-    private $merchantId;
+    protected $merchantId;
 
     /**
      * @param string $environment

diff --git a/src/BusinessLogic/AdminAPI/Connection/Responses/ConnectionSettingsResponse.php b/src/BusinessLogic/AdminAPI/Connection/Responses/ConnectionSettingsResponse.php
@@ -15,7 +15,7 @@ class ConnectionSettingsResponse extends Response
     /**
      * @var ConnectionData
      */
-    private $connectionSettings;
+    protected $connectionSettings;
 
     /**
      * @param ConnectionData|null $connectionSettings

diff --git a/src/BusinessLogic/AdminAPI/Connection/Responses/ConnectionValidationResponse.php b/src/BusinessLogic/AdminAPI/Connection/Responses/ConnectionValidationResponse.php
@@ -14,12 +14,12 @@ class ConnectionValidationResponse extends Response
     /**
      * @var bool
      */
-    private $isValid;
+    protected $isValid;
 
     /**
      * @var string|null
      */
-    private $reason;
+    protected $reason;
 
 
     public function __construct(bool $isValid, ?string $reason = null)

diff --git a/src/BusinessLogic/AdminAPI/Connection/Responses/OnboardingDataResponse.php b/src/BusinessLogic/AdminAPI/Connection/Responses/OnboardingDataResponse.php
@@ -16,12 +16,12 @@ class OnboardingDataResponse extends Response
     /**
      * @var ConnectionData
      */
-    private $connectionData;
+    protected $connectionData;
 
     /**
      * @var StatisticalData
      */
-    private $statisticalData;
+    protected $statisticalData;
 
     /**
      * @param ConnectionData|null $connectionData

diff --git a/src/BusinessLogic/AdminAPI/CountryConfiguration/CountryConfigurationController.php b/src/BusinessLogic/AdminAPI/CountryConfiguration/CountryConfigurationController.php
@@ -22,12 +22,12 @@ class CountryConfigurationController
     /**
      * @var CountryConfigurationService
      */
-    private $countryConfigurationService;
+    protected $countryConfigurationService;
 
     /**
      * @var SellingCountriesService
      */
-    private $sellingCountriesService;
+    protected $sellingCountriesService;
 
     /**
      * @param CountryConfigurationService $countryConfigurationService

diff --git a/src/BusinessLogic/AdminAPI/CountryConfiguration/Requests/CountryConfigurationRequest.php b/src/BusinessLogic/AdminAPI/CountryConfiguration/Requests/CountryConfigurationRequest.php
@@ -17,7 +17,7 @@ class CountryConfigurationRequest extends Request
     /**
      * @var array
      */
-    private $countryConfigurations;
+    protected $countryConfigurations;
 
     /**
      * @param array $countryConfigurations

diff --git a/src/BusinessLogic/AdminAPI/CountryConfiguration/Responses/CountryConfigurationResponse.php b/src/BusinessLogic/AdminAPI/CountryConfiguration/Responses/CountryConfigurationResponse.php
@@ -15,7 +15,7 @@ class CountryConfigurationResponse extends Response
     /**
      * @var CountryConfiguration[]
      */
-    private $countryConfigurations;
+    protected $countryConfigurations;
 
     /**
      * @param CountryConfiguration[]|null $countryConfigurations

diff --git a/src/BusinessLogic/AdminAPI/CountryConfiguration/Responses/SellingCountriesResponse.php b/src/BusinessLogic/AdminAPI/CountryConfiguration/Responses/SellingCountriesResponse.php
@@ -15,7 +15,7 @@ class SellingCountriesResponse extends Response
     /**
      * @var SellingCountry[]
      */
-    private $sellingCountries;
+    protected $sellingCountries;
 
     /**
      * @param SellingCountry[] $sellingCountries

diff --git a/src/BusinessLogic/AdminAPI/Disconnect/DisconnectController.php b/src/BusinessLogic/AdminAPI/Disconnect/DisconnectController.php
@@ -15,7 +15,7 @@ class DisconnectController
     /**
      * @var DisconnectService
      */
-    private $disconnectService;
+    protected $disconnectService;
 
     /**
      * @param DisconnectService $disconnectService

diff --git a/src/BusinessLogic/AdminAPI/GeneralSettings/GeneralSettingsController.php b/src/BusinessLogic/AdminAPI/GeneralSettings/GeneralSettingsController.php
@@ -20,12 +20,12 @@ class GeneralSettingsController
     /**
      * @var GeneralSettingsService
      */
-    private $generalSettingsService;
+    protected $generalSettingsService;
 
     /**
      * @var CategoryService
      */
-    private $categoryService;
+    protected $categoryService;
 
     /**
      * @param GeneralSettingsService $generalSettingsService

diff --git a/src/BusinessLogic/AdminAPI/GeneralSettings/Requests/GeneralSettingsRequest.php b/src/BusinessLogic/AdminAPI/GeneralSettings/Requests/GeneralSettingsRequest.php
@@ -15,27 +15,27 @@ class GeneralSettingsRequest extends Request
     /**
      * @var bool
      */
-    private $sendOrderReportsPeriodicallyToSeQura;
+    protected $sendOrderReportsPeriodicallyToSeQura;
 
     /**
      * @var bool|null
      */
-    private $showSeQuraCheckoutAsHostedPage;
+    protected $showSeQuraCheckoutAsHostedPage;
 
     /**
      * @var string[]|null
      */
-    private $allowedIPAddresses;
+    protected $allowedIPAddresses;
 
     /**
      * @var string[]|null
      */
-    private $excludedCategories;
+    protected $excludedCategories;
 
     /**
      * @var string[]|null
      */
-    private $excludedProducts;
+    protected $excludedProducts;
 
     /**
      * @param bool $sendOrderReportsPeriodicallyToSeQura

diff --git a/src/BusinessLogic/AdminAPI/GeneralSettings/Responses/GeneralSettingsResponse.php b/src/BusinessLogic/AdminAPI/GeneralSettings/Responses/GeneralSettingsResponse.php
@@ -15,7 +15,7 @@ class GeneralSettingsResponse extends Response
     /**
      * @var GeneralSettings
      */
-    private $generalSettings;
+    protected $generalSettings;
 
     /**
      * @param GeneralSettings|null $generalSettings

diff --git a/src/BusinessLogic/AdminAPI/GeneralSettings/Responses/ShopCategoriesResponse.php b/src/BusinessLogic/AdminAPI/GeneralSettings/Responses/ShopCategoriesResponse.php
@@ -15,7 +15,7 @@ class ShopCategoriesResponse extends Response
     /**
      * @var Category[]
      */
-    private $categories;
+    protected $categories;
 
     /**
      * @param Category[]|null $categories

diff --git a/src/BusinessLogic/AdminAPI/Integration/IntegrationController.php b/src/BusinessLogic/AdminAPI/Integration/IntegrationController.php
@@ -21,17 +21,17 @@ class IntegrationController
     /**
      * @var VersionService
      */
-    private $versionService;
+    protected $versionService;
 
     /**
      * @var Configuration
      */
-    private $configurationService;
+    protected $configurationService;
 
     /**
      * @var UIStateService
      */
-    private $stateService;
+    protected $stateService;
 
     /**
      * @param VersionService $versionService

diff --git a/src/BusinessLogic/AdminAPI/Integration/Responses/IntegrationShopNameResponse.php b/src/BusinessLogic/AdminAPI/Integration/Responses/IntegrationShopNameResponse.php
@@ -14,7 +14,7 @@ class IntegrationShopNameResponse extends Response
     /**
      * @var string
      */
-    private $shopName;
+    protected $shopName;
 
     /**
      * @param string $shopName

diff --git a/src/BusinessLogic/AdminAPI/Integration/Responses/IntegrationUIStateResponse.php b/src/BusinessLogic/AdminAPI/Integration/Responses/IntegrationUIStateResponse.php
@@ -14,24 +14,24 @@ class IntegrationUIStateResponse extends Response
     /**
      * Onboarding string constant.
      */
-    private const ONBOARDING = 'onboarding';
+    protected const ONBOARDING = 'onboarding';
 
     /**
      * Dashboard string constant.
      */
-    private const DASHBOARD = 'dashboard';
+    protected const DASHBOARD = 'dashboard';
 
     /**
      * String representation of state.
      *
      * @var string
      */
-    private $state;
+    protected $state;
 
     /**
      * @param string $state
      */
-    private function __construct(string $state)
+    protected function __construct(string $state)
     {
         $this->state = $state;
     }

diff --git a/src/BusinessLogic/AdminAPI/Integration/Responses/IntegrationVersionResponse.php b/src/BusinessLogic/AdminAPI/Integration/Responses/IntegrationVersionResponse.php
@@ -15,7 +15,7 @@ class IntegrationVersionResponse extends Response
     /**
      * @var Version
      */
-    private $version;
+    protected $version;
 
     /**
      * @param Version $version

diff --git a/src/BusinessLogic/AdminAPI/OrderStatusSettings/OrderStatusSettingsController.php b/src/BusinessLogic/AdminAPI/OrderStatusSettings/OrderStatusSettingsController.php
@@ -22,12 +22,12 @@ class OrderStatusSettingsController
     /**
      * @var OrderStatusSettingsService
      */
-    private $orderStatusSettingsService;
+    protected $orderStatusSettingsService;
 
     /**
      * @var ShopOrderStatusesService
      */
-    private $shopOrderStatusesService;
+    protected $shopOrderStatusesService;
 
     /**
      * @param OrderStatusSettingsService $orderStatusSettingsService

diff --git a/src/BusinessLogic/AdminAPI/OrderStatusSettings/Requests/OrderStatusSettingsRequest.php b/src/BusinessLogic/AdminAPI/OrderStatusSettings/Requests/OrderStatusSettingsRequest.php
@@ -17,7 +17,7 @@ class OrderStatusSettingsRequest extends Request
     /**
      * @var array
      */
-    private $orderStatusMappings;
+    protected $orderStatusMappings;
 
     /**
      * @param array $orderStatusMappings

diff --git a/src/BusinessLogic/AdminAPI/OrderStatusSettings/Responses/OrderStatusSettingsResponse.php b/src/BusinessLogic/AdminAPI/OrderStatusSettings/Responses/OrderStatusSettingsResponse.php
@@ -15,7 +15,7 @@ class OrderStatusSettingsResponse extends Response
     /**
      * @var OrderStatusMapping[]
      */
-    private $orderStatusMappings;
+    protected $orderStatusMappings;
 
     /**
      * @param OrderStatusMapping[]|null $orderStatusMappings

diff --git a/src/BusinessLogic/AdminAPI/OrderStatusSettings/Responses/ShopOrderStatusResponse.php b/src/BusinessLogic/AdminAPI/OrderStatusSettings/Responses/ShopOrderStatusResponse.php
@@ -15,7 +15,7 @@ class ShopOrderStatusResponse extends Response
     /**
      * @var OrderStatus[]
      */
-    private $orderStatuses;
+    protected $orderStatuses;
 
     /**
      * @param OrderStatus[]|null $orderStatuses

diff --git a/src/BusinessLogic/AdminAPI/PaymentMethods/PaymentMethodsController.php b/src/BusinessLogic/AdminAPI/PaymentMethods/PaymentMethodsController.php
@@ -17,7 +17,7 @@ class PaymentMethodsController
     /**
      * @var PaymentMethodsService
      */
-    private $paymentMethodsService;
+    protected $paymentMethodsService;
 
     /**
      * @param PaymentMethodsService $paymentMethodsService

diff --git a/src/BusinessLogic/AdminAPI/PaymentMethods/Responses/PaymentMethodsResponse.php b/src/BusinessLogic/AdminAPI/PaymentMethods/Responses/PaymentMethodsResponse.php
@@ -15,7 +15,7 @@ class PaymentMethodsResponse extends Response
     /**
      * @var SeQuraPaymentMethod[]
      */
-    private $paymentMethods;
+    protected $paymentMethods;
 
     /**
      * @param SeQuraPaymentMethod[] $paymentMethods

diff --git a/src/BusinessLogic/AdminAPI/PaymentMethods/Responses/ProductsResponse.php b/src/BusinessLogic/AdminAPI/PaymentMethods/Responses/ProductsResponse.php
@@ -14,7 +14,7 @@ class ProductsResponse extends Response
     /**
      * @var string[]
      */
-    private $products;
+    protected $products;
 
     /**
      * @param string[] $products

diff --git a/src/BusinessLogic/AdminAPI/PromotionalWidgets/Responses/WidgetConfiguratorResponse.php b/src/BusinessLogic/AdminAPI/PromotionalWidgets/Responses/WidgetConfiguratorResponse.php
@@ -11,7 +11,7 @@
  */
 class WidgetConfiguratorResponse extends Response
 {
-    private $widgetConfigurator;
+    protected $widgetConfigurator;
 
     /**
      * @inheritDoc