Bug fixed.

izniburak · May 6, 2021 · 9666905 · 9666905
1 parent 45bff94
commit 9666905
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 24 deletions.
diff --git a/src/AutoRoute.php b/src/AutoRoute.php
@@ -11,7 +11,7 @@
  * Class AutoRoute
  *
  * @package Buki\AutoRoute
- * @author İzni Burak Demirtaş <info@burakdemirtasorg>
+ * @author  İzni Burak Demirtaş <info@burakdemirtasorg>
  */
 class AutoRoute
 {
@@ -64,7 +64,22 @@ public function __construct(Container $app)
     {
         $this->app = $app;
         $this->router = $app->get('router');
-        $this->init($this->app['config']->get('auto-route'));
+    }
+
+    /**
+     * Initialize for the AutoRoute
+     *
+     * @param array $config
+     */
+    public function setConfigurations(array $config): void
+    {
+        $this->mainMethod = $config['main_method'] ?? 'index';
+        $this->namespace = $config['namespace'] ?? 'App\\Http\\Controllers';
+        $this->defaultPatterns = array_merge($this->defaultPatterns, $config['patterns'] ?? []);
+        $this->defaultHttpMethods = $config['http_methods'] ?? $this->availableMethods;
+        if (empty($this->defaultHttpMethods) || $this->defaultHttpMethods === '*') {
+            $this->defaultHttpMethods = $this->availableMethods;
+        }
     }
 
     /**
@@ -110,7 +125,9 @@ public function auto(string $prefix, string $controller, array $options = []): v
                 function () use ($endpoints, $methodName, $method, $httpMethods, $routePatterns) {
                     $endpoints = implode('/', $endpoints);
                     $this->router->addRoute(
-                        array_map(function($method) { return strtoupper($method); }, $httpMethods),
+                        array_map(function ($method) {
+                            return strtoupper($method);
+                        }, $httpMethods),
                         ($methodName !== $this->mainMethod ? $methodName : '') . "/{$endpoints}",
                         [$method->class, $method->name]
                     )->where($routePatterns)->name(".{$methodName}");
@@ -180,21 +197,4 @@ private function resolveControllerName(string $controller): array
             $controller,
         ];
     }
-
-    /**
-     * Initialize for the AutoRoute
-     *
-     * @param array $config
-     */
-    private function init(array $config): void
-    {
-        $this->mainMethod = $config['main_method'] ?? 'index';
-        $this->namespace = $config['namespace'] ?? 'App\\Http\\Controllers';
-        $this->defaultPatterns = array_merge($this->defaultPatterns, $config['patterns'] ?? []);
-        $this->defaultHttpMethods = $config['http_methods'] ?? $this->availableMethods;
-        if (empty($this->defaultHttpMethods) || $this->defaultHttpMethods === '*') {
-            $this->defaultHttpMethods = $this->availableMethods;
-        }
-    }
 }
-
diff --git a/src/AutoRouteServiceProvider.php b/src/AutoRouteServiceProvider.php
@@ -9,7 +9,7 @@
  * Class AutoRouteServiceProvider
  *
  * @package Buki\AutoRoute
- * @author İzni Burak Demirtaş <info@burakdemirtasorg>
+ * @author  İzni Burak Demirtaş <info@burakdemirtasorg>
  */
 class AutoRouteServiceProvider extends ServiceProvider
 {
@@ -21,7 +21,7 @@ class AutoRouteServiceProvider extends ServiceProvider
     public function boot()
     {
         $this->publishes([
-            $this->configPath() => config_path('auto-route.php')
+            $this->configPath() => config_path('auto-route.php'),
         ], 'auto-route');
     }
 
@@ -32,9 +32,11 @@ public function boot()
      */
     public function register()
     {
-        $this->mergeConfigFrom($this->configPath(), 'auto-router');
+        $this->mergeConfigFrom($this->configPath(), 'auto-route');
         $this->app->singleton(AutoRoute::class, function ($app) {
-            return new AutoRoute($app);
+            $autoRouter = new AutoRoute($app);
+            $autoRouter->setConfigurations($app['config']->get('auto-route'));
+            return $autoRouter;
         });
 
         /** @var Router $router */