Remove dead code

Author: mikebronner

src/CacheKey.php

@@ -148,18 +148,6 @@ protected function getValuesClause(array $where = []) : string
 
     protected function getValuesFromWhere(array $where) : string
     {
-        if ((new Arr)->get($where, "query")) {
-            $prefix = $this->getCachePrefix();
-            $subKey = (new self($this->eagerLoad, $this->model, $where["query"]))
-                ->make();
-            $subKey = str_replace($prefix, "", $subKey);
-            $subKey = str_replace($this->getModelSlug(), "", $subKey);
-            $classParts = explode("\\", get_class($this->model));
-            $subKey = strtolower(array_pop($classParts)) . $subKey;
-
-            return $subKey;
-        }
-
         if (is_array((new Arr)->get($where, "values"))) {
             return implode("_", collect($where["values"])->flatten()->toArray());
         }
@@ -215,18 +203,6 @@ protected function getColumnClauses(array $where) : string
         return "-{$where["boolean"]}_{$where["first"]}_{$where["operator"]}_{$where["second"]}";
     }
 
-    protected function getInClauses(array $where) : string
-    {
-        if (! in_array($where["type"], ["In"])) {
-            return "";
-        }
-
-        $this->currentBinding++;
-        $values = $this->recursiveImplode($where["values"], "_");
-
-        return "-{$where["column"]}_in{$values}";
-    }
-
     protected function getInAndNotInClauses(array $where) : string
     {
         if (! in_array($where["type"], ["In", "NotIn", "InRaw"])) {
@@ -248,10 +224,6 @@ protected function recursiveImplode(array $items, string $glue = ",") : string
         $result = "";
 
         foreach ($items as $value) {
-            if ($value instanceof Expression) {
-                $value = $value->getValue();
-            }
-
             if (is_string($value)) {
                 $value = str_replace('"', '', $value);
                 $value = explode(" ", $value);

src/CachedBelongsToMany.php

@@ -12,17 +12,4 @@ class CachedBelongsToMany extends BelongsToMany
     use BuilderCaching;
     use Caching;
     use FiresPivotEventsTrait;
-
-    public function getRelation($name)
-    {
-        $relation = parent::getRelation($name);
-
-        if (! $this->isCachable()
-            && is_a($relation->getQuery(), self::class)
-        ) {
-            $relation->getQuery()->disableModelCaching();
-        }
-
-        return $relation;
-    }
 }

src/Traits/Buildable.php

@@ -68,10 +68,6 @@ public function first($columns = ["*"])
             return parent::first($columns);
         }
 
-        if (! is_array($columns)) {
-            $columns = [$columns];
-        }
-
         $cacheKey = $this->makeCacheKey($columns, null, "-first");
 
         return $this->cachedValue(func_get_args(), $cacheKey);
@@ -167,12 +163,6 @@ protected function recursiveImplodeWithKey(array $items, string $glue = "_") : s
         $result = "";
 
         foreach ($items as $key => $value) {
-            if (is_array($value)) {
-                $result .= $key . $glue . $this->recursiveImplodeWithKey($value, $glue);
-
-                continue;
-            }
-
             $result .= $glue . $key . $glue . $value;
         }
 

tests/Integration/CachedBuilder/DeleteTest.php

@@ -0,0 +1,32 @@
+<?php namespace GeneaLabs\LaravelModelCaching\Tests\Integration\CachedBuilder;
+
+use GeneaLabs\LaravelModelCaching\Tests\Fixtures\Book;
+use GeneaLabs\LaravelModelCaching\Tests\IntegrationTestCase;
+
+class DeleteTest extends IntegrationTestCase
+{
+    public function testDecrementingInvalidatesCache()
+    {
+        $book = (new Book)
+            ->orderBy("id", "DESC")
+            ->first();
+        $key = sha1("genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:books:genealabslaravelmodelcachingtestsfixturesbook_orderBy_id_desc-first");
+        $tags = [
+            "genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:genealabslaravelmodelcachingtestsfixturesbook",
+        ];
+
+        $beforeDeleteCachedResults = $this
+            ->cache()
+            ->tags($tags)
+            ->get($key)['value'];
+        $book->delete();
+        $afterDeleteCachedResults = $this
+            ->cache()
+            ->tags($tags)
+            ->get($key)['value'];
+
+        $this->assertEquals($beforeDeleteCachedResults->id, $book->id);
+        $this->assertNotEquals($beforeDeleteCachedResults, $afterDeleteCachedResults);
+        $this->assertNull($afterDeleteCachedResults);
+    }
+}