Bump versions for Laravel 8.x (#19)

* Bump versions for Laravel 8.x

* Fix: Omit version

* Fix for laravel/framework#31073

* Doc: Add URLs

Author: mpyw

.scrutinizer.yml

@@ -10,7 +10,7 @@ filter:
 build:
 
   environment:
-    php: '7.3'
+    php: '7.4'
 
   dependencies:
     before:
@@ -20,7 +20,7 @@ build:
   tests:
     override:
       -
-        command: 'phpdbg -qrr vendor/bin/phpunit --coverage-clover build/logs/clover.xml'
+        command: 'vendor/bin/phpunit --coverage-clover build/logs/clover.xml'
         coverage:
           file: 'build/logs/clover.xml'
           format: 'clover'

.travis.yml

@@ -2,6 +2,10 @@ language: php
 
 matrix:
   exclude:
+    - env: LARAVEL_VERSION=^8.0 TESTBENCH_VERSION=^6.0
+      php: 7.2
+    - env: LARAVEL_VERSION=^8.0 TESTBENCH_VERSION=^6.0
+      php: 7.1
     - env: LARAVEL_VERSION=^7.0 TESTBENCH_VERSION=^5.0
       php: 7.1
     - env: LARAVEL_VERSION=^6.0 TESTBENCH_VERSION=^4.0
@@ -19,6 +23,7 @@ cache:
     - $HOME/.composer/cache
 
 env:
+  - LARAVEL_VERSION=^8.0 TESTBENCH_VERSION=^6.0
   - LARAVEL_VERSION=^7.0 TESTBENCH_VERSION=^5.0
   - LARAVEL_VERSION=^6.0 TESTBENCH_VERSION=^4.0
   - LARAVEL_VERSION=5.8.* TESTBENCH_VERSION=3.8.*

README.md

@@ -5,7 +5,7 @@ Guarantee database stickiness over the same user's consecutive requests.
 ## Requirements
 
 - PHP: ^7.1
-- Laravel: ^5.8 || ^6.0 || ^7.0 
+- Laravel: ^5.8 || ^6.0 || ^7.0 || ^8.0
 
 ## Installing
 

composer.json

@@ -21,17 +21,16 @@
         }
     },
     "require": {
-        "php": "^7.1",
+        "php": "^7.1 || ^8.0",
         "ext-pdo": "*",
-        "illuminate/container": "^5.8 || ^6.0 || ^7.0 || ^8.0",
-        "illuminate/contracts": "^5.8 || ^6.0 || ^7.0 || ^8.0",
-        "illuminate/database": "^5.8 || ^6.0 || ^7.0 || ^8.0",
-        "illuminate/queue": "^5.8 || ^6.0 || ^7.0 || ^8.0",
-        "illuminate/support": "^5.8 || ^6.0 || ^7.0 || ^8.0"
+        "illuminate/container": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
+        "illuminate/contracts": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
+        "illuminate/database": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
+        "illuminate/queue": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0",
+        "illuminate/support": "^5.8 || ^6.0 || ^7.0 || ^8.0 || ^9.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^5.0",
-        "laravel/framework": "^7.0",
+        "orchestra/testbench": "^6.0",
         "php-coveralls/php-coveralls": "^2.1",
         "friendsofphp/php-cs-fixer": "^2.15",
         "mockery/mockery": "^1.3"

tests/Feature/InitializingTest.php

@@ -2,6 +2,7 @@
 
 namespace Mpyw\LaravelCachedDatabaseStickiness\Tests\Feature;
 
+use Illuminate\Contracts\Mail\Factory as MailerFactory;
 use Illuminate\Contracts\Mail\Mailer;
 use Illuminate\Http\Request;
 use Illuminate\Notifications\AnonymousNotifiable;
@@ -178,6 +179,14 @@ public function testInitializationForNotifications(): void
     {
         $this->mock(Mailer::class)->shouldReceive('send');
 
+        // [7.x] Multiple Mailers Per App
+        // https://github.com/laravel/framework/pull/31073
+        if (interface_exists(MailerFactory::class)) {
+            $this->mock(MailerFactory::class)
+                ->shouldReceive('mailer')
+                ->andReturn($this->app->make(Mailer::class));
+        }
+
         DB::connection();
 
         $this->assertFalse($this->getRecordsModifiedViaReflection());
@@ -202,6 +211,14 @@ public function testInitializationForMailables(): void
     {
         $this->mock(Mailer::class)->shouldReceive('send');
 
+        // [7.x] Multiple Mailers Per App
+        // https://github.com/laravel/framework/pull/31073
+        if (interface_exists(MailerFactory::class)) {
+            $this->mock(MailerFactory::class)
+                ->shouldReceive('mailer')
+                ->andReturn($this->app->make(Mailer::class));
+        }
+
         DB::connection();
 
         $this->assertFalse($this->getRecordsModifiedViaReflection());