Add affordance to restore queries while preparing response

Author: timacdonald

src/Illuminate/Database/Connection.php

@@ -850,7 +850,6 @@ public function allowQueries($callback = null)
         }
     }
 
-
     /**
      * Register a callback to be invoked when the connection queries for longer than a given amount of time.
      *

src/Illuminate/Foundation/Application.php

@@ -1425,7 +1425,8 @@ public function getNamespace()
                 if (realpath($this->path()) === realpath($this->basePath($pathChoice))) {
                     return $this->namespace = $namespace;
                 }
-            } }
+            }
+        }
 
         throw new RuntimeException('Unable to detect application namespace.');
     }
@@ -1444,4 +1445,17 @@ public function preventQueriesWhilePreparingResponse($connection = null)
 
         return $this;
     }
+
+    /**
+     * Restores ability for database to query while preparing the request response.
+     *
+     * @param  string|null  $connection
+     * @return $this
+     */
+    public function allowQueriesWhilePreparingResponse($connection = null)
+    {
+        $this['events']->listen(PreparingResponse::class, fn () => $this['db']->connection($connection)->allowQueries());
+
+        return $this;
+    }
 }

tests/Database/DatabaseConnectionTest.php

@@ -516,7 +516,7 @@ public function testItCanBeNested()
                     return $isActive().$connection->allowQueries(function () use ($connection, $isActive) {
                         return $isActive().$connection->preventQueries(function () use ($connection, $isActive) {
                             return $isActive().$connection->preventQueries(function () use ($connection, $isActive) {
-                                return $isActive().$connection->allowQueries(function () use ($connection, $isActive) {
+                                return $isActive().$connection->allowQueries(function () use ($isActive) {
                                     return $isActive();
                                 }).$isActive();
                             }).$isActive();

tests/Integration/Foundation/ApplicationTest.php

@@ -2,7 +2,6 @@
 
 namespace Illuminate\Tests\Integration\Foundation;
 
-use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Route;
@@ -52,7 +51,8 @@ public function testItCanThrowOnJsonResourceResolution()
         Route::get('test-route', function () {
             DB::table('foo')->get();
 
-            return new class('xxxx') extends JsonResource {
+            return new class('xxxx') extends JsonResource
+            {
                 public function toArray($request)
                 {
                     return [
@@ -80,7 +80,8 @@ public function testItCanRunQueriesAfterResponseResolved()
             $table->id();
         });
         Route::get('test-route', function () {
-            return new class('xxxx') extends JsonResource {
+            return new class('xxxx') extends JsonResource
+            {
                 public function toArray($request)
                 {
                     return [
@@ -97,6 +98,32 @@ public function toArray($request)
 
         $this->assertCount(1, DB::getQueryLog());
     }
+
+    public function testItcanRestoreValue()
+    {
+        Schema::create('foo', function ($table) {
+            $table->id();
+        });
+        Route::get('test-route', function () {
+            return new class('xxxx') extends JsonResource
+            {
+                public function toArray($request)
+                {
+                    return [
+                        //
+                    ];
+                }
+            };
+        })->middleware(TestMiddleware::class);
+        DB::enableQueryLog();
+        $this->withoutExceptionHandling();
+
+        $this->app->preventQueriesWhilePreparingResponse();
+        $this->app->allowQueriesWhilePreparingResponse();
+        $this->get('test-route')->assertOk();
+
+        $this->assertCount(1, DB::getQueryLog());
+    }
 }
 
 class TestMiddleware