WIP

Author: mikebronner

src/CachedBuilder.php

@@ -94,15 +94,11 @@ protected function getWhereClauses(array $wheres = []) : string
             }
 
             $value = array_get($where, 'value');
-            $value .= in_array($where['type'], ['In', 'Null', 'NotNull'])
-                ? strtolower($where['type'])
-                : '';
-            $value .= is_array(array_get($where, 'values'))
-                ? '_' . implode('_', $where['values'])
-                : '';
+            $value .= $this->getTypeClause($where);
+            $value .= $this->getValuesClause($where);
 
             return "{$carry}-{$where['column']}_{$value}";
-        }) ?: '';
+        }) . '';
     }
 
     protected function getWithModels() : string
@@ -246,4 +242,18 @@ public function sum($column)
                 return parent::sum($column);
             });
     }
+
+    protected function getTypeClause($where)
+    {
+        return in_array($where['type'], ['In', 'Null', 'NotNull'])
+            ? strtolower($where['type'])
+            : '';
+    }
+
+    protected function getValuesClause($where)
+    {
+        return is_array(array_get($where, 'values'))
+            ? '_' . implode('_', $where['values'])
+            : '';
+    }
 }