From 16ac0b9bf3e3344a950375e63ceb5f239005c7c0 Mon Sep 17 00:00:00 2001
From: Eric Richer <eric.richer@vistoconsulting.com>
Date: Mon, 28 Jun 2021 21:14:39 -0400
Subject: [PATCH] Fixed composer.json dependencies for doctrine-module and
 re-added test suite for ObjectRepositoryRoleProvider

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

diff --git a/composer.json b/composer.json
index d0b2361b..61e0a032 100644
--- a/composer.json
+++ b/composer.json
@@ -46,13 +46,22 @@
         "phpunit/phpunit": "^9.5",
         "squizlabs/php_codesniffer": "^3.5.5",
         "php-coveralls/php-coveralls": "^2.2",
-        "phpspec/prophecy-phpunit": "^2.0"
+        "phpspec/prophecy-phpunit": "^2.0",
+        "doctrine/doctrine-module": "^4.0",
+        "doctrine/doctrine-orm-module": "^4.0"
     },
     "suggest": {
         "laminas/laminas-developer-tools": "if you want to show information about the roles",
         "doctrine/doctrine-module": "if you want to use Doctrine role provider"
     },
     "replace": {
+        "laminas/laminas-cache-storage-adapter-apc": "*",
+        "laminas/laminas-cache-storage-adapter-dba": "*",
+        "laminas/laminas-cache-storage-adapter-memcached": "*",
+        "laminas/laminas-cache-storage-adapter-mongodb": "*",
+        "laminas/laminas-cache-storage-adapter-wincache": "*",
+        "laminas/laminas-cache-storage-adapter-xcache": "*",
+        "laminas/laminas-cache-storage-adapter-zend-server": "*",
         "laminas-commons/lmc-rbac-mvc": "3.0.1"
     },
     "autoload": {
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..03a031ad 100644
--- a/tests/testing.config.php
+++ b/tests/testing.config.php
@@ -18,7 +18,6 @@
 
 return [
     'lmc_rbac' => [],
-/*
     'doctrine' => [
         'driver' => [
             'application_driver' => [
@@ -49,5 +48,4 @@
             ],
         ],
     ],
-*/
 ];