Merge pull request #3 from mzur/laravel-9-patch-1

Fix failing tests for firstOrCreate, firstOrNew and PHP 8.1

Author: Nielsvanpach

composer.json

@@ -33,7 +33,10 @@
         "codeception/module-filesystem": "^3.0",
         "codeception/module-phpbrowser": "*@dev",
         "slevomat/coding-standard": "^6.2",
-        "squizlabs/php_codesniffer": "*"
+        "squizlabs/php_codesniffer": "*",
+        "phpoption/phpoption": "^1.8.0",
+        "symfony/http-foundation": "^5.3.7 || ^6.0",
+        "ramsey/collection": "^1.2.0"
     },
     "autoload": {
         "psr-4": {

stubs/EloquentBuilder.stubphp

@@ -167,6 +167,20 @@ class Builder
      */
     public function firstOr($columns = ['*'], Closure $callback = null) { }
 
+    /**
+     * @param  array  $attributes
+     * @param  array  $values
+     * @return TModel|self<TModel>
+     */
+    public function firstOrNew(array $attributes = [], array $values = []) { }
+
+    /**
+     * @param  array  $attributes
+     * @param  array  $values
+     * @return TModel|self<TModel>
+     */
+    public function firstOrCreate(array $attributes = [], array $values = []) { }
+
     /**
      * @param  string  $column
      * @return mixed

stubs/HasOneOrMany.stubphp

@@ -66,4 +66,20 @@ abstract class HasOneOrMany extends Relation
      * @psalm-return \Illuminate\Database\Eloquent\Collection<TRelatedModel>
      */
     public function createMany(array $records) { }
+
+    /**
+     * @param  array  $attributes
+     * @param  array  $values
+     * @return \Illuminate\Database\Eloquent\Model
+     * @psalm-return TRelatedModel
+     */
+    public function firstOrNew(array $attributes = [], array $values = []) { }
+
+    /**
+     * @param  array  $attributes
+     * @param  array  $values
+     * @return \Illuminate\Database\Eloquent\Model
+     * @psalm-return TRelatedModel
+     */
+    public function firstOrCreate(array $attributes = [], array $values = []) { }
 }

tests/acceptance/EloquentBuilderTypes.feature

@@ -178,7 +178,7 @@ Feature: Eloquent Builder types
     Then I see no errors
 
   Scenario: can call firstOrNew and firstOrCreate without parameters in Laravel 8.x
-    Given I have the "laravel/framework" package satisfying the ">= 8.0"
+    Given I have the "laravel/framework" package satisfying the "^8.0"
     And I have the following code
     """
     /**
@@ -200,6 +200,29 @@ Feature: Eloquent Builder types
     When I run Psalm
     Then I see no errors
 
+  Scenario: can call firstOrNew and firstOrCreate without parameters in Laravel 9.x
+    Given I have the "laravel/framework" package satisfying the "^9.0"
+    And I have the following code
+    """
+    /**
+    * @psalm-param Builder<User> $builder
+    * @psalm-return Builder<User>|User
+    */
+    function test_firstOrCreate(Builder $builder): Builder|User {
+      return $builder->firstOrCreate();
+    }
+
+    /**
+    * @psalm-param Builder<User> $builder
+    * @psalm-return Builder<User>|User
+    */
+    function test_firstOrNew(Builder $builder): Builder|User {
+      return $builder->firstOrNew();
+    }
+    """
+    When I run Psalm
+    Then I see no errors
+
   Scenario: can call whereDate with \DateTimeInterface|string|null
     Given I have the following code
     """