Merge pull request #5 from FarizInk/master

solve issue #4
digital-entropy · Oct 28, 2021 · dba1329 · dba1329
2 parents 47eb37f + e71113c
commit dba1329
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 5 deletions.
diff --git a/src/RouteServiceProvider.php b/src/RouteServiceProvider.php
@@ -45,10 +45,6 @@ public function register(): void
                 Container::getInstance()['router'],
             ]);
 
-            if (! RouterFactory::$fake && ! $this->routesAreCached()) {
-                $factory->register();
-            }
-
             return $factory;
         });
 
@@ -63,11 +59,24 @@ public function register(): void
         }
     }
 
+    protected function loadCachedRoutes()
+    {
+        parent::loadCachedRoutes();
+        $this->app->booted(function () {
+            $routerFactory = $this->app->make(RouterFactory::SERVICE_NAME);
+            $routerFactory->registerBinder();
+        });
+    }
+
     /**
      * @throws \Illuminate\Contracts\Container\BindingResolutionException
      */
     protected function loadRoutes(): void
     {
-        $this->app->make(RouterFactory::SERVICE_NAME);
+        $routerFactory = $this->app->make(RouterFactory::SERVICE_NAME);
+        $routerFactory->registerBinder();
+        if (! RouterFactory::$fake) {
+            $routerFactory->register();
+        }
     }
 }
diff --git a/src/RouterFactory.php b/src/RouterFactory.php
@@ -101,6 +101,25 @@ public function register(): void
         }
     }
 
+    public function registerBinder(): void
+    {
+        $resolver = $this->resolver;
+
+        /**
+         * @var  \Illuminate\Config\Repository $config
+         * @var  Router $router
+         */
+        [$config, $router] = $resolver();
+
+        $binderClass = $config->get('routes.binder');
+
+        if ($binderClass) {
+            $reflectionClass = new ReflectionClass($binderClass);
+            $bindableClass = $reflectionClass->newInstance($router);
+            $bindableClass->bind();
+        }
+    }
+
     protected function resolveRouteFromConfig(Repository $config): void
     {
         $routes = $config->get('routes.groups');