Added support for PHP 8

CHANGELOG.md

@@ -25,4 +25,5 @@ Refactored code to improve readability and performance
 
 0.2.0
 Changed BaseUsers entity nullable annotation to false in emailAddress and password fields
-Now compatable with PHP 8.0+
+Now compatable with PHP 8.0 & 8.1
+Changed abandoned Container Interop package for PSR Container

composer.json

@@ -50,5 +50,11 @@
         "zf": {
             "module": "FwsDoctrineAuth"
         }
-    }
+    },
+    "funding": [
+        {
+            "type": "other",
+            "url": "https://www.freedomwebservices.net/laminas/fws-doctrine-auth#donate"
+        }
+    ]
 }

src/Controller/Service/IndexControllerFactory.php

@@ -3,7 +3,7 @@
 namespace FwsDoctrineAuth\Controller\Service;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use FwsDoctrineAuth\Controller\IndexController;
 use FwsDoctrineAuth\Model;
 

src/Form/Service/EmailFormFactory.php

@@ -3,7 +3,7 @@
 namespace FwsDoctrineAuth\Form\Service;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Doctrine\ORM\EntityManager;
 
 /**

src/Form/Service/LoginFormFactory.php

@@ -3,7 +3,7 @@
 namespace FwsDoctrineAuth\Form\Service;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Doctrine\ORM\EntityManager;
 
 /**

src/Form/Service/RegisterFormFactory.php

@@ -3,7 +3,7 @@
 namespace FwsDoctrineAuth\Form\Service;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Doctrine\ORM\EntityManager;
 use Doctrine\Laminas\Hydrator\DoctrineObject;
 

src/Form/Service/ResetPasswordFormFactory.php

@@ -3,8 +3,7 @@
 namespace FwsDoctrineAuth\Form\Service;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
-use Interop\Container\ContainerInterface;
-use FwsDoctrineAuth\Form\ResetPasswordForm;
+use Psr\Container\ContainerInterface;
 
 /**
  * ForgotPasswordFormFactory

src/Model/Service/AclFactory.php

@@ -3,7 +3,7 @@
 namespace FwsDoctrineAuth\Model\Service;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use FwsDoctrineAuth\Model\Acl;
 
 /**

src/Model/Service/ForgotPasswordModelFactory.php

@@ -3,7 +3,7 @@
 namespace FwsDoctrineAuth\Model\Service;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use FwsDoctrineAuth\Model\ForgotPasswordModel;
 use FwsDoctrineAuth\Exception\DoctrineAuthException;
 use Doctrine\ORM\EntityManager;

src/Model/Service/LoginModelFactory.php

@@ -3,7 +3,7 @@
 namespace FwsDoctrineAuth\Model\Service;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use FwsDoctrineAuth\Model\LoginModel;
 use Laminas\Authentication\AuthenticationService;
 use Doctrine\ORM\EntityManager;

src/Model/Service/RegisterModelFactory.php

@@ -3,7 +3,7 @@
 namespace FwsDoctrineAuth\Model\Service;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use FwsDoctrineAuth\Model\RegisterModel;
 use Doctrine\ORM\EntityManager;
 use FwsDoctrineAuth\Model\LoginModel;

src/Service/AuthContainerFactory.php

@@ -3,7 +3,7 @@
 namespace FwsDoctrineAuth\Service;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\Session\Container;
 
 class AuthContainerFactory implements FactoryInterface