Merge pull request #19 from repat/master

Torann · web-flow · commit 898b540b5fff · 2020-03-09T09:22:33.000-04:00
Allow Laravel 6 &amp; 7
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
    ],
   "require": {
     "php": ">=5.5.9",
-    "illuminate/support": "~5.0"
+    "illuminate/support": "~5.0 | ^6.0 | ^7.0"
   },
   "autoload": {
     "files": [
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -2,6 +2,8 @@
 
 namespace Torann\LaravelAsana;
 
+use Illuminate\Support\Str;
+
 class ServiceProvider extends \Illuminate\Support\ServiceProvider
 {
     /**
@@ -65,7 +67,7 @@ public function registerResources()
      */
     protected function isLumen()
     {
-        return str_contains($this->app->version(), 'Lumen') === true;
+        return Str::contains($this->app->version(), 'Lumen') === true;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`
`3`	`3`	`namespace Torann\LaravelAsana;`
`4`	`4`
	`5`	`+use Illuminate\Support\Str;`
	`6`	`+`
`5`	`7`	`class ServiceProvider extends \Illuminate\Support\ServiceProvider`
`6`	`8`	`{`
`7`	`9`	`/**`
`@@ -65,7 +67,7 @@ public function registerResources()`
`65`	`67`	`*/`
`66`	`68`	`protected function isLumen()`
`67`	`69`	`{`
`68`		`- return str_contains($this->app->version(), 'Lumen') === true;`
	`70`	`+ return Str::contains($this->app->version(), 'Lumen') === true;`
`69`	`71`	`}`
`70`	`72`
`71`	`73`	`/**`