Merge pull request #24 from dducro/MakeDbViewInjectableByContainer

Make db view injectable by container

Author: Flynsarmy

Diff for: .gitignore

@@ -1,4 +1,5 @@
 /vendor
 composer.phar
 composer.lock
-.DS_Store
+.DS_Store
+.idea

Diff for: composer.json

@@ -7,13 +7,12 @@
         {
             "name": "Flyn San",
             "email": "[email protected]"
+        },
+        {
+            "name": "Ebrahim Radi",
+            "email": "[email protected]",
+            "homepage": "http://me2bits.com"
         }
-      ,
-      {
-        "name": "Ebrahim Radi",
-        "email": "[email protected]",
-        "homepage": "http://me2bits.com"
-      }
     ],
     "require": {
         "php": ">=5.3.0"
@@ -24,4 +23,4 @@
         }
     },
     "minimum-stability": "stable"
-}
+}

Diff for: src/Flynsarmy/DbBladeCompiler/DbBladeCompiler.php

@@ -1,32 +1,34 @@
 <?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();
 
         parent::__construct($filesystem, $cache_path);
-        $this->rawTags = $blade->getRawTags();
-        $this->contentTags = $blade->getContentTags();
-        $this->escapedTags = $blade->getEscapedContentTags();
-        $this->extensions = $blade->getExtensions();
+        $this->rawTags          = $blade->getRawTags();
+        $this->contentTags      = $blade->getContentTags();
+        $this->escapedTags      = $blade->getEscapedContentTags();
+        $this->extensions       = $blade->getExtensions();
         $this->customDirectives = $blade->getCustomDirectives();
-        $this->config = $config;
+        $this->config           = $config;
     }
 
     /**
      * 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)
@@ -61,7 +63,7 @@ public function getCompiledPath($model)
          * e.g db_table_name_id_4
          */
         $field = $this->config->get('db-blade-compiler.model_property');
-        $path = 'db_' . $model->getTable() . '_' . $model->{$field} . '_';
+        $path  = 'db_' . $model->getTable() . '_' . $model->{$field} . '_';
         if (is_null($model->primaryKey)) {
             $path .= $model->id;
         } else if (is_array($model->primaryKey)) {
@@ -78,7 +80,7 @@ public function getCompiledPath($model)
     /**
      * Determine if the view at the given path is expired.
      *
-     * @param  string  $path
+     * @param  string $path
      * @return bool
      */
     public function isExpired($path)

Diff for: 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);
+    }
+}

Diff for: src/Flynsarmy/DbBladeCompiler/DbBladeCompilerServiceProvider.php

@@ -3,64 +3,64 @@
 use Illuminate\Support\ServiceProvider;
 use Illuminate\View\Engines\CompilerEngine;
 
-class DbBladeCompilerServiceProvider extends ServiceProvider {
+class DbBladeCompilerServiceProvider extends ServiceProvider
+{
 
-	/**
-	 * Indicates if loading of the provider is deferred.
-	 *
-	 * @var bool
-	 */
-	protected $defer = false;
+    /**
+     * Indicates if loading of the provider is deferred.
+     *
+     * @var bool
+     */
+    protected $defer = false;
 
-	/**
-	 * Bootstrap the application events.
-	 *
-	 * @return void
-	 */
-	public function boot()
-	{
-    $config_path = __DIR__ . '/../../../config/db-blade-compiler.php';
-    $this->publishes([$config_path => config_path('db-blade-compiler.php')], 'config');
+    /**
+     * Bootstrap the application events.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        $config_path = __DIR__ . '/../../../config/db-blade-compiler.php';
+        $this->publishes([$config_path => config_path('db-blade-compiler.php')], 'config');
 
-    $views_path = __DIR__ . '/../../../config/.gitkeep';
-    $this->publishes([$views_path => storage_path('app/db-blade-compiler/views/.gitkeep')]);
-	}
+        $views_path = __DIR__ . '/../../../config/.gitkeep';
+        $this->publishes([$views_path => storage_path('app/db-blade-compiler/views/.gitkeep')]);
+    }
 
-	/**
-	 * Register the service provider.
-	 *
-	 * @return void
-	 */
-	public function register()
-	{
-    $config_path = __DIR__ . '/../../../config/db-blade-compiler.php';
-    $this->mergeConfigFrom($config_path, 'db-blade-compiler');
+    /**
+     * Register the service provider.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        $config_path = __DIR__ . '/../../../config/db-blade-compiler.php';
+        $this->mergeConfigFrom($config_path, 'db-blade-compiler');
 
-    $this->app['dbview'] = $this->app->share(function($app)
-        {
-        $cache_path = storage_path('app/db-blade-compiler/views');
+        $this->app['dbview'] = $this->app->share(function ($app) {
+            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');
+
+        $this->app->booting(function () {
+            $loader = \Illuminate\Foundation\AliasLoader::getInstance();
+            $loader->alias('DbView', DbView::class);
         });
-	}
+    }
 
-	/**
-	 * Get the services provided by the provider.
-	 *
-	 * @return array
-	 */
-	public function provides()
-	{
-		return array();
-	}
+    /**
+     * Get the services provided by the provider.
+     *
+     * @return array
+     */
+    public function provides()
+    {
+        return array();
+    }
 
 }