From 52edc7c45a5c076e74ceb121e359480a68dab03e Mon Sep 17 00:00:00 2001 From: Dominik Skerhak Date: Fri, 19 Jan 2024 11:06:36 +0100 Subject: [PATCH] [PSR4] ApplicationModule - (Rector) Fix uses of changed classes remp/crm#2228 --- .../CreateMissingRecurrentPaymentsCommand.php | 2 +- .../StopRecurrentPaymentButtonWidget.php | 2 +- .../ExternalIdAdminFilterFormDataProvider.php | 2 +- src/Gateways/GooglePlayBilling.php | 2 +- src/GooglePlayBillingModule.php | 12 ++++++------ src/Models/GooglePlayValidatorFactory.php | 2 +- src/Models/User/GooglePlayUserDataProvider.php | 4 ++-- .../DeveloperNotificationsRepository.php | 4 ++-- .../GooglePlaySubscriptionTypesRepository.php | 2 +- src/Repositories/PurchaseDeviceTokensRepository.php | 2 +- src/Repositories/PurchaseTokensRepository.php | 2 +- src/Seeders/ConfigsSeeder.php | 6 +++--- src/Seeders/SnippetsSeeder.php | 2 +- src/Tests/AccessTokenDataProviderTest.php | 2 +- ...perNotificationReceivedHandlerGracePeriodTest.php | 4 ++-- ...erNotificationReceivedHandlerOfferPeriodsTest.php | 4 ++-- .../DeveloperNotificationReceivedHandlerTest.php | 6 +++--- ...veloperNotificationReceivedHandlerUpgradeTest.php | 6 +++--- src/Tests/PairDeviceAccessTokensEventHandlerTest.php | 2 +- src/Tests/RemovedAccessTokenEventHandlerTest.php | 2 +- 20 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/Commands/CreateMissingRecurrentPaymentsCommand.php b/src/Commands/CreateMissingRecurrentPaymentsCommand.php index 67e9270..ebec4ad 100644 --- a/src/Commands/CreateMissingRecurrentPaymentsCommand.php +++ b/src/Commands/CreateMissingRecurrentPaymentsCommand.php @@ -2,7 +2,7 @@ namespace Crm\GooglePlayBillingModule\Commands; -use Crm\ApplicationModule\Config\ApplicationConfig; +use Crm\ApplicationModule\Models\Config\ApplicationConfig; use Crm\GooglePlayBillingModule\Gateways\GooglePlayBilling; use Crm\GooglePlayBillingModule\GooglePlayBillingModule; use Crm\GooglePlayBillingModule\Repositories\DeveloperNotificationsRepository; diff --git a/src/Components/StopRecurrentPaymentButtonWidget/StopRecurrentPaymentButtonWidget.php b/src/Components/StopRecurrentPaymentButtonWidget/StopRecurrentPaymentButtonWidget.php index 2b146fb..fcd528c 100644 --- a/src/Components/StopRecurrentPaymentButtonWidget/StopRecurrentPaymentButtonWidget.php +++ b/src/Components/StopRecurrentPaymentButtonWidget/StopRecurrentPaymentButtonWidget.php @@ -2,7 +2,7 @@ namespace Crm\GooglePlayBillingModule\Components\StopRecurrentPaymentButtonWidget; -use Crm\ApplicationModule\Widget\BaseLazyWidget; +use Crm\ApplicationModule\Models\Widget\BaseLazyWidget; use Crm\GooglePlayBillingModule\Gateways\GooglePlayBilling; class StopRecurrentPaymentButtonWidget extends BaseLazyWidget diff --git a/src/DataProviders/ExternalIdAdminFilterFormDataProvider.php b/src/DataProviders/ExternalIdAdminFilterFormDataProvider.php index 8791c33..98e73c1 100644 --- a/src/DataProviders/ExternalIdAdminFilterFormDataProvider.php +++ b/src/DataProviders/ExternalIdAdminFilterFormDataProvider.php @@ -2,7 +2,7 @@ namespace Crm\GooglePlayBillingModule\DataProviders; -use Crm\ApplicationModule\DataProvider\DataProviderException; +use Crm\ApplicationModule\Models\DataProvider\DataProviderException; use Crm\PaymentsModule\DataProviders\AdminFilterFormDataProviderInterface; use Crm\PaymentsModule\Repositories\PaymentsRepository; use Nette\Application\UI\Form; diff --git a/src/Gateways/GooglePlayBilling.php b/src/Gateways/GooglePlayBilling.php index 7f179c6..8fff880 100644 --- a/src/Gateways/GooglePlayBilling.php +++ b/src/Gateways/GooglePlayBilling.php @@ -2,7 +2,7 @@ namespace Crm\GooglePlayBillingModule\Gateways; -use Crm\ApplicationModule\Config\ApplicationConfig; +use Crm\ApplicationModule\Models\Config\ApplicationConfig; use Crm\GooglePlayBillingModule\GooglePlayBillingModule; use Crm\GooglePlayBillingModule\Models\GooglePlayValidatorFactory; use Crm\GooglePlayBillingModule\Models\SubscriptionResponseProcessor\SubscriptionResponseProcessorInterface; diff --git a/src/GooglePlayBillingModule.php b/src/GooglePlayBillingModule.php index 26881c1..3300519 100644 --- a/src/GooglePlayBillingModule.php +++ b/src/GooglePlayBillingModule.php @@ -6,13 +6,13 @@ use Crm\ApiModule\Models\Authorization\NoAuthorization; use Crm\ApiModule\Models\Router\ApiIdentifier; use Crm\ApiModule\Models\Router\ApiRoute; -use Crm\ApplicationModule\Commands\CommandsContainerInterface; +use Crm\ApplicationModule\Application\CommandsContainerInterface; +use Crm\ApplicationModule\Application\Managers\SeederManager; use Crm\ApplicationModule\CrmModule; -use Crm\ApplicationModule\DataProvider\DataProviderManager; -use Crm\ApplicationModule\Event\LazyEventEmitter; -use Crm\ApplicationModule\SeederManager; -use Crm\ApplicationModule\User\UserDataRegistrator; -use Crm\ApplicationModule\Widget\LazyWidgetManagerInterface; +use Crm\ApplicationModule\Models\DataProvider\DataProviderManager; +use Crm\ApplicationModule\Models\Event\LazyEventEmitter; +use Crm\ApplicationModule\Models\User\UserDataRegistrator; +use Crm\ApplicationModule\Models\Widget\LazyWidgetManagerInterface; use Crm\GooglePlayBillingModule\Api\DeveloperNotificationPushWebhookApiHandler; use Crm\GooglePlayBillingModule\Api\VerifyPurchaseApiHandler; use Crm\GooglePlayBillingModule\Commands\CreateMissingRecurrentPaymentsCommand; diff --git a/src/Models/GooglePlayValidatorFactory.php b/src/Models/GooglePlayValidatorFactory.php index 3f60a2c..7d487e7 100644 --- a/src/Models/GooglePlayValidatorFactory.php +++ b/src/Models/GooglePlayValidatorFactory.php @@ -2,7 +2,7 @@ namespace Crm\GooglePlayBillingModule\Models; -use Crm\ApplicationModule\Config\ApplicationConfig; +use Crm\ApplicationModule\Models\Config\ApplicationConfig; use Google\Client; use Google\Service\AndroidPublisher; use ReceiptValidator\GooglePlay\Validator; diff --git a/src/Models/User/GooglePlayUserDataProvider.php b/src/Models/User/GooglePlayUserDataProvider.php index a25c91d..87ae528 100644 --- a/src/Models/User/GooglePlayUserDataProvider.php +++ b/src/Models/User/GooglePlayUserDataProvider.php @@ -2,8 +2,8 @@ namespace Crm\GooglePlayBillingModule\Models\User; -use Crm\ApplicationModule\Config\Repository\ConfigsRepository; -use Crm\ApplicationModule\User\UserDataProviderInterface; +use Crm\ApplicationModule\Models\User\UserDataProviderInterface; +use Crm\ApplicationModule\Repositories\ConfigsRepository; use Crm\GooglePlayBillingModule\Gateways\GooglePlayBilling; use Crm\GooglePlayBillingModule\GooglePlayBillingModule; use Crm\GooglePlayBillingModule\Models\Config; diff --git a/src/Repositories/DeveloperNotificationsRepository.php b/src/Repositories/DeveloperNotificationsRepository.php index 4ae1831..e8b5703 100644 --- a/src/Repositories/DeveloperNotificationsRepository.php +++ b/src/Repositories/DeveloperNotificationsRepository.php @@ -3,8 +3,8 @@ namespace Crm\GooglePlayBillingModule\Repositories; use Crm\ApplicationModule\Hermes\HermesMessage; -use Crm\ApplicationModule\Repository; -use Crm\ApplicationModule\Repository\AuditLogRepository; +use Crm\ApplicationModule\Models\Database\Repository; +use Crm\ApplicationModule\Repositories\AuditLogRepository; use Nette\Database\Explorer; use Nette\Database\Table\ActiveRow; use Nette\Utils\DateTime; diff --git a/src/Repositories/GooglePlaySubscriptionTypesRepository.php b/src/Repositories/GooglePlaySubscriptionTypesRepository.php index 7b8515c..de66872 100644 --- a/src/Repositories/GooglePlaySubscriptionTypesRepository.php +++ b/src/Repositories/GooglePlaySubscriptionTypesRepository.php @@ -2,7 +2,7 @@ namespace Crm\GooglePlayBillingModule\Repositories; -use Crm\ApplicationModule\Repository; +use Crm\ApplicationModule\Models\Database\Repository; use Nette\Database\Table\ActiveRow; class GooglePlaySubscriptionTypesRepository extends Repository diff --git a/src/Repositories/PurchaseDeviceTokensRepository.php b/src/Repositories/PurchaseDeviceTokensRepository.php index 7917227..1ac8dd1 100644 --- a/src/Repositories/PurchaseDeviceTokensRepository.php +++ b/src/Repositories/PurchaseDeviceTokensRepository.php @@ -2,7 +2,7 @@ namespace Crm\GooglePlayBillingModule\Repositories; -use Crm\ApplicationModule\Repository; +use Crm\ApplicationModule\Models\Database\Repository; use Nette\Database\Table\ActiveRow; class PurchaseDeviceTokensRepository extends Repository diff --git a/src/Repositories/PurchaseTokensRepository.php b/src/Repositories/PurchaseTokensRepository.php index 3140ac2..b67cedc 100644 --- a/src/Repositories/PurchaseTokensRepository.php +++ b/src/Repositories/PurchaseTokensRepository.php @@ -2,7 +2,7 @@ namespace Crm\GooglePlayBillingModule\Repositories; -use Crm\ApplicationModule\Repository; +use Crm\ApplicationModule\Models\Database\Repository; use Nette\Database\Table\ActiveRow; use Nette\Utils\DateTime; diff --git a/src/Seeders/ConfigsSeeder.php b/src/Seeders/ConfigsSeeder.php index 00415d5..2d336a5 100644 --- a/src/Seeders/ConfigsSeeder.php +++ b/src/Seeders/ConfigsSeeder.php @@ -3,9 +3,9 @@ namespace Crm\GooglePlayBillingModule\Seeders; use Crm\ApplicationModule\Builder\ConfigBuilder; -use Crm\ApplicationModule\Config\ApplicationConfig; -use Crm\ApplicationModule\Config\Repository\ConfigCategoriesRepository; -use Crm\ApplicationModule\Config\Repository\ConfigsRepository; +use Crm\ApplicationModule\Models\Config\ApplicationConfig; +use Crm\ApplicationModule\Repositories\ConfigCategoriesRepository; +use Crm\ApplicationModule\Repositories\ConfigsRepository; use Crm\ApplicationModule\Seeders\ConfigsTrait; use Crm\ApplicationModule\Seeders\ISeeder; use Crm\GooglePlayBillingModule\Models\Config; diff --git a/src/Seeders/SnippetsSeeder.php b/src/Seeders/SnippetsSeeder.php index 11c8483..24252eb 100644 --- a/src/Seeders/SnippetsSeeder.php +++ b/src/Seeders/SnippetsSeeder.php @@ -2,8 +2,8 @@ namespace Crm\GooglePlayBillingModule\Seeders; +use Crm\ApplicationModule\Repositories\SnippetsRepository; use Crm\ApplicationModule\Seeders\ISeeder; -use Crm\ApplicationModule\Snippet\Repository\SnippetsRepository; use Symfony\Component\Console\Output\OutputInterface; class SnippetsSeeder implements ISeeder diff --git a/src/Tests/AccessTokenDataProviderTest.php b/src/Tests/AccessTokenDataProviderTest.php index 4c4ba84..d9c3755 100644 --- a/src/Tests/AccessTokenDataProviderTest.php +++ b/src/Tests/AccessTokenDataProviderTest.php @@ -2,7 +2,7 @@ namespace Crm\GooglePlayBillingModule\Tests; -use Crm\ApplicationModule\DataProvider\DataProviderManager; +use Crm\ApplicationModule\Models\DataProvider\DataProviderManager; use Crm\ApplicationModule\Tests\DatabaseTestCase; use Crm\GooglePlayBillingModule\DataProviders\AccessTokenDataProvider; use Crm\GooglePlayBillingModule\GooglePlayBillingModule; diff --git a/src/Tests/Hermes/DeveloperNotificationReceivedHandlerGracePeriodTest.php b/src/Tests/Hermes/DeveloperNotificationReceivedHandlerGracePeriodTest.php index 4c0a03f..f5332d4 100644 --- a/src/Tests/Hermes/DeveloperNotificationReceivedHandlerGracePeriodTest.php +++ b/src/Tests/Hermes/DeveloperNotificationReceivedHandlerGracePeriodTest.php @@ -2,9 +2,9 @@ namespace Crm\GooglePlayBillingModule\Tests\Hermes; -use Crm\ApplicationModule\Config\Repository\ConfigCategoriesRepository; -use Crm\ApplicationModule\Config\Repository\ConfigsRepository; use Crm\ApplicationModule\Hermes\HermesMessage; +use Crm\ApplicationModule\Repositories\ConfigCategoriesRepository; +use Crm\ApplicationModule\Repositories\ConfigsRepository; use Crm\ApplicationModule\Tests\DatabaseTestCase; use Crm\GooglePlayBillingModule\GooglePlayBillingModule; use Crm\GooglePlayBillingModule\Hermes\DeveloperNotificationReceivedHandler; diff --git a/src/Tests/Hermes/DeveloperNotificationReceivedHandlerOfferPeriodsTest.php b/src/Tests/Hermes/DeveloperNotificationReceivedHandlerOfferPeriodsTest.php index bdf717e..a45388c 100644 --- a/src/Tests/Hermes/DeveloperNotificationReceivedHandlerOfferPeriodsTest.php +++ b/src/Tests/Hermes/DeveloperNotificationReceivedHandlerOfferPeriodsTest.php @@ -2,9 +2,9 @@ namespace Crm\GooglePlayBillingModule\Tests\Hermes; -use Crm\ApplicationModule\Config\Repository\ConfigCategoriesRepository; -use Crm\ApplicationModule\Config\Repository\ConfigsRepository; use Crm\ApplicationModule\Hermes\HermesMessage; +use Crm\ApplicationModule\Repositories\ConfigCategoriesRepository; +use Crm\ApplicationModule\Repositories\ConfigsRepository; use Crm\ApplicationModule\Tests\DatabaseTestCase; use Crm\GooglePlayBillingModule\Hermes\DeveloperNotificationReceivedHandler; use Crm\GooglePlayBillingModule\Repositories\DeveloperNotificationsRepository; diff --git a/src/Tests/Hermes/DeveloperNotificationReceivedHandlerTest.php b/src/Tests/Hermes/DeveloperNotificationReceivedHandlerTest.php index 62bb6ba..b3fba64 100644 --- a/src/Tests/Hermes/DeveloperNotificationReceivedHandlerTest.php +++ b/src/Tests/Hermes/DeveloperNotificationReceivedHandlerTest.php @@ -2,10 +2,10 @@ namespace Crm\GooglePlayBillingModule\Tests\Hermes; -use Crm\ApplicationModule\Config\ApplicationConfig; -use Crm\ApplicationModule\Config\Repository\ConfigCategoriesRepository; -use Crm\ApplicationModule\Config\Repository\ConfigsRepository; use Crm\ApplicationModule\Hermes\HermesMessage; +use Crm\ApplicationModule\Models\Config\ApplicationConfig; +use Crm\ApplicationModule\Repositories\ConfigCategoriesRepository; +use Crm\ApplicationModule\Repositories\ConfigsRepository; use Crm\ApplicationModule\Seeders\ConfigsSeeder as ApplicationConfigsSeeder; use Crm\ApplicationModule\Tests\DatabaseTestCase; use Crm\GooglePlayBillingModule\Hermes\DeveloperNotificationReceivedHandler; diff --git a/src/Tests/Hermes/DeveloperNotificationReceivedHandlerUpgradeTest.php b/src/Tests/Hermes/DeveloperNotificationReceivedHandlerUpgradeTest.php index 28f09fc..62b492a 100644 --- a/src/Tests/Hermes/DeveloperNotificationReceivedHandlerUpgradeTest.php +++ b/src/Tests/Hermes/DeveloperNotificationReceivedHandlerUpgradeTest.php @@ -2,10 +2,10 @@ namespace Crm\GooglePlayBillingModule\Tests\Hermes; -use Crm\ApplicationModule\Config\ApplicationConfig; -use Crm\ApplicationModule\Config\Repository\ConfigCategoriesRepository; -use Crm\ApplicationModule\Config\Repository\ConfigsRepository; use Crm\ApplicationModule\Hermes\HermesMessage; +use Crm\ApplicationModule\Models\Config\ApplicationConfig; +use Crm\ApplicationModule\Repositories\ConfigCategoriesRepository; +use Crm\ApplicationModule\Repositories\ConfigsRepository; use Crm\ApplicationModule\Seeders\ConfigsSeeder as ApplicationConfigsSeeder; use Crm\ApplicationModule\Tests\DatabaseTestCase; use Crm\GooglePlayBillingModule\Hermes\DeveloperNotificationReceivedHandler; diff --git a/src/Tests/PairDeviceAccessTokensEventHandlerTest.php b/src/Tests/PairDeviceAccessTokensEventHandlerTest.php index 339f4be..89fbbf4 100644 --- a/src/Tests/PairDeviceAccessTokensEventHandlerTest.php +++ b/src/Tests/PairDeviceAccessTokensEventHandlerTest.php @@ -2,7 +2,7 @@ namespace Crm\GooglePlayBillingModule\Tests; -use Crm\ApplicationModule\Event\LazyEventEmitter; +use Crm\ApplicationModule\Models\Event\LazyEventEmitter; use Crm\ApplicationModule\Tests\DatabaseTestCase; use Crm\GooglePlayBillingModule\Events\PairDeviceAccessTokensEventHandler; use Crm\UsersModule\Events\PairDeviceAccessTokensEvent; diff --git a/src/Tests/RemovedAccessTokenEventHandlerTest.php b/src/Tests/RemovedAccessTokenEventHandlerTest.php index 5aad086..e34f58b 100644 --- a/src/Tests/RemovedAccessTokenEventHandlerTest.php +++ b/src/Tests/RemovedAccessTokenEventHandlerTest.php @@ -2,7 +2,7 @@ namespace Crm\GooglePlayBillingModule\Tests; -use Crm\ApplicationModule\Event\LazyEventEmitter; +use Crm\ApplicationModule\Models\Event\LazyEventEmitter; use Crm\ApplicationModule\Tests\DatabaseTestCase; use Crm\GooglePlayBillingModule\Events\RemovedAccessTokenEventHandler; use Crm\GooglePlayBillingModule\Gateways\GooglePlayBilling;