feat: compatibility with laravel 10

perspikapps · Aug 8, 2023 · 84d5b65 · 84d5b65
1 parent 1e7b409
commit 84d5b65
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -15,15 +15,13 @@
         "ribbon"
     ],
     "require": {
-        "php": "^7.4",
-        "avto-dev/app-version-laravel": "^3.2",
-        "illuminate/support": "^6.0 || ^7.0 || ^8.0"
+        "php": ">=7.4",
+        "avto-dev/app-version-laravel": "^3.6"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.16",
+        "friendsofphp/php-cs-fixer": "^3.0",
         "nunomaduro/phpinsights": "dev-master",
-        "orchestra/testbench": "~5 || ~6",
-        "phpunit/phpunit": "^9.0",
+        "phpunit/phpunit": "^10.0",
         "squizlabs/php_codesniffer": "^3.5"
     },
     "autoload": {

diff --git a/src/EnvRibbon.php b/src/EnvRibbon.php
@@ -3,7 +3,6 @@
 namespace Perspikapps\LaravelEnvRibbon;
 
 use AvtoDev\AppVersion\AppVersionManager;
-use Illuminate\Support\Str;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -43,8 +42,6 @@ public function __construct($app = null, AppVersionManager $appversion)
         }
 
         $this->app = $app;
-        $this->version = $app->version();
-        $this->is_lumen = Str::contains($this->version, 'Lumen');
         $this->appversion = $appversion;
 
         $this->loadConfig();

diff --git a/src/Middleware/InjectEnvRibbon.php b/src/Middleware/InjectEnvRibbon.php
@@ -17,7 +17,7 @@ class InjectEnvRibbon
     protected $container;
 
     /**
-     * The DebugBar instance.
+     * The EnvRibbon instance.
      *
      * @var LaravelDebugbar
      */
@@ -41,7 +41,7 @@ public function __construct(Container $container, EnvRibbon $envribbon)
      */
     public function handle($request, Closure $next, $guard = null)
     {
-        if (! $this->envribbon->isEnabled()) {
+        if (!$this->envribbon->isEnabled()) {
             return $next($request);
         }