Merge pull request #957 from BrandonSurowiec/master

Prefer Str:: class for Laravel 6 compatability.
barryvdh · Aug 22, 2019 · 8794e7a · 8794e7a
2 parents bf19d93 + 3b2eb63
commit 8794e7a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/DataCollector/RequestCollector.php b/src/DataCollector/RequestCollector.php
@@ -5,6 +5,7 @@
 use DebugBar\DataCollector\DataCollector;
 use DebugBar\DataCollector\DataCollectorInterface;
 use DebugBar\DataCollector\Renderable;
+use Illuminate\Support\Str;
 use Laravel\Telescope\IncomingEntry;
 use Laravel\Telescope\Telescope;
 use Symfony\Component\HttpFoundation\Response;
@@ -115,8 +116,8 @@ public function collect()
         }
 
         foreach ($data['request_server'] as $key => $value) {
-            if (str_is('*_KEY', $key) || str_is('*_PASSWORD', $key)
-                    || str_is('*_SECRET', $key) || str_is('*_PW', $key)) {
+            if (Str::is('*_KEY', $key) || Str::is('*_PASSWORD', $key)
+                    || Str::is('*_SECRET', $key) || Str::is('*_PW', $key)) {
                 $data['request_server'][$key] = '******';
             }
         }

diff --git a/src/LaravelDebugbar.php b/src/LaravelDebugbar.php
@@ -34,6 +34,7 @@
 
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Session\SessionManager;
+use Illuminate\Support\Str;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -98,7 +99,7 @@ public function __construct($app = null)
         }
         $this->app = $app;
         $this->version = $app->version();
-        $this->is_lumen = str_contains($this->version, 'Lumen');
+        $this->is_lumen = Str::contains($this->version, 'Lumen');
     }
 
     /**