Added L5.7 compatibility

Author: mikebronner

.travis.yml

@@ -2,12 +2,16 @@ language: php
 
 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

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.3.0] - 10 Sep 2018
+### Added
+- Laravel 5.7 compatibility.
+
 ## [0.2.64] - 25 Jul 2018
 ### Fixed
 - caching of subqueries of `->whereNotIn()` and `->whereIn()`.

README.md

@@ -24,7 +24,7 @@ relationships. This package is an attempt to address those requirements.
 
 ## Requirements
 -   PHP >= 7.1.3
--   Laravel 5.4 - 5.6
+-   Laravel 5.4 - 5.7
 
 ### Possible Conflicting Packages
 Any packages that also override `newEloquentModel()` from the `Model` class will

composer.json

@@ -21,9 +21,9 @@
         "codedungeon/phpunit-result-printer": "*",
         "fzaninotto/faker": "*",
         "mockery/mockery": "*",
-        "orchestra/database": "3.6.*",
-        "orchestra/testbench-browser-kit": "3.6.*",
-        "orchestra/testbench": "3.6.*",
+        "orchestra/database": "3.7.x-dev",
+        "orchestra/testbench-browser-kit": "3.7.x-dev",
+        "orchestra/testbench": "3.7.*",
         "php-coveralls/php-coveralls" : "*",
         "phpmd/phpmd": "*",
         "phpunit/phpunit": "7.*",

tests/CreatesApplication.php

@@ -72,6 +72,9 @@ protected function getPackageProviders($app)
 
     protected function getEnvironmentSetUp($app)
     {
+        $app['config']->set('database.redis.cache', [
+            'host' => env('REDIS_HOST', '192.168.10.10'),
+        ]);
         $app['config']->set('database.redis.default', [
             'host' => env('REDIS_HOST', '192.168.10.10'),
         ]);

tests/Feature/PaginationTest.php

@@ -7,7 +7,9 @@ class PaginationTest extends FeatureTestCase
 {
     public function testPaginationProvidesDifferentLinksOnDifferentPages()
     {
-        if (starts_with(app()->version(), "5.6")) {
+        if (starts_with(app()->version(), "5.6")
+            || starts_with(app()->version(), "5.7")
+        ) {
             $page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
             $page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
         }
@@ -36,7 +38,9 @@ public function testPaginationProvidesDifferentLinksOnDifferentPages()
 
     public function testAdvancedPagination()
     {
-        if (starts_with(app()->version(), "5.6")) {
+        if (starts_with(app()->version(), "5.6")
+            || starts_with(app()->version(), "5.7")
+        ) {
             $page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
             $page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
         }

tests/Integration/CachedBuilder/PaginateTest.php

@@ -46,7 +46,9 @@ public function testPaginationIsCached()
 
     public function testPaginationReturnsCorrectLinks()
     {
-        if (starts_with(app()->version(), "5.6")) {
+        if (starts_with(app()->version(), "5.6")
+            || starts_with(app()->version(), "5.7")
+        ) {
             $page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
             $page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
             $page24ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">24</span></li>';
@@ -81,7 +83,9 @@ public function testPaginationReturnsCorrectLinks()
 
     public function testPaginationWithOptionsReturnsCorrectLinks()
     {
-        if (starts_with(app()->version(), "5.6")) {
+        if (starts_with(app()->version(), "5.6")
+            || starts_with(app()->version(), "5.7")
+        ) {
             $page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
             $page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
             $page24ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">24</span></li>';
@@ -116,7 +120,9 @@ public function testPaginationWithOptionsReturnsCorrectLinks()
 
     public function testPaginationWithCustomOptionsReturnsCorrectLinks()
     {
-        if (starts_with(app()->version(), "5.6")) {
+        if (starts_with(app()->version(), "5.6")
+            || starts_with(app()->version(), "5.7")
+        ) {
             $page1ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">1</span></li>';
             $page2ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">2</span></li>';
             $page24ActiveLink = '<li class="page-item active" aria-current="page"><span class="page-link">24</span></li>';

tests/Integration/Console/Commands/FlushTest.php

@@ -12,19 +12,28 @@
 
 class FlushTest extends IntegrationTestCase
 {
-    
+    public function setUp()
+    {
+        parent::setUp();
+
+        if (starts_with($this->app->version(), '5.7')) {
+            $this->withoutMockingConsoleOutput();
+        }
+    }
 
     public function testGivenModelIsFlushed()
     {
         $authors = (new Author)->all();
         $key = sha1('genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor');
         $tags = ['genealabs:laravel-model-caching:testing::memory::genealabslaravelmodelcachingtestsfixturesauthor'];
 
-        $cachedResults = $this->cache
+        $cachedResults = $this
+            ->cache
             ->tags($tags)
             ->get($key)['value'];
         $result = $this->artisan('modelCache:clear', ['--model' => Author::class]);
-        $flushedResults = $this->cache
+        $flushedResults = $this
+            ->cache
             ->tags($tags)
             ->get($key)['value'];
 

tests/Integration/Traits/CachableTest.php

@@ -17,8 +17,6 @@
 
 class CachableTest extends IntegrationTestCase
 {
-    
-
     public function testSpecifyingAlternateCacheDriver()
     {
         $configCacheStores = config('cache.stores');

tests/pu-57.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+cp composer.json original-composer.json
+
+composer require codedungeon/phpunit-result-printer --no-update --dev
+composer require "orchestra/database:3.7.x-dev" --no-update --dev
+composer require "orchestra/testbench:3.7.*" --no-update --dev
+composer require "orchestra/testbench-browser-kit:3.7.x-dev" --no-update --dev
+composer require "illuminate/cache:5.7.*" --no-update
+composer require "illuminate/config:5.7.*" --no-update
+composer require "illuminate/console:5.7.*" --no-update
+composer require "illuminate/database:5.7.*" --no-update
+composer require "illuminate/support:5.7.*" --no-update
+composer require "phpunit/phpunit:7.*" --no-update --dev
+composer update --prefer-source --no-interaction
+
+rm composer.json
+mv original-composer.json composer.json
+
+mkdir -p ./build/logs
+php -n vendor/bin/phpunit --configuration phpunit.xml --coverage-text --coverage-clover ./build/logs/clover.xml