Merge pull request #69 from imanghafoori1/analysis-7a3kJZ

Apply fixes from StyleCI

[ci skip] [skip ci]

Author: imanghafoori1

src/Utils/SlotRenderer.php

@@ -9,40 +9,41 @@ trait SlotRenderer
     protected $slots = [];
 
     /**
-     * Start output buffer to get content of slot and set slot name
-     * 
-     * @param String $name
+     * Start output buffer to get content of slot and set slot name.
+     *
+     * @param string $name
      */
     public function startSlot($name)
     {
-        if (ob_start())
+        if (ob_start()) {
             $this->slotName = $name;
+        }
     }
 
     /**
-     * get slot content from widget block
-     * 
-     * @param String $data
+     * get slot content from widget block.
+     *
+     * @param string $data
      */
-    public function renderSlot($data = "")
+    public function renderSlot($data = '')
     {
         $this->slots[$this->slotName] = $data;
     }
 
     /**
-     * check if widget has any slots
-     * 
-     * @return Boolean
+     * check if widget has any slots.
+     *
+     * @return bool
      */
     public function hasSlots()
     {
-        return !empty($this->slots);
+        return ! empty($this->slots);
     }
 
     /**
-     * get and clean current slots
-     * 
-     * @return Array $slots
+     * get and clean current slots.
+     *
+     * @return array $slots
      */
     public function getSlots()
     {

src/Utils/WidgetRenderer.php

@@ -7,7 +7,7 @@
 class WidgetRenderer
 {
     use SlotRenderer;
-    
+
     public $html;
 
     private $_viewData;

src/WidgetsServiceProvider.php

@@ -19,11 +19,11 @@ public function boot()
     {
         $this->_registerDebugbar();
         $this->publishes([
-            __DIR__ . '/config/config.php' => config_path('widgetize.php'),
+            __DIR__.'/config/config.php' => config_path('widgetize.php'),
         ]);
 
         $this->defineDirectives();
-        $this->loadViewsFrom($this->app->basePath() . '/app/Widgets/', 'Widgets');
+        $this->loadViewsFrom($this->app->basePath().'/app/Widgets/', 'Widgets');
     }
 
     /**
@@ -46,14 +46,15 @@ private function defineDirectives()
             return "<?php echo app(\\Imanghafoori\\Widgets\\Utils\\WidgetRenderer::class)->renderWidget{$expression}; ?>";
         });
 
-        Blade::directive('slotWidget', function ($expression) use ($omitParenthesis)  {
+        Blade::directive('slotWidget', function ($expression) use ($omitParenthesis) {
             $this->expression = $omitParenthesis ? $expression : "($expression)";
         });
 
         $this->defineSlotDirectives($omitParenthesis);
 
         Blade::directive('endSlotWidget', function () {
             $expression = $this->expression;
+
             return "<?php echo app(\\Imanghafoori\\Widgets\\Utils\\WidgetRenderer::class)->renderWidget{$expression}; ?>";
         });
     }
@@ -72,11 +73,13 @@ private function defineSlotDirectives($omitParenthesis)
     {
         Blade::directive('slot', function ($slotName) use ($omitParenthesis) {
             $slotName = $omitParenthesis ? $slotName : "($slotName)";
+
             return "<?php echo app(\\Imanghafoori\\Widgets\\Utils\\WidgetRenderer::class)->startSlot{$slotName};?>";
         });
 
         Blade::directive('endSlot', function () {
             $contentKey = '$content';
+
             return "<?php 
                         $contentKey = ob_get_clean();
                         echo app(\\Imanghafoori\\Widgets\\Utils\\WidgetRenderer::class)->renderSlot($contentKey);
@@ -91,15 +94,15 @@ private function defineSlotDirectives($omitParenthesis)
      */
     public function register()
     {
-        $this->mergeConfigFrom(__DIR__ . '/config/config.php', 'widgetize');
+        $this->mergeConfigFrom(__DIR__.'/config/config.php', 'widgetize');
         $this->commands('command.imanghafoori.widget');
         app(RouteMacros::class)->registerMacros();
         app(SingletonServices::class)->registerSingletons($this->app);
     }
 
     private function _registerDebugbar()
     {
-        if (!$this->app->offsetExists('debugbar')) {
+        if (! $this->app->offsetExists('debugbar')) {
             return;
         }
 

tests/SlotWidgetTest.php

@@ -1,7 +1,7 @@
 <?php
 
 use Illuminate\Support\Facades\View;
-use \Imanghafoori\Widgets\Utils\WidgetRenderer;
+use Imanghafoori\Widgets\Utils\WidgetRenderer;
 
 require_once 'test_stubs.php';
 
@@ -23,7 +23,7 @@ public function test_set_slot()
         $this->assertEquals(false, $renderer->hasSlots());
 
         $renderer->startSlot('message');
-        $renderer->renderSlot("<h1> test set slot </h1>");
+        $renderer->renderSlot('<h1> test set slot </h1>');
         ob_end_clean();
 
         $this->assertEquals(true, $renderer->hasSlots());
@@ -32,7 +32,7 @@ public function test_set_slot()
     public function test_get_then_remove_current_slots()
     {
         $slotName = 'message';
-        $slotContent = "<h1> test set and clean slot </h1>";
+        $slotContent = '<h1> test set and clean slot </h1>';
 
         $renderer = $this->renderer;
 
@@ -87,24 +87,24 @@ public function test_widget_with_many_slots()
 
         $slots = [
             'header_links' => "<a href='#'> login </a>",
-            'message' => "<h1> this is my message </h1>",
-            'footer_links' => "<a href='#'> about us </a>"
+            'message' => '<h1> this is my message </h1>',
+            'footer_links' => "<a href='#'> about us </a>",
         ];
 
         View::shouldReceive('exists')->once()->andReturn(true);
         View::shouldReceive('make')->once()
             ->with('hello', ['data' => 'bbaa', 'params' => ['arg1' => 'a', 'arg2' => 'bb'], 'slots' => $slots], [])->andReturn(app('view'));
         View::shouldReceive('render')->once()->andReturn(implode(',', array_values($slots)));
 
-        foreach($slots as $name => $content) {
+        foreach ($slots as $name => $content) {
             $renderer->startSlot($name);
             $renderer->renderSlot($content);
-            ob_end_clean(); 
+            ob_end_clean();
         }
 
         //act
         $widget = new Widget4();
         $widget->controller = 'Widget4Ctrl@meta';
         $renderer->renderWidget($widget, ['arg1' => 'a', 'arg2' => 'bb']);
     }
-}
+}