Bind wizard, cache to service provider

ycs77 · Jun 15, 2019 · 5f21fbe · 5f21fbe
1 parent 570f8dc
commit 5f21fbe
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 11 deletions.
diff --git a/src/CacheManager.php b/src/CacheManager.php
@@ -2,6 +2,7 @@
 
 namespace Ycs77\LaravelWizard;
 
+use Illuminate\Foundation\Application;
 use Illuminate\Support\Manager;
 use Ycs77\LaravelWizard\Wizard;
 
@@ -28,7 +29,7 @@ class CacheManager extends Manager
      * @param  \Illuminate\Contracts\Foundation\Application  $app
      * @return void
      */
-    public function __construct(Wizard $wizard, $app)
+    public function __construct(Wizard $wizard, Application $app)
     {
         $this->app = $app;
         $this->wizard = $wizard;

diff --git a/src/Http/Controllers/WizardController.php b/src/Http/Controllers/WizardController.php
@@ -68,7 +68,8 @@ class WizardController extends Controller
      */
     public function __construct(Wizard $wizard)
     {
-        $this->wizard = $wizard->make($this->wizardName, $this->steps, $this->wizardOptions);
+        $this->wizard = $wizard;
+        $this->wizard->load($this->wizardName, $this->steps, $this->wizardOptions);
     }
 
     /**

diff --git a/src/Wizard.php b/src/Wizard.php
@@ -60,14 +60,14 @@ public function __construct(Application $app)
     }
 
     /**
-     * Make a new wizard.
+     * Load the wizard dependencies.
      *
      * @param  string  $name
      * @param  mixed  $steps
      * @param  array  $options
      * @return self
      */
-    public function make($name, $steps, $options = [])
+    public function load($name, $steps, $options = [])
     {
         $this->setCache();
         $this->setStepRepo();
@@ -76,8 +76,6 @@ public function make($name, $steps, $options = [])
         $this->stepRepo->make($steps);
 
         $this->setOptions($options);
-
-        return $this;
     }
 
     /**
@@ -157,12 +155,12 @@ public function cache()
     /**
      * Set the wizard cache instance.
      *
-     * @param  \Ycs77\LaravelWizard\Contracts\CacheStore|null
+     * @param  \Ycs77\LaravelWizard\Contracts\CacheStore|null $cache
      * @return self
      */
     public function setCache($cache = null)
     {
-        $this->cache = $cache ?? new CacheManager($this, $this->app);
+        $this->cache = $cache ?? $this->app['wizard.cache'];
         return $this;
     }
 
@@ -179,7 +177,7 @@ public function stepRepo()
     /**
      * Set the step repository instance.
      *
-     * @param  \Ycs77\LaravelWizard\StepRepository|null
+     * @param  \Ycs77\LaravelWizard\StepRepository|null $stepRepo
      * @return self
      */
     public function setStepRepo($stepRepo = null)
@@ -201,9 +199,10 @@ public function options()
     /**
      * Get the wizard option.
      *
+     * @param  string  $key
      * @return mixed
      */
-    public function option($key)
+    public function option(string $key)
     {
         return $this->options[$key] ?? null;
     }

diff --git a/src/WizardServiceProvider.php b/src/WizardServiceProvider.php
@@ -11,12 +11,27 @@
 class WizardServiceProvider extends ServiceProvider
 {
     /**
-     * Register services.
+     * Register the service provider.
      *
      * @return void
      */
     public function register()
     {
+        $this->app->singleton('wizard', function ($app) {
+            return new Wizard($app);
+        });
+
+        $this->app->singleton('wizard.cache', function ($app) {
+            return new CacheManager($app['wizard'], $app);
+        });
+
+        $this->app->singleton('wizard.cache.store', function ($app) {
+            return $app['wizard.cache']->driver();
+        });
+
+        $this->app->alias('wizard', Wizard::class);
+        $this->app->alias('wizard.cache', CacheManager::class);
+
         $this->mergeConfigFrom(__DIR__ . '/../config/wizard.php', 'wizard');
     }