Merge pull request #101 from mikebronner/feat/99-add-laravel-13-support

feat(compat): Add Laravel 13 support

Author: mikebronner

.github/workflows/tests.yml

@@ -0,0 +1,50 @@
+name: Tests
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php: ['8.2', '8.3', '8.4', '8.5']
+        laravel: ['11.*', '12.*', '13.*']
+        exclude:
+          - php: '8.5'
+            laravel: '11.*'
+          - php: '8.2'
+            laravel: '13.*'
+        include:
+          - laravel: '11.*'
+            testbench: '9.*'
+          - laravel: '12.*'
+            testbench: '10.*'
+          - laravel: '13.*'
+            testbench: '11.*'
+
+    name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: mbstring, pdo, pdo_sqlite
+          coverage: none
+
+      - name: Install dependencies
+        run: |
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
+          composer update --prefer-dist --no-interaction
+
+      - name: Run tests
+        run: vendor/bin/phpunit

README.md

@@ -18,8 +18,15 @@ Provide a simple method of managing ACL in a Laravel application built on the
  for Laravel.
 
 ## Requirements
-- PHP >=7.1.3
-- Laravel >= 5.5
+
+| Laravel | PHP            | Package |
+|---------|----------------|---------|
+| 10.x    | 8.2+           | latest  |
+| 11.x    | 8.2+           | latest  |
+| 12.x    | 8.2+           | latest  |
+| 13.x    | 8.3+           | latest  |
+
+### Additional Requirements
 - Bootstrap 3 (needs to be included in your layout file)
 - FontAwesome 4 (needs to be included in your layout file)
 

composer.json

@@ -9,17 +9,16 @@
         }
     ],
     "require": {
-        "illuminate/database": "^9.0|^10.0|^11.0|^12.0",
-        "illuminate/support": "^9.0|^10.0|^11.0|^12.0",
-        "php": "^7.3|^8.0",
+        "php": "^8.2",
+        "illuminate/database": "^11.0|^12.0|^13.0",
+        "illuminate/support": "^11.0|^12.0|^13.0",
         "ramsey/uuid": "^4.0"
     },
     "require-dev": {
-        "doctrine/dbal": "^2.9",
+        "doctrine/dbal": "^3.0|^4.0",
         "fakerphp/faker": "^1.23",
-        "laravel/legacy-factories": "^1.0",
-        "orchestra/testbench": "^7.0|^8.0|^9.0|^10.0",
-        "phpunit/phpunit": "^9.5|^10.0|^11.0",
+        "orchestra/testbench": "^9.0|^10.0|^11.0",
+        "phpunit/phpunit": "^10.0|^11.0|^12.0",
         "symfony/thanks": "^1.2"
     },
     "autoload": {
@@ -38,6 +37,7 @@
         ],
         "psr-4": {
             "GeneaLabs\\LaravelGovernor\\Tests\\": "tests/",
+            "GeneaLabs\\LaravelGovernor\\Tests\\Database\\Factories\\": "tests/database/factories/",
             "App\\": "tests/Fixtures/App/"
         }
     },

phpunit.xml

@@ -1,24 +1,20 @@
 <?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="true"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.0/phpunit.xsd"
 >
-  <coverage processUncoveredFiles="true">
+  <source>
     <include>
       <directory suffix=".php">./src</directory>
     </include>
-  </coverage>
+  </source>
   <testsuites>
     <testsuite name="Setup">
-      <directory>./tests/AlwaysRunFirstTest.php</directory>
+      <file>./tests/AlwaysRunFirstTest.php</file>
     </testsuite>
     <testsuite name="IntegrationTests">
       <directory suffix="Test.php">./tests/Integration</directory>

tests/AlwaysRunFirstTest.php

@@ -1,8 +1,9 @@
 <?php namespace GeneaLabs\LaravelGovernor\Tests;
 
-use Orchestra\Testbench\TestCase as BaseTestCase;
-use GeneaLabs\LaravelGovernor\Tests\Fixtures\User;
 use GeneaLabs\LaravelGovernor\Database\Seeders\LaravelGovernorDatabaseSeeder;
+use GeneaLabs\LaravelGovernor\Tests\Fixtures\User;
+use Orchestra\Testbench\TestCase as BaseTestCase;
+use PHPUnit\Framework\Attributes\Test;
 
 class AlwaysRunFirstTest extends BaseTestCase
 {
@@ -18,54 +19,56 @@ protected function getPackageProviders($app)
 
     protected function getEnvironmentSetUp($app)
     {
-        parent::getEnvironmentSetUp($app);
+        $sqliteDatabase = __DIR__ . '/database/database.sqlite';
 
-        shell_exec("cd " . __DIR__ . "/database && rm *.sqlite && touch database.sqlite");
+        if (file_exists($sqliteDatabase)) {
+            unlink($sqliteDatabase);
+        }
+        touch($sqliteDatabase);
 
         $app['config']->set('genealabs-laravel-governor.models', [
-            'auth' => User::class,
-            'action' => \GeneaLabs\LaravelGovernor\Action::class,
+            'auth'       => User::class,
+            'action'     => \GeneaLabs\LaravelGovernor\Action::class,
             'assignment' => \GeneaLabs\LaravelGovernor\Assignment::class,
-            'entity' => \GeneaLabs\LaravelGovernor\Entity::class,
-            'group' => \GeneaLabs\LaravelGovernor\Group::class,
-            'ownership' => \GeneaLabs\LaravelGovernor\Ownership::class,
+            'entity'     => \GeneaLabs\LaravelGovernor\Entity::class,
+            'group'      => \GeneaLabs\LaravelGovernor\Group::class,
+            'ownership'  => \GeneaLabs\LaravelGovernor\Ownership::class,
             'permission' => \GeneaLabs\LaravelGovernor\Permission::class,
-            'role' => \GeneaLabs\LaravelGovernor\Role::class,
-            'team' => \GeneaLabs\LaravelGovernor\Team::class,
+            'role'       => \GeneaLabs\LaravelGovernor\Role::class,
+            'team'       => \GeneaLabs\LaravelGovernor\Team::class,
             'invitation' => \GeneaLabs\LaravelGovernor\TeamInvitation::class,
         ]);
         $app['config']->set('database.default', 'sqlite');
         $app['config']->set('database.connections.sqlite', [
-            'driver' => 'sqlite',
-            "url" => null,
-            'database' => __DIR__ . '/database/database.sqlite',
-            'prefix' => '',
-            "foreign_key_constraints" => false,
+            'driver'                  => 'sqlite',
+            'url'                     => null,
+            'database'                => $sqliteDatabase,
+            'prefix'                  => '',
+            'foreign_key_constraints' => false,
         ]);
     }
 
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 
-        $this->loadLaravelMigrations();
-        $this->loadMigrationsFrom(__DIR__ . "/../database/migrations");
-        $this->loadMigrationsFrom(__DIR__ . "/database/migrations");
+        $this->loadMigrationsFrom(__DIR__ . '/database/migrations');
+        $this->loadMigrationsFrom(__DIR__ . '/../database/migrations');
         $this->artisan('migrate');
         $this->artisan('db:seed', [
-            "--database" => "sqlite",
-            '--class' => LaravelGovernorDatabaseSeeder::class,
+            '--database'      => 'sqlite',
+            '--class'         => LaravelGovernorDatabaseSeeder::class,
             '--no-interaction' => true,
         ]);
     }
 
-    public function tearDown() : void
+    public function tearDown(): void
     {
-        $this->app['config']->set('database.default', 'testing');
+        parent::tearDown();
     }
 
-    /** @test */
-    public function migrateAndInstallTheDatabase()
+    #[Test]
+    public function testMigrateAndInstallTheDatabase(): void
     {
         $this->assertTrue(true);
     }

tests/CreatesApplication.php

@@ -41,10 +41,8 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->withFactories(__DIR__ . "/database/factories");
-        $this->loadLaravelMigrations();
-        $this->loadMigrationsFrom(__DIR__ . "/../database/migrations");
         $this->loadMigrationsFrom(__DIR__ . "/database/migrations");
+        $this->loadMigrationsFrom(__DIR__ . "/../database/migrations");
         $this->artisan('migrate');
         $this->artisan('db:seed', [
             '--class' => LaravelGovernorDatabaseSeeder::class,

tests/Fixtures/Author.php

@@ -1,13 +1,21 @@
 <?php namespace GeneaLabs\LaravelGovernor\Tests\Fixtures;
 
+use GeneaLabs\LaravelGovernor\Tests\Database\Factories\AuthorFactory;
 use GeneaLabs\LaravelGovernor\Traits\Governable;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Author extends Model
 {
     use Governable;
+    use HasFactory;
 
     protected $fillable = [
         "name",
     ];
-}
+
+    protected static function newFactory(): AuthorFactory
+    {
+        return AuthorFactory::new();
+    }
+}

tests/Fixtures/User.php

@@ -1,13 +1,16 @@
 <?php namespace GeneaLabs\LaravelGovernor\Tests\Fixtures;
 
+use GeneaLabs\LaravelGovernor\Tests\Database\Factories\UserFactory;
 use GeneaLabs\LaravelGovernor\Traits\Governing;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 
 class User extends Authenticatable implements MustVerifyEmail
 {
     use Governing;
+    use HasFactory;
     use Notifiable;
 
     protected $fillable = [
@@ -20,4 +23,9 @@ class User extends Authenticatable implements MustVerifyEmail
         "remember_token",
         "activation_token",
     ];
-}
+
+    protected static function newFactory(): UserFactory
+    {
+        return UserFactory::new();
+    }
+}

tests/Integration/Notifications/TeamInvitationTest.php

@@ -14,7 +14,7 @@ public function setUp() : void
     {
         parent::setUp();
 
-        $this->user = factory(User::class)->create();
+        $this->user = User::factory()->create();
         $this->actingAs($this->user);
         $this->team = (new Team)->create([
             "name" => "Test Team",

tests/Integration/Policies/BasePolicyTest.php

@@ -19,26 +19,26 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $this->userWithoutRoles = factory(User::class)->create();
+        $this->userWithoutRoles = User::factory()->create();
         $this->userWithoutRoles->roles()->sync([]);
         $this->userWithoutRoles->teams()->sync([]);
-        $this->otherUser = factory(User::class)->create();
+        $this->otherUser = User::factory()->create();
         $this->otherUser->roles()->attach("SuperAdmin");
         $this->actingAs($this->otherUser);
         $this->otherTeam = (new Team)->create([
             "name" => "Test Team",
             "description" => "bla bla bla",
         ]);
-        $this->otherAuthor = factory(Author::class)->create();
+        $this->otherAuthor = Author::factory()->create();
         $this->otherAuthor->teams()->attach($this->otherTeam);
 
-        $this->user = factory(User::class)->create();
+        $this->user = User::factory()->create();
         $this->actingAs($this->user);
         $this->team = (new Team)->create([
             "name" => "Test Team",
             "description" => "bla bla bla",
         ]);
-        $this->author = factory(Author::class)->create();
+        $this->author = Author::factory()->create();
         $this->author->teams()->attach($this->team);
     }