Laravel 8 support

orkhanahmadov · Sep 23, 2020 · c94527d · c94527d
1 parent 4b0459c
commit c94527d
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 33 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,13 +18,19 @@ matrix:
 
         - php: 7.3
           env: LARAVEL_VERSION=~6.0  TESTBENCH_VERSION=~4.0 PHPUNIT_VERSION=~8.0
+        - php: 7.3
+          env: LARAVEL_VERSION=~7.0  TESTBENCH_VERSION=~5.0 PHPUNIT_VERSION=~8.0
         - php: 7.3
           env: LARAVEL_VERSION=~7.0  TESTBENCH_VERSION=~5.0 PHPUNIT_VERSION=~9.0
+        - php: 7.3
+          env: LARAVEL_VERSION=~8.0  TESTBENCH_VERSION=~6.0 PHPUNIT_VERSION=~9.0
 
         - php: 7.4
           env: LARAVEL_VERSION=~6.0  TESTBENCH_VERSION=~4.0 PHPUNIT_VERSION=~8.0
         - php: 7.4
           env: LARAVEL_VERSION=~7.0  TESTBENCH_VERSION=~5.0 PHPUNIT_VERSION=~9.0
+        - php: 7.4
+          env: LARAVEL_VERSION=~8.0  TESTBENCH_VERSION=~6.0 PHPUNIT_VERSION=~9.0
 
 before_install:
     - travis_retry composer self-update

diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ Laravel middleware for whitelisting/blacklisting client IP addresses
 ## Requirements
 
 * PHP **7.2** or higher
-* Laravel **^6.0**, **^7.0** or higher
+* Laravel **6** or higher
 
 ## Installation
 

diff --git a/composer.json b/composer.json
@@ -22,13 +22,12 @@
     ],
     "require": {
         "php": "^7.2",
-        "illuminate/container": "^6.0|^7.0",
-        "illuminate/contracts": "^6.0|^7.0",
-        "illuminate/http": "^6.0|^7.0",
-        "illuminate/support": "^6.0|^7.0"
+        "illuminate/contracts": "^6.0|^7.0|^8.0",
+        "illuminate/http": "^6.0|^7.0|^8.0",
+        "illuminate/support": "^6.0|^7.0|^8.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^4.0|^5.0",
+        "orchestra/testbench": "^4.0|^5.0|^6.0",
         "phpunit/phpunit": "^8.0|^9.0"
     },
     "autoload": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,29 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
-    <testsuites>
-        <testsuite name="Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="tap" target="build/report.tap"/>
-        <log type="junit" target="build/report.junit.xml"/>
-        <log type="coverage-html" target="build/coverage"/>
-        <log type="coverage-text" target="build/coverage.txt"/>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" backupStaticAttributes="false" colors="true" verbose="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+    <report>
+      <clover outputFile="build/logs/clover.xml"/>
+      <html outputDirectory="build/coverage"/>
+      <text outputFile="build/coverage.txt"/>
+    </report>
+  </coverage>
+  <testsuites>
+    <testsuite name="Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <logging>
+    <junit outputFile="build/report.junit.xml"/>
+  </logging>
 </phpunit>