Merge pull request #11 from olssonm/dev

Compat-check for Laravel 5.8.
olssonm · Mar 8, 2019 · f1b74e0 · f1b74e0
2 parents cb80e8a + bd55b32
commit f1b74e0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,23 +7,11 @@ before_script:
   - travis_retry composer require "illuminate/support:${ILLUMINATE_VERSION}"
 
 script:
-  - phpunit
+  - composer test
 
 matrix:
   include:
-    - php: 5.6
-      env: ILLUMINATE_VERSION=5.3.*
-    - php: 5.6
-      env: ILLUMINATE_VERSION=5.4.*
-    - php: 7.0
-      env: ILLUMINATE_VERSION=5.4.*
     - php: 7.1
-      env: ILLUMINATE_VERSION=5.5.*
-    - php: 7.1
-      env: ILLUMINATE_VERSION=5.6.*
-    - php: 7.2
-      env: ILLUMINATE_VERSION=5.6.*
+      env: ILLUMINATE_VERSION=5.8.*
     - php: 7.2
-      env: ILLUMINATE_VERSION=5.7.*
-    - php: nightly
-      env: ILLUMINATE_VERSION=5.7.*
+      env: ILLUMINATE_VERSION=5.8.*
diff --git a/composer.json b/composer.json
@@ -20,13 +20,13 @@
         }
     ],
     "require": {
-        "php" : ">=5.6.0|>=7.0",
-        "illuminate/support": ">=5.3.0",
-        "bjeavons/zxcvbn-php": "0.3.0|0.4.0"
+        "php" : ">=7.1.3",
+        "illuminate/support": "^5.8",
+        "bjeavons/zxcvbn-php": "0.4.0"
     },
     "require-dev": {
-        "phpunit/phpunit" : "5.7.*|~6.0|~7.0",
-        "orchestra/testbench": ">=3.3.0"
+        "phpunit/phpunit" : "~7.0",
+        "orchestra/testbench": "^3.8.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/tests/ZxcvbnTest.php b/tests/ZxcvbnTest.php
@@ -6,7 +6,7 @@
 
 class ZxcvbnTest extends \Orchestra\Testbench\TestCase {
 
-	public function setUp() {
+	public function setUp(): void {
         parent::setUp();
     }