From 61f0151482f32b6aee1abc83d949b5fb8c649507 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 --- src/Api/CriteriaHandler.php | 2 +- src/Api/UsersApiHandler.php | 2 +- src/Commands/UpdateCountsCommand.php | 4 ++-- .../DashboardSegmentValueBaseWidget.php | 6 +++--- src/Models/Criteria/Generator.php | 4 ++-- src/Models/Params/BaseParam.php | 2 +- src/Presenters/StoredSegmentsPresenter.php | 12 ++++++------ src/Repositories/SegmentGroupsRepository.php | 2 +- src/Repositories/SegmentsRepository.php | 4 ++-- src/Repositories/SegmentsValuesRepository.php | 2 +- src/Seeders/ConfigSeeder.php | 6 +++--- src/SegmentModule.php | 10 +++++----- 12 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/Api/CriteriaHandler.php b/src/Api/CriteriaHandler.php index 27bb9e0..3706912 100644 --- a/src/Api/CriteriaHandler.php +++ b/src/Api/CriteriaHandler.php @@ -3,7 +3,7 @@ namespace Crm\SegmentModule\Api; use Crm\ApiModule\Models\Api\ApiHandler; -use Crm\ApplicationModule\Criteria\CriteriaStorage; +use Crm\ApplicationModule\Models\Criteria\CriteriaStorage; use Nette\Http\Response; use Tomaj\NetteApi\Response\JsonApiResponse; use Tomaj\NetteApi\Response\ResponseInterface; diff --git a/src/Api/UsersApiHandler.php b/src/Api/UsersApiHandler.php index f37eed3..061a58d 100644 --- a/src/Api/UsersApiHandler.php +++ b/src/Api/UsersApiHandler.php @@ -5,7 +5,7 @@ use Crm\ApiModule\Models\Api\ApiHandler; use Crm\ApiModule\Models\Params\InputParam; use Crm\ApiModule\Models\Params\ParamsProcessor; -use Crm\ApplicationModule\Criteria\CriteriaStorage; +use Crm\ApplicationModule\Models\Criteria\CriteriaStorage; use Crm\SegmentModule\Models\Criteria\InvalidCriteriaException; use Crm\SegmentModule\Models\SegmentFactoryInterface; use Crm\SegmentModule\Repositories\SegmentsRepository; diff --git a/src/Commands/UpdateCountsCommand.php b/src/Commands/UpdateCountsCommand.php index 6c3626a..29202a9 100644 --- a/src/Commands/UpdateCountsCommand.php +++ b/src/Commands/UpdateCountsCommand.php @@ -3,8 +3,8 @@ namespace Crm\SegmentModule\Commands; use Crm\ApplicationModule\Commands\DecoratedCommandTrait; -use Crm\ApplicationModule\RedisClientFactory; -use Crm\ApplicationModule\RedisClientTrait; +use Crm\ApplicationModule\Models\Redis\RedisClientFactory; +use Crm\ApplicationModule\Models\Redis\RedisClientTrait; use Crm\SegmentModule\DI\SegmentRecalculationConfig; use Crm\SegmentModule\Models\SegmentFactoryInterface; use Crm\SegmentModule\Repositories\SegmentsRepository; diff --git a/src/Components/DashboardSegmentValueBaseWidget/DashboardSegmentValueBaseWidget.php b/src/Components/DashboardSegmentValueBaseWidget/DashboardSegmentValueBaseWidget.php index 935400e..24dd447 100644 --- a/src/Components/DashboardSegmentValueBaseWidget/DashboardSegmentValueBaseWidget.php +++ b/src/Components/DashboardSegmentValueBaseWidget/DashboardSegmentValueBaseWidget.php @@ -2,9 +2,9 @@ namespace Crm\SegmentModule\Components\DashboardSegmentValueBaseWidget; -use Crm\ApplicationModule\Cache\CacheRepository; -use Crm\ApplicationModule\Widget\BaseLazyWidget; -use Crm\ApplicationModule\Widget\LazyWidgetManager; +use Crm\ApplicationModule\Models\Widget\BaseLazyWidget; +use Crm\ApplicationModule\Models\Widget\LazyWidgetManager; +use Crm\ApplicationModule\Repositories\CacheRepository; use Crm\SegmentModule\Models\SegmentFactoryInterface; use Crm\SegmentModule\Repositories\SegmentsRepository; use Crm\SegmentModule\Repositories\SegmentsValuesRepository; diff --git a/src/Models/Criteria/Generator.php b/src/Models/Criteria/Generator.php index 52f9afe..8de1fce 100644 --- a/src/Models/Criteria/Generator.php +++ b/src/Models/Criteria/Generator.php @@ -2,8 +2,8 @@ namespace Crm\SegmentModule\Models\Criteria; -use Crm\ApplicationModule\Criteria\CriteriaInterface; -use Crm\ApplicationModule\Criteria\CriteriaStorage; +use Crm\ApplicationModule\Models\Criteria\CriteriaInterface; +use Crm\ApplicationModule\Models\Criteria\CriteriaStorage; use Crm\SegmentModule\Models\Params\ParamsBag; use Nette\Utils\Strings; diff --git a/src/Models/Params/BaseParam.php b/src/Models/Params/BaseParam.php index 227b029..a56aa29 100644 --- a/src/Models/Params/BaseParam.php +++ b/src/Models/Params/BaseParam.php @@ -2,7 +2,7 @@ namespace Crm\SegmentModule\Models\Params; -use Crm\ApplicationModule\Criteria\CriteriaParam; +use Crm\ApplicationModule\Models\Criteria\CriteriaParam; use Crm\SegmentModule\Models\Criteria\InvalidCriteriaException; use Nette\Utils\DateTime; diff --git a/src/Presenters/StoredSegmentsPresenter.php b/src/Presenters/StoredSegmentsPresenter.php index e9ecc8f..0c4bbd5 100644 --- a/src/Presenters/StoredSegmentsPresenter.php +++ b/src/Presenters/StoredSegmentsPresenter.php @@ -3,12 +3,12 @@ namespace Crm\SegmentModule\Presenters; use Crm\AdminModule\Presenters\AdminPresenter; -use Crm\ApplicationModule\Components\Graphs\GoogleLineGraphGroupControlFactoryInterface; -use Crm\ApplicationModule\ExcelFactory; -use Crm\ApplicationModule\Graphs\Criteria; -use Crm\ApplicationModule\Graphs\GraphDataItem; -use Crm\ApplicationModule\Widget\LazyWidgetManager; -use Crm\ApplicationModule\Widget\WidgetManager; +use Crm\ApplicationModule\Components\Graphs\GoogleLineGraphGroup\GoogleLineGraphGroupControlFactoryInterface; +use Crm\ApplicationModule\Models\Exports\ExcelFactory; +use Crm\ApplicationModule\Models\Graphs\Criteria; +use Crm\ApplicationModule\Models\Graphs\GraphDataItem; +use Crm\ApplicationModule\Models\Widget\LazyWidgetManager; +use Crm\ApplicationModule\Models\Widget\WidgetManager; use Crm\SegmentModule\Forms\SegmentFormFactory; use Crm\SegmentModule\Forms\SegmentRecalculationSettingsFormFactory; use Crm\SegmentModule\Models\SegmentFactoryInterface; diff --git a/src/Repositories/SegmentGroupsRepository.php b/src/Repositories/SegmentGroupsRepository.php index 17f1c8d..710ed95 100644 --- a/src/Repositories/SegmentGroupsRepository.php +++ b/src/Repositories/SegmentGroupsRepository.php @@ -2,7 +2,7 @@ namespace Crm\SegmentModule\Repositories; -use Crm\ApplicationModule\Repository; +use Crm\ApplicationModule\Models\Database\Repository; use Nette\Database\Table\ActiveRow; use Nette\Utils\DateTime; diff --git a/src/Repositories/SegmentsRepository.php b/src/Repositories/SegmentsRepository.php index f099755..c89df9f 100644 --- a/src/Repositories/SegmentsRepository.php +++ b/src/Repositories/SegmentsRepository.php @@ -2,8 +2,8 @@ namespace Crm\SegmentModule\Repositories; -use Crm\ApplicationModule\Repository; -use Crm\ApplicationModule\Repository\AuditLogRepository; +use Crm\ApplicationModule\Models\Database\Repository; +use Crm\ApplicationModule\Repositories\AuditLogRepository; use DateTime; use Nette\Database\Explorer; use Nette\Database\Table\ActiveRow; diff --git a/src/Repositories/SegmentsValuesRepository.php b/src/Repositories/SegmentsValuesRepository.php index 7a8851d..dbdddd2 100644 --- a/src/Repositories/SegmentsValuesRepository.php +++ b/src/Repositories/SegmentsValuesRepository.php @@ -2,7 +2,7 @@ namespace Crm\SegmentModule\Repositories; -use Crm\ApplicationModule\Repository; +use Crm\ApplicationModule\Models\Database\Repository; use Nette\Database\Explorer; use Nette\Database\Table\ActiveRow; use Nette\Utils\DateTime; diff --git a/src/Seeders/ConfigSeeder.php b/src/Seeders/ConfigSeeder.php index d4c9240..ce64f1a 100644 --- a/src/Seeders/ConfigSeeder.php +++ b/src/Seeders/ConfigSeeder.php @@ -3,9 +3,9 @@ namespace Crm\SegmentModule\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 Symfony\Component\Console\Output\OutputInterface; diff --git a/src/SegmentModule.php b/src/SegmentModule.php index a3c7bed..d4c5263 100644 --- a/src/SegmentModule.php +++ b/src/SegmentModule.php @@ -7,12 +7,12 @@ use Crm\ApiModule\Models\Authorization\BearerTokenAuthorization; use Crm\ApiModule\Models\Router\ApiIdentifier; use Crm\ApiModule\Models\Router\ApiRoute; -use Crm\ApplicationModule\AssetsManager; -use Crm\ApplicationModule\Commands\CommandsContainerInterface; +use Crm\ApplicationModule\Application\CommandsContainerInterface; +use Crm\ApplicationModule\Application\Managers\AssetsManager; +use Crm\ApplicationModule\Application\Managers\SeederManager; use Crm\ApplicationModule\CrmModule; -use Crm\ApplicationModule\Menu\MenuContainerInterface; -use Crm\ApplicationModule\Menu\MenuItem; -use Crm\ApplicationModule\SeederManager; +use Crm\ApplicationModule\Models\Menu\MenuContainerInterface; +use Crm\ApplicationModule\Models\Menu\MenuItem; use Crm\SegmentModule\Api\CheckApiHandler; use Crm\SegmentModule\Api\CountsHandler; use Crm\SegmentModule\Api\CreateOrUpdateSegmentHandler;