Extract widget groups from WidgetFactory

Author: arrilot

src/Facade.php

@@ -8,4 +8,16 @@ protected static function getFacadeAccessor()
     {
         return 'arrilot.widget';
     }
+
+    /**
+     * Get the widget group object.
+     *
+     * @param $name
+     *
+     * @return WidgetGroup
+     */
+    public static function group($name)
+    {
+        return app('arrilot.widget-group-collection')->group($name);
+    }
 }

src/Factories/WidgetFactory.php

@@ -2,17 +2,8 @@
 
 namespace Arrilot\Widgets\Factories;
 
-use Arrilot\Widgets\WidgetGroup;
-
 class WidgetFactory extends AbstractWidgetFactory
 {
-    /**
-     * The array of widget groups.
-     *
-     * @var array
-     */
-    protected $groups;
-
     /**
      * Run widget without magic method.
      *
@@ -33,24 +24,6 @@ public function run()
         return $this->convertToViewExpression($content);
     }
 
-    /**
-     * Get the widget group object.
-     *
-     * @param $name
-     *
-     * @return mixed
-     */
-    public function group($name)
-    {
-        if (isset($this->groups[$name])) {
-            return $this->groups[$name];
-        }
-
-        $this->groups[$name] = new WidgetGroup($name, $this->app);
-
-        return $this->groups[$name];
-    }
-
     /**
      * Get widget reload timeout or false if it's not reloadable.
      *

src/ServiceProvider.php

@@ -31,6 +31,10 @@ public function register()
         $this->app->bind('arrilot.async-widget', function () {
             return new AsyncWidgetFactory(new LaravelApplicationWrapper());
         });
+    
+        $this->app->singleton('arrilot.widget-group-collection', function () {
+            return new WidgetGroupCollection(new LaravelApplicationWrapper());
+        });
 
         $this->app->singleton('command.widget.make', function ($app) {
             return new WidgetMakeCommand($app['files']);
@@ -40,6 +44,7 @@ public function register()
 
         $this->app->alias('arrilot.widget', 'Arrilot\Widgets\Factories\WidgetFactory');
         $this->app->alias('arrilot.async-widget', 'Arrilot\Widgets\Factories\AsyncWidgetFactory');
+        $this->app->alias('arrilot.widget-group-collection', 'Arrilot\Widgets\WidgetGroupCollection');
     }
 
     /**
@@ -67,7 +72,7 @@ public function boot()
         $this->registerBladeDirective('widget', '$1<?php echo app("arrilot.widget")->run$2; ?>');
         $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 Widget::group$2->display(); ?>');
+        $this->registerBladeDirective('widgetGroup', '$1<?php echo  app("arrilot.widget-group-collection")->group$2->display(); ?>');
     }
 
     /**

src/WidgetGroupCollection.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Arrilot\Widgets;
+
+use Arrilot\Widgets\Contracts\ApplicationWrapperContract;
+
+class WidgetGroupCollection
+{
+    
+    /**
+     * The array of widget groups.
+     *
+     * @var array
+     */
+    protected $groups;
+
+    /**
+     * Constructor.
+     *
+     * @param ApplicationWrapperContract $app
+     */
+    public function __construct(ApplicationWrapperContract $app)
+    {
+        $this->app = $app;
+    }
+
+    /**
+     * Get the widget group object.
+     *
+     * @param $name
+     *
+     * @return WidgetGroup
+     */
+    public function group($name)
+    {
+        if (isset($this->groups[$name])) {
+            return $this->groups[$name];
+        }
+
+        $this->groups[$name] = new WidgetGroup($name, $this->app);
+
+        return $this->groups[$name];
+    }
+}

tests/WidgetFactoryTest.php

@@ -152,13 +152,4 @@ public function testItCanCacheWidgets()
 
         $this->assertEquals('Cached output. Key: '.$key.', minutes: '.$widget->cacheTime, $output);
     }
-
-    public function testItGrantsAccessToWidgetGroup()
-    {
-        $groupObject = $this->factory->group('sidebar');
-
-        $expectedObject = new WidgetGroup('sidebar', new TestApplicationWrapper());
-
-        $this->assertEquals($expectedObject, $groupObject);
-    }
 }

tests/WidgetGroupCollectionTest.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Arrilot\Widgets\Test;
+
+use Arrilot\Widgets\Factories\WidgetFactory;
+use Arrilot\Widgets\Test\Dummies\TestCachedWidget;
+use Arrilot\Widgets\Test\Support\TestApplicationWrapper;
+use Arrilot\Widgets\Test\Support\TestCase;
+use Arrilot\Widgets\WidgetGroup;
+use Arrilot\Widgets\WidgetGroupCollection;
+
+class WidgetGroupCollectionTest extends TestCase
+{
+    /**
+     * @var WidgetGroupCollection
+     */
+    protected $collection;
+
+    public function setUp()
+    {
+        $this->collection = new WidgetGroupCollection(new TestApplicationWrapper());
+    }
+
+    public function testItGrantsAccessToWidgetGroup()
+    {
+        $groupObject = $this->collection->group('sidebar');
+
+        $expectedObject = new WidgetGroup('sidebar', new TestApplicationWrapper());
+
+        $this->assertEquals($expectedObject, $groupObject);
+    }
+}