Merge branch 'hotfix/fix-wherebetween'

Author: mikebronner

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.2.23] - 13 Feb 2018
+### Fixed
+- whereBetween and value bindings parsing.
+
 ## [0.2.22] - 10 Feb 2018
 ### Fixed
 - Laravel 5.5 dependencies.

composer.json

@@ -18,7 +18,7 @@
         "fzaninotto/faker": "~1.4",
         "mockery/mockery": "0.9.*",
         "orchestra/database": "3.6.x-dev@dev",
-        "orchestra/testbench-browser-kit": "3.6.x-dev@dev",
+        "orchestra/testbench-browser-kit": "^3.6",
         "orchestra/testbench-dusk": "3.6.x-dev@dev",
         "orchestra/testbench": "^3.6",
         "php-coveralls/php-coveralls" : "*",

phpunit.xml

@@ -9,7 +9,7 @@
     convertWarningsToExceptions="true"
     printerClass="Codedungeon\PHPUnitPrettyResultPrinter\Printer"
     processIsolation="false"
-    stopOnFailure="false"
+    stopOnFailure="true"
     syntaxCheck="false"
 >
 <testsuites>

src/CacheKey.php

@@ -90,7 +90,7 @@ protected function getQueryColumns(array $columns) : string
 
     protected function getTypeClause($where) : string
     {
-        $type =in_array($where['type'], ['In', 'Null', 'NotNull'])
+        $type =in_array($where['type'], ['In', 'Null', 'NotNull', 'between'])
             ? strtolower($where['type'])
             : strtolower($where['operator']);
 
@@ -99,9 +99,19 @@ protected function getTypeClause($where) : string
 
     protected function getValuesClause(array $where = null) : string
     {
-        return is_array(array_get($where, 'values'))
-            ? '_' . implode('_', $where['values'])
+        if (in_array($where['type'], ['NotNull'])) {
+            return '';
+        }
+
+        $values = is_array(array_get($where, 'values'))
+            ? implode('_', $where['values'])
             : '';
+
+        if (! $values && $this->query->bindings['where'] ?? false) {
+            $values = implode('_', $this->query->bindings['where']);
+        }
+
+        return '_' . $values;
     }
 
     protected function getWhereClauses(array $wheres = []) : string
@@ -152,7 +162,6 @@ protected function getOtherClauses(array $where, string $carry = null) : string
         }
 
         $value = $this->getTypeClause($where);
-        $value .= "_" . array_get($where, 'value');
         $value .= $this->getValuesClause($where);
 
         return "{$carry}-{$where['column']}_{$value}";

tests/Fixtures/Book.php

@@ -6,13 +6,17 @@
 
 class Book extends CachedModel
 {
+    protected $casts = [
+        'price' => 'float',
+    ];
     protected $dates = [
         'published_at',
     ];
     protected $fillable = [
         'description',
         'published_at',
         'title',
+        'price',
     ];
 
     public function author() : BelongsTo