declare_strict_types

QuentinGab · QuentinGab · commit 06b73091e800 · 2025-01-11T17:44:04.000+01:00
diff --git a/composer.json b/composer.json
@@ -21,16 +21,16 @@
         "illuminate/contracts": "^10.0||^11.0"
     },
     "require-dev": {
-        "laravel/pint": "^1.14",
-        "nunomaduro/collision": "^8.1.1||^7.10.0",
-        "larastan/larastan": "^2.9",
-        "orchestra/testbench": "^9.0.0||^8.22.0",
-        "pestphp/pest": "^2.34",
-        "pestphp/pest-plugin-arch": "^2.7",
-        "pestphp/pest-plugin-laravel": "^2.3",
-        "phpstan/extension-installer": "^1.3",
-        "phpstan/phpstan-deprecation-rules": "^1.1",
-        "phpstan/phpstan-phpunit": "^1.3"
+        "laravel/pint": "^1.0",
+        "nunomaduro/collision": "^8.1",
+        "larastan/larastan": "^3.0.0",
+        "orchestra/testbench": "^9.0",
+        "pestphp/pest": "^3.0",
+        "pestphp/pest-plugin-arch": "^3.0",
+        "pestphp/pest-plugin-laravel": "^3.0",
+        "phpstan/extension-installer": "^1.4",
+        "phpstan/phpstan-deprecation-rules": "^2.0",
+        "phpstan/phpstan-phpunit": "^2.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/config/workflow.php b/config/workflow.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 return [
 
     'queue' => env('WORKFLOW_QUEUE'),
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -10,3 +10,6 @@ parameters:
     tmpDir: build/phpstan
     checkOctaneCompatibility: true
     checkModelProperties: true
+    noEnvCallsOutsideOfConfig: false
+    ignoreErrors:
+        - '#Trait Elegantly\\Workflow\\Concerns\\HasWorkflows is used zero times and is not analysed.#'
diff --git a/pint.json b/pint.json
@@ -0,0 +1,6 @@
+{
+    "preset": "laravel",
+    "rules": {
+        "declare_strict_types": true
+    }
+}
diff --git a/src/Commands/RunWorkflowsCommand.php b/src/Commands/RunWorkflowsCommand.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Workflow\Commands;
 
 use Elegantly\Workflow\Models\Workflow;
diff --git a/src/Concerns/HasWorkflows.php b/src/Concerns/HasWorkflows.php
@@ -1,14 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Workflow\Concerns;
 
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 
 trait HasWorkflows
 {
     /**
-     * @return MorphMany<Workflow, Model>
+     * @return MorphMany<Workflow, $this>
      */
     public function workflows(): MorphMany
     {
diff --git a/src/Models/Workflow.php b/src/Models/Workflow.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Workflow\Models;
 
 use Carbon\Carbon;
@@ -52,15 +54,15 @@ public function casts()
     }
 
     /**
-     * @return HasMany<WorkflowItem >
+     * @return HasMany<WorkflowItem, $this>
      */
     public function items(): HasMany
     {
         return $this->hasMany(WorkflowItem::class);
     }
 
     /**
-     * @return MorphTo<Model, Workflow>
+     * @return MorphTo<Model, $this>
      */
     public function model(): MorphTo
     {
@@ -157,7 +159,7 @@ public function getRemainingSteps(): SupportCollection
                 $this->items
                     ->where('finished_at', '!=', null)
                     ->where('canceled_at', '!=', null)
-                    ->pluck('name')
+                    ->map(fn ($item) => $item->name)
             );
     }
 
diff --git a/src/Models/WorkflowItem.php b/src/Models/WorkflowItem.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Workflow\Models;
 
 use Carbon\Carbon;
@@ -37,7 +39,7 @@ public function casts(): array
     }
 
     /**
-     * @return BelongsTo<Workflow, WorkflowItem>
+     * @return BelongsTo<Workflow, $this>
      */
     public function workflow(): BelongsTo
     {
diff --git a/src/WorkflowDefinition.php b/src/WorkflowDefinition.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Workflow;
 
 use Elegantly\Workflow\Models\Workflow;
diff --git a/src/WorkflowServiceProvider.php b/src/WorkflowServiceProvider.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Workflow;
 
 use Elegantly\Workflow\Commands\RunWorkflowsCommand;
diff --git a/src/WorkflowStep.php b/src/WorkflowStep.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Workflow;
 
 use Carbon\CarbonInterval;
diff --git a/tests/ArchTest.php b/tests/ArchTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 arch('it will not use debugging functions')
     ->expect(['dd', 'dump', 'ray'])
     ->each->not->toBeUsed();
diff --git a/tests/Feature/FailingWorkflowDefinitionTest.php b/tests/Feature/FailingWorkflowDefinitionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Elegantly\Workflow\Tests\TestFailingWorkflowDefinition;
 
 it('catches workflow failure', function () {
@@ -18,7 +20,7 @@
     try {
         $workflow->run();
     } catch (\Throwable $th) {
-        //throw $th;
+        // throw $th;
     }
 
     expect($workflow->items)->toHaveLength(2);
diff --git a/tests/Feature/WorkflowDefinitionTest.php b/tests/Feature/WorkflowDefinitionTest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Elegantly\Workflow\Tests\TestWorkflowDefinition;
 
 it('can run a workflow', function () {
diff --git a/tests/Pest.php b/tests/Pest.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Elegantly\Workflow\Tests\TestCase;
 
 uses(TestCase::class)->in(__DIR__);
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Workflow\Tests;
 
 use Elegantly\Workflow\WorkflowServiceProvider;
diff --git a/tests/TestFailingWorkflowDefinition.php b/tests/TestFailingWorkflowDefinition.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Workflow\Tests;
 
 use Carbon\CarbonInterval;
diff --git a/tests/TestJob.php b/tests/TestJob.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Workflow\Tests;
 
 use Illuminate\Bus\Queueable;
diff --git a/tests/TestWorkflowDefinition.php b/tests/TestWorkflowDefinition.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Elegantly\Workflow\Tests;
 
 use Carbon\CarbonInterval;
diff --git a/workbench/app/Providers/WorkbenchServiceProvider.php b/workbench/app/Providers/WorkbenchServiceProvider.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Workbench\App\Providers;
 
 use Illuminate\Support\Facades\Route;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`
	`3`	`+declare(strict_types=1);`
	`4`	`+`
`3`	`5`	`namespace Elegantly\Workflow\Models;`
`4`	`6`
`5`	`7`	`use Carbon\Carbon;`
`@@ -52,15 +54,15 @@ public function casts()`
`52`	`54`	`}`
`53`	`55`
`54`	`56`	`/**`
`55`		`- * @return HasMany<WorkflowItem >`
	`57`	`+ * @return HasMany<WorkflowItem, $this>`
`56`	`58`	`*/`
`57`	`59`	`public function items(): HasMany`
`58`	`60`	`{`
`59`	`61`	`return $this->hasMany(WorkflowItem::class);`
`60`	`62`	`}`
`61`	`63`
`62`	`64`	`/**`
`63`		`- * @return MorphTo<Model, Workflow>`
	`65`	`+ * @return MorphTo<Model, $this>`
`64`	`66`	`*/`
`65`	`67`	`public function model(): MorphTo`
`66`	`68`	`{`
`@@ -157,7 +159,7 @@ public function getRemainingSteps(): SupportCollection`
`157`	`159`	`$this->items`
`158`	`160`	`->where('finished_at', '!=', null)`
`159`	`161`	`->where('canceled_at', '!=', null)`
`160`		`- ->pluck('name')`
	`162`	`+ ->map(fn ($item) => $item->name)`
`161`	`163`	`);`
`162`	`164`	`}`
`163`	`165`