Merge branch 'master' into develop

Author: mikebronner

.gitattributes

@@ -5,5 +5,9 @@
 /.gitignore export-ignore
 /.scrutinizer.yml export-ignore
 /.travis.yml export-ignore
+/build
+/composer.lock
+/database.yml export-ignore
 /phpunit.xml export-ignore
 /tests export-ignore
+/vendor

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,26 @@
+---
+name: Bug report
+about: Create a report to help us improve. Please fill out each section completely.
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Eloquent Query**
+Please provide the complete eloquent query that caused the bug, for example:
+```php
+$model->with('otherModel')->get();
+```
+
+**Stack Trace**
+The full stack trace from your log file.
+
+**Environment**
+ - PHP: [e.g. 7.1.0]
+ - OS: [e.g. Ubuntu 18.04]
+ - Laravel: [e.g. 5.6.15]
+ - Model Caching: [e.g. 0.2.61]
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.gitignore

@@ -1,2 +1,3 @@
+/build
 /vendor
 composer.lock

.travis.yml

@@ -1,22 +1,38 @@
 language: php
 
-env:
-    -REDIS_HOST=127.0.0.1
+services:
+    - postgresql
 
-php:
-    - 7.1.3
-    - 7.2
+matrix:
+    include:
+        - php: 7.1.3
+          env: PU_FILE=57 REDIS_HOST=127.0.0.1
+        - php: 7.1.3
+          env: PU_FILE=56 REDIS_HOST=127.0.0.1
+        - php: 7.1.3
+          env: PU_FILE=55 REDIS_HOST=127.0.0.1
+        - php: 7.1.3
+          env: PU_FILE=54 REDIS_HOST=127.0.0.1
+        - php: 7.2
+          env: PU_FILE=57 REDIS_HOST=127.0.0.1
+        - php: 7.2
+          env: PU_FILE=56 REDIS_HOST=127.0.0.1
+        - php: 7.2
+          env: PU_FILE=55 REDIS_HOST=127.0.0.1
+        - php: 7.2
+          env: PU_FILE=54 REDIS_HOST=127.0.0.1
 
 services:
     - redis-server
 
 before_script:
     - travis_retry composer self-update
     - travis_retry composer install --no-interaction --prefer-source
+    - chmod +x tests/*.sh
+    - psql -c 'create database testing;' -U postgres
 
 script:
-    - mkdir -p ./build/logs
-    - ./vendor/bin/phpunit --coverage-text --coverage-clover ./build/logs/clover.xml
+    - ./tests/pu-${PU_FILE}.sh
 
 after_success:
     - travis_retry php vendor/bin/php-coveralls -v

CHANGELOG.md

@@ -4,7 +4,100 @@ 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.51] - 51 Mar 2018
+## [0.3.2] - 3 Nov 2018
+### Added
+- handling of `whereJsonContains()` and `orWhereJsonContains()`.
+
+### Fixed
+- price field value generation in BookFactory to not exceed database field limits.
+
+## [0.3.1] - 7 Oct 2018
+### Changed
+- use of `cache()` helper method to `app("cache")` to allow for better Lumen compatibility. Thanks @nope7777!
+
+### Updated
+- test script for Laravel 5.7 to use non-dev version of test dependency.
+
+### Removed
+- `codedungeon/phpunit-result-printer` unit test output printer.
+
+### Fixed
+- use of custom pagination name.
+- edge-case where tag creation failed.
+- usage of `forceDelete()` in the Builder.
+
+## [0.3.0] - 10 Sep 2018
+### Added
+- Laravel 5.7 compatibility.
+
+## [0.2.64] - 25 Jul 2018
+### Fixed
+- caching of subqueries of `->whereNotIn()` and `->whereIn()`.
+- nested where bindings.
+
+## [0.2.63] - 9 Jun 2018
+### Fixed
+- where clause binding resolution issue.
+
+## [0.2.62] - 1 Jun 2018
+### Fixed
+- function name typo.
+
+### Removed
+- dump() used for debugging.
+
+## [0.2.61] - 31 May 2018
+### Fixed
+- caching of paginated queries with page identifiers as arrays (`?page[size]=1`).
+
+## [0.2.60] - 27 May 2018
+### Added
+- unit tests for multiple versions of Laravel simultaneously.
+- backwards-compatibility to Laravel 5.4.
+
+## [0.2.59] - 27 May 2018
+### Fixed
+- caching of queries with `whereNotIn` clauses.
+
+### Updated
+- readme to specify that lazy-loaded relationships are currently not cached.
+
+## [0.2.58] - 24 May 2018
+### Fixed
+- caching of queries with `whereIn` clauses.
+
+## [0.2.57] - 19 May 2018
+### Added
+- database name to cache keys and tags to help with multi-tenancy use-cases.
+
+### Fixed
+- `find()` using array parameter.
+
+## [0.2.56] - 12 May 2018
+### Fixed
+- nested `whereNull` within `whereHas`.
+
+## [0.2.55] - 6 May 2018
+### Fixed
+- caching of `between` where clauses.
+- test cache keys and brought them back to green.
+
+## [0.2.54] - 6 May 2018
+### Fixed
+- caching of query parameter bindings.
+
+## [0.2.53] - 6 May 2018
+### Fixed
+- `->inRandomOrder()` to not cache the query.
+
+## [0.2.52] - 21 Mar 2018
+### Changed
+- `flush` console command to be called `clear`, to match other laravel commands.
+
+### Fixed
+- implementation of `count()` method.
+
+## [0.2.51] - 10 Mar 2018
 ### Added
 - disabling of `all()` query.
 

README.md

@@ -17,14 +17,19 @@ for me, and one that would let me cache custom queries, as well as cache model
 relationships. This package is an attempt to address those requirements.
 
 ## Features
--   automatic, self-invalidating relationship (both eager- and lazy-loaded) caching.
+-   automatic, self-invalidating relationship (only eager-loading) caching.
 -   automatic, self-invalidating model query caching.
 -   automatic use of cache tags for cache providers that support them (will
     flush entire cache for providers that don't).
 
 ## Requirements
 -   PHP >= 7.1.3
--   Laravel >= 5.5
+-   Laravel 5.4 - 5.7
+
+### Possible Conflicting Packages
+Any packages that also override `newEloquentModel()` from the `Model` class will
+likely conflict with this package. So far these may include the following:
+- [grimzy/laravel-mysql-spatial](https://github.com/grimzy/laravel-mysql-spatial)
 
 [![installation guide cover](https://user-images.githubusercontent.com/1791050/36356190-fc1982b2-14a2-11e8-85ed-06f8e3b57ae8.png)](https://vimeo.com/256318402)
 
@@ -141,13 +146,17 @@ $results = $myModel->disableCache()->where('field', $value)->get();
 ### Manual Flushing of Specific Model
 You can flush the cache of a specific model using the following artisan command:
 ```sh
-php artisan modelCaching:flush --model=App\Model
+php artisan modelCache:clear --model=App\Model
 ```
 
 This comes in handy when manually making updates to the database. You could also
 trigger this after making updates to the database from sources outside your
 Laravel app.
 
+## Possible Future Improvements
+- [caching of lazy-loaded relationships, see #127](https://github.com/GeneaLabs/laravel-model-caching/issues/127).
+- [caching of global scopes, see #106](https://github.com/GeneaLabs/laravel-model-caching/issues/106).
+
 ## Summary
 **That's all you need to do. All model queries and relationships are now
 cached!**

composer.json

@@ -10,26 +10,25 @@
     ],
     "require": {
         "fico7489/laravel-pivot": "*",
-        "illuminate/cache": "5.5 - 5.6",
-        "illuminate/config": "5.5 - 5.6",
-        "illuminate/console": "5.5 - 5.6",
-        "illuminate/database": "5.5 - 5.6",
-        "illuminate/support": "5.5 - 5.6",
+        "illuminate/cache": "5.4 - 5.7",
+        "illuminate/config": "5.4 - 5.7",
+        "illuminate/console": "5.4 - 5.7",
+        "illuminate/database": "5.4 - 5.7",
+        "illuminate/support": "5.4 - 5.7",
         "php": ">=7.1.3"
     },
     "require-dev": {
-        "codedungeon/phpunit-result-printer": "*",
-        "fzaninotto/faker": "~1.4",
-        "mockery/mockery": "0.9.*",
-        "orchestra/database": "3.6.x-dev@dev",
-        "orchestra/testbench": "^3.6",
-        "orchestra/testbench-browser-kit": "^3.6",
+        "fzaninotto/faker": "*",
+        "mockery/mockery": "*",
+        "orchestra/database": "3.7.x-dev@dev",
+        "orchestra/testbench-browser-kit": "3.7.*",
+        "orchestra/testbench": "3.7.*",
         "php-coveralls/php-coveralls" : "*",
         "phpmd/phpmd": "*",
-        "phpunit/phpunit": "*",
+        "phpunit/phpunit": "7.*",
+        "predis/predis": "*",
         "sebastian/phpcpd": "*",
-        "symfony/thanks": "^1.0",
-        "predis/predis": "^1.1"
+        "symfony/thanks": "*"
     },
     "autoload": {
         "psr-4": {

database.yml

@@ -0,0 +1,6 @@
+test:
+  adapter: postgresql
+  database: testing
+  username: homestead
+  password: secret
+  encoding: utf8

phpunit.xml

@@ -7,10 +7,8 @@
     convertErrorsToExceptions="true"
     convertNoticesToExceptions="true"
     convertWarningsToExceptions="true"
-    printerClass="Codedungeon\PHPUnitPrettyResultPrinter\Printer"
     processIsolation="false"
     stopOnFailure="false"
-    syntaxCheck="false"
 >
 <testsuites>
     <testsuite name="Feature">
@@ -33,5 +31,9 @@
         <env name="SESSION_DRIVER" value="array"/>
         <env name="QUEUE_DRIVER" value="sync"/>
         <env name="DB_CONNECTION" value="testing"/>
+        <env name="DB_HOST" value="192.168.10.10"/>
+        <env name="DB_DATABASE" value="testing"/>
+        <env name="DB_USERNAME" value="homestead"/>
+        <env name="DB_PASSWORD" value="secret"/>
     </php>
 </phpunit>