From adff5b84f949edb70820d31e8292d5d6b5777c70 Mon Sep 17 00:00:00 2001 From: alexmerlin Date: Sat, 3 Aug 2024 07:13:02 +0300 Subject: [PATCH] Issue #271: Fixed namespace across the application Signed-off-by: alexmerlin --- composer.json | 12 +++---- config/autoload/authentication.global.php | 4 +-- config/autoload/dependencies.global.php | 4 +-- config/autoload/doctrine.global.php | 2 +- config/autoload/local.test.php.dist | 2 +- config/config.php | 6 ++-- config/pipeline.php | 2 +- data/doctrine/fixtures/AdminLoader.php | 4 +-- data/doctrine/fixtures/AdminRoleLoader.php | 2 +- .../src/Adapter/AuthenticationAdapter.php | 8 ++--- src/Admin/src/ConfigProvider.php | 32 ++++++++--------- src/Admin/src/Controller/AdminController.php | 36 +++++++++---------- .../src/Delegator/AdminRoleDelegator.php | 6 ++-- src/Admin/src/Entity/Admin.php | 10 +++--- src/Admin/src/Entity/AdminIdentity.php | 2 +- src/Admin/src/Entity/AdminInterface.php | 2 +- src/Admin/src/Entity/AdminLogin.php | 8 ++--- src/Admin/src/Entity/AdminRole.php | 8 ++--- .../Factory/AuthenticationServiceFactory.php | 4 +-- src/Admin/src/Form/AccountForm.php | 4 +-- src/Admin/src/Form/AdminDeleteForm.php | 4 +-- src/Admin/src/Form/AdminForm.php | 6 ++-- src/Admin/src/Form/ChangePasswordForm.php | 4 +-- src/Admin/src/Form/LoginForm.php | 4 +-- src/Admin/src/FormData/AdminFormData.php | 4 +-- .../src/InputFilter/AccountInputFilter.php | 4 +-- .../InputFilter/AdminDeleteInputFilter.php | 4 +-- .../src/InputFilter/AdminInputFilter.php | 6 ++-- .../InputFilter/ChangePasswordInputFilter.php | 4 +-- .../src/InputFilter/EditAdminInputFilter.php | 6 ++-- .../src/InputFilter/LoginInputFilter.php | 4 +-- .../src/Repository/AdminLoginRepository.php | 6 ++-- src/Admin/src/Repository/AdminRepository.php | 8 ++--- .../src/Repository/AdminRoleRepository.php | 6 ++-- src/Admin/src/RoutesDelegator.php | 4 +-- src/Admin/src/Service/AdminService.php | 18 +++++----- .../src/Service/AdminServiceInterface.php | 8 ++--- .../Common/ServerRequestAwareInterface.php | 2 +- .../src/Common/ServerRequestAwareTrait.php | 2 +- src/App/src/ConfigProvider.php | 16 ++++----- .../src/Controller/DashboardController.php | 4 +-- src/App/src/Controller/PageController.php | 4 +-- src/App/src/Entity/AbstractEntity.php | 2 +- src/App/src/Entity/TimestampsTrait.php | 2 +- src/App/src/Exception/IdentityException.php | 4 +-- src/App/src/Exception/ORMException.php | 2 +- src/App/src/Factory/AuthMiddlewareFactory.php | 4 +-- .../Factory/EntityListenerResolverFactory.php | 4 +-- src/App/src/Factory/FormsPluginFactory.php | 4 +-- src/App/src/InputFilter/Input/CsrfInput.php | 4 +-- src/App/src/Message.php | 2 +- src/App/src/Middleware/AuthMiddleware.php | 2 +- src/App/src/Plugin/FormsPlugin.php | 2 +- src/App/src/Repository/AbstractRepository.php | 2 +- .../src/Resolver/EntityListenerResolver.php | 2 +- src/App/src/RoutesDelegator.php | 6 ++-- src/App/src/Service/IpService.php | 2 +- src/Setting/src/ConfigProvider.php | 10 +++--- .../src/Controller/SettingController.php | 20 +++++------ src/Setting/src/Entity/Setting.php | 10 +++--- .../Input/SettingIdentifierInput.php | 6 ++-- .../InputFilter/Input/SettingValueInput.php | 4 +-- .../src/InputFilter/SettingInputFilter.php | 6 ++-- .../src/Repository/SettingRepository.php | 6 ++-- src/Setting/src/RoutesDelegator.php | 4 +-- src/Setting/src/Service/SettingService.php | 8 ++--- test/Common/TestCase.php | 2 +- test/Common/TestMode.php | 2 +- test/Functional/DashboardTest.php | 2 +- test/Functional/FunctionalTest.php | 4 +-- test/Functional/HttpRequestTrait.php | 2 +- test/Functional/HttpResponseTrait.php | 2 +- .../Adapter/AuthenticationAdapterTest.php | 10 +++--- test/Unit/Admin/ConfigProviderTest.php | 26 +++++++------- .../Admin/Controller/AdminControllerTest.php | 12 +++---- .../Delegator/AdminRoleDelegatorTest.php | 10 +++--- test/Unit/Admin/Entity/AdminIdentityTest.php | 10 +++--- test/Unit/Admin/Entity/AdminInterfaceTest.php | 8 ++--- test/Unit/Admin/Entity/AdminLoginTest.php | 8 ++--- test/Unit/Admin/Entity/AdminRoleTest.php | 8 ++--- test/Unit/Admin/Entity/AdminTest.php | 10 +++--- .../AuthenticationServiceFactoryTest.php | 8 ++--- test/Unit/Admin/Form/AccountFormTest.php | 6 ++-- test/Unit/Admin/Form/AdminFormTest.php | 10 +++--- .../Admin/Form/ChangePasswordFormTest.php | 6 ++-- test/Unit/Admin/Form/FormTrait.php | 2 +- test/Unit/Admin/Form/LoginFormTest.php | 6 ++-- .../Unit/Admin/FormData/AdminFormDataTest.php | 10 +++--- .../InputFilter/AccountInputFilterTest.php | 6 ++-- .../InputFilter/AdminInputFilterTest.php | 10 +++--- .../ChangePasswordInputFilterTest.php | 6 ++-- .../InputFilter/EditAdminInputFilterTest.php | 10 +++--- .../InputFilter/LoginInputFilterTest.php | 6 ++-- .../Repository/AdminLoginRepositoryTest.php | 8 ++--- .../Admin/Repository/AdminRepositoryTest.php | 8 ++--- .../Repository/AdminRoleRepositoryTest.php | 8 ++--- test/Unit/Admin/RoutesDelegatorTest.php | 6 ++-- test/Unit/Admin/Service/AdminServiceTest.php | 12 +++---- .../App/Common/ServerRequestAwareTest.php | 8 ++--- test/Unit/App/ConfigProviderTest.php | 14 ++++---- .../Controller/DashboardControllerTest.php | 6 ++-- test/Unit/App/Entity/AbstractEntityTest.php | 6 ++-- .../App/Factory/AuthMiddlewareFactoryTest.php | 8 ++--- .../EntityListenerResolverFactoryTest.php | 8 ++--- .../App/Factory/FormsPluginFactoryTest.php | 8 ++--- .../App/Middleware/AuthMiddlewareTest.php | 6 ++-- test/Unit/App/Plugin/FormsPluginTest.php | 8 ++--- .../App/Repository/AbstractRepositoryTest.php | 8 ++--- .../Resolver/EntityListenerResolverTest.php | 6 ++-- test/Unit/App/RoutesDelegatorTest.php | 6 ++-- test/Unit/App/Service/IpServiceTest.php | 6 ++-- test/Unit/Setting/ConfigProviderTest.php | 14 ++++---- .../Controller/SettingControllerTest.php | 10 +++--- .../Unit/Setting/Entity/SettingEntityTest.php | 10 +++--- .../InputFilter/SettingInputFilterTest.php | 8 ++--- .../Repository/SettingRepositoryTest.php | 8 ++--- test/Unit/Setting/RoutesDelegatorTest.php | 6 ++-- .../Setting/Service/SettingServiceTest.php | 8 ++--- test/Unit/UnitTest.php | 4 +-- 119 files changed, 407 insertions(+), 407 deletions(-) diff --git a/composer.json b/composer.json index bf45400d..dae643d1 100644 --- a/composer.json +++ b/composer.json @@ -68,16 +68,16 @@ }, "autoload": { "psr-4": { - "Frontend\\App\\": "src/App/src/", - "Frontend\\Admin\\": "src/Admin/src/", - "Frontend\\Setting\\": "src/Setting/src/" + "Admin\\App\\": "src/App/src/", + "Admin\\Admin\\": "src/Admin/src/", + "Admin\\Setting\\": "src/Setting/src/" } }, "autoload-dev": { "psr-4": { - "FrontendTest\\Common\\": "test/Common", - "FrontendTest\\Functional\\": "test/Functional/", - "FrontendTest\\Unit\\": "test/Unit" + "AdminTest\\Common\\": "test/Common", + "AdminTest\\Functional\\": "test/Functional/", + "AdminTest\\Unit\\": "test/Unit" } }, "scripts": { diff --git a/config/autoload/authentication.global.php b/config/autoload/authentication.global.php index 02424256..7e655315 100644 --- a/config/autoload/authentication.global.php +++ b/config/autoload/authentication.global.php @@ -2,7 +2,7 @@ declare(strict_types=1); -use Frontend\Admin\Entity\Admin; +use Admin\Admin\Entity\Admin; return [ 'doctrine' => [ @@ -12,7 +12,7 @@ 'identity_class' => Admin::class, 'identity_property' => 'identity', 'credential_property' => 'password', - 'credential_callable' => 'Frontend\Admin\Doctrine\AdminAuthentication::verifyCredential', + 'credential_callable' => 'Admin\Admin\Doctrine\AdminAuthentication::verifyCredential', 'messages' => [ 'success' => 'Authenticated successfully.', 'not_found' => 'Identity not found.', diff --git a/config/autoload/dependencies.global.php b/config/autoload/dependencies.global.php index 3ebc4060..a85e156f 100644 --- a/config/autoload/dependencies.global.php +++ b/config/autoload/dependencies.global.php @@ -2,6 +2,8 @@ declare(strict_types=1); +use Admin\App\Factory\AuthMiddlewareFactory; +use Admin\App\Middleware\AuthMiddleware; use Dot\Authorization\AuthorizationInterface; use Dot\ErrorHandler\ErrorHandlerInterface; use Dot\ErrorHandler\LogErrorHandler; @@ -9,8 +11,6 @@ use Dot\Mail\Factory\MailServiceAbstractFactory; use Dot\Mail\Service\MailService; use Dot\Rbac\Authorization\AuthorizationService; -use Frontend\App\Factory\AuthMiddlewareFactory; -use Frontend\App\Middleware\AuthMiddleware; return [ // Provides application-wide services. diff --git a/config/autoload/doctrine.global.php b/config/autoload/doctrine.global.php index 7207077f..3b89f8bd 100644 --- a/config/autoload/doctrine.global.php +++ b/config/autoload/doctrine.global.php @@ -2,10 +2,10 @@ declare(strict_types=1); +use Admin\App\Resolver\EntityListenerResolver; use Doctrine\Persistence\Mapping\Driver\MappingDriverChain; use Dot\Cache\Adapter\ArrayAdapter; use Dot\Cache\Adapter\FilesystemAdapter; -use Frontend\App\Resolver\EntityListenerResolver; use Ramsey\Uuid\Doctrine\UuidBinaryOrderedTimeType; use Ramsey\Uuid\Doctrine\UuidBinaryType; use Ramsey\Uuid\Doctrine\UuidType; diff --git a/config/autoload/local.test.php.dist b/config/autoload/local.test.php.dist index b7de6fd5..0fc1efe8 100644 --- a/config/autoload/local.test.php.dist +++ b/config/autoload/local.test.php.dist @@ -2,7 +2,7 @@ declare(strict_types=1); -use FrontendTest\Common\TestMode; +use AdminTest\Common\TestMode; if (! TestMode::isEnabled()) { return []; diff --git a/config/config.php b/config/config.php index 240b5c06..f3efa4cb 100644 --- a/config/config.php +++ b/config/config.php @@ -48,9 +48,9 @@ new ArrayProvider($cacheConfig), // DotKernel modules - Frontend\App\ConfigProvider::class, - Frontend\Admin\ConfigProvider::class, - Frontend\Setting\ConfigProvider::class, + Admin\App\ConfigProvider::class, + Admin\Admin\ConfigProvider::class, + Admin\Setting\ConfigProvider::class, // Load application config in a pre-defined order in such a way that local settings // overwrite global settings. (Loaded as first to last): diff --git a/config/pipeline.php b/config/pipeline.php index e6472154..13787ca6 100644 --- a/config/pipeline.php +++ b/config/pipeline.php @@ -2,12 +2,12 @@ declare(strict_types=1); +use Admin\App\Middleware\AuthMiddleware; use Dot\ErrorHandler\ErrorHandlerInterface; use Dot\Navigation\NavigationMiddleware; use Dot\Rbac\Guard\Middleware\ForbiddenHandler; use Dot\Rbac\Guard\Middleware\RbacGuardMiddleware; use Dot\Session\SessionMiddleware; -use Frontend\App\Middleware\AuthMiddleware; use Mezzio\Application; use Mezzio\Cors\Middleware\CorsMiddleware; use Mezzio\Handler\NotFoundHandler; diff --git a/data/doctrine/fixtures/AdminLoader.php b/data/doctrine/fixtures/AdminLoader.php index ea2152e5..8dd78b91 100644 --- a/data/doctrine/fixtures/AdminLoader.php +++ b/data/doctrine/fixtures/AdminLoader.php @@ -4,11 +4,11 @@ namespace Admin\Fixtures; +use Admin\Admin\Entity\Admin; +use Admin\Admin\Entity\AdminRole; use Doctrine\Common\DataFixtures\DependentFixtureInterface; use Doctrine\Common\DataFixtures\FixtureInterface; use Doctrine\Persistence\ObjectManager; -use Frontend\Admin\Entity\Admin; -use Frontend\Admin\Entity\AdminRole; use function password_hash; diff --git a/data/doctrine/fixtures/AdminRoleLoader.php b/data/doctrine/fixtures/AdminRoleLoader.php index cefe948d..745be811 100644 --- a/data/doctrine/fixtures/AdminRoleLoader.php +++ b/data/doctrine/fixtures/AdminRoleLoader.php @@ -4,9 +4,9 @@ namespace Admin\Fixtures; +use Admin\Admin\Entity\AdminRole; use Doctrine\Common\DataFixtures\FixtureInterface; use Doctrine\Persistence\ObjectManager; -use Frontend\Admin\Entity\AdminRole; class AdminRoleLoader implements FixtureInterface { diff --git a/src/Admin/src/Adapter/AuthenticationAdapter.php b/src/Admin/src/Adapter/AuthenticationAdapter.php index 274fdb9f..184009b4 100644 --- a/src/Admin/src/Adapter/AuthenticationAdapter.php +++ b/src/Admin/src/Adapter/AuthenticationAdapter.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace Frontend\Admin\Adapter; +namespace Admin\Admin\Adapter; +use Admin\Admin\Entity\Admin; +use Admin\Admin\Entity\AdminIdentity; +use Admin\Admin\Entity\AdminRole; use Doctrine\ORM\EntityManager; use Dot\DependencyInjection\Attribute\Inject; use Exception; -use Frontend\Admin\Entity\Admin; -use Frontend\Admin\Entity\AdminIdentity; -use Frontend\Admin\Entity\AdminRole; use Laminas\Authentication\Adapter\AdapterInterface; use Laminas\Authentication\Result; diff --git a/src/Admin/src/ConfigProvider.php b/src/Admin/src/ConfigProvider.php index 1808132c..f0643849 100644 --- a/src/Admin/src/ConfigProvider.php +++ b/src/Admin/src/ConfigProvider.php @@ -2,25 +2,25 @@ declare(strict_types=1); -namespace Frontend\Admin; +namespace Admin\Admin; +use Admin\Admin\Adapter\AuthenticationAdapter; +use Admin\Admin\Controller\AdminController; +use Admin\Admin\Delegator\AdminRoleDelegator; +use Admin\Admin\Entity\Admin; +use Admin\Admin\Entity\AdminInterface; +use Admin\Admin\Factory\AuthenticationServiceFactory; +use Admin\Admin\Form\AdminDeleteForm; +use Admin\Admin\Form\AdminForm; +use Admin\Admin\Form\ChangePasswordForm; +use Admin\Admin\Form\LoginForm; +use Admin\Admin\Repository\AdminRepository; +use Admin\Admin\Repository\AdminRoleRepository; +use Admin\Admin\Service\AdminService; +use Admin\Admin\Service\AdminServiceInterface; use Doctrine\ORM\Mapping\Driver\AttributeDriver; use Dot\DependencyInjection\Factory\AttributedRepositoryFactory; use Dot\DependencyInjection\Factory\AttributedServiceFactory; -use Frontend\Admin\Adapter\AuthenticationAdapter; -use Frontend\Admin\Controller\AdminController; -use Frontend\Admin\Delegator\AdminRoleDelegator; -use Frontend\Admin\Entity\Admin; -use Frontend\Admin\Entity\AdminInterface; -use Frontend\Admin\Factory\AuthenticationServiceFactory; -use Frontend\Admin\Form\AdminDeleteForm; -use Frontend\Admin\Form\AdminForm; -use Frontend\Admin\Form\ChangePasswordForm; -use Frontend\Admin\Form\LoginForm; -use Frontend\Admin\Repository\AdminRepository; -use Frontend\Admin\Repository\AdminRoleRepository; -use Frontend\Admin\Service\AdminService; -use Frontend\Admin\Service\AdminServiceInterface; use Laminas\Authentication\AuthenticationService; use Laminas\Form\ElementFactory; use Mezzio\Application; @@ -94,7 +94,7 @@ public function getDoctrineConfig(): array 'driver' => [ 'orm_default' => [ 'drivers' => [ - 'Frontend\Admin\Entity' => 'AdminEntities', + 'Admin\Admin\Entity' => 'AdminEntities', ], ], 'AdminEntities' => [ diff --git a/src/Admin/src/Controller/AdminController.php b/src/Admin/src/Controller/AdminController.php index bd7aabe4..e125d4e8 100644 --- a/src/Admin/src/Controller/AdminController.php +++ b/src/Admin/src/Controller/AdminController.php @@ -2,30 +2,30 @@ declare(strict_types=1); -namespace Frontend\Admin\Controller; - +namespace Admin\Admin\Controller; + +use Admin\Admin\Adapter\AuthenticationAdapter; +use Admin\Admin\Entity\Admin; +use Admin\Admin\Entity\AdminIdentity; +use Admin\Admin\Entity\AdminLogin; +use Admin\Admin\Form\AccountForm; +use Admin\Admin\Form\AdminDeleteForm; +use Admin\Admin\Form\AdminForm; +use Admin\Admin\Form\ChangePasswordForm; +use Admin\Admin\Form\LoginForm; +use Admin\Admin\FormData\AdminFormData; +use Admin\Admin\InputFilter\EditAdminInputFilter; +use Admin\Admin\Service\AdminServiceInterface; +use Admin\App\Common\ServerRequestAwareTrait; +use Admin\App\Exception\IdentityException; +use Admin\App\Message; +use Admin\App\Plugin\FormsPlugin; use Doctrine\ORM\NonUniqueResultException; use Dot\Controller\AbstractActionController; use Dot\DependencyInjection\Attribute\Inject; use Dot\FlashMessenger\FlashMessengerInterface; use Fig\Http\Message\RequestMethodInterface; use Fig\Http\Message\StatusCodeInterface; -use Frontend\Admin\Adapter\AuthenticationAdapter; -use Frontend\Admin\Entity\Admin; -use Frontend\Admin\Entity\AdminIdentity; -use Frontend\Admin\Entity\AdminLogin; -use Frontend\Admin\Form\AccountForm; -use Frontend\Admin\Form\AdminDeleteForm; -use Frontend\Admin\Form\AdminForm; -use Frontend\Admin\Form\ChangePasswordForm; -use Frontend\Admin\Form\LoginForm; -use Frontend\Admin\FormData\AdminFormData; -use Frontend\Admin\InputFilter\EditAdminInputFilter; -use Frontend\Admin\Service\AdminServiceInterface; -use Frontend\App\Common\ServerRequestAwareTrait; -use Frontend\App\Exception\IdentityException; -use Frontend\App\Message; -use Frontend\App\Plugin\FormsPlugin; use Laminas\Authentication\AuthenticationServiceInterface; use Laminas\Authentication\Exception\ExceptionInterface; use Laminas\Diactoros\Response\HtmlResponse; diff --git a/src/Admin/src/Delegator/AdminRoleDelegator.php b/src/Admin/src/Delegator/AdminRoleDelegator.php index 5657c10f..46971c93 100644 --- a/src/Admin/src/Delegator/AdminRoleDelegator.php +++ b/src/Admin/src/Delegator/AdminRoleDelegator.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace Frontend\Admin\Delegator; +namespace Admin\Admin\Delegator; -use Frontend\Admin\Form\AdminForm; -use Frontend\Admin\Service\AdminService; +use Admin\Admin\Form\AdminForm; +use Admin\Admin\Service\AdminService; use Laminas\ServiceManager\Factory\DelegatorFactoryInterface; use Psr\Container\ContainerExceptionInterface; use Psr\Container\ContainerInterface; diff --git a/src/Admin/src/Entity/Admin.php b/src/Admin/src/Entity/Admin.php index c7592d66..c0f6d2f8 100644 --- a/src/Admin/src/Entity/Admin.php +++ b/src/Admin/src/Entity/Admin.php @@ -2,15 +2,15 @@ declare(strict_types=1); -namespace Frontend\Admin\Entity; +namespace Admin\Admin\Entity; +use Admin\Admin\Repository\AdminRepository; +use Admin\App\Entity\AbstractEntity; +use Admin\App\Entity\TimestampsTrait; +use Admin\Setting\Entity\Setting; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; -use Frontend\Admin\Repository\AdminRepository; -use Frontend\App\Entity\AbstractEntity; -use Frontend\App\Entity\TimestampsTrait; -use Frontend\Setting\Entity\Setting; use function array_map; use function password_verify; diff --git a/src/Admin/src/Entity/AdminIdentity.php b/src/Admin/src/Entity/AdminIdentity.php index a9821eeb..d2209c0a 100644 --- a/src/Admin/src/Entity/AdminIdentity.php +++ b/src/Admin/src/Entity/AdminIdentity.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Frontend\Admin\Entity; +namespace Admin\Admin\Entity; use Mezzio\Authentication\UserInterface; diff --git a/src/Admin/src/Entity/AdminInterface.php b/src/Admin/src/Entity/AdminInterface.php index b440ddfd..a6f17451 100644 --- a/src/Admin/src/Entity/AdminInterface.php +++ b/src/Admin/src/Entity/AdminInterface.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Frontend\Admin\Entity; +namespace Admin\Admin\Entity; use Doctrine\Common\Collections\ArrayCollection; diff --git a/src/Admin/src/Entity/AdminLogin.php b/src/Admin/src/Entity/AdminLogin.php index 37b2b523..4203634d 100644 --- a/src/Admin/src/Entity/AdminLogin.php +++ b/src/Admin/src/Entity/AdminLogin.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace Frontend\Admin\Entity; +namespace Admin\Admin\Entity; +use Admin\Admin\Repository\AdminLoginRepository; +use Admin\App\Entity\AbstractEntity; +use Admin\App\Entity\TimestampsTrait; use Doctrine\ORM\Mapping as ORM; -use Frontend\Admin\Repository\AdminLoginRepository; -use Frontend\App\Entity\AbstractEntity; -use Frontend\App\Entity\TimestampsTrait; #[ORM\Entity(repositoryClass: AdminLoginRepository::class)] #[ORM\Table(name: 'admin_login')] diff --git a/src/Admin/src/Entity/AdminRole.php b/src/Admin/src/Entity/AdminRole.php index aba70015..c13c2a56 100644 --- a/src/Admin/src/Entity/AdminRole.php +++ b/src/Admin/src/Entity/AdminRole.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace Frontend\Admin\Entity; +namespace Admin\Admin\Entity; +use Admin\Admin\Repository\AdminRoleRepository; +use Admin\App\Entity\AbstractEntity; +use Admin\App\Entity\TimestampsTrait; use Doctrine\ORM\Mapping as ORM; -use Frontend\Admin\Repository\AdminRoleRepository; -use Frontend\App\Entity\AbstractEntity; -use Frontend\App\Entity\TimestampsTrait; #[ORM\Entity(repositoryClass: AdminRoleRepository::class)] #[ORM\Table(name: 'admin_role')] diff --git a/src/Admin/src/Factory/AuthenticationServiceFactory.php b/src/Admin/src/Factory/AuthenticationServiceFactory.php index 71cab211..4a5b1126 100644 --- a/src/Admin/src/Factory/AuthenticationServiceFactory.php +++ b/src/Admin/src/Factory/AuthenticationServiceFactory.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Frontend\Admin\Factory; +namespace Admin\Admin\Factory; -use Frontend\Admin\Adapter\AuthenticationAdapter; +use Admin\Admin\Adapter\AuthenticationAdapter; use Laminas\Authentication\AuthenticationService; use Psr\Container\ContainerExceptionInterface; use Psr\Container\ContainerInterface; diff --git a/src/Admin/src/Form/AccountForm.php b/src/Admin/src/Form/AccountForm.php index ae94c368..45afbbd5 100644 --- a/src/Admin/src/Form/AccountForm.php +++ b/src/Admin/src/Form/AccountForm.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Frontend\Admin\Form; +namespace Admin\Admin\Form; -use Frontend\Admin\InputFilter\AccountInputFilter; +use Admin\Admin\InputFilter\AccountInputFilter; use Laminas\Form\Element\Csrf; use Laminas\Form\Form; use Laminas\Form\FormInterface; diff --git a/src/Admin/src/Form/AdminDeleteForm.php b/src/Admin/src/Form/AdminDeleteForm.php index 06016336..afae14a7 100644 --- a/src/Admin/src/Form/AdminDeleteForm.php +++ b/src/Admin/src/Form/AdminDeleteForm.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Frontend\Admin\Form; +namespace Admin\Admin\Form; -use Frontend\Admin\InputFilter\AdminDeleteInputFilter; +use Admin\Admin\InputFilter\AdminDeleteInputFilter; use Laminas\Form\Element\Csrf; use Laminas\Form\Form; use Laminas\Form\FormInterface; diff --git a/src/Admin/src/Form/AdminForm.php b/src/Admin/src/Form/AdminForm.php index fbd6a6b2..6f4c20bc 100644 --- a/src/Admin/src/Form/AdminForm.php +++ b/src/Admin/src/Form/AdminForm.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace Frontend\Admin\Form; +namespace Admin\Admin\Form; -use Frontend\Admin\Entity\Admin; -use Frontend\Admin\InputFilter\AdminInputFilter; +use Admin\Admin\Entity\Admin; +use Admin\Admin\InputFilter\AdminInputFilter; use Laminas\Form\Element\Csrf; use Laminas\Form\Form; use Laminas\Form\FormInterface; diff --git a/src/Admin/src/Form/ChangePasswordForm.php b/src/Admin/src/Form/ChangePasswordForm.php index 037f5476..d0cc7193 100644 --- a/src/Admin/src/Form/ChangePasswordForm.php +++ b/src/Admin/src/Form/ChangePasswordForm.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Frontend\Admin\Form; +namespace Admin\Admin\Form; -use Frontend\Admin\InputFilter\ChangePasswordInputFilter; +use Admin\Admin\InputFilter\ChangePasswordInputFilter; use Laminas\Form\Element\Csrf; use Laminas\Form\Form; use Laminas\Form\FormInterface; diff --git a/src/Admin/src/Form/LoginForm.php b/src/Admin/src/Form/LoginForm.php index 72a27407..f54b04f9 100644 --- a/src/Admin/src/Form/LoginForm.php +++ b/src/Admin/src/Form/LoginForm.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Frontend\Admin\Form; +namespace Admin\Admin\Form; -use Frontend\Admin\InputFilter\LoginInputFilter; +use Admin\Admin\InputFilter\LoginInputFilter; use Laminas\Form\Element\Csrf; use Laminas\Form\Element\Password; use Laminas\Form\Element\Submit; diff --git a/src/Admin/src/FormData/AdminFormData.php b/src/Admin/src/FormData/AdminFormData.php index be393526..f311ca57 100644 --- a/src/Admin/src/FormData/AdminFormData.php +++ b/src/Admin/src/FormData/AdminFormData.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Frontend\Admin\FormData; +namespace Admin\Admin\FormData; -use Frontend\Admin\Entity\Admin; +use Admin\Admin\Entity\Admin; class AdminFormData { diff --git a/src/Admin/src/InputFilter/AccountInputFilter.php b/src/Admin/src/InputFilter/AccountInputFilter.php index aca81406..0cbdea9f 100644 --- a/src/Admin/src/InputFilter/AccountInputFilter.php +++ b/src/Admin/src/InputFilter/AccountInputFilter.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Frontend\Admin\InputFilter; +namespace Admin\Admin\InputFilter; -use Frontend\App\InputFilter\Input\CsrfInput; +use Admin\App\InputFilter\Input\CsrfInput; use Laminas\Filter\StringTrim; use Laminas\InputFilter\Input; use Laminas\InputFilter\InputFilter; diff --git a/src/Admin/src/InputFilter/AdminDeleteInputFilter.php b/src/Admin/src/InputFilter/AdminDeleteInputFilter.php index 00f747b6..6629f508 100644 --- a/src/Admin/src/InputFilter/AdminDeleteInputFilter.php +++ b/src/Admin/src/InputFilter/AdminDeleteInputFilter.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Frontend\Admin\InputFilter; +namespace Admin\Admin\InputFilter; -use Frontend\App\InputFilter\Input\CsrfInput; +use Admin\App\InputFilter\Input\CsrfInput; use Laminas\InputFilter\Input; use Laminas\InputFilter\InputFilter; use Laminas\Validator\InArray; diff --git a/src/Admin/src/InputFilter/AdminInputFilter.php b/src/Admin/src/InputFilter/AdminInputFilter.php index 382541b1..5029c22d 100644 --- a/src/Admin/src/InputFilter/AdminInputFilter.php +++ b/src/Admin/src/InputFilter/AdminInputFilter.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace Frontend\Admin\InputFilter; +namespace Admin\Admin\InputFilter; -use Frontend\Admin\Entity\Admin; -use Frontend\App\InputFilter\Input\CsrfInput; +use Admin\Admin\Entity\Admin; +use Admin\App\InputFilter\Input\CsrfInput; use Laminas\Filter\StringTrim; use Laminas\InputFilter\Input; use Laminas\InputFilter\InputFilter; diff --git a/src/Admin/src/InputFilter/ChangePasswordInputFilter.php b/src/Admin/src/InputFilter/ChangePasswordInputFilter.php index 9d060062..786bf28e 100644 --- a/src/Admin/src/InputFilter/ChangePasswordInputFilter.php +++ b/src/Admin/src/InputFilter/ChangePasswordInputFilter.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Frontend\Admin\InputFilter; +namespace Admin\Admin\InputFilter; -use Frontend\App\InputFilter\Input\CsrfInput; +use Admin\App\InputFilter\Input\CsrfInput; use Laminas\Filter\StringTrim; use Laminas\InputFilter\Input; use Laminas\InputFilter\InputFilter; diff --git a/src/Admin/src/InputFilter/EditAdminInputFilter.php b/src/Admin/src/InputFilter/EditAdminInputFilter.php index 7e259b2a..60e3f66b 100644 --- a/src/Admin/src/InputFilter/EditAdminInputFilter.php +++ b/src/Admin/src/InputFilter/EditAdminInputFilter.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace Frontend\Admin\InputFilter; +namespace Admin\Admin\InputFilter; -use Frontend\Admin\Entity\Admin; -use Frontend\App\InputFilter\Input\CsrfInput; +use Admin\Admin\Entity\Admin; +use Admin\App\InputFilter\Input\CsrfInput; use Laminas\Filter\StringTrim; use Laminas\InputFilter\Input; use Laminas\InputFilter\InputFilter; diff --git a/src/Admin/src/InputFilter/LoginInputFilter.php b/src/Admin/src/InputFilter/LoginInputFilter.php index 48aee727..f7d97076 100644 --- a/src/Admin/src/InputFilter/LoginInputFilter.php +++ b/src/Admin/src/InputFilter/LoginInputFilter.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Frontend\Admin\InputFilter; +namespace Admin\Admin\InputFilter; -use Frontend\App\InputFilter\Input\CsrfInput; +use Admin\App\InputFilter\Input\CsrfInput; use Laminas\Filter\StringTrim; use Laminas\InputFilter\Input; use Laminas\InputFilter\InputFilter; diff --git a/src/Admin/src/Repository/AdminLoginRepository.php b/src/Admin/src/Repository/AdminLoginRepository.php index dc4a00b8..962d6d71 100644 --- a/src/Admin/src/Repository/AdminLoginRepository.php +++ b/src/Admin/src/Repository/AdminLoginRepository.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace Frontend\Admin\Repository; +namespace Admin\Admin\Repository; +use Admin\Admin\Entity\AdminLogin; +use Admin\App\Repository\AbstractRepository; use Dot\DependencyInjection\Attribute\Entity; -use Frontend\Admin\Entity\AdminLogin; -use Frontend\App\Repository\AbstractRepository; #[Entity(AdminLogin::class)] class AdminLoginRepository extends AbstractRepository diff --git a/src/Admin/src/Repository/AdminRepository.php b/src/Admin/src/Repository/AdminRepository.php index dfd901a6..942a67cb 100644 --- a/src/Admin/src/Repository/AdminRepository.php +++ b/src/Admin/src/Repository/AdminRepository.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace Frontend\Admin\Repository; +namespace Admin\Admin\Repository; +use Admin\Admin\Entity\Admin; +use Admin\Admin\Entity\AdminLogin; +use Admin\App\Repository\AbstractRepository; use Doctrine\ORM\NonUniqueResultException; use Dot\DependencyInjection\Attribute\Entity; -use Frontend\Admin\Entity\Admin; -use Frontend\Admin\Entity\AdminLogin; -use Frontend\App\Repository\AbstractRepository; use Throwable; #[Entity(Admin::class)] diff --git a/src/Admin/src/Repository/AdminRoleRepository.php b/src/Admin/src/Repository/AdminRoleRepository.php index 952b4cfd..62c380f1 100644 --- a/src/Admin/src/Repository/AdminRoleRepository.php +++ b/src/Admin/src/Repository/AdminRoleRepository.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace Frontend\Admin\Repository; +namespace Admin\Admin\Repository; +use Admin\Admin\Entity\AdminRole; +use Admin\App\Repository\AbstractRepository; use Doctrine\ORM\NonUniqueResultException; use Dot\DependencyInjection\Attribute\Entity; -use Frontend\Admin\Entity\AdminRole; -use Frontend\App\Repository\AbstractRepository; #[Entity(AdminRole::class)] class AdminRoleRepository extends AbstractRepository diff --git a/src/Admin/src/RoutesDelegator.php b/src/Admin/src/RoutesDelegator.php index 65eecc97..67ab01e7 100644 --- a/src/Admin/src/RoutesDelegator.php +++ b/src/Admin/src/RoutesDelegator.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace Frontend\Admin; +namespace Admin\Admin; +use Admin\Admin\Controller\AdminController; use Fig\Http\Message\RequestMethodInterface; -use Frontend\Admin\Controller\AdminController; use Mezzio\Application; use Psr\Container\ContainerInterface; diff --git a/src/Admin/src/Service/AdminService.php b/src/Admin/src/Service/AdminService.php index c7d89d6d..cea941df 100644 --- a/src/Admin/src/Service/AdminService.php +++ b/src/Admin/src/Service/AdminService.php @@ -2,20 +2,20 @@ declare(strict_types=1); -namespace Frontend\Admin\Service; - +namespace Admin\Admin\Service; + +use Admin\Admin\Entity\Admin; +use Admin\Admin\Entity\AdminLogin; +use Admin\Admin\Entity\AdminRole; +use Admin\Admin\Repository\AdminRepository; +use Admin\Admin\Repository\AdminRoleRepository; +use Admin\App\Exception\IdentityException; +use Admin\App\Service\IpService; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\EntityRepository; use Doctrine\ORM\NonUniqueResultException; use Dot\DependencyInjection\Attribute\Inject; use Dot\GeoIP\Service\LocationServiceInterface; -use Frontend\Admin\Entity\Admin; -use Frontend\Admin\Entity\AdminLogin; -use Frontend\Admin\Entity\AdminRole; -use Frontend\Admin\Repository\AdminRepository; -use Frontend\Admin\Repository\AdminRoleRepository; -use Frontend\App\Exception\IdentityException; -use Frontend\App\Service\IpService; use function implode; use function is_string; diff --git a/src/Admin/src/Service/AdminServiceInterface.php b/src/Admin/src/Service/AdminServiceInterface.php index 1254d51b..0e475d10 100644 --- a/src/Admin/src/Service/AdminServiceInterface.php +++ b/src/Admin/src/Service/AdminServiceInterface.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace Frontend\Admin\Service; +namespace Admin\Admin\Service; +use Admin\Admin\Entity\Admin; +use Admin\Admin\Entity\AdminLogin; +use Admin\Admin\Repository\AdminRepository; use Doctrine\ORM\EntityRepository; use Doctrine\ORM\Exception\ORMException; use Doctrine\ORM\NonUniqueResultException; -use Frontend\Admin\Entity\Admin; -use Frontend\Admin\Entity\AdminLogin; -use Frontend\Admin\Repository\AdminRepository; interface AdminServiceInterface { diff --git a/src/App/src/Common/ServerRequestAwareInterface.php b/src/App/src/Common/ServerRequestAwareInterface.php index 3ddcc781..7091a539 100644 --- a/src/App/src/Common/ServerRequestAwareInterface.php +++ b/src/App/src/Common/ServerRequestAwareInterface.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Frontend\App\Common; +namespace Admin\App\Common; interface ServerRequestAwareInterface { diff --git a/src/App/src/Common/ServerRequestAwareTrait.php b/src/App/src/Common/ServerRequestAwareTrait.php index 3056d61d..587dfadb 100644 --- a/src/App/src/Common/ServerRequestAwareTrait.php +++ b/src/App/src/Common/ServerRequestAwareTrait.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Frontend\App\Common; +namespace Admin\App\Common; use Exception; use Fig\Http\Message\RequestMethodInterface; diff --git a/src/App/src/ConfigProvider.php b/src/App/src/ConfigProvider.php index e7cfab3c..fa10dcac 100644 --- a/src/App/src/ConfigProvider.php +++ b/src/App/src/ConfigProvider.php @@ -2,20 +2,20 @@ declare(strict_types=1); -namespace Frontend\App; +namespace Admin\App; +use Admin\App\Controller\DashboardController; +use Admin\App\Controller\PageController; +use Admin\App\Factory\EntityListenerResolverFactory; +use Admin\App\Factory\FormsPluginFactory; +use Admin\App\Plugin\FormsPlugin; +use Admin\App\Resolver\EntityListenerResolver; use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Mapping\Driver\AttributeDriver; use Dot\Controller\Factory\PluginManagerFactory; use Dot\Controller\Plugin\PluginManager; use Dot\DependencyInjection\Factory\AttributedServiceFactory; -use Frontend\App\Controller\DashboardController; -use Frontend\App\Controller\PageController; -use Frontend\App\Factory\EntityListenerResolverFactory; -use Frontend\App\Factory\FormsPluginFactory; -use Frontend\App\Plugin\FormsPlugin; -use Frontend\App\Resolver\EntityListenerResolver; use Mezzio\Application; use Roave\PsrContainerDoctrine\EntityManagerFactory; @@ -58,7 +58,7 @@ public function getDoctrineConfig(): array 'driver' => [ 'orm_default' => [ 'drivers' => [ - 'Frontend\App\Entity' => 'AppEntities', + 'Admin\App\Entity' => 'AppEntities', ], ], 'AppEntities' => [ diff --git a/src/App/src/Controller/DashboardController.php b/src/App/src/Controller/DashboardController.php index 928cc50c..3a028e63 100644 --- a/src/App/src/Controller/DashboardController.php +++ b/src/App/src/Controller/DashboardController.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace Frontend\App\Controller; +namespace Admin\App\Controller; +use Admin\App\Common\ServerRequestAwareTrait; use Dot\Controller\AbstractActionController; use Dot\DependencyInjection\Attribute\Inject; -use Frontend\App\Common\ServerRequestAwareTrait; use Laminas\Authentication\AuthenticationServiceInterface; use Laminas\Diactoros\Response\HtmlResponse; use Mezzio\Router\RouterInterface; diff --git a/src/App/src/Controller/PageController.php b/src/App/src/Controller/PageController.php index 36e5b649..d263f283 100644 --- a/src/App/src/Controller/PageController.php +++ b/src/App/src/Controller/PageController.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace Frontend\App\Controller; +namespace Admin\App\Controller; +use Admin\App\Common\ServerRequestAwareTrait; use Dot\Controller\AbstractActionController; use Dot\DependencyInjection\Attribute\Inject; -use Frontend\App\Common\ServerRequestAwareTrait; use Laminas\Diactoros\Response\HtmlResponse; use Mezzio\Router\RouterInterface; use Mezzio\Template\TemplateRendererInterface; diff --git a/src/App/src/Entity/AbstractEntity.php b/src/App/src/Entity/AbstractEntity.php index 268dc03f..379b033c 100644 --- a/src/App/src/Entity/AbstractEntity.php +++ b/src/App/src/Entity/AbstractEntity.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Frontend\App\Entity; +namespace Admin\App\Entity; use Doctrine\ORM\Mapping as ORM; use Ramsey\Uuid\Uuid; diff --git a/src/App/src/Entity/TimestampsTrait.php b/src/App/src/Entity/TimestampsTrait.php index 0cba6f4f..0571ed67 100644 --- a/src/App/src/Entity/TimestampsTrait.php +++ b/src/App/src/Entity/TimestampsTrait.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Frontend\App\Entity; +namespace Admin\App\Entity; use DateTimeImmutable; use Doctrine\ORM\Mapping as ORM; diff --git a/src/App/src/Exception/IdentityException.php b/src/App/src/Exception/IdentityException.php index 52295201..862cd625 100644 --- a/src/App/src/Exception/IdentityException.php +++ b/src/App/src/Exception/IdentityException.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace Frontend\App\Exception; +namespace Admin\App\Exception; +use Admin\App\Message; use Fig\Http\Message\StatusCodeInterface; -use Frontend\App\Message; use RuntimeException; class IdentityException extends RuntimeException diff --git a/src/App/src/Exception/ORMException.php b/src/App/src/Exception/ORMException.php index ba855ba0..87800081 100644 --- a/src/App/src/Exception/ORMException.php +++ b/src/App/src/Exception/ORMException.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Frontend\App\Exception; +namespace Admin\App\Exception; use Exception; diff --git a/src/App/src/Factory/AuthMiddlewareFactory.php b/src/App/src/Factory/AuthMiddlewareFactory.php index a80cc3d7..6160db86 100644 --- a/src/App/src/Factory/AuthMiddlewareFactory.php +++ b/src/App/src/Factory/AuthMiddlewareFactory.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace Frontend\App\Factory; +namespace Admin\App\Factory; +use Admin\App\Middleware\AuthMiddleware; use Dot\FlashMessenger\FlashMessenger; use Dot\Rbac\Guard\Factory\AttachAuthorizationEventListenersTrait; use Dot\Rbac\Guard\Options\RbacGuardOptions; use Dot\Rbac\Guard\Provider\Factory; use Dot\Rbac\Guard\Provider\GuardsProviderPluginManager; -use Frontend\App\Middleware\AuthMiddleware; use Mezzio\Router\RouterInterface; use Psr\Container\ContainerExceptionInterface; use Psr\Container\ContainerInterface; diff --git a/src/App/src/Factory/EntityListenerResolverFactory.php b/src/App/src/Factory/EntityListenerResolverFactory.php index 9e5ce00b..edcc8d6e 100644 --- a/src/App/src/Factory/EntityListenerResolverFactory.php +++ b/src/App/src/Factory/EntityListenerResolverFactory.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Frontend\App\Factory; +namespace Admin\App\Factory; -use Frontend\App\Resolver\EntityListenerResolver; +use Admin\App\Resolver\EntityListenerResolver; use Psr\Container\ContainerInterface; class EntityListenerResolverFactory diff --git a/src/App/src/Factory/FormsPluginFactory.php b/src/App/src/Factory/FormsPluginFactory.php index 550b1f6e..8d0b1e2c 100644 --- a/src/App/src/Factory/FormsPluginFactory.php +++ b/src/App/src/Factory/FormsPluginFactory.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace Frontend\App\Factory; +namespace Admin\App\Factory; +use Admin\App\Plugin\FormsPlugin; use Dot\FlashMessenger\FlashMessengerInterface; -use Frontend\App\Plugin\FormsPlugin; use Laminas\Form\FormElementManager; use Psr\Container\ContainerExceptionInterface; use Psr\Container\ContainerInterface; diff --git a/src/App/src/InputFilter/Input/CsrfInput.php b/src/App/src/InputFilter/Input/CsrfInput.php index e89b6f61..d2a627d1 100644 --- a/src/App/src/InputFilter/Input/CsrfInput.php +++ b/src/App/src/InputFilter/Input/CsrfInput.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Frontend\App\InputFilter\Input; +namespace Admin\App\InputFilter\Input; -use Frontend\App\Message; +use Admin\App\Message; use Laminas\Filter\StringTrim; use Laminas\Filter\StripTags; use Laminas\InputFilter\Input; diff --git a/src/App/src/Message.php b/src/App/src/Message.php index f3b1f46f..498a362e 100644 --- a/src/App/src/Message.php +++ b/src/App/src/Message.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Frontend\App; +namespace Admin\App; class Message { diff --git a/src/App/src/Middleware/AuthMiddleware.php b/src/App/src/Middleware/AuthMiddleware.php index 023938a4..8ec2f8e7 100644 --- a/src/App/src/Middleware/AuthMiddleware.php +++ b/src/App/src/Middleware/AuthMiddleware.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Frontend\App\Middleware; +namespace Admin\App\Middleware; use Dot\FlashMessenger\FlashMessengerInterface; use Dot\Rbac\Guard\Exception\RuntimeException; diff --git a/src/App/src/Plugin/FormsPlugin.php b/src/App/src/Plugin/FormsPlugin.php index da4124bb..0030c211 100644 --- a/src/App/src/Plugin/FormsPlugin.php +++ b/src/App/src/Plugin/FormsPlugin.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Frontend\App\Plugin; +namespace Admin\App\Plugin; use Dot\Controller\Plugin\PluginInterface; use Dot\FlashMessenger\FlashMessengerInterface; diff --git a/src/App/src/Repository/AbstractRepository.php b/src/App/src/Repository/AbstractRepository.php index 651f3ced..26fa9040 100644 --- a/src/App/src/Repository/AbstractRepository.php +++ b/src/App/src/Repository/AbstractRepository.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Frontend\App\Repository; +namespace Admin\App\Repository; use Doctrine\ORM\EntityRepository; use Doctrine\ORM\QueryBuilder; diff --git a/src/App/src/Resolver/EntityListenerResolver.php b/src/App/src/Resolver/EntityListenerResolver.php index 5f23d993..305ecfc4 100644 --- a/src/App/src/Resolver/EntityListenerResolver.php +++ b/src/App/src/Resolver/EntityListenerResolver.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Frontend\App\Resolver; +namespace Admin\App\Resolver; use Doctrine\ORM\Mapping\DefaultEntityListenerResolver; use Psr\Container\ContainerExceptionInterface; diff --git a/src/App/src/RoutesDelegator.php b/src/App/src/RoutesDelegator.php index 1e7ed856..38b1bf9b 100644 --- a/src/App/src/RoutesDelegator.php +++ b/src/App/src/RoutesDelegator.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace Frontend\App; +namespace Admin\App; -use Frontend\App\Controller\DashboardController; -use Frontend\App\Controller\PageController; +use Admin\App\Controller\DashboardController; +use Admin\App\Controller\PageController; use Mezzio\Application; use Psr\Container\ContainerInterface; diff --git a/src/App/src/Service/IpService.php b/src/App/src/Service/IpService.php index 39625289..fa694fe5 100644 --- a/src/App/src/Service/IpService.php +++ b/src/App/src/Service/IpService.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Frontend\App\Service; +namespace Admin\App\Service; use function filter_var; use function getenv; diff --git a/src/Setting/src/ConfigProvider.php b/src/Setting/src/ConfigProvider.php index 2c7da253..71e09350 100644 --- a/src/Setting/src/ConfigProvider.php +++ b/src/Setting/src/ConfigProvider.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace Frontend\Setting; +namespace Admin\Setting; +use Admin\Setting\Controller\SettingController; +use Admin\Setting\Repository\SettingRepository; +use Admin\Setting\Service\SettingService; use Doctrine\ORM\Mapping\Driver\AttributeDriver; use Dot\DependencyInjection\Factory\AttributedRepositoryFactory; use Dot\DependencyInjection\Factory\AttributedServiceFactory; -use Frontend\Setting\Controller\SettingController; -use Frontend\Setting\Repository\SettingRepository; -use Frontend\Setting\Service\SettingService; use Mezzio\Application; class ConfigProvider @@ -44,7 +44,7 @@ public function getDoctrineConfig(): array 'driver' => [ 'orm_default' => [ 'drivers' => [ - 'Frontend\Setting\Entity' => 'SettingEntities', + 'Admin\Setting\Entity' => 'SettingEntities', ], ], 'SettingEntities' => [ diff --git a/src/Setting/src/Controller/SettingController.php b/src/Setting/src/Controller/SettingController.php index 47fedd9f..929c6fe6 100644 --- a/src/Setting/src/Controller/SettingController.php +++ b/src/Setting/src/Controller/SettingController.php @@ -2,19 +2,19 @@ declare(strict_types=1); -namespace Frontend\Setting\Controller; - +namespace Admin\Setting\Controller; + +use Admin\Admin\Entity\Admin; +use Admin\Admin\Service\AdminService; +use Admin\App\Common\ServerRequestAwareTrait; +use Admin\App\Message; +use Admin\Setting\Entity\Setting; +use Admin\Setting\InputFilter\Input\SettingValueInput; +use Admin\Setting\InputFilter\SettingInputFilter; +use Admin\Setting\Service\SettingService; use Dot\Controller\AbstractActionController; use Dot\DependencyInjection\Attribute\Inject; use Fig\Http\Message\StatusCodeInterface; -use Frontend\Admin\Entity\Admin; -use Frontend\Admin\Service\AdminService; -use Frontend\App\Common\ServerRequestAwareTrait; -use Frontend\App\Message; -use Frontend\Setting\Entity\Setting; -use Frontend\Setting\InputFilter\Input\SettingValueInput; -use Frontend\Setting\InputFilter\SettingInputFilter; -use Frontend\Setting\Service\SettingService; use Laminas\Authentication\AuthenticationServiceInterface; use Laminas\Diactoros\Response\JsonResponse; use Mezzio\Router\RouterInterface; diff --git a/src/Setting/src/Entity/Setting.php b/src/Setting/src/Entity/Setting.php index 182d110f..c2da4649 100644 --- a/src/Setting/src/Entity/Setting.php +++ b/src/Setting/src/Entity/Setting.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace Frontend\Setting\Entity; +namespace Admin\Setting\Entity; +use Admin\Admin\Entity\Admin; +use Admin\App\Entity\AbstractEntity; +use Admin\App\Entity\TimestampsTrait; +use Admin\Setting\Repository\SettingRepository; use Doctrine\ORM\Mapping as ORM; -use Frontend\Admin\Entity\Admin; -use Frontend\App\Entity\AbstractEntity; -use Frontend\App\Entity\TimestampsTrait; -use Frontend\Setting\Repository\SettingRepository; use function array_unique; use function json_decode; diff --git a/src/Setting/src/InputFilter/Input/SettingIdentifierInput.php b/src/Setting/src/InputFilter/Input/SettingIdentifierInput.php index 46831b84..c4de4b3d 100644 --- a/src/Setting/src/InputFilter/Input/SettingIdentifierInput.php +++ b/src/Setting/src/InputFilter/Input/SettingIdentifierInput.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace Frontend\Setting\InputFilter\Input; +namespace Admin\Setting\InputFilter\Input; -use Frontend\App\Message; -use Frontend\Setting\Entity\Setting; +use Admin\App\Message; +use Admin\Setting\Entity\Setting; use Laminas\Filter\StringTrim; use Laminas\Filter\StripTags; use Laminas\InputFilter\Input; diff --git a/src/Setting/src/InputFilter/Input/SettingValueInput.php b/src/Setting/src/InputFilter/Input/SettingValueInput.php index 73a6ac68..d3c08f9e 100644 --- a/src/Setting/src/InputFilter/Input/SettingValueInput.php +++ b/src/Setting/src/InputFilter/Input/SettingValueInput.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace Frontend\Setting\InputFilter\Input; +namespace Admin\Setting\InputFilter\Input; -use Frontend\App\Message; +use Admin\App\Message; use Laminas\Filter\StringTrim; use Laminas\Filter\StripTags; use Laminas\InputFilter\Input; diff --git a/src/Setting/src/InputFilter/SettingInputFilter.php b/src/Setting/src/InputFilter/SettingInputFilter.php index 3377aff3..ac0cc0f4 100644 --- a/src/Setting/src/InputFilter/SettingInputFilter.php +++ b/src/Setting/src/InputFilter/SettingInputFilter.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace Frontend\Setting\InputFilter; +namespace Admin\Setting\InputFilter; -use Frontend\Setting\InputFilter\Input\SettingIdentifierInput; -use Frontend\Setting\InputFilter\Input\SettingValueInput; +use Admin\Setting\InputFilter\Input\SettingIdentifierInput; +use Admin\Setting\InputFilter\Input\SettingValueInput; use Laminas\InputFilter\InputFilter; /** diff --git a/src/Setting/src/Repository/SettingRepository.php b/src/Setting/src/Repository/SettingRepository.php index 6318d62e..6a3c2ec5 100644 --- a/src/Setting/src/Repository/SettingRepository.php +++ b/src/Setting/src/Repository/SettingRepository.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace Frontend\Setting\Repository; +namespace Admin\Setting\Repository; +use Admin\App\Repository\AbstractRepository; +use Admin\Setting\Entity\Setting; use Dot\DependencyInjection\Attribute\Entity; -use Frontend\App\Repository\AbstractRepository; -use Frontend\Setting\Entity\Setting; #[Entity(Setting::class)] class SettingRepository extends AbstractRepository diff --git a/src/Setting/src/RoutesDelegator.php b/src/Setting/src/RoutesDelegator.php index a94c5f40..852c88f7 100644 --- a/src/Setting/src/RoutesDelegator.php +++ b/src/Setting/src/RoutesDelegator.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace Frontend\Setting; +namespace Admin\Setting; +use Admin\Setting\Controller\SettingController; use Fig\Http\Message\RequestMethodInterface; -use Frontend\Setting\Controller\SettingController; use Mezzio\Application; use Psr\Container\ContainerInterface; diff --git a/src/Setting/src/Service/SettingService.php b/src/Setting/src/Service/SettingService.php index 46e2c809..9f5c5e8d 100644 --- a/src/Setting/src/Service/SettingService.php +++ b/src/Setting/src/Service/SettingService.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace Frontend\Setting\Service; +namespace Admin\Setting\Service; +use Admin\Admin\Entity\Admin; +use Admin\Setting\Entity\Setting; +use Admin\Setting\Repository\SettingRepository; use Dot\DependencyInjection\Attribute\Inject; -use Frontend\Admin\Entity\Admin; -use Frontend\Setting\Entity\Setting; -use Frontend\Setting\Repository\SettingRepository; class SettingService { diff --git a/test/Common/TestCase.php b/test/Common/TestCase.php index 33f3814c..44c0b2f4 100644 --- a/test/Common/TestCase.php +++ b/test/Common/TestCase.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace FrontendTest\Common; +namespace AdminTest\Common; use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityManagerInterface; diff --git a/test/Common/TestMode.php b/test/Common/TestMode.php index 13a4a625..a7958efd 100644 --- a/test/Common/TestMode.php +++ b/test/Common/TestMode.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace FrontendTest\Common; +namespace AdminTest\Common; use function getenv; use function putenv; diff --git a/test/Functional/DashboardTest.php b/test/Functional/DashboardTest.php index 49fbedef..d2277be8 100644 --- a/test/Functional/DashboardTest.php +++ b/test/Functional/DashboardTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace FrontendTest\Functional; +namespace AdminTest\Functional; use Fig\Http\Message\StatusCodeInterface; diff --git a/test/Functional/FunctionalTest.php b/test/Functional/FunctionalTest.php index 5867e00b..c198d104 100644 --- a/test/Functional/FunctionalTest.php +++ b/test/Functional/FunctionalTest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace FrontendTest\Functional; +namespace AdminTest\Functional; +use AdminTest\Common\TestCase; use Doctrine\ORM\Tools\SchemaTool; -use FrontendTest\Common\TestCase; use Mezzio\Application; use Mezzio\MiddlewareFactory; use Psr\Container\ContainerExceptionInterface; diff --git a/test/Functional/HttpRequestTrait.php b/test/Functional/HttpRequestTrait.php index db9518db..dbea08dd 100644 --- a/test/Functional/HttpRequestTrait.php +++ b/test/Functional/HttpRequestTrait.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace FrontendTest\Functional; +namespace AdminTest\Functional; use Fig\Http\Message\RequestMethodInterface; use Laminas\Diactoros\ServerRequest; diff --git a/test/Functional/HttpResponseTrait.php b/test/Functional/HttpResponseTrait.php index cbeab982..8ff11f57 100644 --- a/test/Functional/HttpResponseTrait.php +++ b/test/Functional/HttpResponseTrait.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace FrontendTest\Functional; +namespace AdminTest\Functional; use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; diff --git a/test/Unit/Admin/Adapter/AuthenticationAdapterTest.php b/test/Unit/Admin/Adapter/AuthenticationAdapterTest.php index 48b1afd4..aa82530e 100644 --- a/test/Unit/Admin/Adapter/AuthenticationAdapterTest.php +++ b/test/Unit/Admin/Adapter/AuthenticationAdapterTest.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Admin\Adapter; +namespace AdminTest\Unit\Admin\Adapter; +use Admin\Admin\Adapter\AuthenticationAdapter; +use Admin\Admin\Entity\Admin; +use Admin\Admin\Repository\AdminRepository; +use AdminTest\Unit\UnitTest; use Doctrine\ORM\EntityManager; -use Frontend\Admin\Adapter\AuthenticationAdapter; -use Frontend\Admin\Entity\Admin; -use Frontend\Admin\Repository\AdminRepository; -use FrontendTest\Unit\UnitTest; use PHPUnit\Framework\MockObject\Exception; use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; diff --git a/test/Unit/Admin/ConfigProviderTest.php b/test/Unit/Admin/ConfigProviderTest.php index 1c62d1a4..10d63bc8 100644 --- a/test/Unit/Admin/ConfigProviderTest.php +++ b/test/Unit/Admin/ConfigProviderTest.php @@ -2,19 +2,19 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Admin; +namespace AdminTest\Unit\Admin; -use Frontend\Admin\Adapter\AuthenticationAdapter; -use Frontend\Admin\ConfigProvider; -use Frontend\Admin\Controller\AdminController; -use Frontend\Admin\Delegator\AdminRoleDelegator; -use Frontend\Admin\Entity\AdminInterface; -use Frontend\Admin\Form\AdminForm; -use Frontend\Admin\Form\ChangePasswordForm; -use Frontend\Admin\Form\LoginForm; -use Frontend\Admin\Service\AdminService; -use Frontend\Admin\Service\AdminServiceInterface; -use FrontendTest\Unit\UnitTest; +use Admin\Admin\Adapter\AuthenticationAdapter; +use Admin\Admin\ConfigProvider; +use Admin\Admin\Controller\AdminController; +use Admin\Admin\Delegator\AdminRoleDelegator; +use Admin\Admin\Entity\AdminInterface; +use Admin\Admin\Form\AdminForm; +use Admin\Admin\Form\ChangePasswordForm; +use Admin\Admin\Form\LoginForm; +use Admin\Admin\Service\AdminService; +use Admin\Admin\Service\AdminServiceInterface; +use AdminTest\Unit\UnitTest; use Laminas\Authentication\AuthenticationService; class ConfigProviderTest extends UnitTest @@ -97,7 +97,7 @@ public function testGetDoctrineConfig(): void $this->assertIsArray($this->config['doctrine']['driver']['orm_default']); $this->assertArrayHasKey('drivers', $this->config['doctrine']['driver']['orm_default']); $this->assertArrayHasKey( - 'Frontend\Admin\Entity', + 'Admin\Admin\Entity', $this->config['doctrine']['driver']['orm_default']['drivers'] ); $this->assertArrayHasKey('AdminEntities', $this->config['doctrine']['driver']); diff --git a/test/Unit/Admin/Controller/AdminControllerTest.php b/test/Unit/Admin/Controller/AdminControllerTest.php index 6e8acdc7..8097a536 100644 --- a/test/Unit/Admin/Controller/AdminControllerTest.php +++ b/test/Unit/Admin/Controller/AdminControllerTest.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Admin\Controller; +namespace AdminTest\Unit\Admin\Controller; +use Admin\Admin\Controller\AdminController; +use Admin\Admin\Form\AdminForm; +use Admin\Admin\Service\AdminServiceInterface; +use Admin\App\Plugin\FormsPlugin; +use AdminTest\Unit\UnitTest; use Dot\FlashMessenger\FlashMessengerInterface; -use Frontend\Admin\Controller\AdminController; -use Frontend\Admin\Form\AdminForm; -use Frontend\Admin\Service\AdminServiceInterface; -use Frontend\App\Plugin\FormsPlugin; -use FrontendTest\Unit\UnitTest; use Laminas\Authentication\AuthenticationServiceInterface; use Laminas\Log\Logger; use Mezzio\Router\RouterInterface; diff --git a/test/Unit/Admin/Delegator/AdminRoleDelegatorTest.php b/test/Unit/Admin/Delegator/AdminRoleDelegatorTest.php index 3f684d40..b65ef837 100644 --- a/test/Unit/Admin/Delegator/AdminRoleDelegatorTest.php +++ b/test/Unit/Admin/Delegator/AdminRoleDelegatorTest.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Admin\Delegator; +namespace AdminTest\Unit\Admin\Delegator; -use Frontend\Admin\Delegator\AdminRoleDelegator; -use Frontend\Admin\Form\AdminForm; -use Frontend\Admin\Service\AdminService; -use FrontendTest\Unit\UnitTest; +use Admin\Admin\Delegator\AdminRoleDelegator; +use Admin\Admin\Form\AdminForm; +use Admin\Admin\Service\AdminService; +use AdminTest\Unit\UnitTest; use PHPUnit\Framework\MockObject\Exception; use Psr\Container\ContainerExceptionInterface; use Psr\Container\ContainerInterface; diff --git a/test/Unit/Admin/Entity/AdminIdentityTest.php b/test/Unit/Admin/Entity/AdminIdentityTest.php index d726353f..1938757e 100644 --- a/test/Unit/Admin/Entity/AdminIdentityTest.php +++ b/test/Unit/Admin/Entity/AdminIdentityTest.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Admin\Entity; +namespace AdminTest\Unit\Admin\Entity; -use Frontend\Admin\Entity\Admin; -use Frontend\Admin\Entity\AdminIdentity; -use Frontend\Admin\Entity\AdminRole; -use FrontendTest\Unit\UnitTest; +use Admin\Admin\Entity\Admin; +use Admin\Admin\Entity\AdminIdentity; +use Admin\Admin\Entity\AdminRole; +use AdminTest\Unit\UnitTest; class AdminIdentityTest extends UnitTest { diff --git a/test/Unit/Admin/Entity/AdminInterfaceTest.php b/test/Unit/Admin/Entity/AdminInterfaceTest.php index d096bde8..b1a29a6c 100644 --- a/test/Unit/Admin/Entity/AdminInterfaceTest.php +++ b/test/Unit/Admin/Entity/AdminInterfaceTest.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Admin\Entity; +namespace AdminTest\Unit\Admin\Entity; +use Admin\Admin\Entity\AdminInterface; +use Admin\Admin\Entity\AdminRole; +use AdminTest\Unit\UnitTest; use Doctrine\Common\Collections\ArrayCollection; -use Frontend\Admin\Entity\AdminInterface; -use Frontend\Admin\Entity\AdminRole; -use FrontendTest\Unit\UnitTest; class AdminInterfaceTest extends UnitTest { diff --git a/test/Unit/Admin/Entity/AdminLoginTest.php b/test/Unit/Admin/Entity/AdminLoginTest.php index 58f09ec0..a8aaeabf 100644 --- a/test/Unit/Admin/Entity/AdminLoginTest.php +++ b/test/Unit/Admin/Entity/AdminLoginTest.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Admin\Entity; +namespace AdminTest\Unit\Admin\Entity; +use Admin\Admin\Entity\AdminLogin; +use Admin\Admin\Repository\AdminLoginRepository; +use AdminTest\Unit\UnitTest; use Doctrine\ORM\Mapping\Entity; use Doctrine\ORM\Mapping\Table; -use Frontend\Admin\Entity\AdminLogin; -use Frontend\Admin\Repository\AdminLoginRepository; -use FrontendTest\Unit\UnitTest; use Ramsey\Uuid\UuidInterface; use ReflectionAttribute; use ReflectionClass; diff --git a/test/Unit/Admin/Entity/AdminRoleTest.php b/test/Unit/Admin/Entity/AdminRoleTest.php index 54706bef..cefae844 100644 --- a/test/Unit/Admin/Entity/AdminRoleTest.php +++ b/test/Unit/Admin/Entity/AdminRoleTest.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Admin\Entity; +namespace AdminTest\Unit\Admin\Entity; +use Admin\Admin\Entity\AdminRole; +use Admin\Admin\Repository\AdminRoleRepository; +use AdminTest\Unit\UnitTest; use Doctrine\ORM\Mapping\Entity; use Doctrine\ORM\Mapping\Table; -use Frontend\Admin\Entity\AdminRole; -use Frontend\Admin\Repository\AdminRoleRepository; -use FrontendTest\Unit\UnitTest; use Ramsey\Uuid\UuidInterface; use ReflectionAttribute; use ReflectionClass; diff --git a/test/Unit/Admin/Entity/AdminTest.php b/test/Unit/Admin/Entity/AdminTest.php index 7c87f229..0b267305 100644 --- a/test/Unit/Admin/Entity/AdminTest.php +++ b/test/Unit/Admin/Entity/AdminTest.php @@ -2,15 +2,15 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Admin\Entity; +namespace AdminTest\Unit\Admin\Entity; +use Admin\Admin\Entity\Admin; +use Admin\Admin\Entity\AdminRole; +use Admin\Admin\Repository\AdminRepository; +use AdminTest\Unit\UnitTest; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\Mapping\Entity; use Doctrine\ORM\Mapping\Table; -use Frontend\Admin\Entity\Admin; -use Frontend\Admin\Entity\AdminRole; -use Frontend\Admin\Repository\AdminRepository; -use FrontendTest\Unit\UnitTest; use Ramsey\Uuid\UuidInterface; use ReflectionAttribute; use ReflectionClass; diff --git a/test/Unit/Admin/Factory/AuthenticationServiceFactoryTest.php b/test/Unit/Admin/Factory/AuthenticationServiceFactoryTest.php index c5c753e1..f9f6e7b4 100644 --- a/test/Unit/Admin/Factory/AuthenticationServiceFactoryTest.php +++ b/test/Unit/Admin/Factory/AuthenticationServiceFactoryTest.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Admin\Factory; +namespace AdminTest\Unit\Admin\Factory; -use Frontend\Admin\Adapter\AuthenticationAdapter; -use Frontend\Admin\Factory\AuthenticationServiceFactory; -use FrontendTest\Unit\UnitTest; +use Admin\Admin\Adapter\AuthenticationAdapter; +use Admin\Admin\Factory\AuthenticationServiceFactory; +use AdminTest\Unit\UnitTest; use Laminas\Authentication\AuthenticationService; use PHPUnit\Framework\MockObject\Exception; use Psr\Container\ContainerExceptionInterface; diff --git a/test/Unit/Admin/Form/AccountFormTest.php b/test/Unit/Admin/Form/AccountFormTest.php index f52e85c1..81591371 100644 --- a/test/Unit/Admin/Form/AccountFormTest.php +++ b/test/Unit/Admin/Form/AccountFormTest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Admin\Form; +namespace AdminTest\Unit\Admin\Form; -use Frontend\Admin\Form\AccountForm; -use FrontendTest\Unit\UnitTest; +use Admin\Admin\Form\AccountForm; +use AdminTest\Unit\UnitTest; class AccountFormTest extends UnitTest { diff --git a/test/Unit/Admin/Form/AdminFormTest.php b/test/Unit/Admin/Form/AdminFormTest.php index f97ffc78..44f3cb84 100644 --- a/test/Unit/Admin/Form/AdminFormTest.php +++ b/test/Unit/Admin/Form/AdminFormTest.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Admin\Form; +namespace AdminTest\Unit\Admin\Form; -use Frontend\Admin\Form\AdminForm; -use Frontend\Admin\InputFilter\AdminInputFilter; -use Frontend\Admin\InputFilter\EditAdminInputFilter; -use FrontendTest\Unit\UnitTest; +use Admin\Admin\Form\AdminForm; +use Admin\Admin\InputFilter\AdminInputFilter; +use Admin\Admin\InputFilter\EditAdminInputFilter; +use AdminTest\Unit\UnitTest; class AdminFormTest extends UnitTest { diff --git a/test/Unit/Admin/Form/ChangePasswordFormTest.php b/test/Unit/Admin/Form/ChangePasswordFormTest.php index b3848c3e..42eb040e 100644 --- a/test/Unit/Admin/Form/ChangePasswordFormTest.php +++ b/test/Unit/Admin/Form/ChangePasswordFormTest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Admin\Form; +namespace AdminTest\Unit\Admin\Form; -use Frontend\Admin\Form\ChangePasswordForm; -use FrontendTest\Unit\UnitTest; +use Admin\Admin\Form\ChangePasswordForm; +use AdminTest\Unit\UnitTest; class ChangePasswordFormTest extends UnitTest { diff --git a/test/Unit/Admin/Form/FormTrait.php b/test/Unit/Admin/Form/FormTrait.php index 4f483e3a..4a1c40f3 100644 --- a/test/Unit/Admin/Form/FormTrait.php +++ b/test/Unit/Admin/Form/FormTrait.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Admin\Form; +namespace AdminTest\Unit\Admin\Form; use Laminas\Form\ElementInterface; use Laminas\Form\FormInterface; diff --git a/test/Unit/Admin/Form/LoginFormTest.php b/test/Unit/Admin/Form/LoginFormTest.php index ee0f5e24..6f9b86e8 100644 --- a/test/Unit/Admin/Form/LoginFormTest.php +++ b/test/Unit/Admin/Form/LoginFormTest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Admin\Form; +namespace AdminTest\Unit\Admin\Form; -use Frontend\Admin\Form\LoginForm; -use FrontendTest\Unit\UnitTest; +use Admin\Admin\Form\LoginForm; +use AdminTest\Unit\UnitTest; class LoginFormTest extends UnitTest { diff --git a/test/Unit/Admin/FormData/AdminFormDataTest.php b/test/Unit/Admin/FormData/AdminFormDataTest.php index 9bc10b7d..b67668d4 100644 --- a/test/Unit/Admin/FormData/AdminFormDataTest.php +++ b/test/Unit/Admin/FormData/AdminFormDataTest.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Admin\FormData; +namespace AdminTest\Unit\Admin\FormData; -use Frontend\Admin\Entity\Admin; -use Frontend\Admin\Entity\AdminRole; -use Frontend\Admin\FormData\AdminFormData; -use FrontendTest\Unit\UnitTest; +use Admin\Admin\Entity\Admin; +use Admin\Admin\Entity\AdminRole; +use Admin\Admin\FormData\AdminFormData; +use AdminTest\Unit\UnitTest; use function array_map; diff --git a/test/Unit/Admin/InputFilter/AccountInputFilterTest.php b/test/Unit/Admin/InputFilter/AccountInputFilterTest.php index 1cc6d1b9..53dd997d 100644 --- a/test/Unit/Admin/InputFilter/AccountInputFilterTest.php +++ b/test/Unit/Admin/InputFilter/AccountInputFilterTest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Admin\InputFilter; +namespace AdminTest\Unit\Admin\InputFilter; -use Frontend\Admin\InputFilter\AccountInputFilter; -use FrontendTest\Unit\UnitTest; +use Admin\Admin\InputFilter\AccountInputFilter; +use AdminTest\Unit\UnitTest; use Laminas\Session\Container; use Laminas\Session\Validator\Csrf; diff --git a/test/Unit/Admin/InputFilter/AdminInputFilterTest.php b/test/Unit/Admin/InputFilter/AdminInputFilterTest.php index 71ac7124..49c4e9cb 100644 --- a/test/Unit/Admin/InputFilter/AdminInputFilterTest.php +++ b/test/Unit/Admin/InputFilter/AdminInputFilterTest.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Admin\InputFilter; +namespace AdminTest\Unit\Admin\InputFilter; -use Frontend\Admin\Entity\Admin; -use Frontend\Admin\Entity\AdminRole; -use Frontend\Admin\InputFilter\AdminInputFilter; -use FrontendTest\Unit\UnitTest; +use Admin\Admin\Entity\Admin; +use Admin\Admin\Entity\AdminRole; +use Admin\Admin\InputFilter\AdminInputFilter; +use AdminTest\Unit\UnitTest; use Laminas\Session\Container; use Laminas\Session\Validator\Csrf; diff --git a/test/Unit/Admin/InputFilter/ChangePasswordInputFilterTest.php b/test/Unit/Admin/InputFilter/ChangePasswordInputFilterTest.php index 96af0e0a..f4df1ab8 100644 --- a/test/Unit/Admin/InputFilter/ChangePasswordInputFilterTest.php +++ b/test/Unit/Admin/InputFilter/ChangePasswordInputFilterTest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Admin\InputFilter; +namespace AdminTest\Unit\Admin\InputFilter; -use Frontend\Admin\InputFilter\ChangePasswordInputFilter; -use FrontendTest\Unit\UnitTest; +use Admin\Admin\InputFilter\ChangePasswordInputFilter; +use AdminTest\Unit\UnitTest; use Laminas\Session\Container; use Laminas\Session\Validator\Csrf; diff --git a/test/Unit/Admin/InputFilter/EditAdminInputFilterTest.php b/test/Unit/Admin/InputFilter/EditAdminInputFilterTest.php index ca5e70fa..f13e38fc 100644 --- a/test/Unit/Admin/InputFilter/EditAdminInputFilterTest.php +++ b/test/Unit/Admin/InputFilter/EditAdminInputFilterTest.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Admin\InputFilter; +namespace AdminTest\Unit\Admin\InputFilter; -use Frontend\Admin\Entity\Admin; -use Frontend\Admin\Entity\AdminRole; -use Frontend\Admin\InputFilter\EditAdminInputFilter; -use FrontendTest\Unit\UnitTest; +use Admin\Admin\Entity\Admin; +use Admin\Admin\Entity\AdminRole; +use Admin\Admin\InputFilter\EditAdminInputFilter; +use AdminTest\Unit\UnitTest; use Laminas\Session\Container; use Laminas\Session\Validator\Csrf; diff --git a/test/Unit/Admin/InputFilter/LoginInputFilterTest.php b/test/Unit/Admin/InputFilter/LoginInputFilterTest.php index 988a569e..ebb121eb 100644 --- a/test/Unit/Admin/InputFilter/LoginInputFilterTest.php +++ b/test/Unit/Admin/InputFilter/LoginInputFilterTest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Admin\InputFilter; +namespace AdminTest\Unit\Admin\InputFilter; -use Frontend\Admin\InputFilter\LoginInputFilter; -use FrontendTest\Unit\UnitTest; +use Admin\Admin\InputFilter\LoginInputFilter; +use AdminTest\Unit\UnitTest; use Laminas\Session\Container; use Laminas\Session\Validator\Csrf; diff --git a/test/Unit/Admin/Repository/AdminLoginRepositoryTest.php b/test/Unit/Admin/Repository/AdminLoginRepositoryTest.php index 22a77c6f..486a3a04 100644 --- a/test/Unit/Admin/Repository/AdminLoginRepositoryTest.php +++ b/test/Unit/Admin/Repository/AdminLoginRepositoryTest.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Admin\Repository; +namespace AdminTest\Unit\Admin\Repository; +use Admin\Admin\Entity\AdminLogin; +use Admin\Admin\Repository\AdminLoginRepository; +use AdminTest\Unit\UnitTest; use Doctrine\ORM\EntityManager; -use Frontend\Admin\Entity\AdminLogin; -use Frontend\Admin\Repository\AdminLoginRepository; -use FrontendTest\Unit\UnitTest; use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; diff --git a/test/Unit/Admin/Repository/AdminRepositoryTest.php b/test/Unit/Admin/Repository/AdminRepositoryTest.php index 9a19adad..444d812a 100644 --- a/test/Unit/Admin/Repository/AdminRepositoryTest.php +++ b/test/Unit/Admin/Repository/AdminRepositoryTest.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Admin\Repository; +namespace AdminTest\Unit\Admin\Repository; +use Admin\Admin\Entity\Admin; +use Admin\Admin\Repository\AdminRepository; +use AdminTest\Unit\UnitTest; use Doctrine\ORM\EntityManager; -use Frontend\Admin\Entity\Admin; -use Frontend\Admin\Repository\AdminRepository; -use FrontendTest\Unit\UnitTest; use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; diff --git a/test/Unit/Admin/Repository/AdminRoleRepositoryTest.php b/test/Unit/Admin/Repository/AdminRoleRepositoryTest.php index 4bfd3c6b..70cb6ff5 100644 --- a/test/Unit/Admin/Repository/AdminRoleRepositoryTest.php +++ b/test/Unit/Admin/Repository/AdminRoleRepositoryTest.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Admin\Repository; +namespace AdminTest\Unit\Admin\Repository; +use Admin\Admin\Entity\AdminRole; +use Admin\Admin\Repository\AdminRoleRepository; +use AdminTest\Unit\UnitTest; use Doctrine\ORM\EntityManager; -use Frontend\Admin\Entity\AdminRole; -use Frontend\Admin\Repository\AdminRoleRepository; -use FrontendTest\Unit\UnitTest; use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; diff --git a/test/Unit/Admin/RoutesDelegatorTest.php b/test/Unit/Admin/RoutesDelegatorTest.php index 8bd69423..fea99903 100644 --- a/test/Unit/Admin/RoutesDelegatorTest.php +++ b/test/Unit/Admin/RoutesDelegatorTest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Admin; +namespace AdminTest\Unit\Admin; -use Frontend\Admin\RoutesDelegator; -use FrontendTest\Unit\UnitTest; +use Admin\Admin\RoutesDelegator; +use AdminTest\Unit\UnitTest; use Mezzio\Application; use PHPUnit\Framework\MockObject\Exception; use Psr\Container\ContainerInterface; diff --git a/test/Unit/Admin/Service/AdminServiceTest.php b/test/Unit/Admin/Service/AdminServiceTest.php index bfdad638..71283720 100644 --- a/test/Unit/Admin/Service/AdminServiceTest.php +++ b/test/Unit/Admin/Service/AdminServiceTest.php @@ -2,15 +2,15 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Admin\Service; +namespace AdminTest\Unit\Admin\Service; +use Admin\Admin\Repository\AdminRepository; +use Admin\Admin\Repository\AdminRoleRepository; +use Admin\Admin\Service\AdminService; +use Admin\Admin\Service\AdminServiceInterface; +use AdminTest\Unit\UnitTest; use Doctrine\ORM\Exception\NotSupported; use Dot\GeoIP\Service\LocationServiceInterface; -use Frontend\Admin\Repository\AdminRepository; -use Frontend\Admin\Repository\AdminRoleRepository; -use Frontend\Admin\Service\AdminService; -use Frontend\Admin\Service\AdminServiceInterface; -use FrontendTest\Unit\UnitTest; use PHPUnit\Framework\MockObject\Exception; use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; diff --git a/test/Unit/App/Common/ServerRequestAwareTest.php b/test/Unit/App/Common/ServerRequestAwareTest.php index 6f24c804..5bdf1d15 100644 --- a/test/Unit/App/Common/ServerRequestAwareTest.php +++ b/test/Unit/App/Common/ServerRequestAwareTest.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace FrontendTest\Unit\App\Common; +namespace AdminTest\Unit\App\Common; +use Admin\App\Common\ServerRequestAwareInterface; +use Admin\App\Common\ServerRequestAwareTrait; +use AdminTest\Unit\UnitTest; use Fig\Http\Message\RequestMethodInterface; -use Frontend\App\Common\ServerRequestAwareInterface; -use Frontend\App\Common\ServerRequestAwareTrait; -use FrontendTest\Unit\UnitTest; use PHPUnit\Framework\MockObject\Exception; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\UploadedFileInterface; diff --git a/test/Unit/App/ConfigProviderTest.php b/test/Unit/App/ConfigProviderTest.php index d87c9bd5..7909d6a6 100644 --- a/test/Unit/App/ConfigProviderTest.php +++ b/test/Unit/App/ConfigProviderTest.php @@ -2,17 +2,17 @@ declare(strict_types=1); -namespace FrontendTest\Unit\App; +namespace AdminTest\Unit\App; +use Admin\App\ConfigProvider; +use Admin\App\Controller\DashboardController; +use Admin\App\Plugin\FormsPlugin; +use Admin\App\Resolver\EntityListenerResolver; +use Admin\App\RoutesDelegator as AppDelegator; +use AdminTest\Unit\UnitTest; use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityManagerInterface; use Dot\Controller\Plugin\PluginManager; -use Frontend\App\ConfigProvider; -use Frontend\App\Controller\DashboardController; -use Frontend\App\Plugin\FormsPlugin; -use Frontend\App\Resolver\EntityListenerResolver; -use Frontend\App\RoutesDelegator as AppDelegator; -use FrontendTest\Unit\UnitTest; use Mezzio\Application; class ConfigProviderTest extends UnitTest diff --git a/test/Unit/App/Controller/DashboardControllerTest.php b/test/Unit/App/Controller/DashboardControllerTest.php index b9c5c4c6..014ddd56 100644 --- a/test/Unit/App/Controller/DashboardControllerTest.php +++ b/test/Unit/App/Controller/DashboardControllerTest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace FrontendTest\Unit\App\Controller; +namespace AdminTest\Unit\App\Controller; -use Frontend\App\Controller\DashboardController; -use FrontendTest\Unit\UnitTest; +use Admin\App\Controller\DashboardController; +use AdminTest\Unit\UnitTest; use Laminas\Authentication\AuthenticationServiceInterface; use Mezzio\Router\RouterInterface; use Mezzio\Template\TemplateRendererInterface; diff --git a/test/Unit/App/Entity/AbstractEntityTest.php b/test/Unit/App/Entity/AbstractEntityTest.php index 482adf60..26f53e25 100644 --- a/test/Unit/App/Entity/AbstractEntityTest.php +++ b/test/Unit/App/Entity/AbstractEntityTest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace FrontendTest\Unit\App\Entity; +namespace AdminTest\Unit\App\Entity; -use Frontend\App\Entity\AbstractEntity; -use FrontendTest\Unit\UnitTest; +use Admin\App\Entity\AbstractEntity; +use AdminTest\Unit\UnitTest; use Ramsey\Uuid\UuidInterface; class AbstractEntityTest extends UnitTest diff --git a/test/Unit/App/Factory/AuthMiddlewareFactoryTest.php b/test/Unit/App/Factory/AuthMiddlewareFactoryTest.php index daa0f53b..c3bb938c 100644 --- a/test/Unit/App/Factory/AuthMiddlewareFactoryTest.php +++ b/test/Unit/App/Factory/AuthMiddlewareFactoryTest.php @@ -2,16 +2,16 @@ declare(strict_types=1); -namespace FrontendTest\Unit\App\Factory; +namespace AdminTest\Unit\App\Factory; +use Admin\App\Factory\AuthMiddlewareFactory; +use Admin\App\Middleware\AuthMiddleware; +use AdminTest\Unit\UnitTest; use Dot\FlashMessenger\FlashMessenger; use Dot\Navigation\Provider\ArrayProvider; use Dot\Rbac\Guard\Options\RbacGuardOptions; use Dot\Rbac\Guard\Provider\GuardsProviderInterface; use Dot\Rbac\Guard\Provider\GuardsProviderPluginManager; -use Frontend\App\Factory\AuthMiddlewareFactory; -use Frontend\App\Middleware\AuthMiddleware; -use FrontendTest\Unit\UnitTest; use Mezzio\Router\RouterInterface; use PHPUnit\Framework\MockObject\Exception; use Psr\Container\ContainerExceptionInterface; diff --git a/test/Unit/App/Factory/EntityListenerResolverFactoryTest.php b/test/Unit/App/Factory/EntityListenerResolverFactoryTest.php index 9fb3c643..4ae226d2 100644 --- a/test/Unit/App/Factory/EntityListenerResolverFactoryTest.php +++ b/test/Unit/App/Factory/EntityListenerResolverFactoryTest.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace FrontendTest\Unit\App\Factory; +namespace AdminTest\Unit\App\Factory; -use Frontend\App\Factory\EntityListenerResolverFactory; -use Frontend\App\Resolver\EntityListenerResolver; -use FrontendTest\Unit\UnitTest; +use Admin\App\Factory\EntityListenerResolverFactory; +use Admin\App\Resolver\EntityListenerResolver; +use AdminTest\Unit\UnitTest; use PHPUnit\Framework\MockObject\Exception; use Psr\Container\ContainerInterface; diff --git a/test/Unit/App/Factory/FormsPluginFactoryTest.php b/test/Unit/App/Factory/FormsPluginFactoryTest.php index 1bf2a552..7db8a59e 100644 --- a/test/Unit/App/Factory/FormsPluginFactoryTest.php +++ b/test/Unit/App/Factory/FormsPluginFactoryTest.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace FrontendTest\Unit\App\Factory; +namespace AdminTest\Unit\App\Factory; +use Admin\App\Factory\FormsPluginFactory; +use Admin\App\Plugin\FormsPlugin; +use AdminTest\Unit\UnitTest; use Dot\FlashMessenger\FlashMessengerInterface; -use Frontend\App\Factory\FormsPluginFactory; -use Frontend\App\Plugin\FormsPlugin; -use FrontendTest\Unit\UnitTest; use Laminas\Form\FormElementManager; use PHPUnit\Framework\MockObject\Exception; use Psr\Container\ContainerExceptionInterface; diff --git a/test/Unit/App/Middleware/AuthMiddlewareTest.php b/test/Unit/App/Middleware/AuthMiddlewareTest.php index 5cbe4f01..ced5bd39 100644 --- a/test/Unit/App/Middleware/AuthMiddlewareTest.php +++ b/test/Unit/App/Middleware/AuthMiddlewareTest.php @@ -2,15 +2,15 @@ declare(strict_types=1); -namespace FrontendTest\Unit\App\Middleware; +namespace AdminTest\Unit\App\Middleware; +use Admin\App\Middleware\AuthMiddleware; +use AdminTest\Unit\UnitTest; use Dot\FlashMessenger\FlashMessengerInterface; use Dot\Rbac\Guard\Exception\RuntimeException; use Dot\Rbac\Guard\Guard\GuardInterface; use Dot\Rbac\Guard\Options\RbacGuardOptions; use Dot\Rbac\Guard\Provider\GuardsProviderInterface; -use Frontend\App\Middleware\AuthMiddleware; -use FrontendTest\Unit\UnitTest; use Laminas\Diactoros\Response\RedirectResponse; use Laminas\Http\Response; use Mezzio\Router\RouterInterface; diff --git a/test/Unit/App/Plugin/FormsPluginTest.php b/test/Unit/App/Plugin/FormsPluginTest.php index b611a6d9..3914b78a 100644 --- a/test/Unit/App/Plugin/FormsPluginTest.php +++ b/test/Unit/App/Plugin/FormsPluginTest.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace FrontendTest\Unit\App\Plugin; +namespace AdminTest\Unit\App\Plugin; +use Admin\Admin\Form\LoginForm; +use Admin\App\Plugin\FormsPlugin; +use AdminTest\Unit\UnitTest; use Dot\FlashMessenger\FlashMessengerInterface; -use Frontend\Admin\Form\LoginForm; -use Frontend\App\Plugin\FormsPlugin; -use FrontendTest\Unit\UnitTest; use Laminas\Form\FormElementManager; use Laminas\Session\Container; use Laminas\Session\Validator\Csrf; diff --git a/test/Unit/App/Repository/AbstractRepositoryTest.php b/test/Unit/App/Repository/AbstractRepositoryTest.php index 9a8949e6..b617ae10 100644 --- a/test/Unit/App/Repository/AbstractRepositoryTest.php +++ b/test/Unit/App/Repository/AbstractRepositoryTest.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace FrontendTest\Unit\App\Repository; +namespace AdminTest\Unit\App\Repository; +use Admin\Admin\Entity\Admin; +use Admin\App\Repository\AbstractRepository; +use AdminTest\Unit\UnitTest; use Doctrine\ORM\EntityRepository; use Doctrine\ORM\QueryBuilder; -use Frontend\Admin\Entity\Admin; -use Frontend\App\Repository\AbstractRepository; -use FrontendTest\Unit\UnitTest; use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; diff --git a/test/Unit/App/Resolver/EntityListenerResolverTest.php b/test/Unit/App/Resolver/EntityListenerResolverTest.php index d12c4102..bbf85152 100644 --- a/test/Unit/App/Resolver/EntityListenerResolverTest.php +++ b/test/Unit/App/Resolver/EntityListenerResolverTest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace FrontendTest\Unit\App\Resolver; +namespace AdminTest\Unit\App\Resolver; -use Frontend\App\Resolver\EntityListenerResolver; -use FrontendTest\Unit\UnitTest; +use Admin\App\Resolver\EntityListenerResolver; +use AdminTest\Unit\UnitTest; use PHPUnit\Framework\MockObject\Exception; use Psr\Container\ContainerExceptionInterface; use Psr\Container\ContainerInterface; diff --git a/test/Unit/App/RoutesDelegatorTest.php b/test/Unit/App/RoutesDelegatorTest.php index f3a29a3f..4eb860ec 100644 --- a/test/Unit/App/RoutesDelegatorTest.php +++ b/test/Unit/App/RoutesDelegatorTest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace FrontendTest\Unit\App; +namespace AdminTest\Unit\App; -use Frontend\Admin\RoutesDelegator; -use FrontendTest\Unit\UnitTest; +use Admin\Admin\RoutesDelegator; +use AdminTest\Unit\UnitTest; use Mezzio\Application; use PHPUnit\Framework\MockObject\Exception; use Psr\Container\ContainerInterface; diff --git a/test/Unit/App/Service/IpServiceTest.php b/test/Unit/App/Service/IpServiceTest.php index 59e1aa05..3a825e62 100644 --- a/test/Unit/App/Service/IpServiceTest.php +++ b/test/Unit/App/Service/IpServiceTest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace FrontendTest\Unit\App\Service; +namespace AdminTest\Unit\App\Service; -use Frontend\App\Service\IpService; -use FrontendTest\Unit\UnitTest; +use Admin\App\Service\IpService; +use AdminTest\Unit\UnitTest; use function putenv; use function sprintf; diff --git a/test/Unit/Setting/ConfigProviderTest.php b/test/Unit/Setting/ConfigProviderTest.php index 8cb17b4e..76628f50 100644 --- a/test/Unit/Setting/ConfigProviderTest.php +++ b/test/Unit/Setting/ConfigProviderTest.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Setting; +namespace AdminTest\Unit\Setting; -use Frontend\Setting\ConfigProvider; -use Frontend\Setting\Controller\SettingController; -use Frontend\Setting\Repository\SettingRepository; -use Frontend\Setting\Service\SettingService; -use FrontendTest\Unit\UnitTest; +use Admin\Setting\ConfigProvider; +use Admin\Setting\Controller\SettingController; +use Admin\Setting\Repository\SettingRepository; +use Admin\Setting\Service\SettingService; +use AdminTest\Unit\UnitTest; class ConfigProviderTest extends UnitTest { @@ -42,7 +42,7 @@ public function testGetDoctrineConfig(): void $this->assertIsArray($this->config['doctrine']['driver']['orm_default']); $this->assertArrayHasKey('drivers', $this->config['doctrine']['driver']['orm_default']); $this->assertArrayHasKey( - 'Frontend\Setting\Entity', + 'Admin\Setting\Entity', $this->config['doctrine']['driver']['orm_default']['drivers'] ); $this->assertArrayHasKey('SettingEntities', $this->config['doctrine']['driver']); diff --git a/test/Unit/Setting/Controller/SettingControllerTest.php b/test/Unit/Setting/Controller/SettingControllerTest.php index b9408720..94c76fab 100644 --- a/test/Unit/Setting/Controller/SettingControllerTest.php +++ b/test/Unit/Setting/Controller/SettingControllerTest.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Setting\Controller; +namespace AdminTest\Unit\Setting\Controller; -use Frontend\Admin\Service\AdminService; -use Frontend\Setting\Controller\SettingController; -use Frontend\Setting\Service\SettingService; -use FrontendTest\Unit\UnitTest; +use Admin\Admin\Service\AdminService; +use Admin\Setting\Controller\SettingController; +use Admin\Setting\Service\SettingService; +use AdminTest\Unit\UnitTest; use Laminas\Authentication\AuthenticationServiceInterface; use Mezzio\Router\RouterInterface; use PHPUnit\Framework\MockObject\Exception; diff --git a/test/Unit/Setting/Entity/SettingEntityTest.php b/test/Unit/Setting/Entity/SettingEntityTest.php index 6e8f12f3..f8f1fd48 100644 --- a/test/Unit/Setting/Entity/SettingEntityTest.php +++ b/test/Unit/Setting/Entity/SettingEntityTest.php @@ -2,14 +2,14 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Setting\Entity; +namespace AdminTest\Unit\Setting\Entity; +use Admin\Admin\Entity\Admin; +use Admin\Setting\Entity\Setting; +use Admin\Setting\Repository\SettingRepository; +use AdminTest\Unit\UnitTest; use Doctrine\ORM\Mapping\Entity; use Doctrine\ORM\Mapping\Table; -use Frontend\Admin\Entity\Admin; -use Frontend\Setting\Entity\Setting; -use Frontend\Setting\Repository\SettingRepository; -use FrontendTest\Unit\UnitTest; use PHPUnit\Framework\MockObject\Exception; use ReflectionAttribute; use ReflectionClass; diff --git a/test/Unit/Setting/InputFilter/SettingInputFilterTest.php b/test/Unit/Setting/InputFilter/SettingInputFilterTest.php index be712185..03bb5d59 100644 --- a/test/Unit/Setting/InputFilter/SettingInputFilterTest.php +++ b/test/Unit/Setting/InputFilter/SettingInputFilterTest.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Setting\InputFilter; +namespace AdminTest\Unit\Setting\InputFilter; -use Frontend\App\Message; -use Frontend\Setting\InputFilter\SettingInputFilter; -use FrontendTest\Common\TestCase; +use Admin\App\Message; +use Admin\Setting\InputFilter\SettingInputFilter; +use AdminTest\Common\TestCase; use function sprintf; diff --git a/test/Unit/Setting/Repository/SettingRepositoryTest.php b/test/Unit/Setting/Repository/SettingRepositoryTest.php index b5500fc1..421c5982 100644 --- a/test/Unit/Setting/Repository/SettingRepositoryTest.php +++ b/test/Unit/Setting/Repository/SettingRepositoryTest.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Setting\Repository; +namespace AdminTest\Unit\Setting\Repository; +use Admin\Setting\Entity\Setting; +use Admin\Setting\Repository\SettingRepository; +use AdminTest\Unit\UnitTest; use Doctrine\ORM\EntityManager; -use Frontend\Setting\Entity\Setting; -use Frontend\Setting\Repository\SettingRepository; -use FrontendTest\Unit\UnitTest; use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; diff --git a/test/Unit/Setting/RoutesDelegatorTest.php b/test/Unit/Setting/RoutesDelegatorTest.php index 62ca6965..c946a5c0 100644 --- a/test/Unit/Setting/RoutesDelegatorTest.php +++ b/test/Unit/Setting/RoutesDelegatorTest.php @@ -2,10 +2,10 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Setting; +namespace AdminTest\Unit\Setting; -use Frontend\App\RoutesDelegator; -use FrontendTest\Unit\UnitTest; +use Admin\App\RoutesDelegator; +use AdminTest\Unit\UnitTest; use Mezzio\Application; use PHPUnit\Framework\MockObject\Exception; use Psr\Container\ContainerInterface; diff --git a/test/Unit/Setting/Service/SettingServiceTest.php b/test/Unit/Setting/Service/SettingServiceTest.php index fb93fca7..08cae7bc 100644 --- a/test/Unit/Setting/Service/SettingServiceTest.php +++ b/test/Unit/Setting/Service/SettingServiceTest.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace FrontendTest\Unit\Setting\Service; +namespace AdminTest\Unit\Setting\Service; -use Frontend\Setting\Repository\SettingRepository; -use Frontend\Setting\Service\SettingService; -use FrontendTest\Unit\UnitTest; +use Admin\Setting\Repository\SettingRepository; +use Admin\Setting\Service\SettingService; +use AdminTest\Unit\UnitTest; use PHPUnit\Framework\MockObject\Exception; class SettingServiceTest extends UnitTest diff --git a/test/Unit/UnitTest.php b/test/Unit/UnitTest.php index 74b6b2d0..650f658e 100644 --- a/test/Unit/UnitTest.php +++ b/test/Unit/UnitTest.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace FrontendTest\Unit; +namespace AdminTest\Unit; -use FrontendTest\Common\TestCase; +use AdminTest\Common\TestCase; class UnitTest extends TestCase {