Refactor where clause parsing

Author: mikebronner

phpunit.xml

@@ -6,7 +6,7 @@
     convertNoticesToExceptions="true"
     convertWarningsToExceptions="true"
     processIsolation="false"
-    stopOnFailure="false"
+    stopOnFailure="true"
     syntaxCheck="false"
     bootstrap="vendor/autoload.php"
 >

src/CacheKey.php

@@ -96,25 +96,54 @@ protected function getWhereClauses(array $wheres = []) : string
     {
         return $this->getWheres($wheres)
             ->reduce(function ($carry, $where) {
-                if (in_array($where['type'], ['Exists', 'Nested', 'NotExists'])) {
-                    return '_' . strtolower($where['type']) . $this->getWhereClauses($where['query']->wheres);
-                }
+                $value = $this->getNestedClauses($where);
+                $value .= $this->getColumnClauses($where);
+                $value .= $this->getRawClauses($where);
+                $value .= $this->getOtherClauses($where, $carry);
 
-                if ($where['type'] === 'Column') {
-                    return "_{$where['boolean']}_{$where['first']}_{$where['operator']}_{$where['second']}";
-                }
+                return $value;
+            })
+            . '';
+    }
 
-                if ($where['type'] === 'raw') {
-                    return "_{$where['boolean']}_" . str_slug($where['sql']);
-                }
+    protected function getNestedClauses(array $where) : string
+    {
+        if (! in_array($where['type'], ['Exists', 'Nested', 'NotExists'])) {
+            return '';
+        }
 
-                $value = array_get($where, 'value');
-                $value .= $this->getTypeClause($where);
-                $value .= $this->getValuesClause($where);
+        return '_' . strtolower($where['type']) . $this->getWhereClauses($where['query']->wheres);
+    }
 
-                return "{$carry}-{$where['column']}_{$value}";
-            })
-            . '';
+    protected function getColumnClauses(array $where) : string
+    {
+        if ($where['type'] !== 'Column') {
+            return '';
+        }
+
+        return "_{$where['boolean']}_{$where['first']}_{$where['operator']}_{$where['second']}";
+    }
+
+    protected function getRawClauses(array $where) : string
+    {
+        if ($where['type'] !== 'raw') {
+            return '';
+        }
+
+        return "_{$where['boolean']}_" . str_slug($where['sql']);
+    }
+
+    protected function getOtherClauses(array $where, string $carry = null) : string
+    {
+        if (in_array($where['type'], ['Exists', 'Nested', 'NotExists', 'raw', 'Column'])) {
+            return '';
+        }
+
+        $value = array_get($where, 'value');
+        $value .= $this->getTypeClause($where);
+        $value .= $this->getValuesClause($where);
+
+        return "{$carry}-{$where['column']}_{$value}";
     }
 
     protected function getWheres(array $wheres) : Collection

tests/Unit/CachedBuilderTest.php

@@ -269,9 +269,6 @@ public function testCountModelResultsCreatesCache()
         $this->assertEquals($liveResults, $cachedResults);
     }
 
-    /**
-     * @group test
-     */
     public function testCursorModelResultsCreatesCache()
     {
         $authors = (new Author)