From c1f1cd2d57b67f2d2975f1bf30f09c3e437aa49e Mon Sep 17 00:00:00 2001 From: Romain BASTIDE Date: Sat, 11 Feb 2023 00:35:19 +0100 Subject: [PATCH] Switch to PSR-4 and move classes accordingly #35 --- Module.php | 117 +----------------- composer.json | 18 +-- phpunit.xml.dist | 4 +- .../Adapter/AbstractAdapter.php | 0 .../Authentication/Adapter/AdapterChain.php | 0 .../Adapter/AdapterChainEvent.php | 0 .../Adapter/AdapterChainServiceFactory.php | 0 .../Adapter/ChainableAdapter.php | 0 .../Authentication/Adapter/Db.php | 0 .../Exception/OptionsNotFoundException.php | 0 .../Authentication/Storage/Db.php | 0 .../Plugin/LmcUserAuthentication.php | 0 .../Controller/RedirectCallback.php | 0 .../Controller/UserController.php | 0 .../Db/Adapter/MasterSlaveAdapter.php | 0 .../Adapter/MasterSlaveAdapterInterface.php | 0 src/{LmcUser => }/Entity/User.php | 0 src/{LmcUser => }/Entity/UserInterface.php | 0 .../EventManager/EventProvider.php | 0 .../AuthenticationEventException.php | 0 .../Exception/DomainException.php | 0 .../Exception/ExceptionInterface.php | 0 .../Authentication/Adapter/DbFactory.php | 0 .../Authentication/Storage/DbFactory.php | 0 .../Factory/AuthenticationService.php | 0 .../Plugin/LmcUserAuthentication.php | 0 .../Controller/RedirectCallbackFactory.php | 0 .../Controller/UserControllerFactory.php | 0 .../Factory/Form/ChangeEmail.php | 0 .../Factory/Form/ChangePassword.php | 0 src/{LmcUser => }/Factory/Form/Login.php | 0 src/{LmcUser => }/Factory/Form/Register.php | 0 src/{LmcUser => }/Factory/Mapper/User.php | 0 .../Factory/Options/ModuleOptions.php | 0 .../Factory/Service/UserFactory.php | 0 src/{LmcUser => }/Factory/UserHydrator.php | 0 .../View/Helper/LmcUserDisplayName.php | 0 .../Factory/View/Helper/LmcUserIdentity.php | 0 .../View/Helper/LmcUserLoginWidget.php | 0 src/{LmcUser => }/Form/Base.php | 0 src/{LmcUser => }/Form/ChangeEmail.php | 0 src/{LmcUser => }/Form/ChangeEmailFilter.php | 0 src/{LmcUser => }/Form/ChangePassword.php | 0 .../Form/ChangePasswordFilter.php | 0 src/{LmcUser => }/Form/Login.php | 0 src/{LmcUser => }/Form/LoginFilter.php | 0 src/{LmcUser => }/Form/ProvidesEventsForm.php | 0 src/{LmcUser => }/Form/Register.php | 0 src/{LmcUser => }/Form/RegisterFilter.php | 0 .../InputFilter/ProvidesEventsInputFilter.php | 0 src/{LmcUser => }/Mapper/AbstractDbMapper.php | 0 .../Mapper/Exception/ExceptionInterface.php | 0 .../Exception/InvalidArgumentException.php | 0 .../Mapper/Exception/RuntimeException.php | 0 src/{LmcUser => }/Mapper/User.php | 0 src/{LmcUser => }/Mapper/UserHydrator.php | 0 src/{LmcUser => }/Mapper/UserInterface.php | 0 src/Module.php | 116 +++++++++++++++++ .../AuthenticationOptionsInterface.php | 0 src/{LmcUser => }/Options/ModuleOptions.php | 0 .../Options/PasswordOptionsInterface.php | 0 .../Options/RegistrationOptionsInterface.php | 0 .../UserControllerOptionsInterface.php | 0 .../Options/UserServiceOptionsInterface.php | 0 .../Service/Exception/ExceptionInterface.php | 0 .../Exception/InvalidArgumentException.php | 0 src/{LmcUser => }/Service/User.php | 0 .../Validator/AbstractRecord.php | 0 .../Exception/ExceptionInterface.php | 0 .../Exception/InvalidArgumentException.php | 0 .../Validator/NoRecordExists.php | 0 src/{LmcUser => }/Validator/RecordExists.php | 0 .../View/Helper/LmcUserDisplayName.php | 0 .../View/Helper/LmcUserIdentity.php | 0 .../View/Helper/LmcUserLoginWidget.php | 0 src/{LmcUser => }/language/cs_CZ.mo | Bin src/{LmcUser => }/language/cs_CZ.po | 0 src/{LmcUser => }/language/de_DE.mo | Bin src/{LmcUser => }/language/de_DE.po | 0 src/{LmcUser => }/language/es_ES.mo | Bin src/{LmcUser => }/language/es_ES.po | 0 src/{LmcUser => }/language/fr_FR.mo | Bin src/{LmcUser => }/language/fr_FR.po | 0 src/{LmcUser => }/language/ja_JP.mo | Bin src/{LmcUser => }/language/ja_JP.po | 0 src/{LmcUser => }/language/msgIds.php | 0 src/{LmcUser => }/language/nl_NL.mo | Bin src/{LmcUser => }/language/nl_NL.po | 0 src/{LmcUser => }/language/pl_PL.mo | Bin src/{LmcUser => }/language/pl_PL.po | 0 src/{LmcUser => }/language/pt_BR.mo | Bin src/{LmcUser => }/language/pt_BR.po | 0 src/{LmcUser => }/language/ru_RU.mo | Bin src/{LmcUser => }/language/ru_RU.po | 0 .../Adapter/AbstractAdapterTest.php | 0 .../Adapter/AdapterChainEventTest.php | 0 .../AdapterChainServiceFactoryTest.php | 0 .../Adapter/AdapterChainTest.php | 0 .../Authentication/Adapter/DbTest.php | 0 .../TestAsset/AbstractAdapterExtension.php | 0 .../Adapter/TestAsset/InvalidUserClass.php | 0 .../Authentication/Storage/DbTest.php | 0 .../Plugin/LmcUserAuthenticationTest.php | 0 .../Controller/RedirectCallbackTest.php | 0 .../Controller/UserControllerTest.php | 0 tests/{LmcUserTest => }/Entity/UserTest.php | 0 .../Form/ChangeEmailFormFactoryTest.php | 0 .../Form/ChangePasswordFormFactoryTest.php | 0 .../Factory/Form/LoginFormFactoryTest.php | 0 .../Factory/Form/RegisterFormFactoryTest.php | 0 .../Factory/Mapper/UserMapperFactoryTest.php | 0 tests/{LmcUserTest => }/Form/BaseTest.php | 0 .../Form/ChangeEmailFilterTest.php | 0 .../Form/ChangeEmailTest.php | 0 .../Form/ChangePasswordFilterTest.php | 0 .../Form/ChangePasswordTest.php | 0 .../Form/LoginFilterTest.php | 0 tests/{LmcUserTest => }/Form/LoginTest.php | 0 .../Form/RegisterFilterTest.php | 0 tests/{LmcUserTest => }/Form/RegisterTest.php | 0 .../Mapper/UserHydratorTest.php | 0 tests/{LmcUserTest => }/Mapper/UserTest.php | 0 .../{LmcUserTest => }/Mapper/_files/user.sql | 0 tests/{LmcUserTest => }/ModuleTest.php | 0 .../Options/ModuleOptionsTest.php | 0 tests/{LmcUserTest => }/Service/UserTest.php | 0 .../Validator/AbstractRecordTest.php | 0 .../Validator/NoRecordExistsTest.php | 0 .../Validator/RecordExistsTest.php | 0 .../TestAsset/AbstractRecordExtension.php | 0 .../View/Helper/LmcUserDisplayNameTest.php | 0 .../View/Helper/LmcUserIdentityTest.php | 0 .../View/Helper/LmcUserLoginWidgetTest.php | 0 133 files changed, 132 insertions(+), 123 deletions(-) rename src/{LmcUser => }/Authentication/Adapter/AbstractAdapter.php (100%) rename src/{LmcUser => }/Authentication/Adapter/AdapterChain.php (100%) rename src/{LmcUser => }/Authentication/Adapter/AdapterChainEvent.php (100%) rename src/{LmcUser => }/Authentication/Adapter/AdapterChainServiceFactory.php (100%) rename src/{LmcUser => }/Authentication/Adapter/ChainableAdapter.php (100%) rename src/{LmcUser => }/Authentication/Adapter/Db.php (100%) rename src/{LmcUser => }/Authentication/Adapter/Exception/OptionsNotFoundException.php (100%) rename src/{LmcUser => }/Authentication/Storage/Db.php (100%) rename src/{LmcUser => }/Controller/Plugin/LmcUserAuthentication.php (100%) rename src/{LmcUser => }/Controller/RedirectCallback.php (100%) rename src/{LmcUser => }/Controller/UserController.php (100%) rename src/{LmcUser => }/Db/Adapter/MasterSlaveAdapter.php (100%) rename src/{LmcUser => }/Db/Adapter/MasterSlaveAdapterInterface.php (100%) rename src/{LmcUser => }/Entity/User.php (100%) rename src/{LmcUser => }/Entity/UserInterface.php (100%) rename src/{LmcUser => }/EventManager/EventProvider.php (100%) rename src/{LmcUser => }/Exception/AuthenticationEventException.php (100%) rename src/{LmcUser => }/Exception/DomainException.php (100%) rename src/{LmcUser => }/Exception/ExceptionInterface.php (100%) rename src/{LmcUser => }/Factory/Authentication/Adapter/DbFactory.php (100%) rename src/{LmcUser => }/Factory/Authentication/Storage/DbFactory.php (100%) rename src/{LmcUser => }/Factory/AuthenticationService.php (100%) rename src/{LmcUser => }/Factory/Controller/Plugin/LmcUserAuthentication.php (100%) rename src/{LmcUser => }/Factory/Controller/RedirectCallbackFactory.php (100%) rename src/{LmcUser => }/Factory/Controller/UserControllerFactory.php (100%) rename src/{LmcUser => }/Factory/Form/ChangeEmail.php (100%) rename src/{LmcUser => }/Factory/Form/ChangePassword.php (100%) rename src/{LmcUser => }/Factory/Form/Login.php (100%) rename src/{LmcUser => }/Factory/Form/Register.php (100%) rename src/{LmcUser => }/Factory/Mapper/User.php (100%) rename src/{LmcUser => }/Factory/Options/ModuleOptions.php (100%) rename src/{LmcUser => }/Factory/Service/UserFactory.php (100%) rename src/{LmcUser => }/Factory/UserHydrator.php (100%) rename src/{LmcUser => }/Factory/View/Helper/LmcUserDisplayName.php (100%) rename src/{LmcUser => }/Factory/View/Helper/LmcUserIdentity.php (100%) rename src/{LmcUser => }/Factory/View/Helper/LmcUserLoginWidget.php (100%) rename src/{LmcUser => }/Form/Base.php (100%) rename src/{LmcUser => }/Form/ChangeEmail.php (100%) rename src/{LmcUser => }/Form/ChangeEmailFilter.php (100%) rename src/{LmcUser => }/Form/ChangePassword.php (100%) rename src/{LmcUser => }/Form/ChangePasswordFilter.php (100%) rename src/{LmcUser => }/Form/Login.php (100%) rename src/{LmcUser => }/Form/LoginFilter.php (100%) rename src/{LmcUser => }/Form/ProvidesEventsForm.php (100%) rename src/{LmcUser => }/Form/Register.php (100%) rename src/{LmcUser => }/Form/RegisterFilter.php (100%) rename src/{LmcUser => }/InputFilter/ProvidesEventsInputFilter.php (100%) rename src/{LmcUser => }/Mapper/AbstractDbMapper.php (100%) rename src/{LmcUser => }/Mapper/Exception/ExceptionInterface.php (100%) rename src/{LmcUser => }/Mapper/Exception/InvalidArgumentException.php (100%) rename src/{LmcUser => }/Mapper/Exception/RuntimeException.php (100%) rename src/{LmcUser => }/Mapper/User.php (100%) rename src/{LmcUser => }/Mapper/UserHydrator.php (100%) rename src/{LmcUser => }/Mapper/UserInterface.php (100%) create mode 100644 src/Module.php rename src/{LmcUser => }/Options/AuthenticationOptionsInterface.php (100%) rename src/{LmcUser => }/Options/ModuleOptions.php (100%) rename src/{LmcUser => }/Options/PasswordOptionsInterface.php (100%) rename src/{LmcUser => }/Options/RegistrationOptionsInterface.php (100%) rename src/{LmcUser => }/Options/UserControllerOptionsInterface.php (100%) rename src/{LmcUser => }/Options/UserServiceOptionsInterface.php (100%) rename src/{LmcUser => }/Service/Exception/ExceptionInterface.php (100%) rename src/{LmcUser => }/Service/Exception/InvalidArgumentException.php (100%) rename src/{LmcUser => }/Service/User.php (100%) rename src/{LmcUser => }/Validator/AbstractRecord.php (100%) rename src/{LmcUser => }/Validator/Exception/ExceptionInterface.php (100%) rename src/{LmcUser => }/Validator/Exception/InvalidArgumentException.php (100%) rename src/{LmcUser => }/Validator/NoRecordExists.php (100%) rename src/{LmcUser => }/Validator/RecordExists.php (100%) rename src/{LmcUser => }/View/Helper/LmcUserDisplayName.php (100%) rename src/{LmcUser => }/View/Helper/LmcUserIdentity.php (100%) rename src/{LmcUser => }/View/Helper/LmcUserLoginWidget.php (100%) rename src/{LmcUser => }/language/cs_CZ.mo (100%) rename src/{LmcUser => }/language/cs_CZ.po (100%) rename src/{LmcUser => }/language/de_DE.mo (100%) rename src/{LmcUser => }/language/de_DE.po (100%) rename src/{LmcUser => }/language/es_ES.mo (100%) rename src/{LmcUser => }/language/es_ES.po (100%) rename src/{LmcUser => }/language/fr_FR.mo (100%) rename src/{LmcUser => }/language/fr_FR.po (100%) rename src/{LmcUser => }/language/ja_JP.mo (100%) rename src/{LmcUser => }/language/ja_JP.po (100%) rename src/{LmcUser => }/language/msgIds.php (100%) rename src/{LmcUser => }/language/nl_NL.mo (100%) rename src/{LmcUser => }/language/nl_NL.po (100%) rename src/{LmcUser => }/language/pl_PL.mo (100%) rename src/{LmcUser => }/language/pl_PL.po (100%) rename src/{LmcUser => }/language/pt_BR.mo (100%) rename src/{LmcUser => }/language/pt_BR.po (100%) rename src/{LmcUser => }/language/ru_RU.mo (100%) rename src/{LmcUser => }/language/ru_RU.po (100%) rename tests/{LmcUserTest => }/Authentication/Adapter/AbstractAdapterTest.php (100%) rename tests/{LmcUserTest => }/Authentication/Adapter/AdapterChainEventTest.php (100%) rename tests/{LmcUserTest => }/Authentication/Adapter/AdapterChainServiceFactoryTest.php (100%) rename tests/{LmcUserTest => }/Authentication/Adapter/AdapterChainTest.php (100%) rename tests/{LmcUserTest => }/Authentication/Adapter/DbTest.php (100%) rename tests/{LmcUserTest => }/Authentication/Adapter/TestAsset/AbstractAdapterExtension.php (100%) rename tests/{LmcUserTest => }/Authentication/Adapter/TestAsset/InvalidUserClass.php (100%) rename tests/{LmcUserTest => }/Authentication/Storage/DbTest.php (100%) rename tests/{LmcUserTest => }/Controller/Plugin/LmcUserAuthenticationTest.php (100%) rename tests/{LmcUserTest => }/Controller/RedirectCallbackTest.php (100%) rename tests/{LmcUserTest => }/Controller/UserControllerTest.php (100%) rename tests/{LmcUserTest => }/Entity/UserTest.php (100%) rename tests/{LmcUserTest => }/Factory/Form/ChangeEmailFormFactoryTest.php (100%) rename tests/{LmcUserTest => }/Factory/Form/ChangePasswordFormFactoryTest.php (100%) rename tests/{LmcUserTest => }/Factory/Form/LoginFormFactoryTest.php (100%) rename tests/{LmcUserTest => }/Factory/Form/RegisterFormFactoryTest.php (100%) rename tests/{LmcUserTest => }/Factory/Mapper/UserMapperFactoryTest.php (100%) rename tests/{LmcUserTest => }/Form/BaseTest.php (100%) rename tests/{LmcUserTest => }/Form/ChangeEmailFilterTest.php (100%) rename tests/{LmcUserTest => }/Form/ChangeEmailTest.php (100%) rename tests/{LmcUserTest => }/Form/ChangePasswordFilterTest.php (100%) rename tests/{LmcUserTest => }/Form/ChangePasswordTest.php (100%) rename tests/{LmcUserTest => }/Form/LoginFilterTest.php (100%) rename tests/{LmcUserTest => }/Form/LoginTest.php (100%) rename tests/{LmcUserTest => }/Form/RegisterFilterTest.php (100%) rename tests/{LmcUserTest => }/Form/RegisterTest.php (100%) rename tests/{LmcUserTest => }/Mapper/UserHydratorTest.php (100%) rename tests/{LmcUserTest => }/Mapper/UserTest.php (100%) rename tests/{LmcUserTest => }/Mapper/_files/user.sql (100%) rename tests/{LmcUserTest => }/ModuleTest.php (100%) rename tests/{LmcUserTest => }/Options/ModuleOptionsTest.php (100%) rename tests/{LmcUserTest => }/Service/UserTest.php (100%) rename tests/{LmcUserTest => }/Validator/AbstractRecordTest.php (100%) rename tests/{LmcUserTest => }/Validator/NoRecordExistsTest.php (100%) rename tests/{LmcUserTest => }/Validator/RecordExistsTest.php (100%) rename tests/{LmcUserTest => }/Validator/TestAsset/AbstractRecordExtension.php (100%) rename tests/{LmcUserTest => }/View/Helper/LmcUserDisplayNameTest.php (100%) rename tests/{LmcUserTest => }/View/Helper/LmcUserIdentityTest.php (100%) rename tests/{LmcUserTest => }/View/Helper/LmcUserLoginWidgetTest.php (100%) diff --git a/Module.php b/Module.php index d1b2743..36b7790 100644 --- a/Module.php +++ b/Module.php @@ -1,116 +1,7 @@ [ - 'lmcUserAuthentication' => Factory\Controller\Plugin\LmcUserAuthentication::class, - ], - ]; - } - - /** - * {@inheritDoc} - * @see \Laminas\ModuleManager\Feature\ControllerProviderInterface::getControllerConfig() - */ - public function getControllerConfig() - { - return [ - 'factories' => [ - 'lmcuser' => Factory\Controller\UserControllerFactory::class, - ], - ]; - } - - /** - * {@inheritDoc} - * @see \Laminas\ModuleManager\Feature\ViewHelperProviderInterface::getViewHelperConfig() - */ - public function getViewHelperConfig() - { - return [ - 'factories' => [ - 'lmcUserDisplayName' => Factory\View\Helper\LmcUserDisplayName::class, - 'lmcUserIdentity' => Factory\View\Helper\LmcUserIdentity::class, - 'lmcUserLoginWidget' => Factory\View\Helper\LmcUserLoginWidget::class, - ], - ]; - } - - /** - * {@inheritDoc} - * @see \Laminas\ModuleManager\Feature\ServiceProviderInterface::getServiceConfig() - */ - public function getServiceConfig() - { - return [ - 'aliases' => [ - 'lmcuser_laminas_db_adapter' => \Laminas\Db\Adapter\Adapter::class, - 'lmcuser_register_form_hydrator' => 'lmcuser_user_hydrator', - 'lmcuser_base_hydrator' => 'lmcuser_default_hydrator', - ], - 'invokables' => [ - 'lmcuser_default_hydrator' => ClassMethodsHydrator::class, - ], - 'factories' => [ - 'lmcuser_redirect_callback' => Factory\Controller\RedirectCallbackFactory::class, - 'lmcuser_module_options' => Factory\Options\ModuleOptions::class, - Authentication\Adapter\AdapterChain::class => Authentication\Adapter\AdapterChainServiceFactory::class, - - // We alias this one because it's LmcUser's instance of - // Laminas\Authentication\AuthenticationService. We don't want to - // hog the FQCN service alias for a Laminas\* class. - 'lmcuser_auth_service' => Factory\AuthenticationService::class, - - 'lmcuser_user_hydrator' => Factory\UserHydrator::class, - 'lmcuser_user_mapper' => Factory\Mapper\User::class, - - 'lmcuser_login_form' => Factory\Form\Login::class, - 'lmcuser_register_form' => Factory\Form\Register::class, - 'lmcuser_change_password_form' => Factory\Form\ChangePassword::class, - 'lmcuser_change_email_form' => Factory\Form\ChangeEmail::class, - - Authentication\Adapter\Db::class => Factory\Authentication\Adapter\DbFactory::class, - Authentication\Storage\Db::class => Factory\Authentication\Storage\DbFactory::class, - - 'lmcuser_user_service' => Factory\Service\UserFactory::class, - ], - ]; - } -} +require_once __DIR__ . '/src/Module.php'; diff --git a/composer.json b/composer.json index 0d9d347..1d9dec3 100644 --- a/composer.json +++ b/composer.json @@ -56,18 +56,20 @@ "laminas/laminas-captcha" : "Laminas\\Captcha if you want to use the captcha component" }, "autoload": { - "psr-0": { - "LmcUser": "src/" - }, - "classmap": [ - "./Module.php" - ] + "psr-4": { + "LmcUser\\": "src/" + } }, "autoload-dev": { - "psr-0": { - "LmcUserTest": "tests/" + "psr-4": { + "LmcUserTest\\": "tests/" } }, + "extra": { + "laminas": { + "module": "LmcUser" + } + }, "scripts": { "check": [ "@cs-check", diff --git a/phpunit.xml.dist b/phpunit.xml.dist index c5fbfe0..d7d2ec5 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,5 +1,5 @@ - - ./tests/LmcUserTest + ./tests diff --git a/src/LmcUser/Authentication/Adapter/AbstractAdapter.php b/src/Authentication/Adapter/AbstractAdapter.php similarity index 100% rename from src/LmcUser/Authentication/Adapter/AbstractAdapter.php rename to src/Authentication/Adapter/AbstractAdapter.php diff --git a/src/LmcUser/Authentication/Adapter/AdapterChain.php b/src/Authentication/Adapter/AdapterChain.php similarity index 100% rename from src/LmcUser/Authentication/Adapter/AdapterChain.php rename to src/Authentication/Adapter/AdapterChain.php diff --git a/src/LmcUser/Authentication/Adapter/AdapterChainEvent.php b/src/Authentication/Adapter/AdapterChainEvent.php similarity index 100% rename from src/LmcUser/Authentication/Adapter/AdapterChainEvent.php rename to src/Authentication/Adapter/AdapterChainEvent.php diff --git a/src/LmcUser/Authentication/Adapter/AdapterChainServiceFactory.php b/src/Authentication/Adapter/AdapterChainServiceFactory.php similarity index 100% rename from src/LmcUser/Authentication/Adapter/AdapterChainServiceFactory.php rename to src/Authentication/Adapter/AdapterChainServiceFactory.php diff --git a/src/LmcUser/Authentication/Adapter/ChainableAdapter.php b/src/Authentication/Adapter/ChainableAdapter.php similarity index 100% rename from src/LmcUser/Authentication/Adapter/ChainableAdapter.php rename to src/Authentication/Adapter/ChainableAdapter.php diff --git a/src/LmcUser/Authentication/Adapter/Db.php b/src/Authentication/Adapter/Db.php similarity index 100% rename from src/LmcUser/Authentication/Adapter/Db.php rename to src/Authentication/Adapter/Db.php diff --git a/src/LmcUser/Authentication/Adapter/Exception/OptionsNotFoundException.php b/src/Authentication/Adapter/Exception/OptionsNotFoundException.php similarity index 100% rename from src/LmcUser/Authentication/Adapter/Exception/OptionsNotFoundException.php rename to src/Authentication/Adapter/Exception/OptionsNotFoundException.php diff --git a/src/LmcUser/Authentication/Storage/Db.php b/src/Authentication/Storage/Db.php similarity index 100% rename from src/LmcUser/Authentication/Storage/Db.php rename to src/Authentication/Storage/Db.php diff --git a/src/LmcUser/Controller/Plugin/LmcUserAuthentication.php b/src/Controller/Plugin/LmcUserAuthentication.php similarity index 100% rename from src/LmcUser/Controller/Plugin/LmcUserAuthentication.php rename to src/Controller/Plugin/LmcUserAuthentication.php diff --git a/src/LmcUser/Controller/RedirectCallback.php b/src/Controller/RedirectCallback.php similarity index 100% rename from src/LmcUser/Controller/RedirectCallback.php rename to src/Controller/RedirectCallback.php diff --git a/src/LmcUser/Controller/UserController.php b/src/Controller/UserController.php similarity index 100% rename from src/LmcUser/Controller/UserController.php rename to src/Controller/UserController.php diff --git a/src/LmcUser/Db/Adapter/MasterSlaveAdapter.php b/src/Db/Adapter/MasterSlaveAdapter.php similarity index 100% rename from src/LmcUser/Db/Adapter/MasterSlaveAdapter.php rename to src/Db/Adapter/MasterSlaveAdapter.php diff --git a/src/LmcUser/Db/Adapter/MasterSlaveAdapterInterface.php b/src/Db/Adapter/MasterSlaveAdapterInterface.php similarity index 100% rename from src/LmcUser/Db/Adapter/MasterSlaveAdapterInterface.php rename to src/Db/Adapter/MasterSlaveAdapterInterface.php diff --git a/src/LmcUser/Entity/User.php b/src/Entity/User.php similarity index 100% rename from src/LmcUser/Entity/User.php rename to src/Entity/User.php diff --git a/src/LmcUser/Entity/UserInterface.php b/src/Entity/UserInterface.php similarity index 100% rename from src/LmcUser/Entity/UserInterface.php rename to src/Entity/UserInterface.php diff --git a/src/LmcUser/EventManager/EventProvider.php b/src/EventManager/EventProvider.php similarity index 100% rename from src/LmcUser/EventManager/EventProvider.php rename to src/EventManager/EventProvider.php diff --git a/src/LmcUser/Exception/AuthenticationEventException.php b/src/Exception/AuthenticationEventException.php similarity index 100% rename from src/LmcUser/Exception/AuthenticationEventException.php rename to src/Exception/AuthenticationEventException.php diff --git a/src/LmcUser/Exception/DomainException.php b/src/Exception/DomainException.php similarity index 100% rename from src/LmcUser/Exception/DomainException.php rename to src/Exception/DomainException.php diff --git a/src/LmcUser/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php similarity index 100% rename from src/LmcUser/Exception/ExceptionInterface.php rename to src/Exception/ExceptionInterface.php diff --git a/src/LmcUser/Factory/Authentication/Adapter/DbFactory.php b/src/Factory/Authentication/Adapter/DbFactory.php similarity index 100% rename from src/LmcUser/Factory/Authentication/Adapter/DbFactory.php rename to src/Factory/Authentication/Adapter/DbFactory.php diff --git a/src/LmcUser/Factory/Authentication/Storage/DbFactory.php b/src/Factory/Authentication/Storage/DbFactory.php similarity index 100% rename from src/LmcUser/Factory/Authentication/Storage/DbFactory.php rename to src/Factory/Authentication/Storage/DbFactory.php diff --git a/src/LmcUser/Factory/AuthenticationService.php b/src/Factory/AuthenticationService.php similarity index 100% rename from src/LmcUser/Factory/AuthenticationService.php rename to src/Factory/AuthenticationService.php diff --git a/src/LmcUser/Factory/Controller/Plugin/LmcUserAuthentication.php b/src/Factory/Controller/Plugin/LmcUserAuthentication.php similarity index 100% rename from src/LmcUser/Factory/Controller/Plugin/LmcUserAuthentication.php rename to src/Factory/Controller/Plugin/LmcUserAuthentication.php diff --git a/src/LmcUser/Factory/Controller/RedirectCallbackFactory.php b/src/Factory/Controller/RedirectCallbackFactory.php similarity index 100% rename from src/LmcUser/Factory/Controller/RedirectCallbackFactory.php rename to src/Factory/Controller/RedirectCallbackFactory.php diff --git a/src/LmcUser/Factory/Controller/UserControllerFactory.php b/src/Factory/Controller/UserControllerFactory.php similarity index 100% rename from src/LmcUser/Factory/Controller/UserControllerFactory.php rename to src/Factory/Controller/UserControllerFactory.php diff --git a/src/LmcUser/Factory/Form/ChangeEmail.php b/src/Factory/Form/ChangeEmail.php similarity index 100% rename from src/LmcUser/Factory/Form/ChangeEmail.php rename to src/Factory/Form/ChangeEmail.php diff --git a/src/LmcUser/Factory/Form/ChangePassword.php b/src/Factory/Form/ChangePassword.php similarity index 100% rename from src/LmcUser/Factory/Form/ChangePassword.php rename to src/Factory/Form/ChangePassword.php diff --git a/src/LmcUser/Factory/Form/Login.php b/src/Factory/Form/Login.php similarity index 100% rename from src/LmcUser/Factory/Form/Login.php rename to src/Factory/Form/Login.php diff --git a/src/LmcUser/Factory/Form/Register.php b/src/Factory/Form/Register.php similarity index 100% rename from src/LmcUser/Factory/Form/Register.php rename to src/Factory/Form/Register.php diff --git a/src/LmcUser/Factory/Mapper/User.php b/src/Factory/Mapper/User.php similarity index 100% rename from src/LmcUser/Factory/Mapper/User.php rename to src/Factory/Mapper/User.php diff --git a/src/LmcUser/Factory/Options/ModuleOptions.php b/src/Factory/Options/ModuleOptions.php similarity index 100% rename from src/LmcUser/Factory/Options/ModuleOptions.php rename to src/Factory/Options/ModuleOptions.php diff --git a/src/LmcUser/Factory/Service/UserFactory.php b/src/Factory/Service/UserFactory.php similarity index 100% rename from src/LmcUser/Factory/Service/UserFactory.php rename to src/Factory/Service/UserFactory.php diff --git a/src/LmcUser/Factory/UserHydrator.php b/src/Factory/UserHydrator.php similarity index 100% rename from src/LmcUser/Factory/UserHydrator.php rename to src/Factory/UserHydrator.php diff --git a/src/LmcUser/Factory/View/Helper/LmcUserDisplayName.php b/src/Factory/View/Helper/LmcUserDisplayName.php similarity index 100% rename from src/LmcUser/Factory/View/Helper/LmcUserDisplayName.php rename to src/Factory/View/Helper/LmcUserDisplayName.php diff --git a/src/LmcUser/Factory/View/Helper/LmcUserIdentity.php b/src/Factory/View/Helper/LmcUserIdentity.php similarity index 100% rename from src/LmcUser/Factory/View/Helper/LmcUserIdentity.php rename to src/Factory/View/Helper/LmcUserIdentity.php diff --git a/src/LmcUser/Factory/View/Helper/LmcUserLoginWidget.php b/src/Factory/View/Helper/LmcUserLoginWidget.php similarity index 100% rename from src/LmcUser/Factory/View/Helper/LmcUserLoginWidget.php rename to src/Factory/View/Helper/LmcUserLoginWidget.php diff --git a/src/LmcUser/Form/Base.php b/src/Form/Base.php similarity index 100% rename from src/LmcUser/Form/Base.php rename to src/Form/Base.php diff --git a/src/LmcUser/Form/ChangeEmail.php b/src/Form/ChangeEmail.php similarity index 100% rename from src/LmcUser/Form/ChangeEmail.php rename to src/Form/ChangeEmail.php diff --git a/src/LmcUser/Form/ChangeEmailFilter.php b/src/Form/ChangeEmailFilter.php similarity index 100% rename from src/LmcUser/Form/ChangeEmailFilter.php rename to src/Form/ChangeEmailFilter.php diff --git a/src/LmcUser/Form/ChangePassword.php b/src/Form/ChangePassword.php similarity index 100% rename from src/LmcUser/Form/ChangePassword.php rename to src/Form/ChangePassword.php diff --git a/src/LmcUser/Form/ChangePasswordFilter.php b/src/Form/ChangePasswordFilter.php similarity index 100% rename from src/LmcUser/Form/ChangePasswordFilter.php rename to src/Form/ChangePasswordFilter.php diff --git a/src/LmcUser/Form/Login.php b/src/Form/Login.php similarity index 100% rename from src/LmcUser/Form/Login.php rename to src/Form/Login.php diff --git a/src/LmcUser/Form/LoginFilter.php b/src/Form/LoginFilter.php similarity index 100% rename from src/LmcUser/Form/LoginFilter.php rename to src/Form/LoginFilter.php diff --git a/src/LmcUser/Form/ProvidesEventsForm.php b/src/Form/ProvidesEventsForm.php similarity index 100% rename from src/LmcUser/Form/ProvidesEventsForm.php rename to src/Form/ProvidesEventsForm.php diff --git a/src/LmcUser/Form/Register.php b/src/Form/Register.php similarity index 100% rename from src/LmcUser/Form/Register.php rename to src/Form/Register.php diff --git a/src/LmcUser/Form/RegisterFilter.php b/src/Form/RegisterFilter.php similarity index 100% rename from src/LmcUser/Form/RegisterFilter.php rename to src/Form/RegisterFilter.php diff --git a/src/LmcUser/InputFilter/ProvidesEventsInputFilter.php b/src/InputFilter/ProvidesEventsInputFilter.php similarity index 100% rename from src/LmcUser/InputFilter/ProvidesEventsInputFilter.php rename to src/InputFilter/ProvidesEventsInputFilter.php diff --git a/src/LmcUser/Mapper/AbstractDbMapper.php b/src/Mapper/AbstractDbMapper.php similarity index 100% rename from src/LmcUser/Mapper/AbstractDbMapper.php rename to src/Mapper/AbstractDbMapper.php diff --git a/src/LmcUser/Mapper/Exception/ExceptionInterface.php b/src/Mapper/Exception/ExceptionInterface.php similarity index 100% rename from src/LmcUser/Mapper/Exception/ExceptionInterface.php rename to src/Mapper/Exception/ExceptionInterface.php diff --git a/src/LmcUser/Mapper/Exception/InvalidArgumentException.php b/src/Mapper/Exception/InvalidArgumentException.php similarity index 100% rename from src/LmcUser/Mapper/Exception/InvalidArgumentException.php rename to src/Mapper/Exception/InvalidArgumentException.php diff --git a/src/LmcUser/Mapper/Exception/RuntimeException.php b/src/Mapper/Exception/RuntimeException.php similarity index 100% rename from src/LmcUser/Mapper/Exception/RuntimeException.php rename to src/Mapper/Exception/RuntimeException.php diff --git a/src/LmcUser/Mapper/User.php b/src/Mapper/User.php similarity index 100% rename from src/LmcUser/Mapper/User.php rename to src/Mapper/User.php diff --git a/src/LmcUser/Mapper/UserHydrator.php b/src/Mapper/UserHydrator.php similarity index 100% rename from src/LmcUser/Mapper/UserHydrator.php rename to src/Mapper/UserHydrator.php diff --git a/src/LmcUser/Mapper/UserInterface.php b/src/Mapper/UserInterface.php similarity index 100% rename from src/LmcUser/Mapper/UserInterface.php rename to src/Mapper/UserInterface.php diff --git a/src/Module.php b/src/Module.php new file mode 100644 index 0000000..d8f1dd3 --- /dev/null +++ b/src/Module.php @@ -0,0 +1,116 @@ + [ + 'lmcUserAuthentication' => Factory\Controller\Plugin\LmcUserAuthentication::class, + ], + ]; + } + + /** + * {@inheritDoc} + * @see \Laminas\ModuleManager\Feature\ControllerProviderInterface::getControllerConfig() + */ + public function getControllerConfig() + { + return [ + 'factories' => [ + 'lmcuser' => Factory\Controller\UserControllerFactory::class, + ], + ]; + } + + /** + * {@inheritDoc} + * @see \Laminas\ModuleManager\Feature\ViewHelperProviderInterface::getViewHelperConfig() + */ + public function getViewHelperConfig() + { + return [ + 'factories' => [ + 'lmcUserDisplayName' => Factory\View\Helper\LmcUserDisplayName::class, + 'lmcUserIdentity' => Factory\View\Helper\LmcUserIdentity::class, + 'lmcUserLoginWidget' => Factory\View\Helper\LmcUserLoginWidget::class, + ], + ]; + } + + /** + * {@inheritDoc} + * @see \Laminas\ModuleManager\Feature\ServiceProviderInterface::getServiceConfig() + */ + public function getServiceConfig() + { + return [ + 'aliases' => [ + 'lmcuser_laminas_db_adapter' => \Laminas\Db\Adapter\Adapter::class, + 'lmcuser_register_form_hydrator' => 'lmcuser_user_hydrator', + 'lmcuser_base_hydrator' => 'lmcuser_default_hydrator', + ], + 'invokables' => [ + 'lmcuser_default_hydrator' => ClassMethodsHydrator::class, + ], + 'factories' => [ + 'lmcuser_redirect_callback' => Factory\Controller\RedirectCallbackFactory::class, + 'lmcuser_module_options' => Factory\Options\ModuleOptions::class, + Authentication\Adapter\AdapterChain::class => Authentication\Adapter\AdapterChainServiceFactory::class, + + // We alias this one because it's LmcUser's instance of + // Laminas\Authentication\AuthenticationService. We don't want to + // hog the FQCN service alias for a Laminas\* class. + 'lmcuser_auth_service' => Factory\AuthenticationService::class, + + 'lmcuser_user_hydrator' => Factory\UserHydrator::class, + 'lmcuser_user_mapper' => Factory\Mapper\User::class, + + 'lmcuser_login_form' => Factory\Form\Login::class, + 'lmcuser_register_form' => Factory\Form\Register::class, + 'lmcuser_change_password_form' => Factory\Form\ChangePassword::class, + 'lmcuser_change_email_form' => Factory\Form\ChangeEmail::class, + + Authentication\Adapter\Db::class => Factory\Authentication\Adapter\DbFactory::class, + Authentication\Storage\Db::class => Factory\Authentication\Storage\DbFactory::class, + + 'lmcuser_user_service' => Factory\Service\UserFactory::class, + ], + ]; + } +} diff --git a/src/LmcUser/Options/AuthenticationOptionsInterface.php b/src/Options/AuthenticationOptionsInterface.php similarity index 100% rename from src/LmcUser/Options/AuthenticationOptionsInterface.php rename to src/Options/AuthenticationOptionsInterface.php diff --git a/src/LmcUser/Options/ModuleOptions.php b/src/Options/ModuleOptions.php similarity index 100% rename from src/LmcUser/Options/ModuleOptions.php rename to src/Options/ModuleOptions.php diff --git a/src/LmcUser/Options/PasswordOptionsInterface.php b/src/Options/PasswordOptionsInterface.php similarity index 100% rename from src/LmcUser/Options/PasswordOptionsInterface.php rename to src/Options/PasswordOptionsInterface.php diff --git a/src/LmcUser/Options/RegistrationOptionsInterface.php b/src/Options/RegistrationOptionsInterface.php similarity index 100% rename from src/LmcUser/Options/RegistrationOptionsInterface.php rename to src/Options/RegistrationOptionsInterface.php diff --git a/src/LmcUser/Options/UserControllerOptionsInterface.php b/src/Options/UserControllerOptionsInterface.php similarity index 100% rename from src/LmcUser/Options/UserControllerOptionsInterface.php rename to src/Options/UserControllerOptionsInterface.php diff --git a/src/LmcUser/Options/UserServiceOptionsInterface.php b/src/Options/UserServiceOptionsInterface.php similarity index 100% rename from src/LmcUser/Options/UserServiceOptionsInterface.php rename to src/Options/UserServiceOptionsInterface.php diff --git a/src/LmcUser/Service/Exception/ExceptionInterface.php b/src/Service/Exception/ExceptionInterface.php similarity index 100% rename from src/LmcUser/Service/Exception/ExceptionInterface.php rename to src/Service/Exception/ExceptionInterface.php diff --git a/src/LmcUser/Service/Exception/InvalidArgumentException.php b/src/Service/Exception/InvalidArgumentException.php similarity index 100% rename from src/LmcUser/Service/Exception/InvalidArgumentException.php rename to src/Service/Exception/InvalidArgumentException.php diff --git a/src/LmcUser/Service/User.php b/src/Service/User.php similarity index 100% rename from src/LmcUser/Service/User.php rename to src/Service/User.php diff --git a/src/LmcUser/Validator/AbstractRecord.php b/src/Validator/AbstractRecord.php similarity index 100% rename from src/LmcUser/Validator/AbstractRecord.php rename to src/Validator/AbstractRecord.php diff --git a/src/LmcUser/Validator/Exception/ExceptionInterface.php b/src/Validator/Exception/ExceptionInterface.php similarity index 100% rename from src/LmcUser/Validator/Exception/ExceptionInterface.php rename to src/Validator/Exception/ExceptionInterface.php diff --git a/src/LmcUser/Validator/Exception/InvalidArgumentException.php b/src/Validator/Exception/InvalidArgumentException.php similarity index 100% rename from src/LmcUser/Validator/Exception/InvalidArgumentException.php rename to src/Validator/Exception/InvalidArgumentException.php diff --git a/src/LmcUser/Validator/NoRecordExists.php b/src/Validator/NoRecordExists.php similarity index 100% rename from src/LmcUser/Validator/NoRecordExists.php rename to src/Validator/NoRecordExists.php diff --git a/src/LmcUser/Validator/RecordExists.php b/src/Validator/RecordExists.php similarity index 100% rename from src/LmcUser/Validator/RecordExists.php rename to src/Validator/RecordExists.php diff --git a/src/LmcUser/View/Helper/LmcUserDisplayName.php b/src/View/Helper/LmcUserDisplayName.php similarity index 100% rename from src/LmcUser/View/Helper/LmcUserDisplayName.php rename to src/View/Helper/LmcUserDisplayName.php diff --git a/src/LmcUser/View/Helper/LmcUserIdentity.php b/src/View/Helper/LmcUserIdentity.php similarity index 100% rename from src/LmcUser/View/Helper/LmcUserIdentity.php rename to src/View/Helper/LmcUserIdentity.php diff --git a/src/LmcUser/View/Helper/LmcUserLoginWidget.php b/src/View/Helper/LmcUserLoginWidget.php similarity index 100% rename from src/LmcUser/View/Helper/LmcUserLoginWidget.php rename to src/View/Helper/LmcUserLoginWidget.php diff --git a/src/LmcUser/language/cs_CZ.mo b/src/language/cs_CZ.mo similarity index 100% rename from src/LmcUser/language/cs_CZ.mo rename to src/language/cs_CZ.mo diff --git a/src/LmcUser/language/cs_CZ.po b/src/language/cs_CZ.po similarity index 100% rename from src/LmcUser/language/cs_CZ.po rename to src/language/cs_CZ.po diff --git a/src/LmcUser/language/de_DE.mo b/src/language/de_DE.mo similarity index 100% rename from src/LmcUser/language/de_DE.mo rename to src/language/de_DE.mo diff --git a/src/LmcUser/language/de_DE.po b/src/language/de_DE.po similarity index 100% rename from src/LmcUser/language/de_DE.po rename to src/language/de_DE.po diff --git a/src/LmcUser/language/es_ES.mo b/src/language/es_ES.mo similarity index 100% rename from src/LmcUser/language/es_ES.mo rename to src/language/es_ES.mo diff --git a/src/LmcUser/language/es_ES.po b/src/language/es_ES.po similarity index 100% rename from src/LmcUser/language/es_ES.po rename to src/language/es_ES.po diff --git a/src/LmcUser/language/fr_FR.mo b/src/language/fr_FR.mo similarity index 100% rename from src/LmcUser/language/fr_FR.mo rename to src/language/fr_FR.mo diff --git a/src/LmcUser/language/fr_FR.po b/src/language/fr_FR.po similarity index 100% rename from src/LmcUser/language/fr_FR.po rename to src/language/fr_FR.po diff --git a/src/LmcUser/language/ja_JP.mo b/src/language/ja_JP.mo similarity index 100% rename from src/LmcUser/language/ja_JP.mo rename to src/language/ja_JP.mo diff --git a/src/LmcUser/language/ja_JP.po b/src/language/ja_JP.po similarity index 100% rename from src/LmcUser/language/ja_JP.po rename to src/language/ja_JP.po diff --git a/src/LmcUser/language/msgIds.php b/src/language/msgIds.php similarity index 100% rename from src/LmcUser/language/msgIds.php rename to src/language/msgIds.php diff --git a/src/LmcUser/language/nl_NL.mo b/src/language/nl_NL.mo similarity index 100% rename from src/LmcUser/language/nl_NL.mo rename to src/language/nl_NL.mo diff --git a/src/LmcUser/language/nl_NL.po b/src/language/nl_NL.po similarity index 100% rename from src/LmcUser/language/nl_NL.po rename to src/language/nl_NL.po diff --git a/src/LmcUser/language/pl_PL.mo b/src/language/pl_PL.mo similarity index 100% rename from src/LmcUser/language/pl_PL.mo rename to src/language/pl_PL.mo diff --git a/src/LmcUser/language/pl_PL.po b/src/language/pl_PL.po similarity index 100% rename from src/LmcUser/language/pl_PL.po rename to src/language/pl_PL.po diff --git a/src/LmcUser/language/pt_BR.mo b/src/language/pt_BR.mo similarity index 100% rename from src/LmcUser/language/pt_BR.mo rename to src/language/pt_BR.mo diff --git a/src/LmcUser/language/pt_BR.po b/src/language/pt_BR.po similarity index 100% rename from src/LmcUser/language/pt_BR.po rename to src/language/pt_BR.po diff --git a/src/LmcUser/language/ru_RU.mo b/src/language/ru_RU.mo similarity index 100% rename from src/LmcUser/language/ru_RU.mo rename to src/language/ru_RU.mo diff --git a/src/LmcUser/language/ru_RU.po b/src/language/ru_RU.po similarity index 100% rename from src/LmcUser/language/ru_RU.po rename to src/language/ru_RU.po diff --git a/tests/LmcUserTest/Authentication/Adapter/AbstractAdapterTest.php b/tests/Authentication/Adapter/AbstractAdapterTest.php similarity index 100% rename from tests/LmcUserTest/Authentication/Adapter/AbstractAdapterTest.php rename to tests/Authentication/Adapter/AbstractAdapterTest.php diff --git a/tests/LmcUserTest/Authentication/Adapter/AdapterChainEventTest.php b/tests/Authentication/Adapter/AdapterChainEventTest.php similarity index 100% rename from tests/LmcUserTest/Authentication/Adapter/AdapterChainEventTest.php rename to tests/Authentication/Adapter/AdapterChainEventTest.php diff --git a/tests/LmcUserTest/Authentication/Adapter/AdapterChainServiceFactoryTest.php b/tests/Authentication/Adapter/AdapterChainServiceFactoryTest.php similarity index 100% rename from tests/LmcUserTest/Authentication/Adapter/AdapterChainServiceFactoryTest.php rename to tests/Authentication/Adapter/AdapterChainServiceFactoryTest.php diff --git a/tests/LmcUserTest/Authentication/Adapter/AdapterChainTest.php b/tests/Authentication/Adapter/AdapterChainTest.php similarity index 100% rename from tests/LmcUserTest/Authentication/Adapter/AdapterChainTest.php rename to tests/Authentication/Adapter/AdapterChainTest.php diff --git a/tests/LmcUserTest/Authentication/Adapter/DbTest.php b/tests/Authentication/Adapter/DbTest.php similarity index 100% rename from tests/LmcUserTest/Authentication/Adapter/DbTest.php rename to tests/Authentication/Adapter/DbTest.php diff --git a/tests/LmcUserTest/Authentication/Adapter/TestAsset/AbstractAdapterExtension.php b/tests/Authentication/Adapter/TestAsset/AbstractAdapterExtension.php similarity index 100% rename from tests/LmcUserTest/Authentication/Adapter/TestAsset/AbstractAdapterExtension.php rename to tests/Authentication/Adapter/TestAsset/AbstractAdapterExtension.php diff --git a/tests/LmcUserTest/Authentication/Adapter/TestAsset/InvalidUserClass.php b/tests/Authentication/Adapter/TestAsset/InvalidUserClass.php similarity index 100% rename from tests/LmcUserTest/Authentication/Adapter/TestAsset/InvalidUserClass.php rename to tests/Authentication/Adapter/TestAsset/InvalidUserClass.php diff --git a/tests/LmcUserTest/Authentication/Storage/DbTest.php b/tests/Authentication/Storage/DbTest.php similarity index 100% rename from tests/LmcUserTest/Authentication/Storage/DbTest.php rename to tests/Authentication/Storage/DbTest.php diff --git a/tests/LmcUserTest/Controller/Plugin/LmcUserAuthenticationTest.php b/tests/Controller/Plugin/LmcUserAuthenticationTest.php similarity index 100% rename from tests/LmcUserTest/Controller/Plugin/LmcUserAuthenticationTest.php rename to tests/Controller/Plugin/LmcUserAuthenticationTest.php diff --git a/tests/LmcUserTest/Controller/RedirectCallbackTest.php b/tests/Controller/RedirectCallbackTest.php similarity index 100% rename from tests/LmcUserTest/Controller/RedirectCallbackTest.php rename to tests/Controller/RedirectCallbackTest.php diff --git a/tests/LmcUserTest/Controller/UserControllerTest.php b/tests/Controller/UserControllerTest.php similarity index 100% rename from tests/LmcUserTest/Controller/UserControllerTest.php rename to tests/Controller/UserControllerTest.php diff --git a/tests/LmcUserTest/Entity/UserTest.php b/tests/Entity/UserTest.php similarity index 100% rename from tests/LmcUserTest/Entity/UserTest.php rename to tests/Entity/UserTest.php diff --git a/tests/LmcUserTest/Factory/Form/ChangeEmailFormFactoryTest.php b/tests/Factory/Form/ChangeEmailFormFactoryTest.php similarity index 100% rename from tests/LmcUserTest/Factory/Form/ChangeEmailFormFactoryTest.php rename to tests/Factory/Form/ChangeEmailFormFactoryTest.php diff --git a/tests/LmcUserTest/Factory/Form/ChangePasswordFormFactoryTest.php b/tests/Factory/Form/ChangePasswordFormFactoryTest.php similarity index 100% rename from tests/LmcUserTest/Factory/Form/ChangePasswordFormFactoryTest.php rename to tests/Factory/Form/ChangePasswordFormFactoryTest.php diff --git a/tests/LmcUserTest/Factory/Form/LoginFormFactoryTest.php b/tests/Factory/Form/LoginFormFactoryTest.php similarity index 100% rename from tests/LmcUserTest/Factory/Form/LoginFormFactoryTest.php rename to tests/Factory/Form/LoginFormFactoryTest.php diff --git a/tests/LmcUserTest/Factory/Form/RegisterFormFactoryTest.php b/tests/Factory/Form/RegisterFormFactoryTest.php similarity index 100% rename from tests/LmcUserTest/Factory/Form/RegisterFormFactoryTest.php rename to tests/Factory/Form/RegisterFormFactoryTest.php diff --git a/tests/LmcUserTest/Factory/Mapper/UserMapperFactoryTest.php b/tests/Factory/Mapper/UserMapperFactoryTest.php similarity index 100% rename from tests/LmcUserTest/Factory/Mapper/UserMapperFactoryTest.php rename to tests/Factory/Mapper/UserMapperFactoryTest.php diff --git a/tests/LmcUserTest/Form/BaseTest.php b/tests/Form/BaseTest.php similarity index 100% rename from tests/LmcUserTest/Form/BaseTest.php rename to tests/Form/BaseTest.php diff --git a/tests/LmcUserTest/Form/ChangeEmailFilterTest.php b/tests/Form/ChangeEmailFilterTest.php similarity index 100% rename from tests/LmcUserTest/Form/ChangeEmailFilterTest.php rename to tests/Form/ChangeEmailFilterTest.php diff --git a/tests/LmcUserTest/Form/ChangeEmailTest.php b/tests/Form/ChangeEmailTest.php similarity index 100% rename from tests/LmcUserTest/Form/ChangeEmailTest.php rename to tests/Form/ChangeEmailTest.php diff --git a/tests/LmcUserTest/Form/ChangePasswordFilterTest.php b/tests/Form/ChangePasswordFilterTest.php similarity index 100% rename from tests/LmcUserTest/Form/ChangePasswordFilterTest.php rename to tests/Form/ChangePasswordFilterTest.php diff --git a/tests/LmcUserTest/Form/ChangePasswordTest.php b/tests/Form/ChangePasswordTest.php similarity index 100% rename from tests/LmcUserTest/Form/ChangePasswordTest.php rename to tests/Form/ChangePasswordTest.php diff --git a/tests/LmcUserTest/Form/LoginFilterTest.php b/tests/Form/LoginFilterTest.php similarity index 100% rename from tests/LmcUserTest/Form/LoginFilterTest.php rename to tests/Form/LoginFilterTest.php diff --git a/tests/LmcUserTest/Form/LoginTest.php b/tests/Form/LoginTest.php similarity index 100% rename from tests/LmcUserTest/Form/LoginTest.php rename to tests/Form/LoginTest.php diff --git a/tests/LmcUserTest/Form/RegisterFilterTest.php b/tests/Form/RegisterFilterTest.php similarity index 100% rename from tests/LmcUserTest/Form/RegisterFilterTest.php rename to tests/Form/RegisterFilterTest.php diff --git a/tests/LmcUserTest/Form/RegisterTest.php b/tests/Form/RegisterTest.php similarity index 100% rename from tests/LmcUserTest/Form/RegisterTest.php rename to tests/Form/RegisterTest.php diff --git a/tests/LmcUserTest/Mapper/UserHydratorTest.php b/tests/Mapper/UserHydratorTest.php similarity index 100% rename from tests/LmcUserTest/Mapper/UserHydratorTest.php rename to tests/Mapper/UserHydratorTest.php diff --git a/tests/LmcUserTest/Mapper/UserTest.php b/tests/Mapper/UserTest.php similarity index 100% rename from tests/LmcUserTest/Mapper/UserTest.php rename to tests/Mapper/UserTest.php diff --git a/tests/LmcUserTest/Mapper/_files/user.sql b/tests/Mapper/_files/user.sql similarity index 100% rename from tests/LmcUserTest/Mapper/_files/user.sql rename to tests/Mapper/_files/user.sql diff --git a/tests/LmcUserTest/ModuleTest.php b/tests/ModuleTest.php similarity index 100% rename from tests/LmcUserTest/ModuleTest.php rename to tests/ModuleTest.php diff --git a/tests/LmcUserTest/Options/ModuleOptionsTest.php b/tests/Options/ModuleOptionsTest.php similarity index 100% rename from tests/LmcUserTest/Options/ModuleOptionsTest.php rename to tests/Options/ModuleOptionsTest.php diff --git a/tests/LmcUserTest/Service/UserTest.php b/tests/Service/UserTest.php similarity index 100% rename from tests/LmcUserTest/Service/UserTest.php rename to tests/Service/UserTest.php diff --git a/tests/LmcUserTest/Validator/AbstractRecordTest.php b/tests/Validator/AbstractRecordTest.php similarity index 100% rename from tests/LmcUserTest/Validator/AbstractRecordTest.php rename to tests/Validator/AbstractRecordTest.php diff --git a/tests/LmcUserTest/Validator/NoRecordExistsTest.php b/tests/Validator/NoRecordExistsTest.php similarity index 100% rename from tests/LmcUserTest/Validator/NoRecordExistsTest.php rename to tests/Validator/NoRecordExistsTest.php diff --git a/tests/LmcUserTest/Validator/RecordExistsTest.php b/tests/Validator/RecordExistsTest.php similarity index 100% rename from tests/LmcUserTest/Validator/RecordExistsTest.php rename to tests/Validator/RecordExistsTest.php diff --git a/tests/LmcUserTest/Validator/TestAsset/AbstractRecordExtension.php b/tests/Validator/TestAsset/AbstractRecordExtension.php similarity index 100% rename from tests/LmcUserTest/Validator/TestAsset/AbstractRecordExtension.php rename to tests/Validator/TestAsset/AbstractRecordExtension.php diff --git a/tests/LmcUserTest/View/Helper/LmcUserDisplayNameTest.php b/tests/View/Helper/LmcUserDisplayNameTest.php similarity index 100% rename from tests/LmcUserTest/View/Helper/LmcUserDisplayNameTest.php rename to tests/View/Helper/LmcUserDisplayNameTest.php diff --git a/tests/LmcUserTest/View/Helper/LmcUserIdentityTest.php b/tests/View/Helper/LmcUserIdentityTest.php similarity index 100% rename from tests/LmcUserTest/View/Helper/LmcUserIdentityTest.php rename to tests/View/Helper/LmcUserIdentityTest.php diff --git a/tests/LmcUserTest/View/Helper/LmcUserLoginWidgetTest.php b/tests/View/Helper/LmcUserLoginWidgetTest.php similarity index 100% rename from tests/LmcUserTest/View/Helper/LmcUserLoginWidgetTest.php rename to tests/View/Helper/LmcUserLoginWidgetTest.php