support route caching with trashed bindings

laravel · Aug 19, 2021 · c3ec2f2 · c3ec2f2
1 parent ac9b6e4
commit c3ec2f2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/Illuminate/Routing/AbstractRouteCollection.php b/src/Illuminate/Routing/AbstractRouteCollection.php
@@ -146,6 +146,7 @@ public function compile()
                 'bindingFields' => $route->bindingFields(),
                 'lockSeconds' => $route->locksFor(),
                 'waitSeconds' => $route->waitsFor(),
+                'withTrashed' => $route->allowsTrashedBindings(),
             ];
         }
 

diff --git a/src/Illuminate/Routing/CompiledRouteCollection.php b/src/Illuminate/Routing/CompiledRouteCollection.php
@@ -302,7 +302,8 @@ protected function newRoute(array $attributes)
             ->setDefaults($attributes['defaults'])
             ->setWheres($attributes['wheres'])
             ->setBindingFields($attributes['bindingFields'])
-            ->block($attributes['lockSeconds'] ?? null, $attributes['waitSeconds'] ?? null);
+            ->block($attributes['lockSeconds'] ?? null, $attributes['waitSeconds'] ?? null)
+            ->withTrashed($attributes['withTrashed'] ?? false);
     }
 
     /**

diff --git a/src/Illuminate/Routing/Route.php b/src/Illuminate/Routing/Route.php
@@ -569,11 +569,12 @@ public function parentOfParameter($parameter)
     /**
      * Allow "trashed" models to be retrieved when resolving implicit model bindings for this route.
      *
+     * @param  bool  $withTrashed
      * @return $this
      */
-    public function withTrashed()
+    public function withTrashed($withTrashed = true)
     {
-        $this->withTrashedBindings = true;
+        $this->withTrashedBindings = $withTrashed;
 
         return $this;
     }