From 62925b64310bb796dff479aea4acc55a1620d470 Mon Sep 17 00:00:00 2001
From: Olzhas <olzhas.290100@gmail.com>
Date: Thu, 11 Mar 2021 21:08:31 +0600
Subject: [PATCH 1/2] Add resource missing option

---
 .../Routing/PendingResourceRegistration.php      | 13 +++++++++++++
 src/Illuminate/Routing/ResourceRegistrar.php     | 11 +++++++++++
 tests/Routing/RouteRegistrarTest.php             | 16 ++++++++++++++++
 3 files changed, 40 insertions(+)

diff --git a/src/Illuminate/Routing/PendingResourceRegistration.php b/src/Illuminate/Routing/PendingResourceRegistration.php
index 3b6c97e2042d..d2bb33c65de2 100644
--- a/src/Illuminate/Routing/PendingResourceRegistration.php
+++ b/src/Illuminate/Routing/PendingResourceRegistration.php
@@ -195,6 +195,19 @@ public function shallow($shallow = true)
         return $this;
     }
 
+    /**
+     * Define the callable that should be invoked on a missing model exception.
+     *
+     * @param $callback
+     * @return $this
+     */
+    public function missing($callback)
+    {
+        $this->options['missing'] = $callback;
+
+        return $this;
+    }
+
     /**
      * Indicate that the resource routes should be scoped using the given binding fields.
      *
diff --git a/src/Illuminate/Routing/ResourceRegistrar.php b/src/Illuminate/Routing/ResourceRegistrar.php
index c32aa023b4bd..d52264456af1 100644
--- a/src/Illuminate/Routing/ResourceRegistrar.php
+++ b/src/Illuminate/Routing/ResourceRegistrar.php
@@ -20,6 +20,13 @@ class ResourceRegistrar
      */
     protected $resourceDefaults = ['index', 'create', 'store', 'show', 'edit', 'update', 'destroy'];
 
+    /**
+     * Actions that use model binding.
+     *
+     * @var string[]
+     */
+    protected $modelBoundMethods = ['show', 'edit', 'update', 'destroy'];
+
     /**
      * The parameters set for this resource instance.
      *
@@ -421,6 +428,10 @@ protected function getResourceAction($resource, $controller, $method, $options)
             $action['where'] = $options['wheres'];
         }
 
+        if (isset($options['missing']) && in_array($method, $this->modelBoundMethods)) {
+            $action['missing'] = $options['missing'];
+        }
+
         return $action;
     }
 
diff --git a/tests/Routing/RouteRegistrarTest.php b/tests/Routing/RouteRegistrarTest.php
index 47fcb2aa31e5..831ced92fdfb 100644
--- a/tests/Routing/RouteRegistrarTest.php
+++ b/tests/Routing/RouteRegistrarTest.php
@@ -334,6 +334,22 @@ public function testCanRegisterResourcesWithoutOption()
         }
     }
 
+    public function testCanRegisterResourceWithMissingOption()
+    {
+        $this->router->middleware('resource-middleware')
+            ->resource('users', RouteRegistrarControllerStub::class)
+            ->missing(function () { return 'missing'; });
+
+        $this->assertIsCallable($this->router->getRoutes()->getByName('users.show')->getMissing());
+        $this->assertIsCallable($this->router->getRoutes()->getByName('users.edit')->getMissing());
+        $this->assertIsCallable($this->router->getRoutes()->getByName('users.update')->getMissing());
+        $this->assertIsCallable($this->router->getRoutes()->getByName('users.destroy')->getMissing());
+
+        $this->assertNull($this->router->getRoutes()->getByName('users.index')->getMissing());
+        $this->assertNull($this->router->getRoutes()->getByName('users.create')->getMissing());
+        $this->assertNull($this->router->getRoutes()->getByName('users.store')->getMissing());
+    }
+
     public function testCanAccessRegisteredResourceRoutesAsRouteCollection()
     {
         $resource = $this->router->middleware('resource-middleware')

From c887875c23f393e3443b1fd2a8dd0c748e6f13ea Mon Sep 17 00:00:00 2001
From: Olzhas <olzhas.290100@gmail.com>
Date: Thu, 11 Mar 2021 21:25:07 +0600
Subject: [PATCH 2/2] Add resource missing option

---
 src/Illuminate/Routing/ResourceRegistrar.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/Illuminate/Routing/ResourceRegistrar.php b/src/Illuminate/Routing/ResourceRegistrar.php
index d52264456af1..c32de58c291f 100644
--- a/src/Illuminate/Routing/ResourceRegistrar.php
+++ b/src/Illuminate/Routing/ResourceRegistrar.php
@@ -20,13 +20,6 @@ class ResourceRegistrar
      */
     protected $resourceDefaults = ['index', 'create', 'store', 'show', 'edit', 'update', 'destroy'];
 
-    /**
-     * Actions that use model binding.
-     *
-     * @var string[]
-     */
-    protected $modelBoundMethods = ['show', 'edit', 'update', 'destroy'];
-
     /**
      * The parameters set for this resource instance.
      *
@@ -191,6 +184,8 @@ protected function addResourceIndex($name, $base, $controller, $options)
     {
         $uri = $this->getResourceUri($name);
 
+        unset($options['missing']);
+
         $action = $this->getResourceAction($name, $controller, 'index', $options);
 
         return $this->router->get($uri, $action);
@@ -209,6 +204,8 @@ protected function addResourceCreate($name, $base, $controller, $options)
     {
         $uri = $this->getResourceUri($name).'/'.static::$verbs['create'];
 
+        unset($options['missing']);
+
         $action = $this->getResourceAction($name, $controller, 'create', $options);
 
         return $this->router->get($uri, $action);
@@ -227,6 +224,8 @@ protected function addResourceStore($name, $base, $controller, $options)
     {
         $uri = $this->getResourceUri($name);
 
+        unset($options['missing']);
+
         $action = $this->getResourceAction($name, $controller, 'store', $options);
 
         return $this->router->post($uri, $action);
@@ -428,7 +427,7 @@ protected function getResourceAction($resource, $controller, $method, $options)
             $action['where'] = $options['wheres'];
         }
 
-        if (isset($options['missing']) && in_array($method, $this->modelBoundMethods)) {
+        if (isset($options['missing'])) {
             $action['missing'] = $options['missing'];
         }