Merge pull request #79 from vmiguellima/add-laravel-11-support

Add Laravel 11.x Support
clarkeash · Mar 25, 2024 · e94b6be · e94b6be
2 parents e55ea32 + 3b34713
commit e94b6be
Show file tree

Hide file tree

Showing 15 changed files with 79 additions and 258 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -17,7 +17,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [8.1]
+        php: [8.2]
         stability: [prefer-lowest, prefer-stable]
 
     # Steps represent a sequence of tasks that will be executed as part of the job

diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@
 /.idea
 coverage.xml
 .phpunit.result.cache
+.phpunit.cache
 composer.lock
diff --git a/README.md b/README.md
@@ -33,13 +33,14 @@ Invite Codes:
  8.x      | 6.x
  9.x      | 7.x
  10.x     | 8.x
+ 11.x     | 9.x
 
 ## Installation
 
 You can pull in the package using [composer](https://getcomposer.org):
 
 ```bash
-$ composer require "clarkeash/doorman=^8.0"
+$ composer require "clarkeash/doorman=^9.0"
 ```
 
 Next, migrate the database:

diff --git a/composer.json b/composer.json
@@ -9,8 +9,8 @@
     }
   ],
   "require": {
-    "php": "^8.1",
-    "laravel/framework": "^10.0",
+    "php": "^8.2",
+    "laravel/framework": "^11.0",
     "ramsey/uuid": "^4.0"
   },
   "autoload": {
@@ -24,8 +24,8 @@
     }
   },
   "require-dev": {
-    "orchestra/testbench": "^8.0",
-    "phpunit/phpunit": "^9.3",
+    "orchestra/testbench": "^9.0",
+    "phpunit/phpunit": "^11.0",
     "mockery/mockery": "^1.4"
   },
   "extra": {

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage processUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">./src</directory>
-    </include>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.0/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <coverage>
     <report>
       <clover outputFile="coverage.xml"/>
     </report>
@@ -23,4 +20,9 @@
     <env name="QUEUE_DRIVER" value="sync"/>
   </php>
   <logging/>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/tests/Feature/CheckInvitesTest.php b/tests/Feature/CheckInvitesTest.php
@@ -13,18 +13,12 @@ class CheckInvitesTest extends TestCase
 {
     use DatabaseMigrations;
 
-    /**
-     * @test
-     */
-    public function check_if_code_is_invalid()
+    public function test_can_check_if_code_is_invalid()
     {
         Assert::assertFalse(Doorman::check('NOPE'));
     }
 
-    /**
-     * @test
-     */
-    public function check_if_maximum_uses_has_been_reached()
+    public function text_can_check_if_maximum_uses_has_been_reached()
     {
         Invite::forceCreate([
             'code' => 'ABCDE',
@@ -35,10 +29,7 @@ public function check_if_maximum_uses_has_been_reached()
         Assert::assertFalse(Doorman::check('ABCDE'));
     }
 
-    /**
-     * @test
-     */
-    public function check_if_code_has_expired()
+    public function test_can_check_if_code_has_expired()
     {
         Invite::forceCreate([
             'code' => 'ABCDE',
@@ -48,10 +39,7 @@ public function check_if_code_has_expired()
         Assert::assertFalse(Doorman::check('ABCDE'));
     }
 
-    /**
-     * @test
-     */
-    public function check_if_trying_to_use_a_code_belonging_to_someone_else()
+    public function test_can_check_if_trying_to_use_a_code_belonging_to_someone_else()
     {
         Invite::forceCreate([
             'code' => 'ABCDE',
@@ -61,10 +49,7 @@ public function check_if_trying_to_use_a_code_belonging_to_someone_else()
         Assert::assertFalse(Doorman::check('ABCDE'));
     }
 
-    /**
-     * @test
-     */
-    public function check_a_code_for_a_specific_user()
+    public function test_can_check_a_code_for_a_specific_user()
     {
         Invite::forceCreate([
             'code' => 'ABCDE',
@@ -74,10 +59,7 @@ public function check_a_code_for_a_specific_user()
         Assert::assertTrue(Doorman::check('ABCDE', '[email protected]'));
     }
 
-    /**
-     * @test
-     */
-    public function a_unrestricted_invite_can_be_redeemed_when_email_is_provided()
+    public function test_can_a_unrestricted_invite_can_be_redeemed_when_email_is_provided()
     {
         Invite::forceCreate([
             'code' => 'ABCDE',
@@ -86,10 +68,7 @@ public function a_unrestricted_invite_can_be_redeemed_when_email_is_provided()
         Assert::assertTrue(Doorman::check('ABCDE', '[email protected]'));
     }
 
-    /**
-     * @test
-     */
-    public function it_can_have_unlimited_redemptions()
+    public function test_can_it_can_have_unlimited_redemptions()
     {
         Invite::forceCreate([
             'code' => 'ABCDE',
@@ -101,10 +80,7 @@ public function it_can_have_unlimited_redemptions()
         }
     }
 
-    /**
-    * @test
-    */
-    public function it_is_not_case_sensitive()
+    public function test_it_is_not_case_sensitive()
     {
         Invite::forceCreate([
             'code' => 'ABCDE',

diff --git a/tests/Feature/CustomModelTest.php b/tests/Feature/CustomModelTest.php
@@ -17,10 +17,7 @@ protected function getEnvironmentSetUp($app)
         $app['config']->set('doorman.invite_model', MyCustomModel::class);
     }
 
-    /**
-     * @test
-     */
-    public function it_can_use_a_custom_model()
+    public function test_it_can_use_a_custom_model()
     {
         $invites = Doorman::generate()->make();
 

diff --git a/tests/Feature/CustomValidationRuleTest.php b/tests/Feature/CustomValidationRuleTest.php
@@ -14,10 +14,7 @@ class CustomValidationRuleTest extends TestCase
 {
     use DatabaseMigrations;
 
-    /**
-     * @test
-     */
-    public function basic_validation()
+    public function test_basic_validation()
     {
         Invite::forceCreate([
             'code' => 'ABCDE',
@@ -37,10 +34,7 @@ public function basic_validation()
         Assert::assertTrue($validator->passes());
     }
 
-    /**
-     * @test
-     */
-    public function validates_email_address()
+    public function test_validates_email_address()
     {
         Invite::forceCreate([
             'code' => 'ABCDE',
@@ -62,10 +56,7 @@ public function validates_email_address()
         Assert::assertTrue($validator->passes());
     }
 
-    /**
-     * @test
-     */
-    public function it_provides_an_error_message()
+    public function test_it_provides_an_error_message()
     {
         Invite::forceCreate([
             'code' => 'ABCDE',

diff --git a/tests/Feature/Drivers/BasicDriverTest.php b/tests/Feature/Drivers/BasicDriverTest.php
@@ -13,35 +13,23 @@ class BasicDriverTest extends TestCase
 {
     use DatabaseMigrations;
 
-    /**
-     * @test
-     */
-    public function it_is_a_driver()
+    public function test_it_is_a_driver()
     {
         Assert::assertInstanceOf(DriverInterface::class, new BasicDriver);
     }
 
-    /**
-     * @test
-     */
-    public function it_is_the_correct_driver()
+    public function test_it_is_the_correct_driver()
     {
         Assert::assertInstanceOf(BasicDriver::class, app(DoormanManager::class)->driver('basic'));
     }
 
-    /**
-     * @test
-     */
-    public function it_is_the_default_driver()
+    public function test_it_is_the_default_driver()
     {
         Assert::assertSame('basic', config('doorman.driver'));
         Assert::assertSame('basic', app(DoormanManager::class)->getDefaultDriver());
     }
 
-    /**
-     * @test
-     */
-    public function it_has_a_default_length()
+    public function test_it_has_a_default_length()
     {
         Assert::assertSame(5, config('doorman.basic.length'));
 
@@ -50,10 +38,7 @@ public function it_has_a_default_length()
         Assert::assertSame(5, strlen($driver->code()));
     }
 
-    /**
-     * @test
-     */
-    public function it_allows_the_length_to_be_overridden()
+    public function test_it_allows_the_length_to_be_overridden()
     {
         Assert::assertSame(5, config('doorman.basic.length'));
 

diff --git a/tests/Feature/Drivers/UuidDriverTest.php b/tests/Feature/Drivers/UuidDriverTest.php
@@ -16,24 +16,17 @@ class UuidDriverTest extends TestCase
 {
     use DatabaseMigrations;
 
-    /**
-     * @test
-     */
-    public function it_is_a_driver()
+    public function test_it_is_a_driver()
     {
         Assert::assertInstanceOf(DriverInterface::class, new UuidDriver);
     }
 
-    /**
-     * @test
-     */
-    public function it_is_the_correct_driver()
+    public function test_it_is_the_correct_driver()
     {
         Assert::assertInstanceOf(UuidDriver::class, app(DoormanManager::class)->driver('uuid'));
     }
 
-    /** @test */
-    public function it_can_generate_a_version_1_uuid()
+    public function test_it_can_generate_a_version_1_uuid()
     {
         $this->app['config']['doorman.uuid.version'] = 1;
 
@@ -45,10 +38,7 @@ public function it_can_generate_a_version_1_uuid()
         Assert::assertSame(1, Uuid::fromString($code)->getVersion());
     }
 
-    /**
-     * @test
-     */
-    public function it_throws_exception_if_invalid_version_supplied()
+    public function test_it_throws_exception_if_invalid_version_supplied()
     {
         $this->expectException(InvalidArgumentException::class);
 
@@ -59,10 +49,7 @@ public function it_throws_exception_if_invalid_version_supplied()
         $driver->code();
     }
 
-    /**
-     * @test
-     */
-    public function namespace_is_required_for_version_3()
+    public function test_namespace_is_required_for_version_3()
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Namespace must be set for uuid version 3');
@@ -75,10 +62,7 @@ public function namespace_is_required_for_version_3()
         $driver->code();
     }
 
-    /**
-     * @test
-     */
-    public function name_is_required_for_version_3()
+    public function test_name_is_required_for_version_3()
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Name must be set for uuid version 3');
@@ -91,9 +75,7 @@ public function name_is_required_for_version_3()
         $driver->code();
     }
 
-
-    /** @test */
-    public function it_can_generate_a_version_3_uuid()
+    public function test_it_can_generate_a_version_3_uuid()
     {
         $this->app['config']['doorman.uuid.version'] = 3;
         $this->app['config']['doorman.uuid.namespace'] = Uuid::NAMESPACE_DNS;
@@ -107,8 +89,7 @@ public function it_can_generate_a_version_3_uuid()
         Assert::assertSame(3, Uuid::fromString($code)->getVersion());
     }
 
-    /** @test */
-    public function it_can_generate_a_version_4_uuid()
+    public function test_it_can_generate_a_version_4_uuid()
     {
         $this->app['config']['doorman.uuid.version'] = 4;
 
@@ -120,10 +101,7 @@ public function it_can_generate_a_version_4_uuid()
         Assert::assertSame(4, Uuid::fromString($code)->getVersion());
     }
 
-    /**
-     * @test
-     */
-    public function namespace_is_required_for_version_5()
+    public function test_namespace_is_required_for_version_5()
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Namespace must be set for uuid version 5');
@@ -136,10 +114,7 @@ public function namespace_is_required_for_version_5()
         $driver->code();
     }
 
-    /**
-     * @test
-     */
-    public function name_is_required_for_version_5()
+    public function test_name_is_required_for_version_5()
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('Name must be set for uuid version 5');
@@ -152,9 +127,7 @@ public function name_is_required_for_version_5()
         $driver->code();
     }
 
-
-    /** @test */
-    public function it_can_generate_a_version_5_uuid()
+    public function test_it_can_generate_a_version_5_uuid()
     {
         $this->app['config']['doorman.uuid.version'] = 5;
         $this->app['config']['doorman.uuid.namespace'] = Uuid::NAMESPACE_DNS;