Merge pull request #21 from visto9259/master

Added support for PHP 8 and other cleanup
LM-Commons · Jun 26, 2021 · 26ee8a3 · 26ee8a3
2 parents f06a7e2 + 0f836cd
commit 26ee8a3
Show file tree

Hide file tree

Showing 30 changed files with 80 additions and 6,618 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 vendor
 .idea
 build
-.phpunit*
+.phpunit*
+composer.lock
diff --git a/.travis.yml b/.travis.yml
@@ -15,8 +15,6 @@ matrix:
     - php: 7.3
       env:
         - DEPS=lowest
-        - CS_CHECK=true
-        - TEST_COVERAGE=true
     - php: 7.3
       env:
         - DEPS=latest
@@ -26,6 +24,14 @@ matrix:
     - php: 7.4
       env:
         - DEPS=latest
+        - CS_CHECK=true
+        - TEST_COVERAGE=true
+    - php: 8.0
+      env:
+        - DEPS=lowest
+    - php: 8.0
+      env:
+        - DEPS=latest
 
 before_install:
   - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi

diff --git a/composer.json b/composer.json
@@ -27,26 +27,26 @@
         }
     ],
     "require": {
-        "php": "~7.2",
+        "php": "^7.3 || ^8.0",
         "laminas/laminas-config": "^3.1",
         "laminas/laminas-eventmanager": "^3.0",
         "laminas/laminas-mvc": "^3.0",
-        "laminas/laminas-servicemanager": "^3.0.3",
+        "laminas/laminas-servicemanager": "^3.0",
         "zfr/rbac": "~1.2",
         "doctrine/persistence": "^2.1"
     },
     "require-dev": {
-        "laminas/laminas-authentication": "~2.2",
-        "laminas/laminas-developer-tools": "~1.1",
-        "laminas/laminas-log": "~2.2",
-        "laminas/laminas-http": "~2.2",
-        "laminas/laminas-i18n": "~2.7.3",
-        "laminas/laminas-serializer": "~2.2",
-        "laminas/laminas-view": "~2.11.3",
-        "phpunit/phpunit": "9.5.2",
-        "squizlabs/php_codesniffer": "3.5.5",
+        "laminas/laminas-authentication": "^2.2",
+        "laminas/laminas-developer-tools": "^2.1",
+        "laminas/laminas-log": "^2.2",
+        "laminas/laminas-http": "^2.2",
+        "laminas/laminas-i18n": "^2.7",
+        "laminas/laminas-serializer": "^2.2",
+        "laminas/laminas-view": "^2.12",
+        "phpunit/phpunit": "^9.5",
+        "squizlabs/php_codesniffer": "^3.5.5",
         "php-coveralls/php-coveralls": "^2.2",
-        "doctrine/doctrine-orm-module": "^3.1"
+        "phpspec/prophecy-phpunit": "^2.0"
     },
     "suggest": {
         "laminas/laminas-developer-tools": "if you want to show information about the roles",