Merge pull request #13 from visto9259/master

Support for PHP 8
LM-Commons · Jun 23, 2021 · 2688d3b · 2688d3b
2 parents 23f2038 + 1c418da
commit 2688d3b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 29 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,18 +15,23 @@ matrix:
     - php: 7.3
       env:
         - DEPENDENCIES=""
-        - EXECUTE_CS_CHECK=true
-        - TEST_COVERAGE=true
     - php: 7.3
       env:
         - DEPENDENCIES="--prefer-lowest --prefer-stable"
     - php: 7.4
       env:
         - DEPENDENCIES=""
+        - EXECUTE_CS_CHECK=true
+        - TEST_COVERAGE=true
     - php: 7.4
       env:
         - DEPENDENCIES="--prefer-lowest --prefer-stable"
-
+    - php: 8.0
+      env:
+        - DEPENDENCIES="--prefer-lowest --prefer-stable"
+    - php: 8.0
+      env:
+        - DEPENDENCIES=""
 before_install:
   - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0; fi
 

diff --git a/composer.json b/composer.json
@@ -35,18 +35,18 @@
     }
   ],
   "require": {
-    "php": "^7.2",
+    "php": "^7.3 || ^8.0",
     "laminas/laminas-servicemanager": "^3.3",
     "laminas/laminas-stdlib": "^3.1",
     "doctrine/persistence": "^2.0"
   },
   "require-dev": {
     "malukenho/docheader": "^0.1.7",
-    "phpunit/phpunit": "^8.5.2",
+    "phpunit/phpunit": "^9.5.0",
     "phpspec/prophecy": "^1.10",
     "friendsofphp/php-cs-fixer": "^2.9.3",
-    "doctrine/doctrine-orm-module": "^3.1",
-    "satooshi/php-coveralls": "^2.0"
+
+    "php-coveralls/php-coveralls": "^2.0"
   },
   "autoload": {
     "psr-4": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,24 +1,15 @@
 <?xml version="1.0"?>
-<phpunit
-        bootstrap="./vendor/autoload.php"
-        colors="true"
-        convertErrorsToExceptions="true"
-        convertNoticesToExceptions="true"
-        convertWarningsToExceptions="true"
-        verbose="true"
-        stopOnFailure="false"
-        processIsolation="false"
-        backupGlobals="false"
-        >
-    <testsuite name="LmcRbac tests">
-        <directory>./test</directory>
-    </testsuite>
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="coverage-html" target="./build/coverage" lowUpperBound="80" highLowerBound="90"/>
-    </logging>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="./vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" verbose="true" stopOnFailure="false" processIsolation="false" backupGlobals="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage includeUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+    <report>
+      <html outputDirectory="./build/coverage" lowUpperBound="80" highLowerBound="90"/>
+    </report>
+  </coverage>
+  <testsuite name="LmcRbac tests">
+    <directory>./test</directory>
+  </testsuite>
+  <logging/>
 </phpunit>