[9.x] Add extra type checks for model factories (#41305)

* Add extra type checks for model factories * Fix code style * Bump minimum PHPStan version
laravel · Mar 3, 2022 · 5b113da · 5b113da
1 parent 0d67602
commit 5b113da
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -90,7 +90,7 @@
         "mockery/mockery": "^1.4.4",
         "orchestra/testbench-core": "^7.1",
         "pda/pheanstalk": "^4.0",
-        "phpstan/phpstan": "^1.0",
+        "phpstan/phpstan": "^1.4.7",
         "phpunit/phpunit": "^9.5.8",
         "predis/predis": "^1.1.9",
         "symfony/cache": "^6.0"

diff --git a/types/Database/Eloquent/Factories/Factory.php b/types/Database/Eloquent/Factories/Factory.php
@@ -31,7 +31,8 @@ public function definition()
 assertType('UserFactory', $factory = UserFactory::new());
 assertType('UserFactory', UserFactory::new(['string' => 'string']));
 assertType('UserFactory', UserFactory::new(function ($attributes) {
-//    assertType('array<string, mixed>', $attributes);
+    assertType('array<string, mixed>', $attributes);
+
     return ['string' => 'string'];
 }));
 
@@ -44,7 +45,8 @@ public function definition()
 assertType('array<int|string, mixed>', $factory->raw());
 assertType('array<int|string, mixed>', $factory->raw(['string' => 'string']));
 assertType('array<int|string, mixed>', $factory->raw(function ($attributes) {
-//    assert('array<string, mixed>', $attributes);
+    assertType('array<string, mixed>', $attributes);
+
     return ['string' => 'string'];
 }));
 
@@ -53,7 +55,8 @@ public function definition()
 assertType('Illuminate\Database\Eloquent\Model', $factory->createOne());
 assertType('Illuminate\Database\Eloquent\Model', $factory->createOne(['string' => 'string']));
 assertType('Illuminate\Database\Eloquent\Model', $factory->createOne(function ($attributes) {
-//    assertType('array<string, mixed>', $attributes);
+    assertType('array<string, mixed>', $attributes);
+
     return ['string' => 'string'];
 }));
 
@@ -62,7 +65,8 @@ public function definition()
 assertType('Illuminate\Database\Eloquent\Model', $factory->createOneQuietly());
 assertType('Illuminate\Database\Eloquent\Model', $factory->createOneQuietly(['string' => 'string']));
 assertType('Illuminate\Database\Eloquent\Model', $factory->createOneQuietly(function ($attributes) {
-//    assertType('array<string, mixed>', $attributes);
+    assertType('array<string, mixed>', $attributes);
+
     return ['string' => 'string'];
 }));
 
@@ -85,7 +89,8 @@ public function definition()
     'string' => 'string',
 ]));
 assertType('Illuminate\Database\Eloquent\Collection<int, Illuminate\Database\Eloquent\Model>|Illuminate\Database\Eloquent\Model', $factory->create(function ($attributes) {
-//    assertType('array<string, mixed>', $attributes);
+    assertType('array<string, mixed>', $attributes);
+
     return ['string' => 'string'];
 }));
 
@@ -116,7 +121,8 @@ public function definition()
     'string' => 'string',
 ]));
 assertType('Illuminate\Database\Eloquent\Model', $factory->makeOne(function ($attributes) {
-//    assert('array<string, mixed>', $attributes);
+    assertType('array<string, mixed>', $attributes);
+
     return ['string' => 'string'];
 }));
 
@@ -129,7 +135,8 @@ public function definition()
     'string' => 'string',
 ]));
 assertType('Illuminate\Database\Eloquent\Collection<int, Illuminate\Database\Eloquent\Model>|Illuminate\Database\Eloquent\Model', $factory->make(function ($attributes) {
-//    assert('array<string, mixed>', $attributes);
+    assertType('array<string, mixed>', $attributes);
+
     return ['string' => 'string'];
 }));