Merge pull request #26 from visto9259/master

Drop PHP 7.3 support - added testing for PHP 8.1
LM-Commons · Jun 23, 2022 · 8d245e3 · 8d245e3
2 parents df3b5d5 + 6985f51
commit 8d245e3
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 14 deletions.
diff --git 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
@@ -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,10 +43,11 @@
         "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"
+        "phpspec/prophecy-phpunit": "^2.0",
+        "doctrine/doctrine-orm-module": "^4.1"
     },
     "suggest": {
         "laminas/laminas-developer-tools": "if you want to show information about the roles",

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' => [
@@ -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 @@
             ],
         ],
     ],
-*/
 ];