Version update with Laravel 8.0 support (#25)

orkhanahmadov · web-flow · commit 5cca9537e75a · 2020-09-19T10:27:17.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -21,14 +21,16 @@ matrix:
           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=~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=~5.0  PHPUNIT_VERSION=~9.0
+          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
@@ -15,9 +15,13 @@ Eloquent Repository package for Laravel created with total "repository pattern"
 
 ## Requirements
 
-**Version ^2.0** - Laravel **^6.0** or **^7.0** or higher and **PHP 7.2** or higher.
+Version requirement and compatibility with Laravel
 
-**Version ^1.0** - Laravel **5.5, 5.6, 5.7, 5.8** and **PHP 7.1** or higher.
+| Package | PHP  | Laravel              |
+|---------|------|----------------------|
+| 1.0     | ^7.1 | 5.5, 5.6, 5.7 or 5.8 |
+| 2.0-2.2 | ^7.2 | ^6.0 or ^7.0         |
+| 2.3     | ^7.3 | ^6.0, ^7.0 or ^8.0   |
 
 ## Installation
 
diff --git a/composer.json b/composer.json
@@ -21,15 +21,15 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.3",
         "illuminate/container": "^6.0|^7.0|^8.0",
         "illuminate/console": "^6.0|^7.0|^8.0",
         "illuminate/contracts": "^6.0|^7.0|^8.0",
         "illuminate/database": "^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,22 @@
 <?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">
+<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>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
     <logging>
-        <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"/>
+        <junit outputFile="build/report.junit.xml"/>
     </logging>
     <php>
         <env name="APP_ENV" value="testing"/>
