Laravel 6 support

Torann · Nov 26, 2019 · dc19a82 · dc19a82
1 parent 591f2db
commit dc19a82
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
     "authors": [
         {
             "name": "Daniel Stainback",
-            "email": "daniel@lyften.com"
+            "email": "torann@gmail.com"
         }
     ],
     "require": {
@@ -18,10 +18,5 @@
         "psr-4": {
           "Torann\\Hashids\\": "src/Torann/Hashids"
         }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.0-dev"
-        }
     }
 }
diff --git a/src/Torann/Hashids/HashidsServiceProvider.php b/src/Torann/Hashids/HashidsServiceProvider.php
@@ -1,6 +1,8 @@
 <?php namespace Torann\Hashids;
 
 use Hashids\Hashids;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Str;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Foundation\AliasLoader;
 
@@ -34,9 +36,9 @@ public function register()
             $config = $app->config->get('hashids');
 
             return new Hashids(
-                array_get($config, 'salt'),
-                array_get($config, 'length', 0),
-                array_get($config, 'alphabet')
+                Arr::get($config, 'salt'),
+                Arr::get($config, 'length', 0),
+                Arr::get($config, 'alphabet')
             );
         });
     }
@@ -48,7 +50,7 @@ public function register()
      */
     protected function isLumen()
     {
-        return str_contains($this->app->version(), 'Lumen') === true;
+        return Str::contains($this->app->version(), 'Lumen') === true;
     }
 
     /**
@@ -58,6 +60,8 @@ protected function isLumen()
      */
     public function provides()
     {
-        return ['hashids'];
+        return [
+            'hashids',
+        ];
     }
 }