Merge pull request #49 from Clarence-pan/master

Fix bug: when a CRLF is in @widget, blade will complains! It is not s…

Author: arrilot

src/ServiceProvider.php

@@ -70,10 +70,20 @@ public function boot()
             });
         }
 
-        $this->registerBladeDirective('widget', '$1<?php echo app("arrilot.widget")->run$2; ?>');
+        Blade::directive('widget', function ($expression) {
+            return "<?php echo app('arrilot.widget')->run{$expression}; ?>";
+        });
+
+        // Blade::directive cannot recognize @async-widget, so @async-widget still use the custom matcher.
         $this->registerBladeDirective('async-widget', '$1<?php echo app("arrilot.async-widget")->run$2; ?>');
-        $this->registerBladeDirective('asyncWidget', '$1<?php echo app("arrilot.async-widget")->run$2; ?>');
-        $this->registerBladeDirective('widgetGroup', '$1<?php echo  app("arrilot.widget-group-collection")->group$2->display(); ?>');
+
+        Blade::directive('asyncWidget', function ($expression) {
+            return "<?php echo app('arrilot.async-widget')->run{$expression}; ?>";
+        });
+
+        Blade::directive('widgetGroup', function ($expression) {
+            return "<?php echo app('arrilot.widget-group-collection')->group{$expression}->display(); ?>";
+        });
     }
 
     /**