allow recursive Model::withoutTimestamps calls (#52768)

* allow recursive Model::withoutTimestamps calls * cs * cs
laravel · Sep 12, 2024 · 54cf9db · 54cf9db
1 parent 2f3a005
commit 54cf9db
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/Illuminate/Database/Eloquent/Concerns/HasTimestamps.php b/src/Illuminate/Database/Eloquent/Concerns/HasTimestamps.php
@@ -199,7 +199,11 @@ public static function withoutTimestampsOn($models, $callback)
         try {
             return $callback();
         } finally {
-            static::$ignoreTimestampsOn = array_values(array_diff(static::$ignoreTimestampsOn, $models));
+            foreach ($models as $model) {
+                if (($key = array_search($model, static::$ignoreTimestampsOn, true)) !== false) {
+                    unset(static::$ignoreTimestampsOn[$key]);
+                }
+            }
         }
     }
 

diff --git a/tests/Database/DatabaseEloquentTimestampsTest.php b/tests/Database/DatabaseEloquentTimestampsTest.php
@@ -112,6 +112,12 @@ public function testWithoutTimestamp()
         $this->assertTrue($user->usesTimestamps());
 
         $user->withoutTimestamps(function () use ($user) {
+            $this->assertFalse($user->usesTimestamps());
+
+            $user->withoutTimestamps(function () use ($user) {
+                $this->assertFalse($user->usesTimestamps());
+            });
+
             $this->assertFalse($user->usesTimestamps());
             $user->update([
                 'email' => 'bar@example.com',