Skip to content

Commit

Permalink
Merge pull request #30 from ALTAMASH80/replace-interop-container-inte…
Browse files Browse the repository at this point in the history
…rface-by-psr-container

#28
  • Loading branch information
visto9259 authored Mar 9, 2023
2 parents 8d245e3 + add3572 commit 1b40c32
Show file tree
Hide file tree
Showing 26 changed files with 35 additions and 25 deletions.
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion src/Factory/AssertionPluginManagerFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Factory/AuthenticationIdentityProviderFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Factory/AuthorizationServiceDelegatorFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Factory/AuthorizationServiceFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Factory/ControllerGuardFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Factory/ControllerPermissionsGuardFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Factory/GuardPluginManagerFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Factory/GuardsFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Factory/HasRoleViewHelperFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Factory/IsGrantedPluginFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Factory/IsGrantedViewHelperFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Factory/ModuleOptionsFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Factory/ObjectRepositoryRoleProviderFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Factory/RbacFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Factory/RedirectStrategyFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Factory/RoleProviderPluginManagerFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Factory/RoleServiceFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Factory/RouteGuardFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Factory/RoutePermissionsGuardFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Factory/UnauthorizedStrategyFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Initializer/AuthorizationServiceInitializer.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tests/Factory/AuthorizationServiceDelegatorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tests/Factory/RedirectStrategyFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tests/Factory/UnauthorizedStrategyFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

namespace LmcRbacMvcTest\Factory;

use Interop\Container\ContainerInterface;
use Psr\Container\ContainerInterface;
use LmcRbacMvc\Factory\UnauthorizedStrategyFactory;
use Prophecy\PhpUnit\ProphecyTrait;

Expand Down
2 changes: 1 addition & 1 deletion tests/Initializer/AuthorizationServiceInitializerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 1b40c32

Please sign in to comment.