fix types

saeedvaziry · saeedvaziry · commit 521abbde440b · 2025-03-08T19:52:26.000+01:00
diff --git a/app/Web/Pages/Settings/Users/Index.php b/app/Web/Pages/Settings/Users/Index.php
@@ -61,7 +61,7 @@ protected function getHeaderActions(): array
                                 ->rules($rules['password']),
                             Select::make('role')
                                 ->rules($rules['role'])
-                                ->options(collect(config('core.user_roles'))->mapWithKeys(fn ($role) => [$role => $role])),
+                                ->options(collect((array) config('core.user_roles'))->mapWithKeys(fn ($role) => [$role => $role])),
                         ])
                         ->columns(1);
                 })
diff --git a/app/Web/Pages/Settings/Users/Widgets/UsersList.php b/app/Web/Pages/Settings/Users/Widgets/UsersList.php
@@ -22,13 +22,11 @@
 
 class UsersList extends Widget
 {
+    /**
+     * @var array<string>
+     */
     protected $listeners = ['$refresh'];
 
-    protected function getTableQuery(): Builder
-    {
-        return User::query();
-    }
-
     protected function getTableColumns(): array
     {
         return [
@@ -52,7 +50,7 @@ public function table(Table $table): Table
     {
         return $table
             ->heading(null)
-            ->query($this->getTableQuery())
+            ->query(User::query())
             ->columns($this->getTableColumns())
             ->actions([
                 EditAction::make('edit')
@@ -76,7 +74,7 @@ public function table(Table $table): Table
                                     ->rules(UpdateUser::rules($record)['timezone']),
                                 Select::make('role')
                                     ->options(
-                                        collect(config('core.user_roles'))
+                                        collect((array) config('core.user_roles'))
                                             ->mapWithKeys(fn ($role) => [$role => $role])
                                     )
                                     ->rules(UpdateUser::rules($record)['role']),
diff --git a/composer.json b/composer.json
@@ -31,6 +31,7 @@
         "mockery/mockery": "^1.4.4",
         "nunomaduro/collision": "^8.1",
         "phpunit/phpunit": "^10.0",
+        "rector/rector": "^2.0",
         "spatie/laravel-ignition": "^2.0"
     },
     "autoload": {
diff --git a/composer.lock b/composer.lock
diff --git a/config/core.php b/config/core.php
@@ -490,7 +490,7 @@
      */
     'restricted_ip_addresses' => array_merge(
         ['127.0.0.1', 'localhost', '0.0.0.0'],
-        explode(',', env('RESTRICTED_IP_ADDRESSES', ''))
+        explode(',', (string) env('RESTRICTED_IP_ADDRESSES', ''))
     ),
 
     /*
diff --git a/database/factories/BackupFactory.php b/database/factories/BackupFactory.php
@@ -5,6 +5,9 @@
 use App\Enums\BackupStatus;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
+/**
+ * @extends Factory<\App\Models\Backup>
+ */
 class BackupFactory extends Factory
 {
     public function definition(): array
diff --git a/database/factories/BackupFileFactory.php b/database/factories/BackupFileFactory.php
@@ -4,6 +4,9 @@
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 
+/**
+ * @extends Factory<\App\Models\BackupFile>
+ */
 class BackupFileFactory extends Factory
 {
     public function definition(): array
diff --git a/database/factories/CommandExecutionFactory.php b/database/factories/CommandExecutionFactory.php
@@ -7,6 +7,9 @@
 use App\Models\CommandExecution;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
+/**
+ * @extends Factory<\App\Models\CommandExecution>
+ */
 class CommandExecutionFactory extends Factory
 {
     protected $model = CommandExecution::class;
diff --git a/database/factories/CommandFactory.php b/database/factories/CommandFactory.php
@@ -7,6 +7,9 @@
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Carbon;
 
+/**
+ * @extends Factory<\App\Models\Command>
+ */
 class CommandFactory extends Factory
 {
     protected $model = Command::class;
diff --git a/database/factories/CronJobFactory.php b/database/factories/CronJobFactory.php
@@ -6,6 +6,9 @@
 use App\Models\CronJob;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
+/**
+ * @extends Factory<\App\Models\CronJob>
+ */
 class CronJobFactory extends Factory
 {
     protected $model = CronJob::class;
diff --git a/database/factories/DatabaseFactory.php b/database/factories/DatabaseFactory.php
@@ -6,6 +6,9 @@
 use App\Models\Database;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
+/**
+ * @extends Factory<\App\Models\Database>
+ */
 class DatabaseFactory extends Factory
 {
     protected $model = Database::class;
diff --git a/database/factories/DatabaseUserFactory.php b/database/factories/DatabaseUserFactory.php
@@ -5,6 +5,9 @@
 use App\Models\DatabaseUser;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
+/**
+ * @extends Factory<\App\Models\DatabaseUser>
+ */
 class DatabaseUserFactory extends Factory
 {
     protected $model = DatabaseUser::class;
diff --git a/database/factories/DeploymentFactory.php b/database/factories/DeploymentFactory.php
@@ -5,6 +5,9 @@
 use App\Models\Deployment;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
+/**
+ * @extends Factory<\App\Models\Deployment>
+ */
 class DeploymentFactory extends Factory
 {
     protected $model = Deployment::class;
diff --git a/database/factories/DeploymentScriptFactory.php b/database/factories/DeploymentScriptFactory.php
@@ -7,6 +7,9 @@
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Carbon;
 
+/**
+ * @extends Factory<\App\Models\DeploymentScript>
+ */
 class DeploymentScriptFactory extends Factory
 {
     protected $model = DeploymentScript::class;
diff --git a/database/factories/FileFactory.php b/database/factories/FileFactory.php
@@ -6,6 +6,9 @@
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Carbon;
 
+/**
+ * @extends Factory<\App\Models\File>
+ */
 class FileFactory extends Factory
 {
     protected $model = File::class;
diff --git a/database/factories/FirewallRuleFactory.php b/database/factories/FirewallRuleFactory.php
@@ -5,6 +5,9 @@
 use App\Models\FirewallRule;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
+/**
+ * @extends Factory<\App\Models\FirewallRule>
+ */
 class FirewallRuleFactory extends Factory
 {
     protected $model = FirewallRule::class;
diff --git a/database/factories/GitHookFactory.php b/database/factories/GitHookFactory.php
@@ -8,6 +8,9 @@
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Carbon;
 
+/**
+ * @extends Factory<\App\Models\GitHook>
+ */
 class GitHookFactory extends Factory
 {
     protected $model = GitHook::class;
diff --git a/database/factories/LoadBalancerServerFactory.php b/database/factories/LoadBalancerServerFactory.php
@@ -6,6 +6,9 @@
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Carbon;
 
+/**
+ * @extends Factory<\App\Models\LoadBalancerServer>
+ */
 class LoadBalancerServerFactory extends Factory
 {
     protected $model = LoadBalancerServer::class;
diff --git a/database/factories/MetricFactory.php b/database/factories/MetricFactory.php
@@ -4,6 +4,9 @@
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 
+/**
+ * @extends Factory<\App\Models\Metric>
+ */
 class MetricFactory extends Factory
 {
     public function definition(): array
diff --git a/database/factories/NotificationChannelFactory.php b/database/factories/NotificationChannelFactory.php
@@ -4,6 +4,9 @@
 
 use Illuminate\Database\Eloquent\Factories\Factory;
 
+/**
+ * @extends Factory<\App\Models\NotificationChannel>
+ */
 class NotificationChannelFactory extends Factory
 {
     public function definition(): array
diff --git a/database/factories/ProjectFactory.php b/database/factories/ProjectFactory.php
@@ -7,7 +7,7 @@
 use Illuminate\Support\Carbon;
 
 /**
- * @extends Factory<Project>
+ * @extends Factory<\App\Models\Project>
  */
 class ProjectFactory extends Factory
 {
diff --git a/database/factories/QueueFactory.php b/database/factories/QueueFactory.php
@@ -6,6 +6,9 @@
 use App\Models\Queue;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
+/**
+ * @extends Factory<\App\Models\Queue>
+ */
 class QueueFactory extends Factory
 {
     protected $model = Queue::class;
diff --git a/database/factories/ScriptExecutionFactory.php b/database/factories/ScriptExecutionFactory.php
@@ -7,6 +7,9 @@
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Carbon;
 
+/**
+ * @extends Factory<\App\Models\ScriptExecution>
+ */
 class ScriptExecutionFactory extends Factory
 {
     protected $model = ScriptExecution::class;
diff --git a/database/factories/ScriptFactory.php b/database/factories/ScriptFactory.php
@@ -6,6 +6,9 @@
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Carbon;
 
+/**
+ * @extends Factory<\App\Models\Script>
+ */
 class ScriptFactory extends Factory
 {
     protected $model = Script::class;
diff --git a/database/factories/ServerFactory.php b/database/factories/ServerFactory.php
@@ -9,6 +9,9 @@
 use App\Models\Server;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
+/**
+ * @extends Factory<\App\Models\Server>
+ */
 class ServerFactory extends Factory
 {
     protected $model = Server::class;
diff --git a/database/factories/ServerLogFactory.php b/database/factories/ServerLogFactory.php
@@ -5,6 +5,9 @@
 use App\Models\ServerLog;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
+/**
+ * @extends Factory<\App\Models\ServerLog>
+ */
 class ServerLogFactory extends Factory
 {
     protected $model = ServerLog::class;
diff --git a/database/factories/ServerProviderFactory.php b/database/factories/ServerProviderFactory.php
@@ -6,6 +6,9 @@
 use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
+/**
+ * @extends Factory<\App\Models\ServerProvider>
+ */
 class ServerProviderFactory extends Factory
 {
     protected $model = ServerProvider::class;
diff --git a/database/factories/ServiceFactory.php b/database/factories/ServiceFactory.php
@@ -5,6 +5,9 @@
 use App\Models\Service;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
+/**
+ * @extends Factory<\App\Models\Service>
+ */
 class ServiceFactory extends Factory
 {
     protected $model = Service::class;
diff --git a/database/factories/SiteFactory.php b/database/factories/SiteFactory.php
@@ -6,6 +6,9 @@
 use App\Models\Site;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
+/**
+ * @extends Factory<\App\Models\Site>
+ */
 class SiteFactory extends Factory
 {
     protected $model = Site::class;
diff --git a/database/factories/SourceControlFactory.php b/database/factories/SourceControlFactory.php
diff --git a/database/factories/SshKeyFactory.php b/database/factories/SshKeyFactory.php
diff --git a/database/factories/SslFactory.php b/database/factories/SslFactory.php
diff --git a/database/factories/StorageProviderFactory.php b/database/factories/StorageProviderFactory.php
diff --git a/database/factories/TagFactory.php b/database/factories/TagFactory.php
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
diff --git a/rector.php b/rector.php

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,9 @@`
`5`	`5`	`use App\Enums\BackupStatus;`
`6`	`6`	`use Illuminate\Database\Eloquent\Factories\Factory;`
`7`	`7`
	`8`	`+/**`
	`9`	`+ * @extends Factory<\App\Models\Backup>`
	`10`	`+ */`
`8`	`11`	`class BackupFactory extends Factory`
`9`	`12`	`{`
`10`	`13`	`public function definition(): array`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,9 @@`
`4`	`4`
`5`	`5`	`use Illuminate\Database\Eloquent\Factories\Factory;`
`6`	`6`
	`7`	`+/**`
	`8`	`+ * @extends Factory<\App\Models\BackupFile>`
	`9`	`+ */`
`7`	`10`	`class BackupFileFactory extends Factory`
`8`	`11`	`{`
`9`	`12`	`public function definition(): array`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,9 @@`
`7`	`7`	`use App\Models\CommandExecution;`
`8`	`8`	`use Illuminate\Database\Eloquent\Factories\Factory;`
`9`	`9`
	`10`	`+/**`
	`11`	`+ * @extends Factory<\App\Models\CommandExecution>`
	`12`	`+ */`
`10`	`13`	`class CommandExecutionFactory extends Factory`
`11`	`14`	`{`
`12`	`15`	`protected $model = CommandExecution::class;`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,9 @@`
`7`	`7`	`use Illuminate\Database\Eloquent\Factories\Factory;`
`8`	`8`	`use Illuminate\Support\Carbon;`
`9`	`9`
	`10`	`+/**`
	`11`	`+ * @extends Factory<\App\Models\Command>`
	`12`	`+ */`
`10`	`13`	`class CommandFactory extends Factory`
`11`	`14`	`{`
`12`	`15`	`protected $model = Command::class;`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,9 @@`
`6`	`6`	`use App\Models\CronJob;`
`7`	`7`	`use Illuminate\Database\Eloquent\Factories\Factory;`
`8`	`8`
	`9`	`+/**`
	`10`	`+ * @extends Factory<\App\Models\CronJob>`
	`11`	`+ */`
`9`	`12`	`class CronJobFactory extends Factory`
`10`	`13`	`{`
`11`	`14`	`protected $model = CronJob::class;`