diff --git a/.gitignore b/.gitignore index 7ef35437..33024c3b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,13 @@ vendor build .phpunit* composer.lock +#ignoring PHPEclipse project files and directories +/.settings +/.project +/.buildpath +#ignoring PHPStorm project files +/.idea +#ignoring VSCode project files +/.vscode +#ignoring NetBeans project files +/nbproject diff --git a/src/Factory/AssertionPluginManagerFactory.php b/src/Factory/AssertionPluginManagerFactory.php index 7007af5f..2512529a 100644 --- a/src/Factory/AssertionPluginManagerFactory.php +++ b/src/Factory/AssertionPluginManagerFactory.php @@ -18,7 +18,7 @@ namespace LmcRbacMvc\Factory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Config; use Laminas\ServiceManager\Factory\FactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; diff --git a/src/Factory/AuthenticationIdentityProviderFactory.php b/src/Factory/AuthenticationIdentityProviderFactory.php index 347902f8..707f2f55 100644 --- a/src/Factory/AuthenticationIdentityProviderFactory.php +++ b/src/Factory/AuthenticationIdentityProviderFactory.php @@ -18,7 +18,7 @@ namespace LmcRbacMvc\Factory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\Authentication\AuthenticationService; use Laminas\ServiceManager\Factory\FactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; diff --git a/src/Factory/AuthorizationServiceDelegatorFactory.php b/src/Factory/AuthorizationServiceDelegatorFactory.php index 341556cc..a09adf52 100644 --- a/src/Factory/AuthorizationServiceDelegatorFactory.php +++ b/src/Factory/AuthorizationServiceDelegatorFactory.php @@ -18,7 +18,7 @@ namespace LmcRbacMvc\Factory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; //use Laminas\ServiceManager\AbstractPluginManager; use Laminas\ServiceManager\Factory\DelegatorFactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; diff --git a/src/Factory/AuthorizationServiceFactory.php b/src/Factory/AuthorizationServiceFactory.php index b9445f32..a8332e00 100644 --- a/src/Factory/AuthorizationServiceFactory.php +++ b/src/Factory/AuthorizationServiceFactory.php @@ -18,7 +18,7 @@ namespace LmcRbacMvc\Factory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\FactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; use LmcRbacMvc\Assertion\AssertionPluginManager; diff --git a/src/Factory/ControllerGuardFactory.php b/src/Factory/ControllerGuardFactory.php index f14afa88..43274007 100644 --- a/src/Factory/ControllerGuardFactory.php +++ b/src/Factory/ControllerGuardFactory.php @@ -18,7 +18,7 @@ namespace LmcRbacMvc\Factory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; use LmcRbacMvc\Guard\ControllerGuard; diff --git a/src/Factory/ControllerPermissionsGuardFactory.php b/src/Factory/ControllerPermissionsGuardFactory.php index de976640..0e023150 100644 --- a/src/Factory/ControllerPermissionsGuardFactory.php +++ b/src/Factory/ControllerPermissionsGuardFactory.php @@ -18,7 +18,7 @@ namespace LmcRbacMvc\Factory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\AbstractPluginManager; use Laminas\ServiceManager\Factory\FactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; diff --git a/src/Factory/GuardPluginManagerFactory.php b/src/Factory/GuardPluginManagerFactory.php index c13540d1..3c4e5b58 100644 --- a/src/Factory/GuardPluginManagerFactory.php +++ b/src/Factory/GuardPluginManagerFactory.php @@ -18,7 +18,7 @@ namespace LmcRbacMvc\Factory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Config; use Laminas\ServiceManager\Factory\FactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; diff --git a/src/Factory/GuardsFactory.php b/src/Factory/GuardsFactory.php index 813c4631..f69b3117 100644 --- a/src/Factory/GuardsFactory.php +++ b/src/Factory/GuardsFactory.php @@ -18,7 +18,7 @@ namespace LmcRbacMvc\Factory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; use LmcRbacMvc\Guard\GuardInterface; diff --git a/src/Factory/HasRoleViewHelperFactory.php b/src/Factory/HasRoleViewHelperFactory.php index 8a09b55d..2ab84721 100644 --- a/src/Factory/HasRoleViewHelperFactory.php +++ b/src/Factory/HasRoleViewHelperFactory.php @@ -18,7 +18,7 @@ namespace LmcRbacMvc\Factory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; use LmcRbacMvc\Service\RoleService; diff --git a/src/Factory/IsGrantedPluginFactory.php b/src/Factory/IsGrantedPluginFactory.php index b9dfe113..6841f118 100644 --- a/src/Factory/IsGrantedPluginFactory.php +++ b/src/Factory/IsGrantedPluginFactory.php @@ -18,7 +18,7 @@ namespace LmcRbacMvc\Factory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; use LmcRbacMvc\Mvc\Controller\Plugin\IsGranted; diff --git a/src/Factory/IsGrantedViewHelperFactory.php b/src/Factory/IsGrantedViewHelperFactory.php index a328fb6d..09c638a8 100644 --- a/src/Factory/IsGrantedViewHelperFactory.php +++ b/src/Factory/IsGrantedViewHelperFactory.php @@ -18,7 +18,7 @@ namespace LmcRbacMvc\Factory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; use LmcRbacMvc\Service\AuthorizationService; diff --git a/src/Factory/ModuleOptionsFactory.php b/src/Factory/ModuleOptionsFactory.php index a7a7c19b..e240731e 100644 --- a/src/Factory/ModuleOptionsFactory.php +++ b/src/Factory/ModuleOptionsFactory.php @@ -18,7 +18,7 @@ namespace LmcRbacMvc\Factory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; use LmcRbacMvc\Options\ModuleOptions; diff --git a/src/Factory/ObjectRepositoryRoleProviderFactory.php b/src/Factory/ObjectRepositoryRoleProviderFactory.php index 6ab9c30f..1605cbd6 100644 --- a/src/Factory/ObjectRepositoryRoleProviderFactory.php +++ b/src/Factory/ObjectRepositoryRoleProviderFactory.php @@ -20,7 +20,7 @@ use Doctrine\Persistence\ObjectManager; use Doctrine\Persistence\ObjectRepository; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; use LmcRbacMvc\Exception; diff --git a/src/Factory/RbacFactory.php b/src/Factory/RbacFactory.php index 739e8d77..2582e5ca 100644 --- a/src/Factory/RbacFactory.php +++ b/src/Factory/RbacFactory.php @@ -18,7 +18,7 @@ namespace LmcRbacMvc\Factory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Rbac\Rbac; use Rbac\Traversal\Strategy\GeneratorStrategy; use Laminas\ServiceManager\Factory\FactoryInterface; diff --git a/src/Factory/RedirectStrategyFactory.php b/src/Factory/RedirectStrategyFactory.php index b1f2589f..6eeffe67 100644 --- a/src/Factory/RedirectStrategyFactory.php +++ b/src/Factory/RedirectStrategyFactory.php @@ -18,7 +18,7 @@ namespace LmcRbacMvc\Factory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\Authentication\AuthenticationService; use Laminas\ServiceManager\Factory\FactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; diff --git a/src/Factory/RoleProviderPluginManagerFactory.php b/src/Factory/RoleProviderPluginManagerFactory.php index decf6c31..86eda746 100644 --- a/src/Factory/RoleProviderPluginManagerFactory.php +++ b/src/Factory/RoleProviderPluginManagerFactory.php @@ -18,7 +18,7 @@ namespace LmcRbacMvc\Factory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; use LmcRbacMvc\Role\RoleProviderPluginManager; diff --git a/src/Factory/RoleServiceFactory.php b/src/Factory/RoleServiceFactory.php index f9a2543c..ff3f034e 100644 --- a/src/Factory/RoleServiceFactory.php +++ b/src/Factory/RoleServiceFactory.php @@ -18,7 +18,7 @@ namespace LmcRbacMvc\Factory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; use LmcRbacMvc\Exception\RuntimeException; diff --git a/src/Factory/RouteGuardFactory.php b/src/Factory/RouteGuardFactory.php index 958b8e23..177d9dfe 100644 --- a/src/Factory/RouteGuardFactory.php +++ b/src/Factory/RouteGuardFactory.php @@ -18,7 +18,7 @@ namespace LmcRbacMvc\Factory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; use LmcRbacMvc\Guard\RouteGuard; diff --git a/src/Factory/RoutePermissionsGuardFactory.php b/src/Factory/RoutePermissionsGuardFactory.php index 0c7c05e3..9cf1ad90 100644 --- a/src/Factory/RoutePermissionsGuardFactory.php +++ b/src/Factory/RoutePermissionsGuardFactory.php @@ -18,7 +18,7 @@ namespace LmcRbacMvc\Factory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; use LmcRbacMvc\Guard\RouteGuard; diff --git a/src/Factory/UnauthorizedStrategyFactory.php b/src/Factory/UnauthorizedStrategyFactory.php index d40669cf..68799c58 100644 --- a/src/Factory/UnauthorizedStrategyFactory.php +++ b/src/Factory/UnauthorizedStrategyFactory.php @@ -18,7 +18,7 @@ namespace LmcRbacMvc\Factory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Laminas\ServiceManager\ServiceLocatorInterface; use LmcRbacMvc\Options\ModuleOptions; diff --git a/src/Initializer/AuthorizationServiceInitializer.php b/src/Initializer/AuthorizationServiceInitializer.php index 7c7d4fe6..b48c61a8 100644 --- a/src/Initializer/AuthorizationServiceInitializer.php +++ b/src/Initializer/AuthorizationServiceInitializer.php @@ -18,7 +18,7 @@ namespace LmcRbacMvc\Initializer; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\AbstractPluginManager; use Laminas\ServiceManager\Initializer\InitializerInterface; use Laminas\ServiceManager\ServiceLocatorInterface; diff --git a/tests/Factory/AuthorizationServiceDelegatorTest.php b/tests/Factory/AuthorizationServiceDelegatorTest.php index e29a7f93..803cd969 100644 --- a/tests/Factory/AuthorizationServiceDelegatorTest.php +++ b/tests/Factory/AuthorizationServiceDelegatorTest.php @@ -17,7 +17,7 @@ */ namespace LmcRbacMvcTest\Factory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\ServiceLocatorInterface; use LmcRbacMvc\Factory\AuthorizationServiceDelegatorFactory; use LmcRbacMvcTest\Initializer\AuthorizationAwareFake; diff --git a/tests/Factory/RedirectStrategyFactoryTest.php b/tests/Factory/RedirectStrategyFactoryTest.php index 5c3fbb32..f72f10f0 100644 --- a/tests/Factory/RedirectStrategyFactoryTest.php +++ b/tests/Factory/RedirectStrategyFactoryTest.php @@ -18,7 +18,7 @@ namespace LmcRbacMvcTest\Factory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\ServiceLocatorInterface; use LmcRbacMvc\Factory\RedirectStrategyFactory; use Prophecy\PhpUnit\ProphecyTrait; diff --git a/tests/Factory/UnauthorizedStrategyFactoryTest.php b/tests/Factory/UnauthorizedStrategyFactoryTest.php index 5d314884..a2b5e286 100644 --- a/tests/Factory/UnauthorizedStrategyFactoryTest.php +++ b/tests/Factory/UnauthorizedStrategyFactoryTest.php @@ -18,7 +18,7 @@ namespace LmcRbacMvcTest\Factory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use LmcRbacMvc\Factory\UnauthorizedStrategyFactory; use Prophecy\PhpUnit\ProphecyTrait; diff --git a/tests/Initializer/AuthorizationServiceInitializerTest.php b/tests/Initializer/AuthorizationServiceInitializerTest.php index f197be20..6084e1a9 100644 --- a/tests/Initializer/AuthorizationServiceInitializerTest.php +++ b/tests/Initializer/AuthorizationServiceInitializerTest.php @@ -17,7 +17,7 @@ */ namespace LmcRbacMvcTest\Initializer; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\ServiceLocatorInterface; use LmcRbacMvc\Initializer\AuthorizationServiceInitializer; use Prophecy\PhpUnit\ProphecyTrait;