Refactor MacroServiceProvider

Author: populov

src/Providers/ControllersServiceProvider.php

@@ -2,7 +2,6 @@
 
 namespace Saritasa\Laravel\Controllers\Providers;
 
-use App\Providers\MacroServiceProvider;
 use Illuminate\Support\ServiceProvider;
 
 class ControllersServiceProvider extends ServiceProvider

src/Providers/MacroServiceProvider.php

@@ -1,57 +1,62 @@
 <?php
 
-namespace App\Providers;
+namespace Saritasa\Laravel\Controllers\Providers;
 
 use Html;
-use Illuminate\Support\Facades\Config;
 use Illuminate\Support\ServiceProvider;
 
 class MacroServiceProvider extends ServiceProvider
 {
-
     public function boot()
     {
+        $this->registerScriptLinkMacro();
+        $this->registerStyleLinkMacro();
+    }
 
-        // Html macro for generate html tag for include javascript file
-        // example of usage: {!! HTML::scriptLink('/assets/js/bower.js') !!}
-        HTML::macro('scriptLink', function($src, $hasMinified = true, $hasVersioning = true)
-        {
-            $revisions = Config::get('revision.files');
+    /**
+     * Register any application services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+    }
 
-            if ($hasMinified && !Config::get('app.debug')) {
+    /**
+     * Html macro for generate html tag for include javascript file
+     * example of usage: {!! HTML::scriptLink('/assets/js/bower.js') !!}
+     */
+    public function registerScriptLinkMacro()
+    {
+        HTML::macro('scriptLink', function ($src, $hasMinified = true, $hasVersioning = true) {
+            $revisions = config('revision.files');
+
+            if ($hasMinified && !config('app.debug')) {
                 $src = str_replace('.js', '.min.js', $src);
             }
             if ($hasVersioning) {
-                $src .= (isset($revisions[ltrim($src, '/')]) ? '?'.$revisions[ltrim($src, '/')] : '');
+                $src .= (isset($revisions[ltrim($src, '/')]) ? '?' . $revisions[ltrim($src, '/')] : '');
             }
             return "<script src=\"$src\"></script>";
         });
+    }
 
-        // Html macro for generate html tag for include css file
-        // example of usage: {!! HTML::styleLink('/assets/css/bower.css') !!}
-        HTML::macro('styleLink', function($href, $hasMinified = true, $hasVersioning = true)
-        {
-            $revisions = Config::get('revision.files');
+    /**
+     * Html macro for generate html tag for include css file
+     * example of usage: {!! HTML::styleLink('/assets/css/bower.css') !!}
+     */
+    public function registerStyleLinkMacro()
+    {
+        HTML::macro('styleLink', function ($href, $hasMinified = true, $hasVersioning = true) {
+            $revisions = config('revision.files');
 
-            if ($hasMinified && !Config::get('app.debug')) {
+            if ($hasMinified && !config('app.debug')) {
                 $href = str_replace('.css', '.min.css', $href);
             }
             if ($hasVersioning) {
-                $href .= (isset($revisions[ltrim($href, '/')]) ? '?'.$revisions[ltrim($href, '/')] : '');
+                $href .= (isset($revisions[ltrim($href, '/')]) ? '?' . $revisions[ltrim($href, '/')] : '');
             }
             return "<link rel=\"stylesheet\" href=\"$href\">";
         });
-
-
-    }
-
-    /**
-     * Register any application services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-
     }
 }