diff --git a/src/BusinessLogic/AdminAPI/Aspects/StoreContextAspect.php b/src/BusinessLogic/AdminAPI/Aspects/StoreContextAspect.php index 61cc6cd..11b8e49 100644 --- 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 index ca2faa0..cbfad99 100644 --- 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 index d76abcf..08cce32 100644 --- 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 index 9c9202a..7afa6a0 100644 --- 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 index e3ac42b..82ac84b 100644 --- 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 index 232d326..c919116 100644 --- 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 index daf9a0f..09aca52 100644 --- 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 index 0f6aade..c778c75 100644 --- 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 index bb18bc9..b49e61b 100644 --- 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 index a235e42..7baa068 100644 --- 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 index 0fde58a..78ef9b5 100644 --- 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 index 95f6cda..e918de9 100644 --- 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 index 25f8225..f13b3d2 100644 --- 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 index 01c4f06..a49740c 100644 --- 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 index 3f82baa..73b0282 100644 --- 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 index 2b76117..ab5d8c7 100644 --- 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 index d4de41e..e0689d0 100644 --- 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 index 10d8020..3c9a317 100644 --- 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 index f5f9862..54615bf 100644 --- 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 index 1d814c5..bae64a8 100644 --- 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 index fa4aacb..b64f383 100644 --- 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 index 2bf0752..c59baff 100644 --- 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 index 976ac61..bac9de1 100644 --- 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 index ac00f4c..d93992b 100644 --- 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 index e2da24d..c89e52b 100644 --- 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 index 3b79cbb..0d07488 100644 --- 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 index d3f4569..cfe06d7 100644 --- 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 index 5636eb9..69e702c 100644 --- 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 diff --git a/src/BusinessLogic/AdminAPI/Store/Responses/StoreResponse.php b/src/BusinessLogic/AdminAPI/Store/Responses/StoreResponse.php index e436d2b..3c0f3d0 100644 --- a/src/BusinessLogic/AdminAPI/Store/Responses/StoreResponse.php +++ b/src/BusinessLogic/AdminAPI/Store/Responses/StoreResponse.php @@ -15,7 +15,7 @@ class StoreResponse extends Response /** * @var Store */ - private $store; + protected $store; /** * @param Store $store diff --git a/src/BusinessLogic/AdminAPI/Store/Responses/StoresResponse.php b/src/BusinessLogic/AdminAPI/Store/Responses/StoresResponse.php index e88a18d..783b144 100644 --- a/src/BusinessLogic/AdminAPI/Store/Responses/StoresResponse.php +++ b/src/BusinessLogic/AdminAPI/Store/Responses/StoresResponse.php @@ -15,7 +15,7 @@ class StoresResponse extends Response /** * @var Store[] */ - private $stores; + protected $stores; /** * @param Store[] $stores diff --git a/src/BusinessLogic/AdminAPI/Store/StoreController.php b/src/BusinessLogic/AdminAPI/Store/StoreController.php index 73648dd..2ec6418 100644 --- a/src/BusinessLogic/AdminAPI/Store/StoreController.php +++ b/src/BusinessLogic/AdminAPI/Store/StoreController.php @@ -18,7 +18,7 @@ class StoreController /** * @var StoreService */ - private $storeService; + protected $storeService; /** * @param StoreService $storeService @@ -59,7 +59,7 @@ public function getCurrentStore(): StoreResponse * * @return Store */ - private function failBackStore(): Store + protected function failBackStore(): Store { return new Store('failBack', 'failBack'); } diff --git a/src/BusinessLogic/AdminAPI/TransactionLogs/Responses/TransactionLogsResponse.php b/src/BusinessLogic/AdminAPI/TransactionLogs/Responses/TransactionLogsResponse.php index 912a51a..388634f 100644 --- a/src/BusinessLogic/AdminAPI/TransactionLogs/Responses/TransactionLogsResponse.php +++ b/src/BusinessLogic/AdminAPI/TransactionLogs/Responses/TransactionLogsResponse.php @@ -10,12 +10,12 @@ class TransactionLogsResponse extends Response /** * @var bool */ - private $hasNextPage; + protected $hasNextPage; /** * @var TransactionLog[] */ - private $transactionLogs; + protected $transactionLogs; /** * @param bool $hasNextPage diff --git a/src/BusinessLogic/AdminAPI/TransactionLogs/TransactionLogsController.php b/src/BusinessLogic/AdminAPI/TransactionLogs/TransactionLogsController.php index fc61c4b..4d5a86f 100644 --- a/src/BusinessLogic/AdminAPI/TransactionLogs/TransactionLogsController.php +++ b/src/BusinessLogic/AdminAPI/TransactionLogs/TransactionLogsController.php @@ -16,7 +16,7 @@ class TransactionLogsController /** * @var TransactionLogService */ - private $transactionLogService; + protected $transactionLogService; /** * @param TransactionLogService $transactionLogService diff --git a/src/BusinessLogic/Bootstrap/Aspect/Aspects.php b/src/BusinessLogic/Bootstrap/Aspect/Aspects.php index ee33df3..e3f486a 100644 --- a/src/BusinessLogic/Bootstrap/Aspect/Aspects.php +++ b/src/BusinessLogic/Bootstrap/Aspect/Aspects.php @@ -16,15 +16,15 @@ class Aspects /** * @var T|null */ - private $subject; + protected $subject; /** * @var class-string|null */ - private $subjectClassName; + protected $subjectClassName; /** * @var Aspect */ - private $aspect; + protected $aspect; protected function __construct(Aspect $aspect) { diff --git a/src/BusinessLogic/Bootstrap/Aspect/CompositeAspect.php b/src/BusinessLogic/Bootstrap/Aspect/CompositeAspect.php index fe44748..0ef84b8 100644 --- a/src/BusinessLogic/Bootstrap/Aspect/CompositeAspect.php +++ b/src/BusinessLogic/Bootstrap/Aspect/CompositeAspect.php @@ -12,11 +12,11 @@ class CompositeAspect /** * @var Aspect */ - private $aspect; + protected $aspect; /** * @var Aspect|null */ - private $next; + protected $next; public function __construct(Aspect $aspect) { @@ -41,7 +41,7 @@ public function applyOn(callable $callee, array $params = []) return $this->aspect->applyOn($callback, $params); } - private function getNextCallee(callable $callee, array $params = []): \Closure + protected function getNextCallee(callable $callee, array $params = []): \Closure { return function () use ($callee, $params) { return $this->next->applyOn($callee, $params); diff --git a/src/BusinessLogic/CheckoutAPI/CheckoutAPI.php b/src/BusinessLogic/CheckoutAPI/CheckoutAPI.php index e4ba9b2..04e922c 100644 --- a/src/BusinessLogic/CheckoutAPI/CheckoutAPI.php +++ b/src/BusinessLogic/CheckoutAPI/CheckoutAPI.php @@ -14,7 +14,7 @@ */ class CheckoutAPI { - private function __construct() + protected function __construct() { } diff --git a/src/BusinessLogic/CheckoutAPI/Solicitation/Controller/SolicitationController.php b/src/BusinessLogic/CheckoutAPI/Solicitation/Controller/SolicitationController.php index e87e3c2..1a4f02d 100644 --- a/src/BusinessLogic/CheckoutAPI/Solicitation/Controller/SolicitationController.php +++ b/src/BusinessLogic/CheckoutAPI/Solicitation/Controller/SolicitationController.php @@ -17,7 +17,7 @@ class SolicitationController /** * @var OrderService */ - private $orderService; + protected $orderService; public function __construct(OrderService $orderService) { diff --git a/src/BusinessLogic/CheckoutAPI/Solicitation/Response/IdentificationFormResponse.php b/src/BusinessLogic/CheckoutAPI/Solicitation/Response/IdentificationFormResponse.php index a3998db..ac11e7d 100644 --- a/src/BusinessLogic/CheckoutAPI/Solicitation/Response/IdentificationFormResponse.php +++ b/src/BusinessLogic/CheckoutAPI/Solicitation/Response/IdentificationFormResponse.php @@ -15,7 +15,7 @@ class IdentificationFormResponse extends Response /** * @var SeQuraForm */ - private $identificationForm; + protected $identificationForm; public function __construct(SeQuraForm $identificationForm) { diff --git a/src/BusinessLogic/CheckoutAPI/Solicitation/Response/SolicitationResponse.php b/src/BusinessLogic/CheckoutAPI/Solicitation/Response/SolicitationResponse.php index 8683ff7..b541507 100644 --- a/src/BusinessLogic/CheckoutAPI/Solicitation/Response/SolicitationResponse.php +++ b/src/BusinessLogic/CheckoutAPI/Solicitation/Response/SolicitationResponse.php @@ -16,11 +16,11 @@ class SolicitationResponse extends Response /** * @var SeQuraOrder */ - private $order; + protected $order; /** * @var SeQuraPaymentMethod[] */ - private $availablePaymentMethods; + protected $availablePaymentMethods; /** * SolicitationResponse constructor. diff --git a/src/BusinessLogic/Domain/Connection/Models/AuthorizationCredentials.php b/src/BusinessLogic/Domain/Connection/Models/AuthorizationCredentials.php index 6a5c6aa..69cf87c 100644 --- a/src/BusinessLogic/Domain/Connection/Models/AuthorizationCredentials.php +++ b/src/BusinessLogic/Domain/Connection/Models/AuthorizationCredentials.php @@ -14,12 +14,12 @@ class AuthorizationCredentials extends DataTransferObject /** * @var string Authorization username. */ - private $username; + protected $username; /** * @var string Authorization username. */ - private $password; + protected $password; /** * @param string $username diff --git a/src/BusinessLogic/Domain/Connection/Models/ConnectionData.php b/src/BusinessLogic/Domain/Connection/Models/ConnectionData.php index ab8cbf8..866cff1 100644 --- a/src/BusinessLogic/Domain/Connection/Models/ConnectionData.php +++ b/src/BusinessLogic/Domain/Connection/Models/ConnectionData.php @@ -16,17 +16,17 @@ class ConnectionData extends DataTransferObject /** * @var string */ - private $environment; + protected $environment; /** * @var string|null */ - private $merchantId; + protected $merchantId; /** * @var AuthorizationCredentials */ - private $authorizationCredentials; + protected $authorizationCredentials; /** * @param string $environment diff --git a/src/BusinessLogic/Domain/Connection/Models/OnboardingData.php b/src/BusinessLogic/Domain/Connection/Models/OnboardingData.php index 75a1fc3..ae66526 100644 --- a/src/BusinessLogic/Domain/Connection/Models/OnboardingData.php +++ b/src/BusinessLogic/Domain/Connection/Models/OnboardingData.php @@ -12,12 +12,12 @@ class OnboardingData /** * @var ConnectionData */ - private $connectionData; + protected $connectionData; /** * @var bool */ - private $sendStatisticalData; + protected $sendStatisticalData; /** * @param ConnectionData $connectionData diff --git a/src/BusinessLogic/Domain/Connection/Models/ValidateConnectionRequest.php b/src/BusinessLogic/Domain/Connection/Models/ValidateConnectionRequest.php index ebb4d90..0347da8 100644 --- a/src/BusinessLogic/Domain/Connection/Models/ValidateConnectionRequest.php +++ b/src/BusinessLogic/Domain/Connection/Models/ValidateConnectionRequest.php @@ -15,7 +15,7 @@ class ValidateConnectionRequest extends DataTransferObject /** * @var ConnectionData */ - private $connectionData; + protected $connectionData; /** * @param ConnectionData $connectionData diff --git a/src/BusinessLogic/Domain/Connection/Services/ConnectionService.php b/src/BusinessLogic/Domain/Connection/Services/ConnectionService.php index a50953b..670a203 100644 --- a/src/BusinessLogic/Domain/Connection/Services/ConnectionService.php +++ b/src/BusinessLogic/Domain/Connection/Services/ConnectionService.php @@ -24,7 +24,7 @@ class ConnectionService /** * @var ConnectionProxyInterface */ - private $connectionProxy; + protected $connectionProxy; /** * @param ConnectionProxyInterface $connectionProxy @@ -85,7 +85,7 @@ public function saveConnectionData(ConnectionData $connectionData): void * * @return ConnectionDataRepositoryInterface */ - private function getConnectionDataRepository(): ConnectionDataRepositoryInterface + protected function getConnectionDataRepository(): ConnectionDataRepositoryInterface { return ServiceRegister::getService(ConnectionDataRepositoryInterface::class); } diff --git a/src/BusinessLogic/Domain/CountryConfiguration/Models/CountryConfiguration.php b/src/BusinessLogic/Domain/CountryConfiguration/Models/CountryConfiguration.php index 8c19af1..d525c2e 100644 --- a/src/BusinessLogic/Domain/CountryConfiguration/Models/CountryConfiguration.php +++ b/src/BusinessLogic/Domain/CountryConfiguration/Models/CountryConfiguration.php @@ -17,12 +17,12 @@ class CountryConfiguration /** * @var string */ - private $countryCode; + protected $countryCode; /** * @var string */ - private $merchantId; + protected $merchantId; /** * @param string $countryCode diff --git a/src/BusinessLogic/Domain/CountryConfiguration/Models/SellingCountry.php b/src/BusinessLogic/Domain/CountryConfiguration/Models/SellingCountry.php index 41c2c80..dda23a5 100644 --- a/src/BusinessLogic/Domain/CountryConfiguration/Models/SellingCountry.php +++ b/src/BusinessLogic/Domain/CountryConfiguration/Models/SellingCountry.php @@ -12,12 +12,12 @@ class SellingCountry /** * @var string */ - private $code; + protected $code; /** * @var string */ - private $name; + protected $name; /** * @param string $code diff --git a/src/BusinessLogic/Domain/CountryConfiguration/Services/CountryConfigurationService.php b/src/BusinessLogic/Domain/CountryConfiguration/Services/CountryConfigurationService.php index d00c04c..d657f9f 100644 --- a/src/BusinessLogic/Domain/CountryConfiguration/Services/CountryConfigurationService.php +++ b/src/BusinessLogic/Domain/CountryConfiguration/Services/CountryConfigurationService.php @@ -16,11 +16,11 @@ class CountryConfigurationService /** * @var CountryConfigurationRepositoryInterface */ - private $countryConfigurationRepository; + protected $countryConfigurationRepository; /** * @var SellingCountriesServiceInterface */ - private $sellingCountriesService; + protected $sellingCountriesService; /** * @param CountryConfigurationRepositoryInterface $countryConfigurationRepository diff --git a/src/BusinessLogic/Domain/CountryConfiguration/Services/SellingCountriesService.php b/src/BusinessLogic/Domain/CountryConfiguration/Services/SellingCountriesService.php index 7091d16..5ef8e58 100644 --- a/src/BusinessLogic/Domain/CountryConfiguration/Services/SellingCountriesService.php +++ b/src/BusinessLogic/Domain/CountryConfiguration/Services/SellingCountriesService.php @@ -19,7 +19,7 @@ class SellingCountriesService /** * @var SellingCountriesServiceInterface */ - private $integrationSellingCountriesService; + protected $integrationSellingCountriesService; public function __construct(SellingCountriesServiceInterface $integrationSellingCountriesService) { diff --git a/src/BusinessLogic/Domain/Disconnect/Services/DisconnectService.php b/src/BusinessLogic/Domain/Disconnect/Services/DisconnectService.php index c8d58ab..8ff9518 100644 --- a/src/BusinessLogic/Domain/Disconnect/Services/DisconnectService.php +++ b/src/BusinessLogic/Domain/Disconnect/Services/DisconnectService.php @@ -16,12 +16,12 @@ class DisconnectService /** * @var DisconnectServiceInterface */ - private $integrationDisconnectService; + protected $integrationDisconnectService; /** * @var SendReportRepositoryInterface */ - private $sendReportRepository; + protected $sendReportRepository; /** * @param DisconnectServiceInterface $integrationDisconnectService diff --git a/src/BusinessLogic/Domain/GeneralSettings/Models/Category.php b/src/BusinessLogic/Domain/GeneralSettings/Models/Category.php index 96d8172..d861026 100644 --- a/src/BusinessLogic/Domain/GeneralSettings/Models/Category.php +++ b/src/BusinessLogic/Domain/GeneralSettings/Models/Category.php @@ -15,12 +15,12 @@ class Category /** * @var string */ - private $id; + protected $id; /** * @var string */ - private $name; + protected $name; /** * @param string $id diff --git a/src/BusinessLogic/Domain/GeneralSettings/Models/GeneralSettings.php b/src/BusinessLogic/Domain/GeneralSettings/Models/GeneralSettings.php index 912a2db..0bbd8f4 100644 --- a/src/BusinessLogic/Domain/GeneralSettings/Models/GeneralSettings.php +++ b/src/BusinessLogic/Domain/GeneralSettings/Models/GeneralSettings.php @@ -12,27 +12,27 @@ class GeneralSettings /** * @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/Domain/GeneralSettings/Services/CategoryService.php b/src/BusinessLogic/Domain/GeneralSettings/Services/CategoryService.php index d6c3fe9..3d5414f 100644 --- a/src/BusinessLogic/Domain/GeneralSettings/Services/CategoryService.php +++ b/src/BusinessLogic/Domain/GeneralSettings/Services/CategoryService.php @@ -18,7 +18,7 @@ class CategoryService /** * @var CategoryServiceInterface */ - private $integrationCategoryService; + protected $integrationCategoryService; /** * @param CategoryServiceInterface $integrationCategoryService diff --git a/src/BusinessLogic/Domain/GeneralSettings/Services/GeneralSettingsService.php b/src/BusinessLogic/Domain/GeneralSettings/Services/GeneralSettingsService.php index 4c15aa9..4b754c9 100644 --- a/src/BusinessLogic/Domain/GeneralSettings/Services/GeneralSettingsService.php +++ b/src/BusinessLogic/Domain/GeneralSettings/Services/GeneralSettingsService.php @@ -15,7 +15,7 @@ class GeneralSettingsService /** * @var GeneralSettingsRepositoryInterface */ - private $generalSettingsRepository; + protected $generalSettingsRepository; /** * @param GeneralSettingsRepositoryInterface $generalSettingsRepository diff --git a/src/BusinessLogic/Domain/Merchant/Models/GetAvailablePaymentMethodsRequest.php b/src/BusinessLogic/Domain/Merchant/Models/GetAvailablePaymentMethodsRequest.php index 698a03b..e5c9831 100644 --- a/src/BusinessLogic/Domain/Merchant/Models/GetAvailablePaymentMethodsRequest.php +++ b/src/BusinessLogic/Domain/Merchant/Models/GetAvailablePaymentMethodsRequest.php @@ -14,7 +14,7 @@ class GetAvailablePaymentMethodsRequest extends DataTransferObject /** * @var string */ - private $merchantId; + protected $merchantId; /** * @param string $merchantId diff --git a/src/BusinessLogic/Domain/Multistore/StoreContext.php b/src/BusinessLogic/Domain/Multistore/StoreContext.php index 4a73a9c..8de2ad8 100644 --- a/src/BusinessLogic/Domain/Multistore/StoreContext.php +++ b/src/BusinessLogic/Domain/Multistore/StoreContext.php @@ -14,14 +14,14 @@ class StoreContext /** * @var self */ - private static $instance; + protected static $instance; /** * @var string */ - private $storeId = ''; + protected $storeId = ''; - private function __construct() + protected function __construct() { } diff --git a/src/BusinessLogic/Domain/Order/Models/GetAvailablePaymentMethodsRequest.php b/src/BusinessLogic/Domain/Order/Models/GetAvailablePaymentMethodsRequest.php index 1f7492e..11dab9c 100644 --- a/src/BusinessLogic/Domain/Order/Models/GetAvailablePaymentMethodsRequest.php +++ b/src/BusinessLogic/Domain/Order/Models/GetAvailablePaymentMethodsRequest.php @@ -14,7 +14,7 @@ class GetAvailablePaymentMethodsRequest extends DataTransferObject /** * @var string */ - private $orderId; + protected $orderId; /** * @param string $orderId diff --git a/src/BusinessLogic/Domain/Order/Models/GetFormRequest.php b/src/BusinessLogic/Domain/Order/Models/GetFormRequest.php index 0e7aaff..f0a9528 100644 --- a/src/BusinessLogic/Domain/Order/Models/GetFormRequest.php +++ b/src/BusinessLogic/Domain/Order/Models/GetFormRequest.php @@ -14,22 +14,22 @@ class GetFormRequest extends DataTransferObject /** * @var string */ - private $orderId; + protected $orderId; /** * @var string|null */ - private $product; + protected $product; /** * @var string|null */ - private $campaign; + protected $campaign; /** * @var bool|null */ - private $ajax; + protected $ajax; /** * @param string $orderId diff --git a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Address.php b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Address.php index 7b9e746..64e8375 100644 --- a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Address.php +++ b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Address.php @@ -12,67 +12,67 @@ class Address extends OrderRequestDTO /** * @var string|null Customer's given names for delivery/invoice. */ - private $givenNames; + protected $givenNames; /** * @var string|null Customer's last names for delivery/invoice. */ - private $surnames; + protected $surnames; /** * @var string Customer company name. */ - private $company; + protected $company; /** * @var string Delivery/invoice address line 1. */ - private $addressLine1; + protected $addressLine1; /** * @var string Delivery/invoice address line 2. */ - private $addressLine2; + protected $addressLine2; /** * @var string Delivery/invoice address postal code. */ - private $postalCode; + protected $postalCode; /** * @var string Delivery/invoice address city. */ - private $city; + protected $city; /** * @var string Delivery/invoice address country code. */ - private $countryCode; + protected $countryCode; /** * @var string|null Customer phone. */ - private $phone; + protected $phone; /** * @var string|null Customer mobile phone. */ - private $mobilePhone; + protected $mobilePhone; /** * @var string|null Customer region or state. */ - private $state; + protected $state; /** * @var string|null Extra handling information that the customer adds to the order. */ - private $extra; + protected $extra; /** * @var string|null Customer VAT number. */ - private $vatNumber; + protected $vatNumber; /** * @param string $company diff --git a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Cart.php b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Cart.php index c8105d1..c088cb5 100644 --- a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Cart.php +++ b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Cart.php @@ -27,37 +27,37 @@ class Cart extends OrderRequestDTO /** * @var string Name of currency used on the purchase. */ - private $currency; + protected $currency; /** * @var boolean Set to true if shopper has indicated that this is a gift. */ - private $gift; + protected $gift; /** * @var int Total value with tax of the items listed below. */ - private $orderTotalWithTax; + protected $orderTotalWithTax; /** * @var string|int|null Shop's unique id for this basket. */ - private $cartRef; + protected $cartRef; /** * @var string|null When shopper put the first item in the cart. */ - private $createdAt; + protected $createdAt; /** * @var string|null When shopper put the last item in the cart. */ - private $updatedAt; + protected $updatedAt; /** * @var Item[] List of items in the order. */ - private $items; + protected $items; /** * @param string $currency diff --git a/src/BusinessLogic/Domain/Order/Models/OrderRequest/CreateOrderRequest.php b/src/BusinessLogic/Domain/Order/Models/OrderRequest/CreateOrderRequest.php index 3acd3f2..37a8df6 100644 --- a/src/BusinessLogic/Domain/Order/Models/OrderRequest/CreateOrderRequest.php +++ b/src/BusinessLogic/Domain/Order/Models/OrderRequest/CreateOrderRequest.php @@ -23,12 +23,12 @@ class CreateOrderRequest extends BaseOrderRequest /** * @var string String containing state of the order. */ - private $state; + protected $state; /** * @var Cart Fields describing the shopping cart. */ - private $cart; + protected $cart; /** * @var Gui Fields describing the medium for which the response will be generated. diff --git a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Customer.php b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Customer.php index 132f19b..a3a38f5 100644 --- a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Customer.php +++ b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Customer.php @@ -12,98 +12,98 @@ class Customer extends OrderRequestDTO /** * @var string|null Customer given names. */ - private $givenNames; + protected $givenNames; /** * @var string|null Customer surnames. */ - private $surnames; + protected $surnames; /** * @var string|null Customer title and/or gender. */ - private $title; + protected $title; /** * @var string Customer email. */ - private $email; + protected $email; /** * @var boolean|string Is the customer logged in. */ - private $loggedIn; + protected $loggedIn; /** * @var string Customer language code. */ - private $languageCode; + protected $languageCode; /** * @var string Customer ip number. */ - private $ipNumber; + protected $ipNumber; /** * @var string Customer browser. */ - private $userAgent; + protected $userAgent; /** * @var string|int|null Customer reference number in the shop's database. */ - private $ref; + protected $ref; /** * @var string|null Customer date of birth in ISO-8601 format. */ - private $dateOfBirth; + protected $dateOfBirth; /** * @var string|null Customer's national identity number. */ - private $nin; + protected $nin; /** * @var string|null Customer company name. */ - private $company; + protected $company; /** * @var string|null Shopper VAT number. */ - private $vatNumber; + protected $vatNumber; /** * @var string|null Date when this customer was added to the shop database, in ISO-8601 format. */ - private $createdAt; + protected $createdAt; /** * @var string|null Date when this customer was updated in the shop database, in ISO-8601 format. */ - private $updatedAt; + protected $updatedAt; /** * @var int|null The merchant's rating of this customer. 0 to 100, inclusive, where 0 is "cannot be trusted" and * 100 is "very trustworthy". */ - private $rating; + protected $rating; /** * @var string|null A validation code printed in the physical DNI or NIE. */ - private $ninControl; + protected $ninControl; /** * @var PreviousOrder[]|null List of customer's previous orders in this shop. */ - private $previousOrders; + protected $previousOrders; /** * @var Vehicle|null Fields describing the customer's vehicle. */ - private $vehicle; + protected $vehicle; /** * @param string $email diff --git a/src/BusinessLogic/Domain/Order/Models/OrderRequest/DeliveryMethod.php b/src/BusinessLogic/Domain/Order/Models/OrderRequest/DeliveryMethod.php index 0556e68..06a5899 100644 --- a/src/BusinessLogic/Domain/Order/Models/OrderRequest/DeliveryMethod.php +++ b/src/BusinessLogic/Domain/Order/Models/OrderRequest/DeliveryMethod.php @@ -12,22 +12,22 @@ class DeliveryMethod extends OrderRequestDTO /** * @var string Name of the delivery method. */ - private $name; + protected $name; /** * @var string|null Days it takes to deliver the goods. */ - private $days; + protected $days; /** * @var string|null Company or agent that performs the delivery. */ - private $provider; + protected $provider; /** * @var boolean|null If goods are delivered to the buyer's home or office and not to a pick-up place. */ - private $homeDelivery; + protected $homeDelivery; /** * @param string $name diff --git a/src/BusinessLogic/Domain/Order/Models/OrderRequest/EventsWebhook.php b/src/BusinessLogic/Domain/Order/Models/OrderRequest/EventsWebhook.php index 541a8cf..9cb9a89 100644 --- a/src/BusinessLogic/Domain/Order/Models/OrderRequest/EventsWebhook.php +++ b/src/BusinessLogic/Domain/Order/Models/OrderRequest/EventsWebhook.php @@ -15,12 +15,12 @@ class EventsWebhook extends OrderRequestDTO /** * @var string SeQura will make a POST to this URL when an event happens for that order after confirmation. */ - private $url; + protected $url; /** * @var string[]|null Optional name/value pairs that will be included in the webhook event POST. */ - private $parameters; + protected $parameters; /** * @param string $url diff --git a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Gui.php b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Gui.php index 9ec3538..09d075f 100644 --- a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Gui.php +++ b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Gui.php @@ -19,7 +19,7 @@ class Gui extends OrderRequestDTO /** * @var string Type of layout the API should optimise for. */ - private $layout; + protected $layout; /** * @param string $layout diff --git a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Item/DiscountItem.php b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Item/DiscountItem.php index 3cff4f0..4951a42 100644 --- a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Item/DiscountItem.php +++ b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Item/DiscountItem.php @@ -12,12 +12,12 @@ class DiscountItem extends Item /** * @var string|int A unique code that refers to this discount. */ - private $reference; + protected $reference; /** * @var string A name to describe this discount. */ - private $name; + protected $name; /** * @param int|string $reference diff --git a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Item/HandlingItem.php b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Item/HandlingItem.php index f0b8db6..78dc87d 100644 --- a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Item/HandlingItem.php +++ b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Item/HandlingItem.php @@ -12,12 +12,12 @@ class HandlingItem extends Item /** * @var string|int A unique code that refers to this item. */ - private $reference; + protected $reference; /** * @var string A name to describe this item. */ - private $name; + protected $name; /** * @param int|string $reference diff --git a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Item/OtherPaymentItem.php b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Item/OtherPaymentItem.php index f2866e5..ba65cff 100644 --- a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Item/OtherPaymentItem.php +++ b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Item/OtherPaymentItem.php @@ -12,12 +12,12 @@ class OtherPaymentItem extends Item /** * @var string|int A code that refers to this "other" payment. */ - private $reference; + protected $reference; /** * @var string A name to describe this payment. */ - private $name; + protected $name; /** * @param int|string $reference diff --git a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Item/ProductItem.php b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Item/ProductItem.php index 91fb304..7c7ceb8 100644 --- a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Item/ProductItem.php +++ b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Item/ProductItem.php @@ -12,78 +12,78 @@ class ProductItem extends Item /** * @var string|int A public product id for this item. */ - private $reference; + protected $reference; /** * @var string A description to include in the payment instructions. */ - private $name; + protected $name; /** * @var int Price with tax for one item. */ - private $priceWithTax; + protected $priceWithTax; /** * @var int The number of items ordered by the shopper. */ - private $quantity; + protected $quantity; /** * @var boolean Can the buyer access or consume the product without a physical delivery. */ - private $downloadable; + protected $downloadable; /** * @var boolean|null A product is perishable if it loses its value if it is not delivered on time. */ - private $perishable; + protected $perishable; /** * @var boolean|null A product is personalized if it is irreversibly customized in a way that makes it less * appealing to most people other than the buyer. */ - private $personalized; + protected $personalized; /** * @var boolean|null A product is restockable if it can be sold to someone else if returned in good condition. */ - private $restockable; + protected $restockable; /** * @var string|null Name of category. */ - private $category; + protected $category; /** * @var string|null Product description. */ - private $description; + protected $description; /** * @var string|null Name of manufacturer. */ - private $manufacturer; + protected $manufacturer; /** * @var string|null Name of supplier or provider. */ - private $supplier; + protected $supplier; /** * @var string|int|null Id from database. */ - private $productId; + protected $productId; /** * @var string|null Product page URL in your shop. */ - private $url; + protected $url; /** * @var string|null A reference to the tracking in which this item will be handed. */ - private $trackingReference; + protected $trackingReference; /** * @param int|string $reference diff --git a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Item/ServiceItem.php b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Item/ServiceItem.php index e076c39..f950abf 100644 --- a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Item/ServiceItem.php +++ b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Item/ServiceItem.php @@ -18,47 +18,47 @@ class ServiceItem extends Item /** * @var string|int A public id for this service. */ - private $reference; + protected $reference; /** * @var string A name to describe this service. */ - private $name; + protected $name; /** * @var string|null Maximum date for the service to be rendered or ended (ISO8601 formatted date). */ - private $endsOn; + protected $endsOn; /** * @var string|null Maximum time, from the start of the service, for the service to be rendered or ended. */ - private $endsIn; + protected $endsIn; /** * @var int Price with tax for one item. */ - private $priceWithTax; + protected $priceWithTax; /** * @var int The number of items ordered by the shopper. */ - private $quantity; + protected $quantity; /** * @var boolean True for services that can be fully (or sufficiently) enjoyed without a physical delivery. */ - private $downloadable; + protected $downloadable; /** * @var string|null Name of supplier or provider. */ - private $supplier; + protected $supplier; /** * @var boolean|null True when the service has been rendered. */ - private $rendered; + protected $rendered; /** * @param $reference diff --git a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Merchant.php b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Merchant.php index c3b64cc..6e065a6 100644 --- a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Merchant.php +++ b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Merchant.php @@ -15,65 +15,65 @@ class Merchant extends OrderRequestDTO /** * @var string|int Merchant identifier. */ - private $id; + protected $id; /** * @var string|null SeQura will make an IPN POST to this URL when the order is approved. */ - private $notifyUrl; + protected $notifyUrl; /** * @var string[]|null Optional name/value pairs that will be included in the IPN POST. */ - private $notificationParameters; + protected $notificationParameters; /** * @var string|null The shopper will be redirected to this URL once the shop has confirmed the order after IPN * notification. */ - private $returnUrl; + protected $returnUrl; /** * @var string|null Name of Javascript function to call when SeQura approves the order and checkout should move to * next step. */ - private $approvedCallback; + protected $approvedCallback; /** * @var string|null URL for a page where the shopper can edit their name, address, etc. */ - private $editUrl; + protected $editUrl; /** * @var string|null URL for a page where the shopper can pick another payment method. */ - private $abortUrl; + protected $abortUrl; /** * @var string|null Name of Javascript function to call if the shopper is rejected. */ - private $rejectedCallback; + protected $rejectedCallback; /** * @var string|null Name of Javascript function to call to get the shopper's part-payment details. */ - private $partpaymentDetailsGetter; + protected $partpaymentDetailsGetter; /** * @var string|null When SeQura approves the order, the customer's browser will make a POST to this URL without * arguments. */ - private $approvedUrl; + protected $approvedUrl; /** * @var Options|null Features activated by this merchant in this request. */ - private $options; + protected $options; /** * @var EventsWebhook|null Fields describing how the merchant wants to receive webhook events. */ - private $eventsWebhook; + protected $eventsWebhook; /** * @param int|string $id diff --git a/src/BusinessLogic/Domain/Order/Models/OrderRequest/MerchantReference.php b/src/BusinessLogic/Domain/Order/Models/OrderRequest/MerchantReference.php index 8c774c0..09e474b 100644 --- a/src/BusinessLogic/Domain/Order/Models/OrderRequest/MerchantReference.php +++ b/src/BusinessLogic/Domain/Order/Models/OrderRequest/MerchantReference.php @@ -12,12 +12,12 @@ class MerchantReference extends OrderRequestDTO /** * @var string|int Merchant reference 1. */ - private $orderRef1; + protected $orderRef1; /** * @var string|int|null Merchant reference 2. */ - private $orderRef2; + protected $orderRef2; /** * @param int|string $orderRef1 diff --git a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Options.php b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Options.php index 927275a..32cadaa 100644 --- a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Options.php +++ b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Options.php @@ -12,23 +12,23 @@ class Options extends OrderRequestDTO /** * @var boolean|null Set to true if $ is jQuery 1.7 or above, false otherwise. */ - private $hasJquery; + protected $hasJquery; /** * @var boolean|null True if the merchant wishes to use the API option that explicitly communicates if some items * will be shipped immediately after confirmation. */ - private $usesShippedCart; + protected $usesShippedCart; /** * @var boolean|null True if the merchant cannot send both addresses during checkout. */ - private $addressesMayBeMissing; + protected $addressesMayBeMissing; /** * @var boolean|null True if the merchant wishes to lock the provided shopper's personal data. */ - private $immutableCustomerData; + protected $immutableCustomerData; /** * @param bool|null $hasJquery diff --git a/src/BusinessLogic/Domain/Order/Models/OrderRequest/OrderRequestDTO.php b/src/BusinessLogic/Domain/Order/Models/OrderRequest/OrderRequestDTO.php index 933883f..45f4a94 100644 --- a/src/BusinessLogic/Domain/Order/Models/OrderRequest/OrderRequestDTO.php +++ b/src/BusinessLogic/Domain/Order/Models/OrderRequest/OrderRequestDTO.php @@ -59,7 +59,7 @@ public function transformPropertiesToAnArray(array $properties): array * * @return array */ - private function handleArrayProperty(array $arrayData, string $name, array $value): array + protected function handleArrayProperty(array $arrayData, string $name, array $value): array { $arrayData[$name] = []; foreach ($value as $key => $item) { diff --git a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Platform.php b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Platform.php index ee6637b..de711da 100644 --- a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Platform.php +++ b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Platform.php @@ -12,37 +12,37 @@ class Platform extends OrderRequestDTO /** * @var string Name of the platform. */ - private $name; + protected $name; /** * @var string Version of the platform. */ - private $version; + protected $version; /** * @var string|null Version of the plugin or platform module. */ - private $pluginVersion; + protected $pluginVersion; /** * @var string uname of the shop server. */ - private $uname; + protected $uname; /** * @var string DB used. */ - private $dbName; + protected $dbName; /** * @var string Version of the DB. */ - private $dbVersion; + protected $dbVersion; /** * @var string|null PHP interpreter version. */ - private $phpVersion; + protected $phpVersion; /** * @param string $name diff --git a/src/BusinessLogic/Domain/Order/Models/OrderRequest/PreviousOrder.php b/src/BusinessLogic/Domain/Order/Models/OrderRequest/PreviousOrder.php index bbf3ff7..ff6bbab 100644 --- a/src/BusinessLogic/Domain/Order/Models/OrderRequest/PreviousOrder.php +++ b/src/BusinessLogic/Domain/Order/Models/OrderRequest/PreviousOrder.php @@ -12,47 +12,47 @@ class PreviousOrder extends OrderRequestDTO /** * @var string Date (and time, if available) when this order was created or delivered, in ISO-8601 format. */ - private $createdAt; + protected $createdAt; /** * @var int Total order amount including tax. */ - private $amount; + protected $amount; /** * @var string Currency name for amount. */ - private $currency; + protected $currency; /** * @var string|null The status of the order as reported in the platform. */ - private $rawStatus; + protected $rawStatus; /** * @var string|null The mapped status value. */ - private $status; + protected $status; /** * @var string|null Payment method as reported by the platform. */ - private $paymentMethodRaw; + protected $paymentMethodRaw; /** * @var string|null Mapped payment methods. */ - private $paymentMethod; + protected $paymentMethod; /** * @var string|null Previous order's delivery address postal code. */ - private $postalCode; + protected $postalCode; /** * @var string|null Previous order's country code. */ - private $countryCode; + protected $countryCode; /** * @param string $createdAt diff --git a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Tracking/TrackingPickupPoint.php b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Tracking/TrackingPickupPoint.php index 4fec83c..32cdcec 100644 --- a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Tracking/TrackingPickupPoint.php +++ b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Tracking/TrackingPickupPoint.php @@ -16,47 +16,47 @@ class TrackingPickupPoint extends Tracking /** * @var string|null Permanent identifier for the operator that handed the delivery. */ - private $operatorRef; + protected $operatorRef; /** * @var string|null Permanent identifier for the store that handled this delivery. */ - private $storeRef; + protected $storeRef; /** * @var string|null When this delivery was available in the store. */ - private $availableAt; + protected $availableAt; /** * @var string|null Address line 1 for the pickup point. */ - private $addressLine1; + protected $addressLine1; /** * @var string|null Address line 2 for the pickup point. */ - private $addressLine2; + protected $addressLine2; /** * @var string|null Postal code. */ - private $postalCode; + protected $postalCode; /** * @var string|null City. */ - private $city; + protected $city; /** * @var string|null State or region. */ - private $state; + protected $state; /** * @var string|null Country code. */ - private $countryCode; + protected $countryCode; /** * @param string $reference diff --git a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Tracking/TrackingPickupStore.php b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Tracking/TrackingPickupStore.php index ea450ba..3e45996 100644 --- a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Tracking/TrackingPickupStore.php +++ b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Tracking/TrackingPickupStore.php @@ -16,47 +16,47 @@ class TrackingPickupStore extends Tracking /** * @var string|null Permanent identifier for the operator that handed the delivery. */ - private $operatorRef; + protected $operatorRef; /** * @var string|null Permanent identifier for the store that handled this delivery. */ - private $storeRef; + protected $storeRef; /** * @var string|null When this delivery was available in the store. */ - private $availableAt; + protected $availableAt; /** * @var string|null Address line 1 for the store. */ - private $addressLine1; + protected $addressLine1; /** * @var string|null Address line 2 for the store. */ - private $addressLine2; + protected $addressLine2; /** * @var string|null Postal code. */ - private $postalCode; + protected $postalCode; /** * @var string|null City. */ - private $city; + protected $city; /** * @var string|null State or region. */ - private $state; + protected $state; /** * @var string|null Country code. */ - private $countryCode; + protected $countryCode; /** * @param string $reference diff --git a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Tracking/TrackingPostal.php b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Tracking/TrackingPostal.php index d125aa5..e49a7ad 100644 --- a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Tracking/TrackingPostal.php +++ b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Tracking/TrackingPostal.php @@ -16,12 +16,12 @@ class TrackingPostal extends Tracking /** * @var string The name of the company that handled this delivery. */ - private $carrier; + protected $carrier; /** * @var string|null Tracking URL. */ - private $trackingUrl; + protected $trackingUrl; /** * @param string $reference diff --git a/src/BusinessLogic/Domain/Order/Models/OrderRequest/UpdateOrderRequest.php b/src/BusinessLogic/Domain/Order/Models/OrderRequest/UpdateOrderRequest.php index c339603..50a8b0f 100644 --- a/src/BusinessLogic/Domain/Order/Models/OrderRequest/UpdateOrderRequest.php +++ b/src/BusinessLogic/Domain/Order/Models/OrderRequest/UpdateOrderRequest.php @@ -21,12 +21,12 @@ class UpdateOrderRequest extends BaseOrderRequest /** * @var Cart Fields describing the unshipped cart. */ - private $unshippedCart; + protected $unshippedCart; /** * @var Cart Fields describing the shipped cart. */ - private $shippedCart; + protected $shippedCart; /** * @param Merchant $merchant diff --git a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Vehicle.php b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Vehicle.php index cad6739..45b88ac 100644 --- a/src/BusinessLogic/Domain/Order/Models/OrderRequest/Vehicle.php +++ b/src/BusinessLogic/Domain/Order/Models/OrderRequest/Vehicle.php @@ -12,27 +12,27 @@ class Vehicle extends OrderRequestDTO /** * @var string Plaque identification from customer's vehicle. */ - private $plaque; + protected $plaque; /** * @var string|null Brand from customer's vehicle. */ - private $brand; + protected $brand; /** * @var string|null Model from customer's vehicle. */ - private $model; + protected $model; /** * @var string|null Frame identification from customer's vehicle. */ - private $frame; + protected $frame; /** * @var string|null First registration date plaque from customer's vehicle. */ - private $firstRegistrationDate; + protected $firstRegistrationDate; /** * @param string $plaque diff --git a/src/BusinessLogic/Domain/Order/Models/OrderUpdateData.php b/src/BusinessLogic/Domain/Order/Models/OrderUpdateData.php index 3d46d89..63f33d5 100644 --- a/src/BusinessLogic/Domain/Order/Models/OrderUpdateData.php +++ b/src/BusinessLogic/Domain/Order/Models/OrderUpdateData.php @@ -17,27 +17,27 @@ class OrderUpdateData extends DataTransferObject /** * @var string */ - private $orderShopReference; + protected $orderShopReference; /** * @var Cart|null */ - private $shippedCart; + protected $shippedCart; /** * @var Cart|null */ - private $unshippedCart; + protected $unshippedCart; /** * @var Address|null */ - private $deliveryAddress; + protected $deliveryAddress; /** * @var Address|null */ - private $invoiceAddress; + protected $invoiceAddress; /** * @param string $orderShopReference diff --git a/src/BusinessLogic/Domain/Order/Models/PaymentMethod.php b/src/BusinessLogic/Domain/Order/Models/PaymentMethod.php index 0aae407..ab20a73 100644 --- a/src/BusinessLogic/Domain/Order/Models/PaymentMethod.php +++ b/src/BusinessLogic/Domain/Order/Models/PaymentMethod.php @@ -14,17 +14,17 @@ class PaymentMethod extends DataTransferObject /** * @var string */ - private $id; + protected $id; /** * @var string */ - private $name; + protected $name; /** * @var string|null */ - private $icon; + protected $icon; /** * @param string $id diff --git a/src/BusinessLogic/Domain/Order/Models/SeQuraForm.php b/src/BusinessLogic/Domain/Order/Models/SeQuraForm.php index 9c9f09a..743cf3f 100644 --- a/src/BusinessLogic/Domain/Order/Models/SeQuraForm.php +++ b/src/BusinessLogic/Domain/Order/Models/SeQuraForm.php @@ -12,7 +12,7 @@ class SeQuraForm /** * @var string HTML form from SeQura. */ - private $form; + protected $form; /** * @param string $form diff --git a/src/BusinessLogic/Domain/Order/OrderRequestStatusMapping.php b/src/BusinessLogic/Domain/Order/OrderRequestStatusMapping.php index fac1a43..b21c650 100644 --- a/src/BusinessLogic/Domain/Order/OrderRequestStatusMapping.php +++ b/src/BusinessLogic/Domain/Order/OrderRequestStatusMapping.php @@ -17,7 +17,7 @@ class OrderRequestStatusMapping * * @var array */ - private static $statusMap = [ + protected static $statusMap = [ OrderStates::STATE_APPROVED => OrderRequestStates::CONFIRMED, OrderStates::STATE_NEEDS_REVIEW => OrderRequestStates::ON_HOLD, OrderStates::STATE_CANCELLED => OrderRequestStates::CANCELLED diff --git a/src/BusinessLogic/Domain/Order/Service/OrderService.php b/src/BusinessLogic/Domain/Order/Service/OrderService.php index 0a1ea1f..d041792 100644 --- a/src/BusinessLogic/Domain/Order/Service/OrderService.php +++ b/src/BusinessLogic/Domain/Order/Service/OrderService.php @@ -34,11 +34,11 @@ class OrderService /** * @var OrderProxyInterface */ - private $proxy; + protected $proxy; /** * @var SeQuraOrderRepositoryInterface */ - private $orderRepository; + protected $orderRepository; public function __construct(OrderProxyInterface $proxy, SeQuraOrderRepositoryInterface $orderRepository) { @@ -210,7 +210,7 @@ public function updateOrder(OrderUpdateData $orderUpdateData): SeQuraOrder * @throws HttpRequestException * @throws Exception */ - private function tryOrderUpdate(SeQuraOrder $order) + protected function tryOrderUpdate(SeQuraOrder $order) { try { $this->proxy->updateOrder($this->getUpdateOrderRequest($order)); @@ -230,7 +230,7 @@ private function tryOrderUpdate(SeQuraOrder $order) * * @return SeQuraOrder|null */ - private function getExistingOrderFor(CreateOrderRequest $request): ?SeQuraOrder + protected function getExistingOrderFor(CreateOrderRequest $request): ?SeQuraOrder { $existingOrder = null; if ($request->getCart()->getCartRef()) { @@ -255,7 +255,7 @@ private function getExistingOrderFor(CreateOrderRequest $request): ?SeQuraOrder * * @throws Exception */ - private function getUpdateOrderRequest(SeQuraOrder $order): UpdateOrderRequest + protected function getUpdateOrderRequest(SeQuraOrder $order): UpdateOrderRequest { return UpdateOrderRequest::fromArray([ 'merchant' => $order->getMerchant()->toArray(), @@ -279,7 +279,7 @@ private function getUpdateOrderRequest(SeQuraOrder $order): UpdateOrderRequest * * @return bool */ - private function areObjectsEqual($object1, $object2): bool + protected function areObjectsEqual($object1, $object2): bool { if (method_exists($object1, 'toArray') && method_exists($object2, 'toArray')) { return json_encode($object1->toArray()) === json_encode($object2->toArray()); diff --git a/src/BusinessLogic/Domain/OrderReport/Listeners/TickEventListener.php b/src/BusinessLogic/Domain/OrderReport/Listeners/TickEventListener.php index 856051d..0a063db 100644 --- a/src/BusinessLogic/Domain/OrderReport/Listeners/TickEventListener.php +++ b/src/BusinessLogic/Domain/OrderReport/Listeners/TickEventListener.php @@ -36,7 +36,7 @@ public static function handle(): void /** * @return StatisticalDataService */ - private static function getStatisticalDataService(): StatisticalDataService + protected static function getStatisticalDataService(): StatisticalDataService { return ServiceRegister::getService(StatisticalDataService::class); } @@ -44,7 +44,7 @@ private static function getStatisticalDataService(): StatisticalDataService /** * @return QueueService */ - private static function getQueueService(): QueueService + protected static function getQueueService(): QueueService { return ServiceRegister::getService(QueueService::class); } diff --git a/src/BusinessLogic/Domain/OrderReport/Models/OrderReport.php b/src/BusinessLogic/Domain/OrderReport/Models/OrderReport.php index d9b9496..62ba65c 100644 --- a/src/BusinessLogic/Domain/OrderReport/Models/OrderReport.php +++ b/src/BusinessLogic/Domain/OrderReport/Models/OrderReport.php @@ -27,52 +27,52 @@ class OrderReport extends OrderRequestDTO /** * @var string String containing state of the order. */ - private $state; + protected $state; /** * @var string|null String containing the time of sending the order report. */ - private $sentAt; + protected $sentAt; /** * @var MerchantReference Order id(s) used by the merchant. */ - private $merchantReference; + protected $merchantReference; /** * @var Cart Fields describing the shopping cart. */ - private $cart; + protected $cart; /** * @var Tracking[]|null A list of trackings for the order. */ - private $trackings; + protected $trackings; /** * @var Cart|null Fields describing the remaining cart. */ - private $remainingCart; + protected $remainingCart; /** * @var DeliveryMethod Delivery method used on the purchase. */ - private $deliveryMethod; + protected $deliveryMethod; /** * @var Address|null Fields describing the delivery address. */ - private $deliveryAddress; + protected $deliveryAddress; /** * @var Address|null Fields describing the invoice address. */ - private $invoiceAddress; + protected $invoiceAddress; /** * @var Customer Fields describing the customer. */ - private $customer; + protected $customer; /** * @param string $state diff --git a/src/BusinessLogic/Domain/OrderReport/Models/OrderStatistics.php b/src/BusinessLogic/Domain/OrderReport/Models/OrderStatistics.php index dba1680..599234b 100644 --- a/src/BusinessLogic/Domain/OrderReport/Models/OrderStatistics.php +++ b/src/BusinessLogic/Domain/OrderReport/Models/OrderStatistics.php @@ -15,52 +15,52 @@ class OrderStatistics extends OrderRequestDTO /** * @var string Filed representing the date of order completion. */ - private $completedAt; + protected $completedAt; /** * @var string Field representing the order currency. */ - private $currency; + protected $currency; /** * @var int|null Field representing the total amount paid or due to pay. */ - private $amount; + protected $amount; /** * @var MerchantReference|null Order id(s) used by the merchant. */ - private $merchantReference; + protected $merchantReference; /** * @var string|null Name or type of payment method. */ - private $paymentMethod; + protected $paymentMethod; /** * @var string|null ISO-3166-1 country code of the delivery address. */ - private $country; + protected $country; /** * @var string|null Device used in purchase. */ - private $device; + protected $device; /** * @var string|null Status of the order. */ - private $status; + protected $status; /** * @var string|null Your platform's string representation of the order status. */ - private $rawStatus; + protected $rawStatus; /** * @var bool|null Was the shopper offered to use SeQura in the checkout? */ - private $sequraOffered; + protected $sequraOffered; /** * @param string $completedAt diff --git a/src/BusinessLogic/Domain/OrderReport/Models/ReportData.php b/src/BusinessLogic/Domain/OrderReport/Models/ReportData.php index 7178309..e68456c 100644 --- a/src/BusinessLogic/Domain/OrderReport/Models/ReportData.php +++ b/src/BusinessLogic/Domain/OrderReport/Models/ReportData.php @@ -12,17 +12,17 @@ class ReportData /** * @var string */ - private $merchantId; + protected $merchantId; /** * @var string[] */ - private $reportOrderIds; + protected $reportOrderIds; /** * @var string[]|null */ - private $statisticsOrderIds; + protected $statisticsOrderIds; /** * @param string $merchantId diff --git a/src/BusinessLogic/Domain/OrderReport/Models/SendOrderReportRequest.php b/src/BusinessLogic/Domain/OrderReport/Models/SendOrderReportRequest.php index 21d86db..68ec7d3 100644 --- a/src/BusinessLogic/Domain/OrderReport/Models/SendOrderReportRequest.php +++ b/src/BusinessLogic/Domain/OrderReport/Models/SendOrderReportRequest.php @@ -24,22 +24,22 @@ class SendOrderReportRequest extends OrderRequestDTO /** * @var Merchant Fields describing the merchant. */ - private $merchant; + protected $merchant; /** * @var OrderReport[] A list of order reports. */ - private $orders; + protected $orders; /** * @var Statistics|null Filed containing a list of statistical order data. */ - private $statistics; + protected $statistics; /** * @var Platform Fields describing the store platform. */ - private $platform; + protected $platform; /** * @param Merchant $merchant diff --git a/src/BusinessLogic/Domain/OrderReport/Models/Statistics.php b/src/BusinessLogic/Domain/OrderReport/Models/Statistics.php index f4d78a2..b4bcf83 100644 --- a/src/BusinessLogic/Domain/OrderReport/Models/Statistics.php +++ b/src/BusinessLogic/Domain/OrderReport/Models/Statistics.php @@ -14,7 +14,7 @@ class Statistics extends OrderRequestDTO /** * @var OrderStatistics[] */ - private $orders; + protected $orders; /** * @param OrderStatistics[] $orders diff --git a/src/BusinessLogic/Domain/OrderReport/OrderReporter.php b/src/BusinessLogic/Domain/OrderReport/OrderReporter.php index 670c939..ab4c2a4 100644 --- a/src/BusinessLogic/Domain/OrderReport/OrderReporter.php +++ b/src/BusinessLogic/Domain/OrderReport/OrderReporter.php @@ -24,7 +24,7 @@ class OrderReporter extends Orchestrator protected const ORDERS_PER_BACH = 5000; protected $page = 1; - private $storeId; + protected $storeId; public function __construct() { @@ -104,7 +104,7 @@ protected function getSubTask(): ?ExecutionDetails * * @throws QueueStorageUnavailableException */ - private function getSubTaskInContext(): ?ExecutionDetails + protected function getSubTaskInContext(): ?ExecutionDetails { $reportOrderIds = $this->getShopOrderService()->getReportOrderIds($this->page, static::ORDERS_PER_BACH); @@ -134,7 +134,7 @@ private function getSubTaskInContext(): ?ExecutionDetails * * @return ShopOrderService */ - private function getShopOrderService(): ShopOrderService + protected function getShopOrderService(): ShopOrderService { return ServiceRegister::getService(ShopOrderService::class); } @@ -144,7 +144,7 @@ private function getShopOrderService(): ShopOrderService * * @return StatisticalDataRepositoryInterface */ - private function getStatisticalDataRepository(): StatisticalDataRepositoryInterface + protected function getStatisticalDataRepository(): StatisticalDataRepositoryInterface { return ServiceRegister::getService(StatisticalDataRepositoryInterface::class); } @@ -154,7 +154,7 @@ private function getStatisticalDataRepository(): StatisticalDataRepositoryInterf * * @return CountryConfigurationRepositoryInterface */ - private function getCountryConfigurationRepository(): CountryConfigurationRepositoryInterface + protected function getCountryConfigurationRepository(): CountryConfigurationRepositoryInterface { return ServiceRegister::getService(CountryConfigurationRepositoryInterface::class); } diff --git a/src/BusinessLogic/Domain/OrderReport/Service/OrderReportService.php b/src/BusinessLogic/Domain/OrderReport/Service/OrderReportService.php index da46a5d..e9a8252 100644 --- a/src/BusinessLogic/Domain/OrderReport/Service/OrderReportService.php +++ b/src/BusinessLogic/Domain/OrderReport/Service/OrderReportService.php @@ -25,17 +25,17 @@ class OrderReportService /** * @var OrderReportProxyInterface */ - private $proxy; + protected $proxy; /** * @var OrderReportServiceInterface */ - private $integrationOrderReportService; + protected $integrationOrderReportService; /** * @var SendReportRepositoryInterface */ - private $sendReportRepository; + protected $sendReportRepository; /** * @param OrderReportProxyInterface $proxy @@ -106,7 +106,7 @@ public function setSendReportTime(int $time): void * * @throws InvalidUrlException */ - private function createSendOrderReportRequest( + protected function createSendOrderReportRequest( string $merchantId, array $orderReports, array $orderStatistics = null diff --git a/src/BusinessLogic/Domain/OrderReport/Tasks/OrderReportTask.php b/src/BusinessLogic/Domain/OrderReport/Tasks/OrderReportTask.php index 2ab2e80..d6f4598 100644 --- a/src/BusinessLogic/Domain/OrderReport/Tasks/OrderReportTask.php +++ b/src/BusinessLogic/Domain/OrderReport/Tasks/OrderReportTask.php @@ -23,22 +23,22 @@ class OrderReportTask extends Task /** * @var string */ - private $merchantId; + protected $merchantId; /** * @var string[] */ - private $reportOrderIds; + protected $reportOrderIds; /** * @var string[] | null */ - private $statisticsOrderIds; + protected $statisticsOrderIds; /** * @var string */ - private $storeId; + protected $storeId; /** * OrderReportTask constructor. @@ -154,7 +154,7 @@ function () { * @throws HttpRequestException * @throws InvalidUrlException */ - private function doExecute(): void + protected function doExecute(): void { $this->getOrderReportService()->sendReport( new ReportData($this->merchantId, $this->reportOrderIds, $this->statisticsOrderIds) @@ -168,7 +168,7 @@ private function doExecute(): void * * @return OrderReportService */ - private function getOrderReportService(): OrderReportService + protected function getOrderReportService(): OrderReportService { return ServiceRegister::getService(OrderReportService::class); } diff --git a/src/BusinessLogic/Domain/OrderStatus/Models/OrderStatus.php b/src/BusinessLogic/Domain/OrderStatus/Models/OrderStatus.php index 696fdd9..c5d766e 100644 --- a/src/BusinessLogic/Domain/OrderStatus/Models/OrderStatus.php +++ b/src/BusinessLogic/Domain/OrderStatus/Models/OrderStatus.php @@ -15,12 +15,12 @@ class OrderStatus /** * @var string */ - private $id; + protected $id; /** * @var string */ - private $name; + protected $name; /** * @param string $id diff --git a/src/BusinessLogic/Domain/OrderStatusSettings/Models/OrderStatusMapping.php b/src/BusinessLogic/Domain/OrderStatusSettings/Models/OrderStatusMapping.php index 7798c69..7963238 100644 --- a/src/BusinessLogic/Domain/OrderStatusSettings/Models/OrderStatusMapping.php +++ b/src/BusinessLogic/Domain/OrderStatusSettings/Models/OrderStatusMapping.php @@ -17,12 +17,12 @@ class OrderStatusMapping /** * @var string */ - private $sequraStatus; + protected $sequraStatus; /** * @var string */ - private $shopStatus; + protected $shopStatus; /** * @param string $seQuraStatus diff --git a/src/BusinessLogic/Domain/OrderStatusSettings/Services/OrderStatusSettingsService.php b/src/BusinessLogic/Domain/OrderStatusSettings/Services/OrderStatusSettingsService.php index d7c5d1e..593dbcc 100644 --- a/src/BusinessLogic/Domain/OrderStatusSettings/Services/OrderStatusSettingsService.php +++ b/src/BusinessLogic/Domain/OrderStatusSettings/Services/OrderStatusSettingsService.php @@ -18,12 +18,12 @@ class OrderStatusSettingsService implements OrderStatusProvider /** * @var OrderStatusSettingsRepositoryInterface */ - private $orderStatusSettingsRepository; + protected $orderStatusSettingsRepository; /** * @var ShopOrderStatusesServiceInterface */ - private $integrationShopOrderStatusesService; + protected $integrationShopOrderStatusesService; /** * @param OrderStatusSettingsRepositoryInterface $orderStatusSettingsRepository diff --git a/src/BusinessLogic/Domain/OrderStatusSettings/Services/ShopOrderStatusesService.php b/src/BusinessLogic/Domain/OrderStatusSettings/Services/ShopOrderStatusesService.php index 2cddfcd..3d56226 100644 --- a/src/BusinessLogic/Domain/OrderStatusSettings/Services/ShopOrderStatusesService.php +++ b/src/BusinessLogic/Domain/OrderStatusSettings/Services/ShopOrderStatusesService.php @@ -18,7 +18,7 @@ class ShopOrderStatusesService /** * @var ShopOrderStatusesServiceInterface */ - private $integrationShopOrderStatusesService; + protected $integrationShopOrderStatusesService; public function __construct(ShopOrderStatusesServiceInterface $integrationShopOrderStatusesService) { diff --git a/src/BusinessLogic/Domain/PaymentMethod/Models/SeQuraCost.php b/src/BusinessLogic/Domain/PaymentMethod/Models/SeQuraCost.php index 1d11803..d84e291 100644 --- a/src/BusinessLogic/Domain/PaymentMethod/Models/SeQuraCost.php +++ b/src/BusinessLogic/Domain/PaymentMethod/Models/SeQuraCost.php @@ -12,22 +12,22 @@ class SeQuraCost /** * @var int Setup fee to pay the order. */ - private $setupFee; + protected $setupFee; /** * @var int Installment fee to pay the order. */ - private $instalmentFee; + protected $instalmentFee; /** * @var int Down payment fee to pay the order. */ - private $downPaymentFees; + protected $downPaymentFees; /** * @var int Total amount for each instalment to pay the order. */ - private $instalmentTotal; + protected $instalmentTotal; /** * @param int $setupFee diff --git a/src/BusinessLogic/Domain/PaymentMethod/Models/SeQuraPaymentMethod.php b/src/BusinessLogic/Domain/PaymentMethod/Models/SeQuraPaymentMethod.php index ea57c00..8aecf22 100644 --- a/src/BusinessLogic/Domain/PaymentMethod/Models/SeQuraPaymentMethod.php +++ b/src/BusinessLogic/Domain/PaymentMethod/Models/SeQuraPaymentMethod.php @@ -15,67 +15,67 @@ class SeQuraPaymentMethod /** * @var string SeQura product code. */ - private $product; + protected $product; /** * @var string|null SeQura campaign code. */ - private $campaign; + protected $campaign; /** * @var string Payment method title. */ - private $title; + protected $title; /** * @var string Longer payment method title. */ - private $longTitle; + protected $longTitle; /** * @var string|null Payment method claim. */ - private $claim; + protected $claim; /** * @var string|null Payment method description. */ - private $description; + protected $description; /** * @var string|null Serialized HTML element. */ - private $icon; + protected $icon; /** * @var SeQuraCost */ - private $cost; + protected $cost; /** * @var string|null Cost description. */ - private $costDescription; + protected $costDescription; /** * @var DateTime Method available from this date on. */ - private $startsAt; + protected $startsAt; /** * @var DateTime Method available until this date. */ - private $endsAt; + protected $endsAt; /** * @var int|null Minimum supported order amount for this payment method. */ - private $minAmount; + protected $minAmount; /** * @var int|null Maximum supported order amount for this payment method. */ - private $maxAmount; + protected $maxAmount; /** * @param string $product diff --git a/src/BusinessLogic/Domain/PaymentMethod/Models/SeQuraPaymentMethodCategory.php b/src/BusinessLogic/Domain/PaymentMethod/Models/SeQuraPaymentMethodCategory.php index 965fdea..9f6ff7f 100644 --- a/src/BusinessLogic/Domain/PaymentMethod/Models/SeQuraPaymentMethodCategory.php +++ b/src/BusinessLogic/Domain/PaymentMethod/Models/SeQuraPaymentMethodCategory.php @@ -9,22 +9,22 @@ class SeQuraPaymentMethodCategory /** * @var string String containing the title of the category. */ - private $title; + protected $title; /** * @var string String containing the description of the category. */ - private $description; + protected $description; /** * @var string|null String containing icon for the methods category in svg format. */ - private $icon; + protected $icon; /** * @var SeQuraPaymentMethod[] Array of payment methods. */ - private $methods; + protected $methods; /** * @param string $title diff --git a/src/BusinessLogic/Domain/PaymentMethod/Services/PaymentMethodsService.php b/src/BusinessLogic/Domain/PaymentMethod/Services/PaymentMethodsService.php index 349f5d3..0ae2944 100644 --- a/src/BusinessLogic/Domain/PaymentMethod/Services/PaymentMethodsService.php +++ b/src/BusinessLogic/Domain/PaymentMethod/Services/PaymentMethodsService.php @@ -17,7 +17,7 @@ class PaymentMethodsService /** * @var MerchantProxyInterface */ - private $merchantProxy; + protected $merchantProxy; /** * @param MerchantProxyInterface $merchantProxy diff --git a/src/BusinessLogic/Domain/PromotionalWidgets/Models/ValidateAssetsKeyRequest.php b/src/BusinessLogic/Domain/PromotionalWidgets/Models/ValidateAssetsKeyRequest.php index bef620e..bf1ee8f 100644 --- a/src/BusinessLogic/Domain/PromotionalWidgets/Models/ValidateAssetsKeyRequest.php +++ b/src/BusinessLogic/Domain/PromotionalWidgets/Models/ValidateAssetsKeyRequest.php @@ -12,19 +12,19 @@ class ValidateAssetsKeyRequest /** * @var string */ - private $merchantId; + protected $merchantId; /** * @var array */ - private $paymentMethodIds; + protected $paymentMethodIds; /** * @var string */ - private $assetsKey; + protected $assetsKey; /** * @var string */ - private $mode; + protected $mode; /** * @param string $merchantId diff --git a/src/BusinessLogic/Domain/PromotionalWidgets/Models/WidgetLabels.php b/src/BusinessLogic/Domain/PromotionalWidgets/Models/WidgetLabels.php index 9fddded..a87c6a1 100644 --- a/src/BusinessLogic/Domain/PromotionalWidgets/Models/WidgetLabels.php +++ b/src/BusinessLogic/Domain/PromotionalWidgets/Models/WidgetLabels.php @@ -14,14 +14,14 @@ class WidgetLabels * * @var string[] */ - private $messages; + protected $messages; /** * Mini widget messages for price below limit * in supported languages. * * @var string[] */ - private $messagesBelowLimit; + protected $messagesBelowLimit; /** * @param string[] $messages diff --git a/src/BusinessLogic/Domain/PromotionalWidgets/Services/WidgetSettingsService.php b/src/BusinessLogic/Domain/PromotionalWidgets/Services/WidgetSettingsService.php index dd31685..3ebbef7 100644 --- a/src/BusinessLogic/Domain/PromotionalWidgets/Services/WidgetSettingsService.php +++ b/src/BusinessLogic/Domain/PromotionalWidgets/Services/WidgetSettingsService.php @@ -22,23 +22,23 @@ class WidgetSettingsService /** * @var WidgetSettingsRepositoryInterface */ - private $widgetSettingsRepository; + protected $widgetSettingsRepository; /** * @var PaymentMethodsService */ - private $paymentMethodsService; + protected $paymentMethodsService; /** * @var CountryConfigurationService */ - private $countryConfigService; + protected $countryConfigService; /** * @var ConnectionService */ - private $connectionService; + protected $connectionService; /** * @var WidgetsProxyInterface */ - private $widgetsProxy; + protected $widgetsProxy; /** * @param WidgetSettingsRepositoryInterface $widgetSettingsRepository diff --git a/src/BusinessLogic/Domain/SendReport/Models/SendReport.php b/src/BusinessLogic/Domain/SendReport/Models/SendReport.php index 932944b..f21a0aa 100644 --- a/src/BusinessLogic/Domain/SendReport/Models/SendReport.php +++ b/src/BusinessLogic/Domain/SendReport/Models/SendReport.php @@ -12,7 +12,7 @@ class SendReport /** * @var int */ - private $sendReportTime; + protected $sendReportTime; /** * @param int $sendReportTime diff --git a/src/BusinessLogic/Domain/StatisticalData/Models/StatisticalData.php b/src/BusinessLogic/Domain/StatisticalData/Models/StatisticalData.php index 458ab34..148501f 100644 --- a/src/BusinessLogic/Domain/StatisticalData/Models/StatisticalData.php +++ b/src/BusinessLogic/Domain/StatisticalData/Models/StatisticalData.php @@ -12,7 +12,7 @@ class StatisticalData /** * @var bool */ - private $sendStatisticalData; + protected $sendStatisticalData; /** * @param bool $sendStatisticalData diff --git a/src/BusinessLogic/Domain/Stores/Models/Store.php b/src/BusinessLogic/Domain/Stores/Models/Store.php index 06d6df5..0704e6e 100644 --- a/src/BusinessLogic/Domain/Stores/Models/Store.php +++ b/src/BusinessLogic/Domain/Stores/Models/Store.php @@ -15,12 +15,12 @@ class Store /** * @var string */ - private $storeId; + protected $storeId; /** * @var string */ - private $storeName; + protected $storeName; /** * @param string $storeId diff --git a/src/BusinessLogic/Domain/Stores/Services/StoreService.php b/src/BusinessLogic/Domain/Stores/Services/StoreService.php index 945bbc4..4361101 100644 --- a/src/BusinessLogic/Domain/Stores/Services/StoreService.php +++ b/src/BusinessLogic/Domain/Stores/Services/StoreService.php @@ -19,12 +19,12 @@ class StoreService /** * @var ConnectionDataRepositoryInterface */ - private $connectionDataRepository; + protected $connectionDataRepository; /** * @var StoreServiceInterface */ - private $integrationStoreService; + protected $integrationStoreService; public function __construct( StoreServiceInterface $integrationStoreService, @@ -85,7 +85,7 @@ public function getConnectedStores(): array * * @return string */ - private function getFirstConnectedStoreId(): string + protected function getFirstConnectedStoreId(): string { $oldestStoreId = $this->connectionDataRepository->getOldestConnectionSettingsStoreId(); diff --git a/src/BusinessLogic/Domain/Version/Models/Version.php b/src/BusinessLogic/Domain/Version/Models/Version.php index fa4d664..740a30e 100644 --- a/src/BusinessLogic/Domain/Version/Models/Version.php +++ b/src/BusinessLogic/Domain/Version/Models/Version.php @@ -12,15 +12,15 @@ class Version /** * @var string */ - private $current; + protected $current; /** * @var string | null */ - private $new; + protected $new; /** * @var string | null */ - private $downloadNewVersionUrl; + protected $downloadNewVersionUrl; /** * @param string $current diff --git a/src/BusinessLogic/Domain/Version/Services/VersionService.php b/src/BusinessLogic/Domain/Version/Services/VersionService.php index 1b61168..edb9ab3 100644 --- a/src/BusinessLogic/Domain/Version/Services/VersionService.php +++ b/src/BusinessLogic/Domain/Version/Services/VersionService.php @@ -18,7 +18,7 @@ class VersionService /** * @var VersionServiceInterface */ - private $integrationVersionService; + protected $integrationVersionService; public function __construct(VersionServiceInterface $integrationVersionService) { diff --git a/src/BusinessLogic/SeQuraAPI/Connection/Request/ValidateConnectionHttpRequest.php b/src/BusinessLogic/SeQuraAPI/Connection/Request/ValidateConnectionHttpRequest.php index 6a0893e..56c0988 100644 --- a/src/BusinessLogic/SeQuraAPI/Connection/Request/ValidateConnectionHttpRequest.php +++ b/src/BusinessLogic/SeQuraAPI/Connection/Request/ValidateConnectionHttpRequest.php @@ -31,7 +31,7 @@ public function __construct(ValidateConnectionRequest $request) * * @return string[] */ - private function generateAuthHeaderForValidation(AuthorizationCredentials $authorizationCredentials): array + protected function generateAuthHeaderForValidation(AuthorizationCredentials $authorizationCredentials): array { $token = base64_encode(sprintf( '%s:%s', diff --git a/src/BusinessLogic/SeQuraAPI/Exceptions/HttpApiRequestException.php b/src/BusinessLogic/SeQuraAPI/Exceptions/HttpApiRequestException.php index 94a2e35..1839305 100644 --- a/src/BusinessLogic/SeQuraAPI/Exceptions/HttpApiRequestException.php +++ b/src/BusinessLogic/SeQuraAPI/Exceptions/HttpApiRequestException.php @@ -15,7 +15,7 @@ class HttpApiRequestException extends HttpRequestException /** * @var string[] */ - private $errors = []; + protected $errors = []; /** * Creates an instance of HttpApiRequestException. diff --git a/src/BusinessLogic/SeQuraAPI/Merchant/MerchantProxy.php b/src/BusinessLogic/SeQuraAPI/Merchant/MerchantProxy.php index b837fac..409d81f 100644 --- a/src/BusinessLogic/SeQuraAPI/Merchant/MerchantProxy.php +++ b/src/BusinessLogic/SeQuraAPI/Merchant/MerchantProxy.php @@ -37,7 +37,7 @@ public function getAvailablePaymentMethods(GetAvailablePaymentMethodsRequest $re * * @throws Exception */ - private function getListOfPaymentMethods(array $responseData): array + protected function getListOfPaymentMethods(array $responseData): array { $paymentMethods = []; diff --git a/src/BusinessLogic/SeQuraAPI/Order/OrderProxy.php b/src/BusinessLogic/SeQuraAPI/Order/OrderProxy.php index 2f92d42..fbed961 100644 --- a/src/BusinessLogic/SeQuraAPI/Order/OrderProxy.php +++ b/src/BusinessLogic/SeQuraAPI/Order/OrderProxy.php @@ -26,8 +26,8 @@ */ class OrderProxy extends AuthorizedProxy implements OrderProxyInterface { - private const PAYMENT_OPTIONS_KEY = 'payment_options'; - private const METHODS_KEY = 'methods'; + protected const PAYMENT_OPTIONS_KEY = 'payment_options'; + protected const METHODS_KEY = 'methods'; /** * @inheritDoc @@ -104,7 +104,7 @@ public function getForm(GetFormRequest $request): SeQuraForm * * @return string */ - private function getOrderUUID(array $headers): string + protected function getOrderUUID(array $headers): string { $headers = array_change_key_case($headers); $location = array_key_exists('location', $headers) ? $headers['location'] : ''; @@ -121,7 +121,7 @@ private function getOrderUUID(array $headers): string * * @throws Exception */ - private function getListOfPaymentMethods(array $responseData): array + protected function getListOfPaymentMethods(array $responseData): array { $paymentMethods = []; @@ -143,7 +143,7 @@ private function getListOfPaymentMethods(array $responseData): array * * @throws Exception */ - private function getListOfPaymentMethodsInCategories(array $responseData): array + protected function getListOfPaymentMethodsInCategories(array $responseData): array { $paymentMethodCategories = []; diff --git a/src/BusinessLogic/SeQuraAPI/Order/Requests/AcknowledgeOrderHttpRequest.php b/src/BusinessLogic/SeQuraAPI/Order/Requests/AcknowledgeOrderHttpRequest.php index f1d00b8..1a5d468 100644 --- a/src/BusinessLogic/SeQuraAPI/Order/Requests/AcknowledgeOrderHttpRequest.php +++ b/src/BusinessLogic/SeQuraAPI/Order/Requests/AcknowledgeOrderHttpRequest.php @@ -28,7 +28,7 @@ public function __construct(string $id, BaseOrderRequest $request) * * @return array */ - private function transformBody(BaseOrderRequest $request): array + protected function transformBody(BaseOrderRequest $request): array { $data['order'] = $request->toArray(); diff --git a/src/BusinessLogic/SeQuraAPI/Order/Requests/CreateOrderHttpRequest.php b/src/BusinessLogic/SeQuraAPI/Order/Requests/CreateOrderHttpRequest.php index 91abe31..c7e576b 100644 --- a/src/BusinessLogic/SeQuraAPI/Order/Requests/CreateOrderHttpRequest.php +++ b/src/BusinessLogic/SeQuraAPI/Order/Requests/CreateOrderHttpRequest.php @@ -27,7 +27,7 @@ public function __construct(BaseOrderRequest $request) * * @return array */ - private function transformBody(BaseOrderRequest $request): array + protected function transformBody(BaseOrderRequest $request): array { $data['order'] = $request->toArray(); diff --git a/src/BusinessLogic/SeQuraAPI/Order/Requests/GetFormHttpRequest.php b/src/BusinessLogic/SeQuraAPI/Order/Requests/GetFormHttpRequest.php index 973b281..93716c2 100644 --- a/src/BusinessLogic/SeQuraAPI/Order/Requests/GetFormHttpRequest.php +++ b/src/BusinessLogic/SeQuraAPI/Order/Requests/GetFormHttpRequest.php @@ -25,7 +25,7 @@ public function __construct(GetFormRequest $request) ); } - private function transformQueryParameters(GetFormRequest $request): array + protected function transformQueryParameters(GetFormRequest $request): array { $request->getProduct() && $params['product'] = $request->getProduct(); $request->getCampaign() && $params['campaign'] = $request->getCampaign(); diff --git a/src/BusinessLogic/SeQuraAPI/Order/Requests/UpdateOrderHttpRequest.php b/src/BusinessLogic/SeQuraAPI/Order/Requests/UpdateOrderHttpRequest.php index 8378c7d..685f114 100644 --- a/src/BusinessLogic/SeQuraAPI/Order/Requests/UpdateOrderHttpRequest.php +++ b/src/BusinessLogic/SeQuraAPI/Order/Requests/UpdateOrderHttpRequest.php @@ -33,7 +33,7 @@ public function __construct(string $merchantId, string $shopOrderReference, Upda * * @return array */ - private function transformBody(BaseOrderRequest $request): array + protected function transformBody(BaseOrderRequest $request): array { $data['order'] = $request->toArray(); diff --git a/src/BusinessLogic/SeQuraAPI/OrderReport/Requests/SendOrderReportHttpRequest.php b/src/BusinessLogic/SeQuraAPI/OrderReport/Requests/SendOrderReportHttpRequest.php index e7bb092..ef10dc6 100644 --- a/src/BusinessLogic/SeQuraAPI/OrderReport/Requests/SendOrderReportHttpRequest.php +++ b/src/BusinessLogic/SeQuraAPI/OrderReport/Requests/SendOrderReportHttpRequest.php @@ -27,7 +27,7 @@ public function __construct(SendOrderReportRequest $request) * * @return array */ - private function transformBody(SendOrderReportRequest $request): array + protected function transformBody(SendOrderReportRequest $request): array { $data['delivery_report'] = $request->toArray(); diff --git a/src/BusinessLogic/SeQuraAPI/Widgets/Requests/ValidateAssetsKeyHttpRequest.php b/src/BusinessLogic/SeQuraAPI/Widgets/Requests/ValidateAssetsKeyHttpRequest.php index c8e09d6..9a5e022 100644 --- a/src/BusinessLogic/SeQuraAPI/Widgets/Requests/ValidateAssetsKeyHttpRequest.php +++ b/src/BusinessLogic/SeQuraAPI/Widgets/Requests/ValidateAssetsKeyHttpRequest.php @@ -33,7 +33,7 @@ public function __construct(ValidateAssetsKeyRequest $request) * * @throws HttpNoAvailablePaymentMethods */ - private function generatePaymentString(array $paymentMethodIds) + protected function generatePaymentString(array $paymentMethodIds) { $i1Key = array_search('i1', $paymentMethodIds); diff --git a/src/BusinessLogic/TransactionLog/Listeners/AbortedListener.php b/src/BusinessLogic/TransactionLog/Listeners/AbortedListener.php index 40207cf..4f0708a 100644 --- a/src/BusinessLogic/TransactionLog/Listeners/AbortedListener.php +++ b/src/BusinessLogic/TransactionLog/Listeners/AbortedListener.php @@ -14,7 +14,7 @@ class AbortedListener extends UpdateListener /** * @var string */ - private const ABORT_DESCRIPTION = 'Order update action not supported on SeQura.'; + protected const ABORT_DESCRIPTION = 'Order update action not supported on SeQura.'; /** * @var QueueItemAbortedEvent diff --git a/src/BusinessLogic/TransactionLog/Listeners/FailedListener.php b/src/BusinessLogic/TransactionLog/Listeners/FailedListener.php index 33af573..a5cb5b4 100644 --- a/src/BusinessLogic/TransactionLog/Listeners/FailedListener.php +++ b/src/BusinessLogic/TransactionLog/Listeners/FailedListener.php @@ -14,7 +14,7 @@ class FailedListener extends UpdateListener /** * @var string */ - private const FAILURE_DESCRIPTION = 'Order update action not supported on SeQura.'; + protected const FAILURE_DESCRIPTION = 'Order update action not supported on SeQura.'; /** * @var QueueItemFailedEvent diff --git a/src/BusinessLogic/TransactionLog/Listeners/Listener.php b/src/BusinessLogic/TransactionLog/Listeners/Listener.php index be83f7f..c0da854 100644 --- a/src/BusinessLogic/TransactionLog/Listeners/Listener.php +++ b/src/BusinessLogic/TransactionLog/Listeners/Listener.php @@ -17,7 +17,7 @@ abstract class Listener /** * @var TransactionLogService */ - private $transactionLogService; + protected $transactionLogService; public function __construct(TransactionLogService $transactionLogService) { diff --git a/src/BusinessLogic/TransactionLog/Models/TransactionData.php b/src/BusinessLogic/TransactionLog/Models/TransactionData.php index cbc5aeb..4db4e81 100644 --- a/src/BusinessLogic/TransactionLog/Models/TransactionData.php +++ b/src/BusinessLogic/TransactionLog/Models/TransactionData.php @@ -14,23 +14,23 @@ class TransactionData extends DataTransferObject /** * @var string|int */ - private $merchantReference; + protected $merchantReference; /** * @var string */ - private $eventCode; + protected $eventCode; /** * @var int */ - private $timestamp; + protected $timestamp; /** * @var string */ - private $reason; + protected $reason; /** * @var bool */ - private $isSuccessful; + protected $isSuccessful; /** * @param $merchantReference diff --git a/src/BusinessLogic/TransactionLog/Services/TransactionLogService.php b/src/BusinessLogic/TransactionLog/Services/TransactionLogService.php index 4e90265..d549971 100644 --- a/src/BusinessLogic/TransactionLog/Services/TransactionLogService.php +++ b/src/BusinessLogic/TransactionLog/Services/TransactionLogService.php @@ -30,15 +30,15 @@ class TransactionLogService /** * @var TransactionLogRepositoryInterface */ - private $transactionLogRepository; + protected $transactionLogRepository; /** * @var OrderService */ - private $orderService; + protected $orderService; /** * @var ShopOrderService */ - private $integrationOrderService; + protected $integrationOrderService; public function __construct( TransactionLogRepositoryInterface $transactionLogRepository, @@ -241,7 +241,7 @@ public function logsExist(DateTime $beforeDate): bool * @throws QueueItemDeserializationException * @throws OrderNotFoundException */ - private function createTransactionLogInstance(QueueItem $item): TransactionLog + protected function createTransactionLogInstance(QueueItem $item): TransactionLog { /** diff --git a/src/BusinessLogic/TransactionLog/Tasks/TransactionalOrderUpdateTask.php b/src/BusinessLogic/TransactionLog/Tasks/TransactionalOrderUpdateTask.php index d8367f5..dde0edb 100644 --- a/src/BusinessLogic/TransactionLog/Tasks/TransactionalOrderUpdateTask.php +++ b/src/BusinessLogic/TransactionLog/Tasks/TransactionalOrderUpdateTask.php @@ -20,17 +20,17 @@ class TransactionalOrderUpdateTask extends TransactionalTask /** * @var OrderUpdateData */ - private $orderUpdateData; + protected $orderUpdateData; /** * @var TransactionData */ - private $transactionData; + protected $transactionData; /** * @var string */ - private $storeId; + protected $storeId; /** * @param OrderUpdateData $orderUpdateData @@ -65,7 +65,7 @@ function () { * * @throws Exception */ - private function doExecute(): void + protected function doExecute(): void { $this->getOrderService()->updateOrder($this->orderUpdateData); $this->transactionData->setIsSuccessful(true); @@ -75,7 +75,7 @@ private function doExecute(): void /** * @return OrderService */ - private function getOrderService(): OrderService + protected function getOrderService(): OrderService { return ServiceRegister::getService(OrderService::class); } diff --git a/src/BusinessLogic/Webhook/Tasks/OrderUpdateTask.php b/src/BusinessLogic/Webhook/Tasks/OrderUpdateTask.php index 90fa45c..21257e0 100644 --- a/src/BusinessLogic/Webhook/Tasks/OrderUpdateTask.php +++ b/src/BusinessLogic/Webhook/Tasks/OrderUpdateTask.php @@ -21,12 +21,12 @@ class OrderUpdateTask extends Task /** * @var Webhook */ - private $webhook; + protected $webhook; /** * @var string */ - private $storeId; + protected $storeId; /** * Transforms array into an order update task object, @@ -77,7 +77,7 @@ function () { * * @return void */ - private function doExecute(): void + protected function doExecute(): void { $shopStatus = $this->getOrderStatusMappingService()->getMapping($this->webhook->getSqState()); $this->getShopOrderService()->updateStatus($this->webhook, $shopStatus); @@ -144,7 +144,7 @@ public function unserialize($serialized): void * * @return OrderStatusSettingsService */ - private function getOrderStatusMappingService(): OrderStatusSettingsService + protected function getOrderStatusMappingService(): OrderStatusSettingsService { return ServiceRegister::getService(OrderStatusSettingsService::class); } @@ -154,7 +154,7 @@ private function getOrderStatusMappingService(): OrderStatusSettingsService * * @return ShopOrderService */ - private function getShopOrderService(): ShopOrderService + protected function getShopOrderService(): ShopOrderService { return ServiceRegister::getService(ShopOrderService::class); } diff --git a/src/BusinessLogic/WebhookAPI/Controller/WebhookController.php b/src/BusinessLogic/WebhookAPI/Controller/WebhookController.php index 6ffe420..d4e51ec 100644 --- a/src/BusinessLogic/WebhookAPI/Controller/WebhookController.php +++ b/src/BusinessLogic/WebhookAPI/Controller/WebhookController.php @@ -19,12 +19,12 @@ class WebhookController /** * @var WebhookValidator */ - private $validator; + protected $validator; /** * @var WebhookHandler */ - private $handler; + protected $handler; /** * WebhookController constructor. diff --git a/src/Infrastructure/AutoTest/AutoTestService.php b/src/Infrastructure/AutoTest/AutoTestService.php index ef4be38..8922c5c 100644 --- a/src/Infrastructure/AutoTest/AutoTestService.php +++ b/src/Infrastructure/AutoTest/AutoTestService.php @@ -31,7 +31,7 @@ class AutoTestService * * @var Configuration */ - private $configService; + protected $configService; /** * Starts the auto-test. @@ -173,7 +173,7 @@ protected function logHttpOptions() * * @return Configuration Configuration service instance. */ - private function getConfigService() + protected function getConfigService() { if ($this->configService === null) { $this->configService = ServiceRegister::getService(Configuration::CLASS_NAME); diff --git a/src/Infrastructure/Http/AutoConfiguration.php b/src/Infrastructure/Http/AutoConfiguration.php index 2d429a0..7a35a29 100644 --- a/src/Infrastructure/Http/AutoConfiguration.php +++ b/src/Infrastructure/Http/AutoConfiguration.php @@ -33,11 +33,11 @@ class AutoConfiguration /** * @var Configuration */ - private $configService; + protected $configService; /** * @var HttpClient */ - private $httpClient; + protected $httpClient; /** * AutoConfigurationController constructor. diff --git a/src/Infrastructure/Http/CurlHttpClient.php b/src/Infrastructure/Http/CurlHttpClient.php index 363ab08..67d9506 100644 --- a/src/Infrastructure/Http/CurlHttpClient.php +++ b/src/Infrastructure/Http/CurlHttpClient.php @@ -50,7 +50,7 @@ class CurlHttpClient extends HttpClient * * @var resource */ - private $curlSession; + protected $curlSession; /** * Create and send request. diff --git a/src/Infrastructure/Http/DTO/Options.php b/src/Infrastructure/Http/DTO/Options.php index 513a04a..1ea15cc 100644 --- a/src/Infrastructure/Http/DTO/Options.php +++ b/src/Infrastructure/Http/DTO/Options.php @@ -16,13 +16,13 @@ class Options extends DataTransferObject * * @var string */ - private $name; + protected $name; /** * Value of the option. * * @var string */ - private $value; + protected $value; /** * Options constructor. diff --git a/src/Infrastructure/Http/HttpClient.php b/src/Infrastructure/Http/HttpClient.php index 0f62e5f..b6b1f85 100644 --- a/src/Infrastructure/Http/HttpClient.php +++ b/src/Infrastructure/Http/HttpClient.php @@ -65,13 +65,13 @@ abstract class HttpClient * * @var Configuration */ - private $configService; + protected $configService; /** * An array of additional HTTP configuration options. * * @var array */ - private $httpConfigurationOptions; + protected $httpConfigurationOptions; /** * Create and send request. @@ -249,7 +249,7 @@ protected function getAdditionalOptions(string $domain): array * * @return bool TRUE if request was successful; otherwise, FALSE. */ - private function isRequestSuccessful( + protected function isRequestSuccessful( string $method, string $url, ?array $headers = array(), diff --git a/src/Infrastructure/Http/HttpResponse.php b/src/Infrastructure/Http/HttpResponse.php index 0c3d0f6..b661671 100644 --- a/src/Infrastructure/Http/HttpResponse.php +++ b/src/Infrastructure/Http/HttpResponse.php @@ -18,19 +18,19 @@ class HttpResponse * * @var int */ - private $status; + protected $status; /** * Response body. * * @var string */ - private $body; + protected $body; /** * HTTP headers. * * @var array */ - private $headers; + protected $headers; /** * HttpResponse constructor. diff --git a/src/Infrastructure/Http/LoggingHttpclient.php b/src/Infrastructure/Http/LoggingHttpclient.php index 2e88b7f..a3f7e4b 100644 --- a/src/Infrastructure/Http/LoggingHttpclient.php +++ b/src/Infrastructure/Http/LoggingHttpclient.php @@ -9,7 +9,7 @@ class LoggingHttpclient extends HttpClient /** * @var HttpClient */ - private $client; + protected $client; /** * LoggingHttpclient constructor. diff --git a/src/Infrastructure/Logger/LogContextData.php b/src/Infrastructure/Logger/LogContextData.php index 8207609..14b8498 100644 --- a/src/Infrastructure/Logger/LogContextData.php +++ b/src/Infrastructure/Logger/LogContextData.php @@ -16,13 +16,13 @@ class LogContextData extends DataTransferObject * * @var string */ - private $name; + protected $name; /** * Value of data. * * @var mixed */ - private $value; + protected $value; /** * LogContextData constructor. diff --git a/src/Infrastructure/Logger/Logger.php b/src/Infrastructure/Logger/Logger.php index 31c2f5b..90c8f28 100644 --- a/src/Infrastructure/Logger/Logger.php +++ b/src/Infrastructure/Logger/Logger.php @@ -42,13 +42,13 @@ class Logger extends Singleton * * @var ShopLoggerAdapter */ - private $shopLogger; + protected $shopLogger; /** * Time provider. * * @var TimeProvider */ - private $timeProvider; + protected $timeProvider; /** * Logger constructor. Hidden. @@ -117,7 +117,7 @@ public static function logDebug($message, $component = 'Core', array $context = * @param string $component Component for which to log message. * @param LogContextData[]|array $context Additional context data. */ - private function logMessage($level, $message, $component, array $context = array()) + protected function logMessage($level, $message, $component, array $context = array()) { $config = LoggerConfiguration::getInstance(); $logData = new LogData( diff --git a/src/Infrastructure/Logger/LoggerConfiguration.php b/src/Infrastructure/Logger/LoggerConfiguration.php index 107b939..15d6b74 100644 --- a/src/Infrastructure/Logger/LoggerConfiguration.php +++ b/src/Infrastructure/Logger/LoggerConfiguration.php @@ -33,25 +33,25 @@ class LoggerConfiguration extends Singleton * * @var boolean */ - private $isDefaultLoggerEnabled; + protected $isDefaultLoggerEnabled; /** * Configuration service instance. * * @var Configuration */ - private $shopConfiguration; + protected $shopConfiguration; /** * Minimum log level set. * * @var int */ - private $minLogLevel; + protected $minLogLevel; /** * Integration name. * * @var string */ - private $integrationName; + protected $integrationName; /** * Set default logger status (turning on/off). @@ -157,7 +157,7 @@ public function getIntegrationName() * * @return Configuration Instance of configuration service. */ - private function getShopConfiguration() + protected function getShopConfiguration() { if ($this->shopConfiguration === null) { $this->shopConfiguration = ServiceRegister::getService(Configuration::CLASS_NAME); diff --git a/src/Infrastructure/ORM/Configuration/EntityConfiguration.php b/src/Infrastructure/ORM/Configuration/EntityConfiguration.php index c526f2c..1f6f140 100644 --- a/src/Infrastructure/ORM/Configuration/EntityConfiguration.php +++ b/src/Infrastructure/ORM/Configuration/EntityConfiguration.php @@ -14,13 +14,13 @@ class EntityConfiguration * * @var IndexMap */ - private $indexMap; + protected $indexMap; /** * Entity type. * * @var string */ - private $type; + protected $type; /** * EntityConfiguration constructor. diff --git a/src/Infrastructure/ORM/Configuration/Index.php b/src/Infrastructure/ORM/Configuration/Index.php index 4ec9e5d..1894d77 100644 --- a/src/Infrastructure/ORM/Configuration/Index.php +++ b/src/Infrastructure/ORM/Configuration/Index.php @@ -36,13 +36,13 @@ class Index * * @var string */ - private $type; + protected $type; /** * Property name (column name). * * @var string */ - private $property; + protected $property; /** * Index constructor. diff --git a/src/Infrastructure/ORM/Configuration/IndexMap.php b/src/Infrastructure/ORM/Configuration/IndexMap.php index 016f8a9..488c91b 100644 --- a/src/Infrastructure/ORM/Configuration/IndexMap.php +++ b/src/Infrastructure/ORM/Configuration/IndexMap.php @@ -14,7 +14,7 @@ class IndexMap * * @var Index[] */ - private $indexes = array(); + protected $indexes = array(); /** * Adds boolean index. diff --git a/src/Infrastructure/ORM/IntermediateObject.php b/src/Infrastructure/ORM/IntermediateObject.php index 967489d..457a72b 100644 --- a/src/Infrastructure/ORM/IntermediateObject.php +++ b/src/Infrastructure/ORM/IntermediateObject.php @@ -12,35 +12,35 @@ class IntermediateObject /** * @var string */ - private $index1; + protected $index1; /** * @var string */ - private $index2; + protected $index2; /** * @var string */ - private $index3; + protected $index3; /** * @var string */ - private $index4; + protected $index4; /** * @var string */ - private $index5; + protected $index5; /** * @var string */ - private $index6; + protected $index6; /** * @var string */ - private $data; + protected $data; /** * @var array */ - private $otherIndexes = array(); + protected $otherIndexes = array(); /** * @return string diff --git a/src/Infrastructure/ORM/QueryFilter/QueryCondition.php b/src/Infrastructure/ORM/QueryFilter/QueryCondition.php index e41aa7f..aedd7d5 100644 --- a/src/Infrastructure/ORM/QueryFilter/QueryCondition.php +++ b/src/Infrastructure/ORM/QueryFilter/QueryCondition.php @@ -14,23 +14,23 @@ class QueryCondition /** * @var string - AND | OR */ - private $chainOperator; + protected $chainOperator; /** * @var string */ - private $column; + protected $column; /** * @var string */ - private $operator; + protected $operator; /** * @var mixed */ - private $value; + protected $value; /** * @var string */ - private $valueType; + protected $valueType; /** * Condition constructor. diff --git a/src/Infrastructure/ORM/QueryFilter/QueryFilter.php b/src/Infrastructure/ORM/QueryFilter/QueryFilter.php index 28e3052..977af00 100644 --- a/src/Infrastructure/ORM/QueryFilter/QueryFilter.php +++ b/src/Infrastructure/ORM/QueryFilter/QueryFilter.php @@ -21,31 +21,31 @@ class QueryFilter * * @var QueryCondition[] */ - private $conditions = array(); + protected $conditions = array(); /** * Order by column name. * * @var string */ - private $orderByColumn; + protected $orderByColumn; /** * Order direction. * * @var string */ - private $orderDirection = 'ASC'; + protected $orderDirection = 'ASC'; /** * Limit for select. * * @var int */ - private $limit; + protected $limit; /** * Offset for select. * * @var int */ - private $offset; + protected $offset; /** * Gets limit for select. @@ -198,7 +198,7 @@ public function orWhere($column, $operator, $value = null) * * @throws QueryFilterInvalidParamException */ - private function validateConditionParameters($column, $operator, $value) + protected function validateConditionParameters($column, $operator, $value) { if (!is_string($column) || !is_string($operator)) { throw new QueryFilterInvalidParamException('Column and operator values must be string types'); diff --git a/src/Infrastructure/ORM/Utility/EntityTranslator.php b/src/Infrastructure/ORM/Utility/EntityTranslator.php index 00ad69d..cff263f 100644 --- a/src/Infrastructure/ORM/Utility/EntityTranslator.php +++ b/src/Infrastructure/ORM/Utility/EntityTranslator.php @@ -16,7 +16,7 @@ class EntityTranslator /** * @var string */ - private $entityClass; + protected $entityClass; /** * @param string $entityClass @@ -62,7 +62,7 @@ public function translate(array $intermediateObjects) * @return Entity * @throws EntityClassException */ - private function translateOne(IntermediateObject $intermediateObject) + protected function translateOne(IntermediateObject $intermediateObject) { $data = json_decode($intermediateObject->getData(), true); diff --git a/src/Infrastructure/ServiceRegister.php b/src/Infrastructure/ServiceRegister.php index 57d69f0..573859d 100644 --- a/src/Infrastructure/ServiceRegister.php +++ b/src/Infrastructure/ServiceRegister.php @@ -17,7 +17,7 @@ class ServiceRegister * * @var ServiceRegister */ - private static $instance; + protected static $instance; /** * Array of registered services. * diff --git a/src/Infrastructure/TaskExecution/AsyncBatchStarter.php b/src/Infrastructure/TaskExecution/AsyncBatchStarter.php index f3051ee..f16082d 100644 --- a/src/Infrastructure/TaskExecution/AsyncBatchStarter.php +++ b/src/Infrastructure/TaskExecution/AsyncBatchStarter.php @@ -15,31 +15,31 @@ class AsyncBatchStarter implements Runnable * * @var int */ - private $batchSize; + protected $batchSize; /** * List of sub-batches. * * @var AsyncBatchStarter[] */ - private $subBatches = array(); + protected $subBatches = array(); /** * List of runners. * * @var Runnable[] */ - private $runners = array(); + protected $runners = array(); /** * Current add index. * * @var int */ - private $addIndex = 0; + protected $addIndex = 0; /** * Instance of async process starter. * * @var AsyncProcessService */ - private $asyncProcessStarter; + protected $asyncProcessStarter; /** * @inheritDoc diff --git a/src/Infrastructure/TaskExecution/AsyncProcessStarterService.php b/src/Infrastructure/TaskExecution/AsyncProcessStarterService.php index 2161c37..31ddb84 100644 --- a/src/Infrastructure/TaskExecution/AsyncProcessStarterService.php +++ b/src/Infrastructure/TaskExecution/AsyncProcessStarterService.php @@ -36,25 +36,25 @@ class AsyncProcessStarterService extends Singleton implements AsyncProcessServic * * @var Configuration */ - private $configuration; + protected $configuration; /** * Process entity repository. * * @var RepositoryInterface */ - private $processRepository; + protected $processRepository; /** * GUID provider instance. * * @var GuidProvider */ - private $guidProvider; + protected $guidProvider; /** * HTTP client. * * @var HttpClient */ - private $httpClient; + protected $httpClient; /** * AsyncProcessStarterService constructor. @@ -119,7 +119,7 @@ public function runProcess($guid) * * @throws ProcessStarterSaveException */ - private function saveGuidAndRunner($guid, Runnable $runner) + protected function saveGuidAndRunner($guid, Runnable $runner) { try { $process = new Process(); @@ -140,7 +140,7 @@ private function saveGuidAndRunner($guid, Runnable $runner) * * @throws HttpRequestException */ - private function startRunnerAsynchronously($guid) + protected function startRunnerAsynchronously($guid) { try { $this->httpClient->requestAsync( diff --git a/src/Infrastructure/TaskExecution/Composite/ExecutionDetails.php b/src/Infrastructure/TaskExecution/Composite/ExecutionDetails.php index 473f4a0..73d9453 100644 --- a/src/Infrastructure/TaskExecution/Composite/ExecutionDetails.php +++ b/src/Infrastructure/TaskExecution/Composite/ExecutionDetails.php @@ -10,7 +10,7 @@ * * @package SeQura\Core\Infrastructure\TaskExecution\Composite * - * @access private + * @access protected */ class ExecutionDetails implements Serializable { @@ -19,19 +19,19 @@ class ExecutionDetails implements Serializable * * @var int */ - private $executionId; + protected $executionId; /** * Positive (grater than zero) integer. Higher number implies higher impact of subtask's progress on total progress. * * @var int */ - private $weight; + protected $weight; /** * Task progress. * * @var float */ - private $progress; + protected $progress; /** * ExecutionDetails constructor. diff --git a/src/Infrastructure/TaskExecution/Composite/Orchestrator.php b/src/Infrastructure/TaskExecution/Composite/Orchestrator.php index 6821e30..928520f 100644 --- a/src/Infrastructure/TaskExecution/Composite/Orchestrator.php +++ b/src/Infrastructure/TaskExecution/Composite/Orchestrator.php @@ -191,7 +191,7 @@ protected function createSubJob(Task $task, $weight = 1) * * @return float */ - private function calculateProgress() + protected function calculateProgress() { $totalWeight = 0; $totalProgress = 0; @@ -219,7 +219,7 @@ protected function getSubJobQueueName() * * @return QueueService */ - private function getQueueService() + protected function getQueueService() { return ServiceRegister::getService(QueueService::CLASS_NAME); } @@ -229,7 +229,7 @@ private function getQueueService() * * @return string */ - private function getContext() + protected function getContext() { /** * @var ConfigurationManager $configManager @@ -246,7 +246,7 @@ private function getContext() * * @return ExecutionDetails | false */ - private function getSubJob($executionId) + protected function getSubJob($executionId) { return current(array_filter( $this->taskList, @@ -259,7 +259,7 @@ static function (ExecutionDetails $d) use ($executionId) { /** * Aborts incomplete sub-jobs. */ - private function abortSubJobs() + protected function abortSubJobs() { $ids = []; foreach ($this->taskList as $task) { @@ -278,7 +278,7 @@ private function abortSubJobs() /** * Starts sub-jobs. */ - private function startSubJobs() + protected function startSubJobs() { $ids = array_map(static function (ExecutionDetails $d) { return $d->getExecutionId(); diff --git a/src/Infrastructure/TaskExecution/CompositeTask.php b/src/Infrastructure/TaskExecution/CompositeTask.php index 54eb25e..5065583 100644 --- a/src/Infrastructure/TaskExecution/CompositeTask.php +++ b/src/Infrastructure/TaskExecution/CompositeTask.php @@ -40,7 +40,7 @@ abstract class CompositeTask extends Task * * @var int */ - private $initialProgress; + protected $initialProgress; /** * CompositeTask constructor. @@ -355,7 +355,7 @@ protected function isProcessCompleted() * * @param Task $task A Task for which to register listener. */ - private function registerReportAliveEvent(Task $task) + protected function registerReportAliveEvent(Task $task) { $self = $this; @@ -372,7 +372,7 @@ function () use ($self) { * * @param string $taskKey A Task for which to register listener. */ - private function registerReportProgressEvent($taskKey) + protected function registerReportProgressEvent($taskKey) { $self = $this; $task = $this->tasks[$taskKey]; diff --git a/src/Infrastructure/TaskExecution/Events/BeforeQueueStatusChangeEvent.php b/src/Infrastructure/TaskExecution/Events/BeforeQueueStatusChangeEvent.php index 65b125f..c08a2f5 100644 --- a/src/Infrastructure/TaskExecution/Events/BeforeQueueStatusChangeEvent.php +++ b/src/Infrastructure/TaskExecution/Events/BeforeQueueStatusChangeEvent.php @@ -21,13 +21,13 @@ class BeforeQueueStatusChangeEvent extends Event * * @var QueueItem */ - private $queueItem; + protected $queueItem; /** * Previous state of queue item. * * @var string */ - private $previousState; + protected $previousState; /** * TaskProgressEvent constructor. diff --git a/src/Infrastructure/TaskExecution/Events/QueueStatusChangedEvent.php b/src/Infrastructure/TaskExecution/Events/QueueStatusChangedEvent.php index ea3056c..e1f821e 100644 --- a/src/Infrastructure/TaskExecution/Events/QueueStatusChangedEvent.php +++ b/src/Infrastructure/TaskExecution/Events/QueueStatusChangedEvent.php @@ -21,13 +21,13 @@ class QueueStatusChangedEvent extends Event * * @var QueueItem */ - private $queueItem; + protected $queueItem; /** * Previous state of queue item. * * @var string */ - private $previousState; + protected $previousState; /** * TaskProgressEvent constructor. diff --git a/src/Infrastructure/TaskExecution/QueueItem.php b/src/Infrastructure/TaskExecution/QueueItem.php index e33dea1..e84c135 100644 --- a/src/Infrastructure/TaskExecution/QueueItem.php +++ b/src/Infrastructure/TaskExecution/QueueItem.php @@ -193,7 +193,7 @@ class QueueItem extends Entity * * @var TimeProvider */ - private $timeProvider; + protected $timeProvider; /** * QueueItem constructor. @@ -867,7 +867,7 @@ protected function getDateTimeFromTimestamp($timestamp) /** * Attach Task event handlers. */ - private function attachTaskEventHandlers() + protected function attachTaskEventHandlers() { if ($this->task === null) { return; diff --git a/src/Infrastructure/TaskExecution/QueueItemStarter.php b/src/Infrastructure/TaskExecution/QueueItemStarter.php index 29d4d58..95ffbf0 100644 --- a/src/Infrastructure/TaskExecution/QueueItemStarter.php +++ b/src/Infrastructure/TaskExecution/QueueItemStarter.php @@ -25,19 +25,19 @@ class QueueItemStarter implements Runnable * * @var int */ - private $queueItemId; + protected $queueItemId; /** * Service instance. * * @var QueueService */ - private $queueService; + protected $queueService; /** * Service instance. * * @var ConfigurationManager */ - private $configurationManager; + protected $configurationManager; /** * QueueItemStarter constructor. @@ -173,7 +173,7 @@ public function getQueueItemId() * * @return QueueItem|null Queue item if found; otherwise, null. */ - private function fetchItem() + protected function fetchItem() { try { $queueItem = $this->getQueueService()->find($this->queueItemId); @@ -189,7 +189,7 @@ private function fetchItem() * * @return QueueService Service instance. */ - private function getQueueService() + protected function getQueueService() { if ($this->queueService === null) { $this->queueService = ServiceRegister::getService(QueueService::CLASS_NAME); @@ -203,7 +203,7 @@ private function getQueueService() * * @return ConfigurationManager Service instance. */ - private function getConfigManager() + protected function getConfigManager() { if ($this->configurationManager === null) { $this->configurationManager = ServiceRegister::getService(ConfigurationManager::CLASS_NAME); diff --git a/src/Infrastructure/TaskExecution/QueueService.php b/src/Infrastructure/TaskExecution/QueueService.php index 75ec211..0d50c4d 100644 --- a/src/Infrastructure/TaskExecution/QueueService.php +++ b/src/Infrastructure/TaskExecution/QueueService.php @@ -50,25 +50,25 @@ class QueueService * * @var RepositoryRegistry */ - private $storage; + protected $storage; /** * Time provider instance. * * @var TimeProvider */ - private $timeProvider; + protected $timeProvider; /** * Task runner wakeup instance. * * @var TaskRunnerWakeup */ - private $taskRunnerWakeup; + protected $taskRunnerWakeup; /** * Configuration service instance. * * @var Configuration */ - private $configService; + protected $configService; /** * Updates status of a group of tasks. @@ -534,7 +534,7 @@ public function fireStateTransitionEvent(Event $event) * * @throws QueueStorageUnavailableException */ - private function save( + protected function save( QueueItem $queueItem, array $additionalWhere = array(), $reportStateChange = false, @@ -564,7 +564,7 @@ private function save( * @param QueueItem $queueItem Queue item with is about to change status. * @param string $previousState Previous state. MUST be one of the states defined as constants in @see QueueItem. */ - private function reportBeforeStatusChange(QueueItem $queueItem, $previousState) + protected function reportBeforeStatusChange(QueueItem $queueItem, $previousState) { /** * @var EventBus $eventBus @@ -579,7 +579,7 @@ private function reportBeforeStatusChange(QueueItem $queueItem, $previousState) * @param QueueItem $queueItem Queue item with changed status. * @param string $previousState Previous state. MUST be one of the states defined as constants in @see QueueItem. */ - private function reportStatusChange(QueueItem $queueItem, $previousState) + protected function reportStatusChange(QueueItem $queueItem, $previousState) { /** * @var EventBus $eventBus @@ -595,7 +595,7 @@ private function reportStatusChange(QueueItem $queueItem, $previousState) * * @return QueueItemRepository Task storage instance. */ - private function getStorage() + protected function getStorage() { if ($this->storage === null) { /** @@ -612,7 +612,7 @@ private function getStorage() * * @return TimeProvider Time provider instance. */ - private function getTimeProvider() + protected function getTimeProvider() { if ($this->timeProvider === null) { $this->timeProvider = ServiceRegister::getService(TimeProvider::CLASS_NAME); @@ -626,7 +626,7 @@ private function getTimeProvider() * * @return TaskRunnerWakeup Task runner wakeup instance. */ - private function getTaskRunnerWakeup() + protected function getTaskRunnerWakeup() { if ($this->taskRunnerWakeup === null) { $this->taskRunnerWakeup = ServiceRegister::getService(TaskRunnerWakeup::CLASS_NAME); @@ -640,7 +640,7 @@ private function getTaskRunnerWakeup() * * @return Configuration Configuration service instance. */ - private function getConfigService() + protected function getConfigService() { if ($this->configService === null) { $this->configService = ServiceRegister::getService(Configuration::CLASS_NAME); @@ -657,7 +657,7 @@ private function getConfigService() * * @throws BadMethodCallException */ - private function throwIllegalTransitionException($fromStatus, $toStatus) + protected function throwIllegalTransitionException($fromStatus, $toStatus) { throw new BadMethodCallException( sprintf( @@ -673,7 +673,7 @@ private function throwIllegalTransitionException($fromStatus, $toStatus) * * @return int Number of retries. */ - private function getMaxRetries() + protected function getMaxRetries() { $configurationValue = $this->getConfigService()->getMaxTaskExecutionRetries(); @@ -691,7 +691,7 @@ private function getMaxRetries() * * @return QueueItem */ - private function instantiate(Task $task, $queueName, $context, $priority, $parent = null) + protected function instantiate(Task $task, $queueName, $context, $priority, $parent = null) { $queueItem = new QueueItem($task); $queueItem->setQueueName($queueName); diff --git a/src/Infrastructure/TaskExecution/RunnerStatusStorage.php b/src/Infrastructure/TaskExecution/RunnerStatusStorage.php index 569efd3..1c8d31c 100644 --- a/src/Infrastructure/TaskExecution/RunnerStatusStorage.php +++ b/src/Infrastructure/TaskExecution/RunnerStatusStorage.php @@ -20,7 +20,7 @@ class RunnerStatusStorage implements TaskRunnerStatusStorage * * @var Configuration */ - private $configService; + protected $configService; /** * Returns task runner status. @@ -63,7 +63,7 @@ public function setStatus(TaskRunnerStatus $status) * @throws TaskRunnerStatusChangeException * @throws TaskRunnerStatusStorageUnavailableException */ - private function checkTaskRunnerStatusChangeAvailability(TaskRunnerStatus $status) + protected function checkTaskRunnerStatusChangeAvailability(TaskRunnerStatus $status) { $currentGuid = $this->getStatus()->getGuid(); $guidForUpdate = $status->getGuid(); @@ -80,7 +80,7 @@ private function checkTaskRunnerStatusChangeAvailability(TaskRunnerStatus $statu * * @see Configuration service. */ - private function getConfigService() + protected function getConfigService() { if ($this->configService === null) { $this->configService = ServiceRegister::getService(Configuration::CLASS_NAME); diff --git a/src/Infrastructure/TaskExecution/Task.php b/src/Infrastructure/TaskExecution/Task.php index f55b058..efbec24 100644 --- a/src/Infrastructure/TaskExecution/Task.php +++ b/src/Infrastructure/TaskExecution/Task.php @@ -36,19 +36,19 @@ abstract class Task extends EventEmitter implements Serializable * * @var DateTime */ - private $lastAliveSignalTime; + protected $lastAliveSignalTime; /** * An instance of Configuration service. * * @var Configuration */ - private $configService; + protected $configService; /** * Task execution id. * * @var string */ - private $executionId; + protected $executionId; /** * Runs task logic. @@ -247,7 +247,7 @@ public function onAbort() * * @return int Base points representation of percentage. */ - private function percentToBasePoints($percentValue) + protected function percentToBasePoints($percentValue) { return (int)round($percentValue * 100, 2); } diff --git a/src/Infrastructure/TaskExecution/TaskEvents/Listeners/OnReportAlive.php b/src/Infrastructure/TaskExecution/TaskEvents/Listeners/OnReportAlive.php index 51f36c7..27dad0c 100644 --- a/src/Infrastructure/TaskExecution/TaskEvents/Listeners/OnReportAlive.php +++ b/src/Infrastructure/TaskExecution/TaskEvents/Listeners/OnReportAlive.php @@ -44,7 +44,7 @@ public static function handle(QueueItem $queueItem) * * @return QueueService */ - private static function getQueue() + protected static function getQueue() { return ServiceRegister::getService(QueueService::CLASS_NAME); } diff --git a/src/Infrastructure/TaskExecution/TaskEvents/Listeners/OnReportProgress.php b/src/Infrastructure/TaskExecution/TaskEvents/Listeners/OnReportProgress.php index e2de0f1..88123a3 100644 --- a/src/Infrastructure/TaskExecution/TaskEvents/Listeners/OnReportProgress.php +++ b/src/Infrastructure/TaskExecution/TaskEvents/Listeners/OnReportProgress.php @@ -56,7 +56,7 @@ public static function handle(QueueItem $queueItem, $progressBasePoints) * * @return QueueService */ - private static function getQueueService() + protected static function getQueueService() { return ServiceRegister::getService(QueueService::CLASS_NAME); } diff --git a/src/Infrastructure/TaskExecution/TaskEvents/TaskProgressEvent.php b/src/Infrastructure/TaskExecution/TaskEvents/TaskProgressEvent.php index e038fa7..69d836f 100644 --- a/src/Infrastructure/TaskExecution/TaskEvents/TaskProgressEvent.php +++ b/src/Infrastructure/TaskExecution/TaskEvents/TaskProgressEvent.php @@ -21,7 +21,7 @@ class TaskProgressEvent extends Event * * @var int */ - private $progressPercentBasePoints; + protected $progressPercentBasePoints; /** * TaskProgressEvent constructor. diff --git a/src/Infrastructure/TaskExecution/TaskRunner.php b/src/Infrastructure/TaskExecution/TaskRunner.php index b5f2625..4810c21 100644 --- a/src/Infrastructure/TaskExecution/TaskRunner.php +++ b/src/Infrastructure/TaskExecution/TaskRunner.php @@ -46,49 +46,49 @@ class TaskRunner * * @var QueueService */ - private $queueService; + protected $queueService; /** * Service. * * @var TaskRunnerStatusStorage */ - private $runnerStorage; + protected $runnerStorage; /** * Service. * * @var Configuration */ - private $configurationService; + protected $configurationService; /** * Service. * * @var TimeProvider */ - private $timeProvider; + protected $timeProvider; /** * Service. * * @var TaskRunnerWakeup */ - private $taskWakeup; + protected $taskWakeup; /** * Configuration manager. * * @var ConfigurationManager Configuration manager instance. */ - private $configurationManager; + protected $configurationManager; /** * Defines when was the task runner alive since time step last updated at. * * @var int */ - private $aliveSinceUpdatedAt = 0; + protected $aliveSinceUpdatedAt = 0; /** * Sleep time in seconds with microsecond precision. * * @var float */ - private $batchSleepTime = 0.0; + protected $batchSleepTime = 0.0; /** * Sets task runner guid. @@ -143,7 +143,7 @@ public function run() * @throws QueueStorageUnavailableException * @throws TaskRunnerStatusStorageUnavailableException */ - private function failOrRequeueExpiredTasks() + protected function failOrRequeueExpiredTasks() { $this->logDebug(array('Message' => 'Task runner: expired tasks cleanup started.')); @@ -185,7 +185,7 @@ private function failOrRequeueExpiredTasks() * @throws QueueItemDeserializationException * @throws QueueStorageUnavailableException */ - private function failOrRequeueExpiredTask(QueueItem $item) + protected function failOrRequeueExpiredTask(QueueItem $item) { if (!$this->isItemExpired($item)) { return; @@ -218,7 +218,7 @@ private function failOrRequeueExpiredTask(QueueItem $item) * @throws QueueItemDeserializationException * @throws TaskRunnerStatusStorageUnavailableException */ - private function startOldestQueuedItems() + protected function startOldestQueuedItems() { $this->keepAlive(); @@ -283,7 +283,7 @@ private function startOldestQueuedItems() * @throws TaskRunnerStatusChangeException * @throws TaskRunnerStatusStorageUnavailableException */ - private function wakeup() + protected function wakeup() { $this->logDebug(array('Message' => 'Task runner: starting self deactivation.')); @@ -303,7 +303,7 @@ private function wakeup() * * @throws TaskRunnerStatusStorageUnavailableException */ - private function keepAlive() + protected function keepAlive() { $currentTime = $this->getTimeProvider()->getCurrentLocalTime()->getTimestamp(); if (($currentTime - $this->aliveSinceUpdatedAt) < self::TASK_RUNNER_KEEP_ALIVE_PERIOD) { @@ -321,7 +321,7 @@ private function keepAlive() * * @throws TaskRunnerStatusStorageUnavailableException */ - private function isCurrentRunnerAlive() + protected function isCurrentRunnerAlive() { $runnerStatus = $this->getRunnerStorage()->getStatus(); $runnerExpired = $runnerStatus->isExpired(); @@ -347,7 +347,7 @@ private function isCurrentRunnerAlive() * * @throws QueueItemDeserializationException */ - private function isItemExpired(QueueItem $item) + protected function isItemExpired(QueueItem $item) { $currentTimestamp = $this->getTimeProvider()->getCurrentLocalTime()->getTimestamp(); $maxTaskInactivityPeriod = $item->getTask()->getMaxInactivityPeriod(); @@ -364,7 +364,7 @@ private function isItemExpired(QueueItem $item) * * @throws QueueItemDeserializationException */ - private function getItemDescription(QueueItem $item) + protected function getItemDescription(QueueItem $item) { return "{$item->getId()}({$item->getTaskType()})"; } @@ -374,7 +374,7 @@ private function getItemDescription(QueueItem $item) * * @see QueueService service instance. */ - private function getQueue() + protected function getQueue() { if ($this->queueService === null) { $this->queueService = ServiceRegister::getService(QueueService::CLASS_NAME); @@ -388,7 +388,7 @@ private function getQueue() * * @see TaskRunnerStatusStorageInterface service instance. */ - private function getRunnerStorage() + protected function getRunnerStorage() { if ($this->runnerStorage === null) { $this->runnerStorage = ServiceRegister::getService(TaskRunnerStatusStorage::CLASS_NAME); @@ -416,7 +416,7 @@ public function getConfigurationManager() * * @see Configuration service instance. */ - private function getConfigurationService() + protected function getConfigurationService() { if ($this->configurationService === null) { $this->configurationService = ServiceRegister::getService(Configuration::CLASS_NAME); @@ -430,7 +430,7 @@ private function getConfigurationService() * * @see TimeProvider instance. */ - private function getTimeProvider() + protected function getTimeProvider() { if ($this->timeProvider === null) { $this->timeProvider = ServiceRegister::getService(TimeProvider::CLASS_NAME); @@ -444,7 +444,7 @@ private function getTimeProvider() * * @see TaskRunnerWakeupInterface service instance. */ - private function getTaskWakeup() + protected function getTaskWakeup() { if ($this->taskWakeup === null) { $this->taskWakeup = ServiceRegister::getService(TaskRunnerWakeup::CLASS_NAME); @@ -458,7 +458,7 @@ private function getTaskWakeup() * * @return int Wakeup delay in seconds. */ - private function getWakeupDelay() + protected function getWakeupDelay() { $configurationValue = $this->getConfigurationService()->getTaskRunnerWakeupDelay(); @@ -475,7 +475,7 @@ private function getWakeupDelay() * * @throws QueueItemDeserializationException */ - private function logMessageFor(QueueItem $queueItem, $message) + protected function logMessageFor(QueueItem $queueItem, $message) { $this->logDebug( array( @@ -495,7 +495,7 @@ private function logMessageFor(QueueItem $queueItem, $message) * * @param array $debugContent Array of debug content for logging. */ - private function logDebug(array $debugContent) + protected function logDebug(array $debugContent) { $debugContent['RunnerGuid'] = $this->guid; Logger::logDebug($debugContent['Message'], 'Core', $debugContent); @@ -506,7 +506,7 @@ private function logDebug(array $debugContent) * * @param array $debugContent Array of debug content for logging. */ - private function logWarning(array $debugContent) + protected function logWarning(array $debugContent) { $debugContent['RunnerGuid'] = $this->guid; Logger::logWarning($debugContent['Message'], 'Core', $debugContent); diff --git a/src/Infrastructure/TaskExecution/TaskRunnerStarter.php b/src/Infrastructure/TaskExecution/TaskRunnerStarter.php index a9c438e..36e8d1e 100644 --- a/src/Infrastructure/TaskExecution/TaskRunnerStarter.php +++ b/src/Infrastructure/TaskExecution/TaskRunnerStarter.php @@ -27,25 +27,25 @@ class TaskRunnerStarter implements Runnable * * @var string */ - private $guid; + protected $guid; /** * Instance of task runner status storage. * * @var TaskRunnerStatusStorage */ - private $runnerStatusStorage; + protected $runnerStatusStorage; /** * Instance of task runner. * * @var TaskRunner */ - private $taskRunner; + protected $taskRunner; /** * Instance of task runner wakeup service. * * @var TaskRunnerWakeup */ - private $taskWakeup; + protected $taskWakeup; /** * TaskRunnerStarter constructor. @@ -173,7 +173,7 @@ public function run() * @throws TaskRunnerRunException * @throws TaskRunnerStatusStorageUnavailableException */ - private function doRun() + protected function doRun() { $runnerStatus = $this->getRunnerStorage()->getStatus(); if ($this->guid !== $runnerStatus->getGuid()) { @@ -203,7 +203,7 @@ private function doRun() * * @return TaskRunnerStatusStorage Instance of runner status storage service. */ - private function getRunnerStorage() + protected function getRunnerStorage() { if ($this->runnerStatusStorage === null) { $this->runnerStatusStorage = ServiceRegister::getService(TaskRunnerStatusStorage::CLASS_NAME); @@ -217,7 +217,7 @@ private function getRunnerStorage() * * @return TaskRunner Instance of runner service. */ - private function getTaskRunner() + protected function getTaskRunner() { if ($this->taskRunner === null) { $this->taskRunner = ServiceRegister::getService(TaskRunner::CLASS_NAME); @@ -231,7 +231,7 @@ private function getTaskRunner() * * @return TaskRunnerWakeup Instance of runner wakeup service. */ - private function getTaskWakeup() + protected function getTaskWakeup() { if ($this->taskWakeup === null) { $this->taskWakeup = ServiceRegister::getService(TaskRunnerWakeup::CLASS_NAME); diff --git a/src/Infrastructure/TaskExecution/TaskRunnerStatus.php b/src/Infrastructure/TaskExecution/TaskRunnerStatus.php index c5d61a3..635af59 100644 --- a/src/Infrastructure/TaskExecution/TaskRunnerStatus.php +++ b/src/Infrastructure/TaskExecution/TaskRunnerStatus.php @@ -22,25 +22,25 @@ class TaskRunnerStatus * * @var string */ - private $guid; + protected $guid; /** * Timestamp since task runner is alive. * * @var int|null */ - private $aliveSinceTimestamp; + protected $aliveSinceTimestamp; /** * Time provider service instance. * * @var TimeProvider */ - private $timeProvider; + protected $timeProvider; /** * Configuration service instance. * * @var Configuration */ - private $configService; + protected $configService; /** * TaskRunnerStatus constructor. @@ -104,7 +104,7 @@ public function isExpired() * * @return int Max alive timestamp. */ - private function getMaxAliveTimestamp() + protected function getMaxAliveTimestamp() { $configurationValue = $this->configService->getTaskRunnerMaxAliveTime(); diff --git a/src/Infrastructure/TaskExecution/TaskRunnerWakeupService.php b/src/Infrastructure/TaskExecution/TaskRunnerWakeupService.php index ba6c65e..41cb897 100644 --- a/src/Infrastructure/TaskExecution/TaskRunnerWakeupService.php +++ b/src/Infrastructure/TaskExecution/TaskRunnerWakeupService.php @@ -27,25 +27,25 @@ class TaskRunnerWakeupService implements TaskRunnerWakeup * * @var AsyncProcessStarterService */ - private $asyncProcessStarter; + protected $asyncProcessStarter; /** * Service instance. * * @var RunnerStatusStorage */ - private $runnerStatusStorage; + protected $runnerStatusStorage; /** * Service instance. * * @var TimeProvider */ - private $timeProvider; + protected $timeProvider; /** * Service instance. * * @var GuidProvider */ - private $guidProvider; + protected $guidProvider; /** * Wakes up @see TaskRunner instance asynchronously if active instance is not already running. @@ -92,7 +92,7 @@ public function wakeup() * @throws TaskRunnerStatusStorageUnavailableException * @throws HttpRequestException */ - private function doWakeup() + protected function doWakeup() { $runnerStatus = $this->getRunnerStorage()->getStatus(); $currentGuid = $runnerStatus->getGuid(); @@ -122,7 +122,7 @@ private function doWakeup() * * @see TaskRunnerStatusStorageInterface. */ - private function getRunnerStorage() + protected function getRunnerStorage() { if ($this->runnerStatusStorage === null) { $this->runnerStatusStorage = ServiceRegister::getService(TaskRunnerStatusStorage::CLASS_NAME); @@ -136,7 +136,7 @@ private function getRunnerStorage() * * @see GuidProvider. */ - private function getGuidProvider() + protected function getGuidProvider() { if ($this->guidProvider === null) { $this->guidProvider = ServiceRegister::getService(GuidProvider::CLASS_NAME); @@ -150,7 +150,7 @@ private function getGuidProvider() * * @see TimeProvider. */ - private function getTimeProvider() + protected function getTimeProvider() { if ($this->timeProvider === null) { $this->timeProvider = ServiceRegister::getService(TimeProvider::CLASS_NAME); @@ -164,7 +164,7 @@ private function getTimeProvider() * * @see AsyncProcessStarterService. */ - private function getAsyncProcessStarter() + protected function getAsyncProcessStarter() { if ($this->asyncProcessStarter === null) { $this->asyncProcessStarter = ServiceRegister::getService(AsyncProcessService::CLASS_NAME); diff --git a/src/Infrastructure/Utility/GuidProvider.php b/src/Infrastructure/Utility/GuidProvider.php index 512d326..14a3b00 100644 --- a/src/Infrastructure/Utility/GuidProvider.php +++ b/src/Infrastructure/Utility/GuidProvider.php @@ -24,7 +24,7 @@ class GuidProvider /** * GuidProvider constructor. */ - private function __construct() + protected function __construct() { } diff --git a/src/Infrastructure/Utility/TimeProvider.php b/src/Infrastructure/Utility/TimeProvider.php index 855cfc1..55c9dbb 100644 --- a/src/Infrastructure/Utility/TimeProvider.php +++ b/src/Infrastructure/Utility/TimeProvider.php @@ -25,7 +25,7 @@ class TimeProvider /** * TimeProvider constructor */ - private function __construct() + protected function __construct() { }