Merge pull request #7 from kirschbaum-development/laravel-11

Laravel 11 Support

Author: victorsfleite

.github/workflows/ci.yml

@@ -9,44 +9,34 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.4, 8.0, 8.1, 8.2, 8.3]
-        laravel: [6.*, 7.*, 8.*, 9.*, 10.*]
+        php: [8.0, 8.1, 8.2, 8.3]
+        laravel: [8.*, 9.*, 10.*, 11.*]
         exclude:
-          - php: 7.4
-            laravel: 9.*
-          - php: 7.4
-            laravel: 10.*
-          - php: 8.0
-            laravel: 10.*
-          - php: 8.1
-            laravel: 6.*
-          - php: 8.1
-            laravel: 7.*
-          - php: 8.2
-            laravel: 6.*
-          - php: 8.2
-            laravel: 7.*
-          - php: 8.2
-            laravel: 8.*
-          - php: 8.3
-            laravel: 6.*
-          - php: 8.3
-            laravel: 7.*
-          - php: 8.3
-            laravel: 8.*
-          - php: 8.3
-            laravel: 9.*
+          - laravel: 11.*
+            php: 8.0
+          - laravel: 11.*
+            php: 8.1
+          - laravel: 10.*
+            php: 8.0
+          - laravel: 8.*
+            php: 8.1
+          - laravel: 8.*
+            php: 8.2
+          - laravel: 9.*
+            php: 8.2
+          - laravel: 8.*
+            php: 8.3
+          - laravel: 9.*
+            php: 8.3
         include:
+          - laravel: 11.*
+            testbench: 9.*
           - laravel: 10.*
             testbench: 8.*
           - laravel: 9.*
             testbench: 7.*
           - laravel: 8.*
             testbench: 6.*
-          - laravel: 7.*
-            testbench: 5.*
-          - laravel: 6.*
-            testbench: 4.*
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
 

.gitignore

@@ -5,3 +5,4 @@
 build/*
 composer.lock
 vendor/
+.phpunit.cache

README.md

@@ -1,6 +1,6 @@
 # Laravel Preflight Checks
 
-![Laravel Supported Versions](https://img.shields.io/badge/laravel-6.x/7.x/8.x/9.x/10.x-green.svg)
+![Laravel Supported Versions](https://img.shields.io/badge/laravel-6.x/7.x/8.x/9.x/10.x/11.x-green.svg)
 [![MIT Licensed](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE.md)
 
 Performs pre-flight checks to ensure configuration and setup for deployment or development.

composer.json

@@ -8,23 +8,28 @@
     "type": "library",
     "license": "MIT",
     "authors": [
+        {
+            "name": "Victor Leite",
+            "email": "[email protected]",
+            "role": "Developer"
+        },
         {
             "name": "Zack Teska",
-            "email": "zack@kirschbaumdevelopment.com",
+            "email": "hello@kirschbaumdevelopment.com",
             "role": "Developer"
         }
     ],
     "require": {
-        "php": "^7.4|^8.0",
-        "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0",
-        "illuminate/pipeline": "^6.0|^7.0|^8.0|^9.0|^10.0"
+        "php": "^8.0",
+        "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
+        "illuminate/pipeline": "^8.0|^9.0|^10.0|^11.0"
     },
     "require-dev": {
-        "doctrine/dbal": "^2.0",
+        "doctrine/dbal": "^2.0|^3.0|^4.0",
         "fakerphp/faker": "^1.9.1",
         "mockery/mockery": "^1.3.1",
-        "orchestra/testbench": "4.*|5.*|6.*|7.*|8.*",
-        "phpunit/phpunit": "^9.0"
+        "orchestra/testbench": "4.*|5.*|6.*|7.*|8.*|9.*",
+        "phpunit/phpunit": "^9.0|^10.0"
     },
     "autoload": {
         "psr-4": {

phpunit.xml.dist

@@ -1,27 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        bootstrap="vendor/autoload.php"
-        backupGlobals="false"
-        backupStaticAttributes="false"
-        colors="true"
-        verbose="true"
-        convertErrorsToExceptions="true"
-        convertNoticesToExceptions="true"
-        convertWarningsToExceptions="true"
-        processIsolation="false"
-        stopOnFailure="false"
-        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-    <coverage>
-        <include>
-            <directory suffix=".php">src/</directory>
-        </include>
-    </coverage>
-    <testsuites>
-        <testsuite name="Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <logging>
-        <junit outputFile="build/report.junit.xml" />
-    </logging>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <testsuites>
+    <testsuite name="Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <logging>
+    <junit outputFile="build/report.junit.xml"/>
+  </logging>
+  <source>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </source>
 </phpunit>

tests/Checks/BasePreflightCheckTest.php renamed to tests/Checks/BasePreflightCheck.php

@@ -2,13 +2,13 @@
 
 namespace Kirschbaum\PreflightChecks\Tests\Checks;
 
-use Kirschbaum\PreflightChecks\Checks\PreflightCheck;
+use Orchestra\Testbench\TestCase;
 use Kirschbaum\PreflightChecks\Checks\Result;
+use Kirschbaum\PreflightChecks\Checks\PreflightCheck;
 use Kirschbaum\PreflightChecks\PreflightChecksServiceProvider;
 use Kirschbaum\PreflightChecks\Tests\Helpers\CanAccessProtected;
-use Orchestra\Testbench\TestCase;
 
-abstract class BasePreflightCheckTest extends TestCase
+abstract class BasePreflightCheck extends TestCase
 {
     use CanAccessProtected;
 
@@ -17,11 +17,6 @@ abstract class BasePreflightCheckTest extends TestCase
      */
     protected $preflightCheckClass;
 
-    protected function getPackageProviders($app)
-    {
-        return [PreflightChecksServiceProvider::class];
-    }
-
     public function checkConfigValues(PreflightCheck $preflightCheck)
     {
         $config = $this->getProtectedProperty($preflightCheck, 'requiredConfig');
@@ -36,6 +31,11 @@ public function checkConfigValues(PreflightCheck $preflightCheck)
         }
     }
 
+    protected function getPackageProviders($app)
+    {
+        return [PreflightChecksServiceProvider::class];
+    }
+
     protected function assertPassed(Result $result): void
     {
         $this->assertTrue($result->passed());

tests/Checks/ConfigurationTest.php

@@ -2,10 +2,10 @@
 
 namespace Kirschbaum\PreflightChecks\Tests\Checks;
 
-use Kirschbaum\PreflightChecks\Checks\Configuration;
 use Kirschbaum\PreflightChecks\Checks\Result;
+use Kirschbaum\PreflightChecks\Checks\Configuration;
 
-class ConfigurationTest extends BasePreflightCheckTest
+class ConfigurationTest extends BasePreflightCheck
 {
     protected $preflightCheckClass = Configuration::class;
 

tests/Checks/DatabaseTest.php

@@ -2,26 +2,33 @@
 
 namespace Kirschbaum\PreflightChecks\Tests\Checks;
 
+use PDO;
+use Mockery;
+use PDOException;
+use Illuminate\Support\Facades\DB;
 use Doctrine\DBAL\Driver\PDO\Exception;
 use Doctrine\DBAL\Driver\PDOConnection;
-use Illuminate\Support\Facades\DB;
-use Kirschbaum\PreflightChecks\Checks\Database;
 use Kirschbaum\PreflightChecks\Checks\Result;
-use Mockery;
-use PDO;
-use PDOException;
+use Kirschbaum\PreflightChecks\Checks\Database;
 
-class DatabaseTest extends BasePreflightCheckTest
+class DatabaseTest extends BasePreflightCheck
 {
-    protected $preflightCheckClass = Database::class;
-
     private const TEST_DEFAULT_DB_CONNECTION = 'test_default';
 
+    protected $preflightCheckClass = Database::class;
+
     protected function setUp(): void
     {
         parent::setUp();
 
         config(['database.default' => static::TEST_DEFAULT_DB_CONNECTION]);
+        config([
+            'database.connections.' . static::TEST_DEFAULT_DB_CONNECTION => [
+                'driver' => 'sqlite',
+                'database' => ':memory:',
+                'prefix' => '',
+            ],
+        ]);
     }
 
     /**
@@ -55,7 +62,7 @@ public function testChecksDatabaseAccessible(?array $options, string $expectedCo
         $this->assertPassed($result);
     }
 
-    public function providesDatabaseScenarios()
+    public static function providesDatabaseScenarios()
     {
         yield 'No options checks default' => [
             null,
@@ -72,7 +79,7 @@ public function providesDatabaseScenarios()
             static::TEST_DEFAULT_DB_CONNECTION,
         ];
 
-        $testConnection = 'test_connection_'.mt_rand(100, 99999);
+        $testConnection = 'test_connection_' . mt_rand(100, 99999);
 
         yield 'Connection checks connection' => [
             ['connection' => $testConnection],
@@ -92,7 +99,7 @@ public function testChecksDatabaseInaccessible()
                 Mockery::mock(Connection::class)
                     ->shouldReceive('getPdo')
                     ->once()
-                    ->andThrow(new Exception(Mockery::mock(PDOException::class)))
+                    ->andThrow(new Exception(PDOException::class))
                     ->getMock()
             );
 

tests/Checks/RedisTest.php

@@ -2,19 +2,22 @@
 
 namespace Kirschbaum\PreflightChecks\Tests\Checks;
 
+use Mockery;
 use Illuminate\Redis\Connections\Connection;
-use Illuminate\Support\Facades\Redis as RedisFacade;
 use Kirschbaum\PreflightChecks\Checks\Redis;
 use Kirschbaum\PreflightChecks\Checks\Result;
-use Mockery;
+use Illuminate\Support\Facades\Redis as RedisFacade;
 
-class RedisTest extends BasePreflightCheckTest
+class RedisTest extends BasePreflightCheck
 {
     protected $preflightCheckClass = Redis::class;
 
     /**
      * @test
      * @dataProvider providesConnectionScenarios
+     *
+     * @param mixed $options
+     * @param mixed $expectedConnection
      */
     public function testChecksRedisIsAccessible($options, $expectedConnection)
     {
@@ -43,7 +46,7 @@ public function testChecksRedisIsAccessible($options, $expectedConnection)
         $this->assertEquals($connectionInfo['os'], $resultData['info']['os']);
     }
 
-    public function providesConnectionScenarios()
+    public static function providesConnectionScenarios()
     {
         return [
             'No options is default' => [

tests/Commands/PreflightCheckCommandTest.php

@@ -2,25 +2,20 @@
 
 namespace Kirschbaum\PreflightChecks\Tests\Commands;
 
+use Mockery;
 use Illuminate\Config\Repository;
+use Orchestra\Testbench\TestCase;
 use Illuminate\Support\Facades\App;
-use Kirschbaum\PreflightChecks\Checks\Exceptions\NoPreflightChecksDefinedException;
 use Kirschbaum\PreflightChecks\PreflightChecksServiceProvider;
 use Kirschbaum\PreflightChecks\Tests\Checks\Fixtures\FailedCheck;
-use Kirschbaum\PreflightChecks\Tests\Checks\Fixtures\OptionsCheck;
 use Kirschbaum\PreflightChecks\Tests\Checks\Fixtures\PassedCheck;
+use Kirschbaum\PreflightChecks\Tests\Checks\Fixtures\OptionsCheck;
 use Kirschbaum\PreflightChecks\Tests\Checks\Fixtures\SkippedCheck;
 use Kirschbaum\PreflightChecks\Tests\Checks\Fixtures\SkippedFailedCheck;
-use Mockery;
-use Orchestra\Testbench\TestCase;
+use Kirschbaum\PreflightChecks\Checks\Exceptions\NoPreflightChecksDefinedException;
 
 class PreflightCheckCommandTest extends TestCase
 {
-    protected function getPackageProviders($app)
-    {
-        return [PreflightChecksServiceProvider::class];
-    }
-
     /**
      * @test
      * @dataProvider providesCommandScenarios
@@ -35,7 +30,7 @@ public function testPerformsPreflightChecks(array $config, int $expectedExitCode
             ->assertExitCode($expectedExitCode);
     }
 
-    public function providesCommandScenarios()
+    public static function providesCommandScenarios()
     {
         return [
             'Passes with no checks' => [
@@ -129,4 +124,9 @@ public function testEnvironmentIsCaseInsensitive()
         $this->artisan('preflight:check')
             ->assertExitCode(0);
     }
+
+    protected function getPackageProviders($app)
+    {
+        return [PreflightChecksServiceProvider::class];
+    }
 }