Merge pull request vyuldashev#57 from zlodes/service-provider-refactoring

Move bindings to the register method

Author: vyuldashev

src/OpenApiServiceProvider.php

@@ -4,6 +4,7 @@
 
 namespace Vyuldashev\LaravelOpenApi;
 
+use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Support\Collection;
 use Illuminate\Support\ServiceProvider;
 use Vyuldashev\LaravelOpenApi\Builders\Components\CallbacksBuilder;
@@ -19,13 +20,12 @@
 
 class OpenApiServiceProvider extends ServiceProvider
 {
-    public function boot(): void
+    public function register(): void
     {
-        if ($this->app->runningInConsole()) {
-            $this->publishes([
-                __DIR__.'/../config/openapi.php' => config_path('openapi.php'),
-            ], 'openapi-config');
-        }
+        $this->mergeConfigFrom(
+            __DIR__.'/../config/openapi.php',
+            'openapi'
+        );
 
         $this->app->bind(CallbacksBuilder::class, function () {
             return new CallbacksBuilder($this->getPathsFromConfig('callbacks'));
@@ -47,29 +47,19 @@ public function boot(): void
             return new SecuritySchemesBuilder($this->getPathsFromConfig('security_schemes'));
         });
 
-        $this->app->singleton(Generator::class, static function ($app) {
+        $this->app->singleton(Generator::class, static function (Application $app) {
             $config = config('openapi');
 
             return new Generator(
                 $config,
-                $app[InfoBuilder::class],
-                $app[ServersBuilder::class],
-                $app[TagsBuilder::class],
-                $app[PathsBuilder::class],
-                $app[ComponentsBuilder::class]
+                $app->make(InfoBuilder::class),
+                $app->make(ServersBuilder::class),
+                $app->make(TagsBuilder::class),
+                $app->make(PathsBuilder::class),
+                $app->make(ComponentsBuilder::class)
             );
         });
 
-        $this->loadRoutesFrom(__DIR__.'/../routes/api.php');
-    }
-
-    public function register(): void
-    {
-        $this->mergeConfigFrom(
-            __DIR__.'/../config/openapi.php',
-            'openapi'
-        );
-
         $this->commands([
             Console\GenerateCommand::class,
         ]);
@@ -87,6 +77,17 @@ public function register(): void
         }
     }
 
+    public function boot(): void
+    {
+        if ($this->app->runningInConsole()) {
+            $this->publishes([
+                __DIR__.'/../config/openapi.php' => config_path('openapi.php'),
+            ], 'openapi-config');
+        }
+
+        $this->loadRoutesFrom(__DIR__.'/../routes/api.php');
+    }
+
     private function getPathsFromConfig(string $type): array
     {
         $directories = config('openapi.locations.'.$type, []);