Merge pull request #228 from mycarrysun/deprecated-functions

Replace deprecated functions for Laravel 5.9

Author: mikebronner

src/CacheKey.php

@@ -3,9 +3,11 @@
 use GeneaLabs\LaravelModelCaching\Traits\CachePrefixing;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Query\Builder;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Database\Query\Expression;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Support\Str;
 
 class CacheKey
 {
@@ -62,13 +64,13 @@ protected function getLimitClause() : string
 
     protected function getTableSlug() : string
     {
-        return str_slug($this->model->getTable())
+        return Str::slug($this->model->getTable())
             . ":";
     }
 
     protected function getModelSlug() : string
     {
-        return str_slug(get_class($this->model));
+        return Str::slug(get_class($this->model));
     }
 
     protected function getOffsetClause() : string
@@ -87,7 +89,7 @@ protected function getOrderByClauses() : string
         return $orders
             ->reduce(function ($carry, $order) {
                 if (($order["type"] ?? "") === "Raw") {
-                    return $carry . "_orderByRaw_" . str_slug($order["sql"]);
+                    return $carry . "_orderByRaw_" . Str::slug($order["sql"]);
                 }
 
                 return $carry . "_orderBy_" . $order["column"] . "_" . $order["direction"];
@@ -127,7 +129,7 @@ protected function getValuesClause(array $where = null) : string
 
     protected function getValuesFromWhere(array $where) : string
     {
-        if (array_get($where, "query")) {
+        if (Arr::get($where, "query")) {
             $prefix = $this->getCachePrefix();
             $subKey = (new self($this->eagerLoad, $this->model, $where["query"]))
                 ->make();
@@ -139,11 +141,11 @@ protected function getValuesFromWhere(array $where) : string
             return $subKey;
         }
 
-        if (is_array(array_get($where, "values"))) {
+        if (is_array(Arr::get($where, "values"))) {
             return implode("_", collect($where["values"])->flatten()->toArray());
         }
 
-        return array_get($where, "value", "");
+        return Arr::get($where, "value", "");
     }
 
     protected function getValuesFromBindings(array $where, string $values) : string

src/CacheTags.php

@@ -5,6 +5,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Database\Query\Builder;
+use Illuminate\Support\Str;
 
 class CacheTags
 {
@@ -32,7 +33,7 @@ public function make() : array
                 $relation = $this->getRelation($relationName);
 
                 return $this->getCachePrefix()
-                    . str_slug(get_class($relation->getQuery()->getModel()));
+                    . Str::slug(get_class($relation->getQuery()->getModel()));
             })
             ->prepend($this->getTagName())
             ->values()
@@ -64,6 +65,6 @@ protected function getRelation(string $relationName) : Relation
     protected function getTagName() : string
     {
         return $this->getCachePrefix()
-            . str_slug(get_class($this->model));
+            . Str::slug(get_class($this->model));
     }
 }