Merge pull request #34 from ALTAMASH80/using-psr-container-insted-of-…

…interop-container #32
LM-Commons · Feb 9, 2023 · 1bb730b · 1bb730b
2 parents d146254 + 15fc40f
commit 1bb730b
Show file tree

Hide file tree

Showing 22 changed files with 35 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,13 @@
 composer.lock
-vendor/*
+vendor/*
+
+#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/LmcUser/Authentication/Adapter/AdapterChainServiceFactory.php b/src/LmcUser/Authentication/Adapter/AdapterChainServiceFactory.php
@@ -1,13 +1,9 @@
 <?php
 namespace LmcUser\Authentication\Adapter;
 
-use Interop\Container\ContainerInterface;
-use Interop\Container\Exception\ContainerException;
-use Laminas\ServiceManager\Exception\ServiceNotCreatedException;
-use Laminas\ServiceManager\Exception\ServiceNotFoundException;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Laminas\ServiceManager\ServiceLocatorInterface;
-use LmcUser\Authentication\Adapter\AdapterChain;
 use LmcUser\Options\ModuleOptions;
 use LmcUser\Authentication\Adapter\Exception\OptionsNotFoundException;
 

diff --git a/src/LmcUser/Authentication/Adapter/Db.php b/src/LmcUser/Authentication/Adapter/Db.php
@@ -2,9 +2,8 @@
 
 namespace LmcUser\Authentication\Adapter;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\Authentication\Result as AuthenticationResult;
-use Laminas\EventManager\EventInterface;
 use Laminas\ServiceManager\ServiceManager;
 use Laminas\Crypt\Password\Bcrypt;
 use Laminas\Session\Container as SessionContainer;

diff --git a/src/LmcUser/Authentication/Storage/Db.php b/src/LmcUser/Authentication/Storage/Db.php
@@ -2,7 +2,7 @@
 
 namespace LmcUser\Authentication\Storage;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\Authentication\Storage;
 use Laminas\Authentication\Storage\StorageInterface;
 use Laminas\ServiceManager\ServiceManager;

diff --git a/src/LmcUser/Factory/Authentication/Adapter/DbFactory.php b/src/LmcUser/Factory/Authentication/Adapter/DbFactory.php
@@ -2,7 +2,7 @@
 
 namespace LmcUser\Factory\Authentication\Adapter;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Laminas\ServiceManager\ServiceLocatorInterface;
 use LmcUser\Authentication\Adapter\Db;

diff --git a/src/LmcUser/Factory/Authentication/Storage/DbFactory.php b/src/LmcUser/Factory/Authentication/Storage/DbFactory.php
@@ -2,7 +2,7 @@
 
 namespace LmcUser\Factory\Authentication\Storage;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Laminas\ServiceManager\ServiceLocatorInterface;
 use LmcUser\Authentication\Storage\Db;

diff --git a/src/LmcUser/Factory/AuthenticationService.php b/src/LmcUser/Factory/AuthenticationService.php
@@ -2,7 +2,7 @@
 
 namespace LmcUser\Factory;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Laminas\ServiceManager\ServiceLocatorInterface;
 

diff --git a/src/LmcUser/Factory/Controller/Plugin/LmcUserAuthentication.php b/src/LmcUser/Factory/Controller/Plugin/LmcUserAuthentication.php
@@ -2,7 +2,7 @@
 
 namespace LmcUser\Factory\Controller\Plugin;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Laminas\ServiceManager\ServiceLocatorInterface;
 use LmcUser\Controller;

diff --git a/src/LmcUser/Factory/Controller/RedirectCallbackFactory.php b/src/LmcUser/Factory/Controller/RedirectCallbackFactory.php
@@ -2,7 +2,7 @@
 
 namespace LmcUser\Factory\Controller;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\Mvc\Application;
 use Laminas\Router\RouteInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;

diff --git a/src/LmcUser/Factory/Controller/UserControllerFactory.php b/src/LmcUser/Factory/Controller/UserControllerFactory.php
@@ -2,7 +2,7 @@
 
 namespace LmcUser\Factory\Controller;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\Mvc\Controller\ControllerManager;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Laminas\ServiceManager\ServiceLocatorInterface;

diff --git a/src/LmcUser/Factory/Form/ChangeEmail.php b/src/LmcUser/Factory/Form/ChangeEmail.php
@@ -2,7 +2,7 @@
 
 namespace LmcUser\Factory\Form;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use LmcUser\Form;
 use LmcUser\Validator;

diff --git a/src/LmcUser/Factory/Form/ChangePassword.php b/src/LmcUser/Factory/Form/ChangePassword.php
@@ -2,7 +2,7 @@
 
 namespace LmcUser\Factory\Form;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use LmcUser\Form;
 

diff --git a/src/LmcUser/Factory/Form/Login.php b/src/LmcUser/Factory/Form/Login.php
@@ -2,7 +2,7 @@
 
 namespace LmcUser\Factory\Form;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use LmcUser\Form;
 

diff --git a/src/LmcUser/Factory/Form/Register.php b/src/LmcUser/Factory/Form/Register.php
@@ -2,7 +2,7 @@
 
 namespace LmcUser\Factory\Form;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use LmcUser\Form;
 use LmcUser\Validator;

diff --git a/src/LmcUser/Factory/Mapper/User.php b/src/LmcUser/Factory/Mapper/User.php
@@ -2,7 +2,7 @@
 
 namespace LmcUser\Factory\Mapper;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use LmcUser\Mapper;
 use LmcUser\Options\ModuleOptions;

diff --git a/src/LmcUser/Factory/Options/ModuleOptions.php b/src/LmcUser/Factory/Options/ModuleOptions.php
@@ -2,7 +2,7 @@
 
 namespace LmcUser\Factory\Options;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Laminas\ServiceManager\ServiceLocatorInterface;
 use LmcUser\Options;

diff --git a/src/LmcUser/Factory/Service/UserFactory.php b/src/LmcUser/Factory/Service/UserFactory.php
@@ -2,7 +2,7 @@
 
 namespace LmcUser\Factory\Service;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Laminas\ServiceManager\ServiceLocatorInterface;
 use LmcUser\Service\User;

diff --git a/src/LmcUser/Factory/UserHydrator.php b/src/LmcUser/Factory/UserHydrator.php
@@ -2,8 +2,9 @@
 
 namespace LmcUser\Factory;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use LmcUser\Mapper\UserHydrator as UserHyDratorObject;
 
 /**
  * Class UserHydrator
@@ -16,6 +17,6 @@ class UserHydrator implements FactoryInterface
      */
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
-        return new \LmcUser\Mapper\UserHydrator($container->get('lmcuser_base_hydrator'));
+        return new UserHyDratorObject($container->get('lmcuser_base_hydrator'));
     }
 }
diff --git a/src/LmcUser/Factory/View/Helper/LmcUserDisplayName.php b/src/LmcUser/Factory/View/Helper/LmcUserDisplayName.php
@@ -2,7 +2,7 @@
 
 namespace LmcUser\Factory\View\Helper;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use LmcUser\View;
 

diff --git a/src/LmcUser/Factory/View/Helper/LmcUserIdentity.php b/src/LmcUser/Factory/View/Helper/LmcUserIdentity.php
@@ -2,7 +2,7 @@
 
 namespace LmcUser\Factory\View\Helper;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use LmcUser\View;
 

diff --git a/src/LmcUser/Factory/View/Helper/LmcUserLoginWidget.php b/src/LmcUser/Factory/View/Helper/LmcUserLoginWidget.php
@@ -2,7 +2,7 @@
 
 namespace LmcUser\Factory\View\Helper;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use LmcUser\View;
 

diff --git a/src/LmcUser/Service/User.php b/src/LmcUser/Service/User.php
@@ -2,7 +2,7 @@
 
 namespace LmcUser\Service;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\Authentication\AuthenticationService;
 use Laminas\Form\Form;
 use Laminas\ServiceManager\ServiceManager;