inject DbBladeCompilerEngine in DbView, bind DbBladeCompiler, created DbBladeCompilerEngine

Author: dducro

src/Flynsarmy/DbBladeCompiler/DbBladeCompiler.php

@@ -1,15 +1,17 @@
 <?php namespace Flynsarmy\DbBladeCompiler;
 
+use Illuminate\Config\Repository;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\View\Compilers\BladeCompiler;
 use Illuminate\View\Compilers\CompilerInterface;
 
 class DbBladeCompiler extends BladeCompiler implements CompilerInterface
 {
 
-    /** @var \Illuminate\Config\Repository */
+    /** @var Repository */
     protected $config;
 
-    public function __construct($filesystem, $cache_path, $config, $app)
+    public function __construct($filesystem, $cache_path, Repository $config)
     {
         // Get Current Blade Instance
         $blade = app('view')->getEngineResolver()->resolve('blade')->getCompiler();
@@ -26,7 +28,7 @@ public function __construct($filesystem, $cache_path, $config, $app)
     /**
      * Compile the view at the given path.
      *
-     * @param  Illuminate\Database\Eloquent\Model $path
+     * @param  Model $path
      * @return void
      */
     public function compile($path)
@@ -48,7 +50,7 @@ public function compile($path)
     /**
      * Get the path to the compiled version of a view.
      *
-     * @param  Illuminate\Database\Eloquent\Model $model
+     * @param  Model $model
      * @return string
      */
     public function getCompiledPath($model)

src/Flynsarmy/DbBladeCompiler/DbBladeCompilerEngine.php

@@ -0,0 +1,16 @@
+<?php namespace Flynsarmy\DbBladeCompiler;
+
+use Illuminate\View\Engines\CompilerEngine;
+
+class DbBladeCompilerEngine extends CompilerEngine
+{
+    /**
+     * DbBladeCompilerEngine constructor.
+     *
+     * @param DbBladeCompiler $bladeCompiler
+     */
+    public function __construct(DbBladeCompiler $bladeCompiler)
+    {
+        parent::__construct($bladeCompiler);
+    }
+}

src/Flynsarmy/DbBladeCompiler/DbBladeCompilerServiceProvider.php

@@ -38,17 +38,18 @@ public function register()
         $this->mergeConfigFrom($config_path, 'db-blade-compiler');
 
         $this->app['dbview'] = $this->app->share(function ($app) {
-            $cache_path = storage_path('app/db-blade-compiler/views');
+            return $app->make(DbView::class);
+        });
 
-            $db_view  = new DbView($app['config']);
-            $compiler = new DbBladeCompiler($app['files'], $cache_path, $app['config'], $app);
-            $db_view->setEngine(new CompilerEngine($compiler));
+        $this->app->bind(DbBladeCompiler::class, function($app) {
+            $cache_path = storage_path('app/db-blade-compiler/views');
 
-            return $db_view;
+            return new DbBladeCompiler($app['files'], $cache_path, $app['config']);
         });
+
         $this->app->booting(function () {
             $loader = \Illuminate\Foundation\AliasLoader::getInstance();
-            $loader->alias('DbView', 'Flynsarmy\DbBladeCompiler\Facades\DbView');
+            $loader->alias('DbView', DbView::class);
         });
     }
 

src/Flynsarmy/DbBladeCompiler/DbView.php

@@ -4,7 +4,6 @@
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Config\Repository;
-use Illuminate\View\Engines\EngineInterface;
 use Illuminate\Database\Eloquent\Model;
 
 class DbView extends \Illuminate\View\View implements ArrayAccess, Renderable
@@ -15,20 +14,16 @@ class DbView extends \Illuminate\View\View implements ArrayAccess, Renderable
     /** @var Repository */
     protected $config;
 
-    public function __construct(Repository $config)
-    {
-        $this->config = $config;
-    }
-
     /**
-     * @param EngineInterface $compiler
-     * @return DbView
+     * DbView constructor.
+     *
+     * @param Repository            $config
+     * @param DbBladeCompilerEngine $engine
      */
-    public function setEngine(EngineInterface $compiler)
+    public function __construct(Repository $config, DbBladeCompilerEngine $engine)
     {
-        $this->engine = $compiler;
-
-        return $this;
+        $this->config = $config;
+        $this->engine = $engine;
     }
 
     /**