Merge pull request #111 from GeneaLabs/feature/update-to-laravel-6

Add Laravel 6.0 compatibility.

Author: mikebronner

CHANGELOG.md

@@ -1,4 +1,10 @@
 # Change Log
+## [1.0] - 2019-09-05
+### Added
+- Laravel 6.0 compatibility.
+
+### Removed
+- compatibility with older versions of Laravel.
 
 ## [0.8.3] - 2019-06-30
 ### Added

composer.json

@@ -9,18 +9,18 @@
         }
     ],
     "require": {
-        "illuminate/routing": "5.3 - 5.8",
-        "illuminate/support": "5.3 - 5.8",
-        "jenssegers/model": "*",
-        "php": ">=7.1.3"
+        "illuminate/routing": "6.0",
+        "illuminate/support": "6.0",
+        "jenssegers/model": "^1.2.1"
     },
     "require-dev": {
         "codedungeon/phpunit-result-printer": "*",
-        "mockery/mockery": "*",
-        "orchestra/testbench-browser-kit": "3.8.*",
-        "orchestra/testbench": "3.8.*",
+        "mockery/mockery": "^1.0",
+        "orchestra/testbench-browser-kit": "^3.9",
+        "orchestra/testbench-dusk": "^3.9",
+        "orchestra/testbench": "^3.9",
         "phpmd/phpmd": "*",
-        "phpunit/phpunit": "*",
+        "phpunit/phpunit": "^8.0",
         "php-coveralls/php-coveralls" : "*",
         "sebastian/phpcpd": "*"
     },
@@ -40,5 +40,7 @@
                 "GeneaLabs\\LaravelCaffeine\\Providers\\Service"
             ]
         }
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }

tests/Unit/Console/Commands/PublishTest.php

@@ -15,9 +15,9 @@ public function testConfigFileContainsCorrectSettings()
     {
         $settings = file_get_contents(base_path('config/genealabs-laravel-caffeine.php'));
 
-        $this->assertStringContainsString("'drip-interval' => 300000,", $settings);
-        $this->assertStringContainsString("'domain' => null,", $settings);
-        $this->assertStringContainsString("'route' => 'genealabs/laravel-caffeine/drip',", $settings);
-        $this->assertStringContainsString("'outdated-drip-check-interval' => 2000,", $settings);
+        $this->assertStringContainsStringIgnoringCase("'drip-interval' => 300000,", $settings);
+        $this->assertStringContainsStringIgnoringCase("'domain' => null,", $settings);
+        $this->assertStringContainsStringIgnoringCase("'route' => 'genealabs/laravel-caffeine/drip',", $settings);
+        $this->assertStringContainsStringIgnoringCase("'outdated-drip-check-interval' => 2000,", $settings);
     }
 }