From 864eaadda27d56f0a1815e2e2180f1dee1bb6774 Mon Sep 17 00:00:00 2001
From: Eric Richer <eric.richer@vistoconsulting.com>
Date: Thu, 23 Jun 2022 10:27:18 -0400
Subject: [PATCH 1/3] Drop php 7.3 support

---
 .travis.yml   | 12 ++++++------
 composer.json |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9894cf11..e5270c36 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,24 +12,24 @@ env:
 matrix:
   fast_finish: true
   include:
-    - php: 7.3
+    - php: 7.4
       env:
         - DEPS=lowest
-    - php: 7.3
+    - php: 7.4
       env:
         - DEPS=latest
-    - php: 7.4
+    - php: 8.0
       env:
         - DEPS=lowest
-    - php: 7.4
+    - php: 8.0
       env:
         - DEPS=latest
         - CS_CHECK=true
         - TEST_COVERAGE=true
-    - php: 8.0
+    - php: 8.1
       env:
         - DEPS=lowest
-    - php: 8.0
+    - php: 8.1
       env:
         - DEPS=latest
 
diff --git a/composer.json b/composer.json
index d0b2361b..5dce76c1 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
         }
     ],
     "require": {
-        "php": "^7.3 || ^8.0",
+        "php": "^7.4 || ^8.0",
         "laminas/laminas-config": "^3.1",
         "laminas/laminas-eventmanager": "^3.0",
         "laminas/laminas-mvc": "^3.0",
@@ -43,7 +43,7 @@
         "laminas/laminas-i18n": "^2.7",
         "laminas/laminas-serializer": "^2.2",
         "laminas/laminas-view": "^2.12",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "9.5.21",
         "squizlabs/php_codesniffer": "^3.5.5",
         "php-coveralls/php-coveralls": "^2.2",
         "phpspec/prophecy-phpunit": "^2.0"

From 4c4ae31b95a348aeb6bd198c9fd27a081d7e39a2 Mon Sep 17 00:00:00 2001
From: Eric Richer <eric.richer@vistoconsulting.com>
Date: Thu, 23 Jun 2022 16:05:39 -0400
Subject: [PATCH 2/3] Re-enable Doctrine ORM Testing

---
 composer.json                                                 | 3 ++-
 ...viderTest.php.bak => ObjectRepositoryRoleProviderTest.php} | 0
 tests/TestConfiguration.php.dist                              | 2 --
 tests/testing.config.php                                      | 4 +---
 4 files changed, 3 insertions(+), 6 deletions(-)
 rename tests/Role/{ObjectRepositoryRoleProviderTest.php.bak => ObjectRepositoryRoleProviderTest.php} (100%)

diff --git a/composer.json b/composer.json
index 5dce76c1..77f8dc48 100644
--- a/composer.json
+++ b/composer.json
@@ -46,7 +46,8 @@
         "phpunit/phpunit": "9.5.21",
         "squizlabs/php_codesniffer": "^3.5.5",
         "php-coveralls/php-coveralls": "^2.2",
-        "phpspec/prophecy-phpunit": "^2.0"
+        "phpspec/prophecy-phpunit": "^2.0",
+        "doctrine/doctrine-orm-module": "^4.0"
     },
     "suggest": {
         "laminas/laminas-developer-tools": "if you want to show information about the roles",
diff --git a/tests/Role/ObjectRepositoryRoleProviderTest.php.bak b/tests/Role/ObjectRepositoryRoleProviderTest.php
similarity index 100%
rename from tests/Role/ObjectRepositoryRoleProviderTest.php.bak
rename to tests/Role/ObjectRepositoryRoleProviderTest.php
diff --git a/tests/TestConfiguration.php.dist b/tests/TestConfiguration.php.dist
index 88547b6c..feb4ebc3 100644
--- a/tests/TestConfiguration.php.dist
+++ b/tests/TestConfiguration.php.dist
@@ -20,10 +20,8 @@ return [
     'modules' => [
         'Laminas\Router',
         'LmcRbacMvc',
-/*
         'DoctrineModule',
         'DoctrineORMModule',
-*/
     ],
     'module_listener_options' => [
         'config_glob_paths' => [
diff --git a/tests/testing.config.php b/tests/testing.config.php
index 64bf95ca..ca2c8660 100644
--- a/tests/testing.config.php
+++ b/tests/testing.config.php
@@ -18,7 +18,6 @@
 
 return [
     'lmc_rbac' => [],
-/*
     'doctrine' => [
         'driver' => [
             'application_driver' => [
@@ -35,7 +34,7 @@
 
         'connection' => [
             'orm_default' => [
-                'driverClass' => 'Doctrine\DBAL\Driver\PDOSqlite\Driver',
+                'driverClass'       => 'Doctrine\DBAL\Driver\PDO\SQLite\Driver',
                 'params' => [
                     'host'          => null,
                     'port'          => null,
@@ -49,5 +48,4 @@
             ],
         ],
     ],
-*/
 ];

From 6985f513d0c7ecce9fc4e19f7367ce36648e677d Mon Sep 17 00:00:00 2001
From: Eric Richer <eric.richer@vistoconsulting.com>
Date: Thu, 23 Jun 2022 16:24:26 -0400
Subject: [PATCH 3/3] Re-enable Doctrine ORM Testing

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 77f8dc48..5ea0b202 100644
--- a/composer.json
+++ b/composer.json
@@ -47,7 +47,7 @@
         "squizlabs/php_codesniffer": "^3.5.5",
         "php-coveralls/php-coveralls": "^2.2",
         "phpspec/prophecy-phpunit": "^2.0",
-        "doctrine/doctrine-orm-module": "^4.0"
+        "doctrine/doctrine-orm-module": "^4.1"
     },
     "suggest": {
         "laminas/laminas-developer-tools": "if you want to show information about the roles",