Improved Seeders and models to support more laravel 12.x syntax

Author: ManiruzzamanAkash

README.md

@@ -11,6 +11,7 @@ password - 12345678
 ## Requirements:
 - Laravel `7.x` | `9.7` | `11.x` | `12.x`
 - Spatie role permission package  `^6.4`
+- PHPUnit test package `^11.x`
 
 ## Versions:
 - Laravel `7.x` & PHP -`7.x`
@@ -23,7 +24,7 @@ password - 12345678
 - Laravel `11.x`
     - Tag - https://github.com/ManiruzzamanAkash/laravel-role/releases/tag/v11.x-main
 
-- Laravel `12.x`
+- Laravel `12.x` & PHP >= `8.3`
     - Tag - https://github.com/ManiruzzamanAkash/laravel-role/releases/tag/Laravel12.x
 
 ## Project Setup

app/Http/Controllers/Auth/RegisterController.php

@@ -4,7 +4,7 @@
 
 use App\Http\Controllers\Controller;
 use App\Providers\RouteServiceProvider;
-use App\User;
+use App\Models\User;
 use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
@@ -60,9 +60,9 @@ protected function validator(array $data)
      * Create a new user instance after a valid registration.
      *
      * @param  array  $data
-     * @return \App\User
+     * @return ?User
      */
-    protected function create(array $data)
+    protected function create(array $data): ?User
     {
         return User::create([
             'name' => $data['name'],

app/Http/Controllers/Backend/RolesController.php

@@ -4,7 +4,7 @@
 
 namespace App\Http\Controllers\Backend;
 
-use App\User;
+use App\Models\User;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\RoleRequest;
 use Illuminate\Contracts\Support\Renderable;

app/Models/Admin.php

@@ -1,16 +1,19 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Models;
 
-use Illuminate\Contracts\Auth\MustVerifyEmail;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Facades\DB;
+use Spatie\Permission\Models\Role;
 use Spatie\Permission\Traits\HasRoles;
 
 class Admin extends Authenticatable
 {
-    use Notifiable, HasRoles;
+    use Notifiable, HasRoles, HasFactory;
 
     /**
      * Set the default guard for this model.
@@ -25,7 +28,9 @@ class Admin extends Authenticatable
      * @var array
      */
     protected $fillable = [
-        'name', 'email', 'password',
+        'name',
+        'email',
+        'password',
     ];
 
     /**
@@ -34,7 +39,8 @@ class Admin extends Authenticatable
      * @var array
      */
     protected $hidden = [
-        'password', 'remember_token',
+        'password',
+        'remember_token',
     ];
 
     /**
@@ -48,31 +54,28 @@ class Admin extends Authenticatable
 
     public static function getpermissionGroups()
     {
-        $permission_groups = DB::table('permissions')
+        return DB::table('permissions')
             ->select('group_name as name')
             ->groupBy('group_name')
             ->get();
-        return $permission_groups;
     }
 
-    public static function getpermissionsByGroupName($group_name)
+    public static function getpermissionsByGroupName(string $group_name)
     {
-        $permissions = DB::table('permissions')
+        return DB::table('permissions')
             ->select('name', 'id')
             ->where('group_name', $group_name)
             ->get();
-        return $permissions;
     }
 
-    public static function roleHasPermissions($role, $permissions)
+    public static function roleHasPermissions(Role $role, array $permissions): bool
     {
-        $hasPermission = true;
         foreach ($permissions as $permission) {
             if (!$role->hasPermissionTo($permission->name)) {
-                $hasPermission = false;
-                return $hasPermission;
+                return false;
             }
         }
-        return $hasPermission;
+
+        return true; // ensure returning true if all permissions are granted
     }
 }

app/User.php app/Models/User.php

@@ -1,16 +1,19 @@
 <?php
 
-namespace App;
+declare(strict_types=1);
+
+namespace App\Models;
 
 use Illuminate\Contracts\Auth\MustVerifyEmail;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Facades\DB;
 use Spatie\Permission\Traits\HasRoles;
 
 class User extends Authenticatable
 {
-    use Notifiable, HasRoles;
+    use Notifiable, HasRoles, HasFactory;
 
     /**
      * The attributes that are mass assignable.

composer.json

@@ -8,21 +8,21 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^8.2",
+        "php": "^8.3",
         "laravel/framework": "^12.0",
-        "laravel/tinker": "^2.9",
+        "laravel/tinker": "^2.10",
         "guzzlehttp/guzzle": "^7.2",
         "laravel/ui": "^4.5",
         "spatie/laravel-permission": "^6.4"
     },
     "require-dev": {
-        "fakerphp/faker": "^1.23",
-        "laravel/pint": "^1.13",
-        "laravel/sail": "^1.26",
+        "fakerphp/faker": "^1.24",
+        "laravel/pint": "^1.21",
+        "laravel/sail": "^1.41",
         "mockery/mockery": "^1.6",
-        "nunomaduro/collision": "^8.0",
-        "phpunit/phpunit": "^11.0",
-        "spatie/laravel-ignition": "^2.4"
+        "nunomaduro/collision": "^8.6",
+        "phpunit/phpunit": "^11.5.3",
+        "spatie/laravel-ignition": "^2.9"
     },
     "config": {
         "optimize-autoloader": true,
@@ -36,10 +36,12 @@
     },
     "autoload": {
         "psr-4": {
-            "App\\": "app/"
+            "App\\": "app/",
+            "Database\\Factories\\": "database/factories/",
+            "Database\\Seeders\\": "database/seeders/"
         },
         "classmap": [
-            "database/seeds",
+            "database/seeders",
             "database/factories"
         ]
     },

composer.lock

@@ -79,7 +79,7 @@
     'providers' => [
         'users' => [
             'driver' => 'eloquent',
-            'model' => App\User::class,
+            'model' => App\Models\User::class,
         ],
 
         'admins' => [

config/auth.php

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Str;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Admin>
+ */
+class AdminFactory extends Factory
+{
+    /**
+     * The current password being used by the factory.
+     */
+    protected static ?string $password;
+
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            'name' => fake()->name(),
+            'email' => fake()->unique()->safeEmail(),
+            'username' => fake()->unique()->userName(),
+            'email_verified_at' => now(),
+            'password' => static::$password ??= Hash::make('password'),
+            'remember_token' => Str::random(10),
+        ];
+    }
+
+    /**
+     * Indicate that the model's email address should be unverified.
+     */
+    public function unverified(): static
+    {
+        return $this->state(fn(array $attributes) => [
+            'email_verified_at' => null,
+        ]);
+    }
+}

database/factories/AdminFactory.php

@@ -1,28 +1,46 @@
 <?php
 
-/** @var \Illuminate\Database\Eloquent\Factory $factory */
+declare(strict_types=1);
 
-use App\User;
-use Faker\Generator as Faker;
+namespace Database\Factories;
+
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
 
-/*
-|--------------------------------------------------------------------------
-| Model Factories
-|--------------------------------------------------------------------------
-|
-| This directory should contain each of the model factory definitions for
-| your application. Factories provide a convenient way to generate new
-| model instances for testing / seeding your application's database.
-|
-*/
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\User>
+ */
+class UserFactory extends Factory
+{
+    /**
+     * The current password being used by the factory.
+     */
+    protected static ?string $password;
+
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            'name' => fake()->name(),
+            'email' => fake()->unique()->safeEmail(),
+            'email_verified_at' => now(),
+            'password' => static::$password ??= Hash::make('password'),
+            'remember_token' => Str::random(10),
+        ];
+    }
 
-$factory->define(User::class, function (Faker $faker) {
-    return [
-        'name' => $faker->name,
-        'email' => $faker->unique()->safeEmail,
-        'email_verified_at' => now(),
-        'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password
-        'remember_token' => Str::random(10),
-    ];
-});
+    /**
+     * Indicate that the model's email address should be unverified.
+     */
+    public function unverified(): static
+    {
+        return $this->state(fn(array $attributes) => [
+            'email_verified_at' => null,
+        ]);
+    }
+}

database/factories/UserFactory.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Database\Seeders;
+
+use App\Models\Admin;
+use DB;
+use Illuminate\Database\Seeder;
+use Illuminate\Support\Facades\Hash;
+
+class AdminSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run(): void
+    {
+        $admin =
+            [
+                'name' => 'Super Admin',
+                'email' => 'superadmin@example.com',
+                'username' => 'superadmin',
+                'password' => Hash::make('12345678'),
+            ];
+
+        Admin::create($admin);
+
+        // Run factory to create additional admins with unique details.
+        Admin::factory()->count(10)->create();
+        $this->command->info('Admins table seeded with 11 admins!');
+    }
+}

database/seeders/AdminSeeder.php

@@ -1,5 +1,9 @@
 <?php
 
+declare(strict_types=1);
+
+namespace Database\Seeders;
+
 use Illuminate\Database\Seeder;
 
 class DatabaseSeeder extends Seeder