Merge pull request #22 from visto9259/master

Updated require-dev dependencies for doctrine-module
LM-Commons · Nov 26, 2021 · 7fc9536 · 7fc9536
2 parents 9fd2312 + 6bfe136
commit 7fc9536
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git 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/.../ObjectRepositoryRoleProviderTest.php.bak → ...Role/ObjectRepositoryRoleProviderTest.php b/.../ObjectRepositoryRoleProviderTest.php.bak → ...Role/ObjectRepositoryRoleProviderTest.php
diff --git 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
@@ -18,7 +18,6 @@
 
 return [
     'lmc_rbac' => [],
-/*
     'doctrine' => [
         'driver' => [
             'application_driver' => [
@@ -49,5 +48,4 @@
             ],
         ],
     ],
-*/
 ];