Merge branch 'master' into develop

Author: mikebronner

.travis.yml

@@ -1,8 +1,7 @@
 language: php
 
 php:
-    - 7.0
-    - 7.1
+    - 7.1.3
     - 7.2
 
 before_script:

CHANGELOG.md

@@ -4,6 +4,40 @@ 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.
+
+## [0.2.21] - 9 Feb 2018
+### Added
+- Laravel 5.6 compatibility.
+
+## [0.2.20] - 7 Feb 2018
+### Fixed
+- previously existing unit tests to properly consider changes made in 0.2.19.
+
+## [0.2.19] - 7 Feb 2018
+### Fixed
+- parsing of where clause operators.
+
+## [0.2.18] - 16 Jan 2018
+### Added
+- hashing of cache keys to prevent key length over-run issues.
+
+### Updated
+- dependency version constraint for "pretty test printer".
+
+## [0.2.17] - 10 Jan 2018
+###Added
+- caching for value() querybuilder method.
+
+### Updated
+- tests to use Orchestral Testbench.
+
 ## [0.2.16] - 5 Jan 2018
 ### Added
 - `thanks` package.

README.md

@@ -2,9 +2,9 @@
 
 # Model Caching for Laravel
 [![Gitter](https://badges.gitter.im/GeneaLabs/laravel-model-caching.svg)](https://gitter.im/GeneaLabs/laravel-model-caching?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=body_badge)
-[![Travis](https://img.shields.io/travis/GeneaLabs/laravel-model-caching.svg)](https://travis-ci.org/GeneaLabs/laravel-model-caching)
-[![Scrutinizer](https://img.shields.io/scrutinizer/g/GeneaLabs/laravel-model-caching.svg)](https://scrutinizer-ci.com/g/GeneaLabs/laravel-model-caching)
-[![Coveralls](https://img.shields.io/coveralls/GeneaLabs/laravel-model-caching.svg)](https://coveralls.io/github/GeneaLabs/laravel-model-caching)
+[![Travis](https://img.shields.io/travis/GeneaLabs/laravel-model-caching/master.svg)](https://travis-ci.org/GeneaLabs/laravel-model-caching)
+[![Scrutinizer](https://img.shields.io/scrutinizer/g/GeneaLabs/laravel-model-caching/master.svg)](https://scrutinizer-ci.com/g/GeneaLabs/laravel-model-caching)
+[![Coveralls](https://img.shields.io/coveralls/GeneaLabs/laravel-model-caching/master.svg)](https://coveralls.io/github/GeneaLabs/laravel-model-caching)
 [![GitHub (pre-)release](https://img.shields.io/github/release/GeneaLabs/laravel-model-caching/all.svg)](https://github.com/GeneaLabs/laravel-model-caching)
 [![Packagist](https://img.shields.io/packagist/dt/GeneaLabs/laravel-model-caching.svg)](https://packagist.org/packages/genealabs/laravel-model-caching)
 [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/GeneaLabs/laravel-model-caching/master/LICENSE)
@@ -23,8 +23,8 @@ relationships. This package is the attempt to address those requirements.
     flush entire cache for providers that don't).
 
 ## Requirements
--   PHP >= 7.0.0
--   Laravel 5.5
+-   PHP >= 7.1.3
+-   Laravel >= 5.5
 
 ## Installation
 ```

composer.json

@@ -9,18 +9,18 @@
         }
     ],
     "require": {
-        "illuminate/cache": "5.5.*",
-        "illuminate/database": "5.5.*",
-        "php": ">=7.0.0"
+        "illuminate/cache": "5.5 - 5.6",
+        "illuminate/database": "5.5 - 5.6",
+        "php": ">=7.1.3"
     },
     "require-dev": {
         "codedungeon/phpunit-result-printer": "*",
         "fzaninotto/faker": "~1.4",
         "mockery/mockery": "0.9.*",
-        "orchestra/database": "^3.5",
-        "orchestra/testbench-browser-kit": "^3.5",
-        "orchestra/testbench-dusk": "3.5.x-dev@dev",
-        "orchestra/testbench": "^3.5",
+        "orchestra/database": "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" : "*",
         "phpmd/phpmd": "*",
         "phpunit/phpunit": "*",

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,16 +90,28 @@ protected function getQueryColumns(array $columns) : string
 
     protected function getTypeClause($where) : string
     {
-        return in_array($where['type'], ['In', 'Null', 'NotNull'])
+        $type =in_array($where['type'], ['In', 'Null', 'NotNull', 'between'])
             ? strtolower($where['type'])
-            : '';
+            : strtolower($where['operator']);
+
+        return str_replace(' ', '_', $type);
     }
 
     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
@@ -149,8 +161,7 @@ protected function getOtherClauses(array $where, string $carry = null) : string
             return '';
         }
 
-        $value = array_get($where, 'value');
-        $value .= $this->getTypeClause($where);
+        $value = $this->getTypeClause($where);
         $value .= $this->getValuesClause($where);
 
         return "{$carry}-{$where['column']}_{$value}";

tests/CreatesApplication.php

@@ -10,7 +10,7 @@ public function setUp()
         parent::setUp();
 
         $this->withFactories(__DIR__ . '/database/factories');
-        $this->loadMigrationsFrom(realpath(__DIR__ . '/database/migrations'));
+        $this->loadMigrationsFrom(__DIR__ . '/database/migrations');
     }
 
     /**

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