LaravelFreelancerNL · LaravelFreelancerNL · Jun 8, 2024 · Jun 8, 2024 · Jun 8, 2024 · Jun 8, 2024
diff --git a/phpstan.neon b/phpstan.neon
@@ -2,11 +2,12 @@ includes:
     - vendor/larastan/larastan/extension.neon
 
 parameters:
-	level: 8
-	checkGenericClassInNonGenericObjectType: false
-	universalObjectCratesClasses:
-	    - 'Illuminate\Support\Fluent'
-	paths:
-		- src
-	excludePaths:
-	    - src/Schema
+    level: 8
+    ignoreErrors:
+        - identifier: missingType.generics
+    universalObjectCratesClasses:
+        - 'Illuminate\Support\Fluent'
+    paths:
+        - src
+    excludePaths:
+        - src/Schema
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -2,11 +2,12 @@ includes:
     - vendor/larastan/larastan/extension.neon
 
 parameters:
-	level: 8
-	checkGenericClassInNonGenericObjectType: false
-	universalObjectCratesClasses:
-	    - 'Illuminate\Support\Fluent'
-	paths:
-		- src
-	excludePaths:
-	    - src/Schema
+    level: 8
+    ignoreErrors:
+        - identifier: missingType.generics
+    universalObjectCratesClasses:
+        - 'Illuminate\Support\Fluent'
+    paths:
+        - src
+    excludePaths:
+        - src/Schema
diff --git a/src/AranguentServiceProvider.php b/src/AranguentServiceProvider.php
@@ -26,10 +26,12 @@ class AranguentServiceProvider extends ServiceProvider
      */
     public function boot()
     {
+        /** @phpstan-ignore offsetAccess.nonOffsetAccessible */
         if (isset($this->app['db'])) {
             Model::setConnectionResolver($this->app['db']);
         }
 
+        /** @phpstan-ignore offsetAccess.nonOffsetAccessible */
         if (isset($this->app['events'])) {
             Model::setEventDispatcher($this->app['events']);
         }

diff --git a/src/Query/Concerns/BuildsUpdates.php b/src/Query/Concerns/BuildsUpdates.php
@@ -4,6 +4,7 @@
 
 namespace LaravelFreelancerNL\Aranguent\Query\Concerns;
 
+use Closure;
 use Illuminate\Database\Query\Expression;
 use Illuminate\Support\Arr;
 use InvalidArgumentException;
@@ -64,13 +65,19 @@ public function update(array $values)
      * Insert or update a record matching the attributes, and fill it with values.
      *
      * @param array<mixed> $attributes
-     * @param array<mixed> $values
+     * @param array<mixed>|callable $values
      * @return bool
      * @throws BindException
      */
-    public function updateOrInsert(array $attributes, array $values = [])
+    public function updateOrInsert(array $attributes, array|callable $values = [])
     {
-        if (!$this->where($attributes)->exists()) {
+        $exists = $this->where($attributes)->exists();
+
+        if ($values instanceof Closure) {
+            $values = $values($exists);
+        }
+
+        if (! $exists) {
             $this->bindings['where'] = [];
             return $this->insert(array_merge($attributes, $values));
         }

diff --git a/tests/Console/MigrateInstallCommandTest.php b/tests/Console/MigrateInstallCommandTest.php
@@ -34,4 +34,4 @@
 
 test('migrate:install --database=none', function () {
     $this->artisan('migrate:install', ['--database' => 'none'])->assertExitCode(0);
-})->throws(ErrorException::class);
+})->throws(InvalidArgumentException::class);
diff --git a/tests/Query/UpdateTest.php b/tests/Query/UpdateTest.php
@@ -67,6 +67,22 @@
         ->and($result->en->words)->toBe($words);
 });
 
+test('updateOrInsert without values', function () {
+    $exists = DB::table('characters')->where('id', 'JaimeLannister')->exists();
+    expect($exists)->toBeTrue();
+
+    $result = DB::table('characters')
+        ->updateOrInsert(["_key" => "JaimeLannister"], []);
+
+    $exists = DB::table('characters')->where('id', 'JaimeLannister')->exists();
+
+    expect($result)->toBeTrue();
+    expect($exists)->toBeTrue();
+});
+
+
+
+
 test('updateOrInsert updates', function () {
     DB::table('characters')
         ->updateOrInsert(["_key" => "NedStark"], ["alive" => false, "age" => 42]);
@@ -96,6 +112,42 @@
     expect($result)->toBeTrue();
 });
 
+test('updateOrInsert inserts with callback', function () {
+    $result = DB::table('characters')->where('id', 'LyannaStark')->exists();
+
+    expect($result)->toBeFalse();
+
+    $data = [
+        "name" => "Lyanna",
+        "surname" => "Stark",
+        "alive" => false,
+        "age" => 25,
+        "residence_id" => "winterfell",
+        "tags" => [],
+    ];
+
+    DB::table('characters')->updateOrInsert(
+        ["_key" => "LyannaStark"],
+        function ($exists) use ($data) {
+            if ($exists) {
+                return [
+                    "name" => "Lyanna",
+                    "surname" => "Stark",
+                ];
+            }
+
+            return [
+                "name" => "Lyanna",
+                "surname" => "Stark",
+                "alive" => $data['alive'],
+            ];
+        },
+    );
+
+    $result = DB::table('characters')->where('id', 'LyannaStark')->exists();
+
+    expect($result)->toBeTrue();
+});
 
 test('increment', function () {
     $youngNed = DB::table('characters')->where('id', 'NedStark')->first();