Added Laravel 7 compatibility.

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.8.0] - 2020-02-29
+### Added
+- Laravel 7 compatibility.
+
 ## [0.7.4] - 2019-12-22
 ### Added
 - documentation to explain that database transactions are currently not supported.

composer.json

@@ -9,25 +9,24 @@
         }
     ],
     "require": {
-        "genealabs/laravel-pivot-events": "^0.2.1",
-        "illuminate/cache": "^6.0",
-        "illuminate/config": "^6.0",
-        "illuminate/console": "^6.0",
-        "illuminate/container": "^6.0",
-        "illuminate/database": "^6.0",
-        "illuminate/http": "^6.0",
-        "illuminate/support": "^6.0"
+        "php": ">=7.2.5",
+        "genealabs/laravel-pivot-events": "^0.3.0",
+        "illuminate/cache": "^7.0",
+        "illuminate/config": "^7.0",
+        "illuminate/console": "^7.0",
+        "illuminate/container": "^7.0",
+        "illuminate/database": "^7.0",
+        "illuminate/http": "^7.0",
+        "illuminate/support": "^7.0",
+        "predis/predis": "^1.1"
     },
     "require-dev": {
-        "fzaninotto/faker": "^1.4",
-        "mockery/mockery": "^1.3",
-        "orchestra/testbench-browser-kit": "^4.0",
-        "orchestra/testbench": "^4.0",
+        "fzaninotto/faker": "^1.9.1",
+        "orchestra/testbench-browser-kit": "^5.0",
+        "orchestra/testbench": "^5.0",
         "php-coveralls/php-coveralls" : "^2.2",
         "phpmd/phpmd": "^2.7",
         "phpunit/phpunit": "^8.0",
-        "predis/predis": "^1.1",
-        "sebastian/phpcpd": "^4.1",
         "squizlabs/php_codesniffer": "^3.4",
         "symfony/thanks": "^1.2"
     },
@@ -51,5 +50,7 @@
                 "GeneaLabs\\LaravelModelCaching\\Providers\\Service"
             ]
         }
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }

tests/EnvironmentSetup.php

@@ -11,6 +11,7 @@ protected function getEnvironmentSetUp($app)
             'prefix' => '',
             "foreign_key_constraints" => false,
         ]);
+        $app['config']->set('database.redis.client', "predis");
         $app['config']->set('database.redis.cache', [
             'host' => env('REDIS_HOST', '127.0.0.1'),
             'port' => env('REDIS_PORT', 6379),

tests/Feature/PaginationTest.php

@@ -8,7 +8,7 @@ class PaginationTest extends FeatureTestCase
     public function testPaginationProvidesDifferentLinksOnDifferentPages()
     {
         // Checking the version start with 5.6, 5.7, 5.8 or 6.
-        if (preg_match("/^((5\.[6-8])|(6\.))/", app()->version())) {
+        if (preg_match("/^((5\.[6-8])|(6\.)|(7\.))/", app()->version())) {
             $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>';
         }
@@ -33,7 +33,7 @@ public function testPaginationProvidesDifferentLinksOnDifferentPages()
 
     public function testAdvancedPagination()
     {
-        if (preg_match("/^((5\.[6-8])|(6\.))/", app()->version())) {
+        if (preg_match("/^((5\.[6-8])|(6\.)|(7\.))/", app()->version())) {
             $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>';
         }
@@ -50,7 +50,7 @@ public function testAdvancedPagination()
 
     public function testCustomPagination()
     {
-        if (preg_match("/^((5\.[6-8])|(6\.))/", app()->version())) {
+        if (preg_match("/^((5\.[6-8])|(6\.)|(7\.))/", app()->version())) {
             $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/Fixtures/Http/Resources/Author.php

@@ -1,8 +1,8 @@
 <?php namespace GeneaLabs\LaravelModelCaching\Tests\Fixtures\Http\Resources;
 
-use Illuminate\Http\Resources\Json\Resource;
+use Illuminate\Http\Resources\Json\JsonResource;
 
-class Author extends Resource
+class Author extends JsonResource
 {
     public function toArray($request)
     {

tests/Integration/CachedBuilder/PaginateTest.php

@@ -36,7 +36,7 @@ public function testPaginationIsCached()
 
     public function testPaginationReturnsCorrectLinks()
     {
-        if (preg_match("/^((5\.[6-8])|(6\.))/", app()->version())) {
+        if (preg_match("/^((5\.[6-8])|(6\.)|(7\.))/", app()->version())) {
             $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>';
@@ -65,7 +65,7 @@ public function testPaginationReturnsCorrectLinks()
 
     public function testPaginationWithOptionsReturnsCorrectLinks()
     {
-        if (preg_match("/^((5\.[6-8])|(6\.))/", app()->version())) {
+        if (preg_match("/^((5\.[6-8])|(6\.)|(7\.))/", app()->version())) {
             $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>';
@@ -94,7 +94,7 @@ public function testPaginationWithOptionsReturnsCorrectLinks()
 
     public function testPaginationWithCustomOptionsReturnsCorrectLinks()
     {
-        if (preg_match("/^((5\.[6-8])|(6\.))/", app()->version())) {
+        if (preg_match("/^((5\.[6-8])|(6\.)|(7\.))/", app()->version())) {
             $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>';