From 15fc40f18281113133f149710a80eaf7ac1cc845 Mon Sep 17 00:00:00 2001
From: Mubashir <shah.mubashir@gmail.com>
Date: Thu, 9 Feb 2023 13:13:35 +0500
Subject: [PATCH] https://github.com/LM-Commons/LmcUser/issues/32

Signed-off-by: Mubashir <shah.mubashir@gmail.com>
---
 .gitignore                                          | 13 ++++++++++++-
 .../Adapter/AdapterChainServiceFactory.php          |  6 +-----
 src/LmcUser/Authentication/Adapter/Db.php           |  3 +--
 src/LmcUser/Authentication/Storage/Db.php           |  2 +-
 .../Factory/Authentication/Adapter/DbFactory.php    |  2 +-
 .../Factory/Authentication/Storage/DbFactory.php    |  2 +-
 src/LmcUser/Factory/AuthenticationService.php       |  2 +-
 .../Controller/Plugin/LmcUserAuthentication.php     |  2 +-
 .../Factory/Controller/RedirectCallbackFactory.php  |  2 +-
 .../Factory/Controller/UserControllerFactory.php    |  2 +-
 src/LmcUser/Factory/Form/ChangeEmail.php            |  2 +-
 src/LmcUser/Factory/Form/ChangePassword.php         |  2 +-
 src/LmcUser/Factory/Form/Login.php                  |  2 +-
 src/LmcUser/Factory/Form/Register.php               |  2 +-
 src/LmcUser/Factory/Mapper/User.php                 |  2 +-
 src/LmcUser/Factory/Options/ModuleOptions.php       |  2 +-
 src/LmcUser/Factory/Service/UserFactory.php         |  2 +-
 src/LmcUser/Factory/UserHydrator.php                |  5 +++--
 .../Factory/View/Helper/LmcUserDisplayName.php      |  2 +-
 src/LmcUser/Factory/View/Helper/LmcUserIdentity.php |  2 +-
 .../Factory/View/Helper/LmcUserLoginWidget.php      |  2 +-
 src/LmcUser/Service/User.php                        |  2 +-
 22 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/.gitignore b/.gitignore
index 28e4fbd..65eff63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,13 @@
 composer.lock
-vendor/*
\ No newline at end of file
+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
index a7f1660..a473e14 100644
--- 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
index 9a91026..a566ff2 100644
--- 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
index 4db2e67..dd45794 100644
--- 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
index bd07d0d..7a3f3ae 100644
--- 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
index a0a45b7..0feac61 100644
--- 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
index 2749a20..36cf90d 100644
--- 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
index 01b55f8..7dd329f 100644
--- 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
index aa9cd94..2275fc5 100644
--- 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
index 62d2e92..1edd86e 100644
--- 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
index 0208334..4024f4d 100644
--- 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
index c9865ee..14f62f1 100644
--- 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
index 288b130..ea8e0cb 100644
--- 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
index b120f1c..e96f329 100644
--- 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
index da845b9..e24507b 100644
--- 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
index ffbda0d..7ccf33c 100644
--- 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
index 814f366..44f2e00 100644
--- 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
index 1f13b19..a5ad57e 100644
--- 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
index 7eb5f9b..4b08e93 100644
--- 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
index cc75f4f..44e81b6 100644
--- 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
index d5c393c..717fe35 100644
--- 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
index 54ef950..f0c4388 100644
--- 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;