Fix widget class reslution

Author: arrilot

src/Factories/AbstractWidgetFactory.php

@@ -113,16 +113,14 @@ protected function instantiateWidget(array $params = [])
 
         $rootNamespace = $this->app->config('laravel-widgets.default_namespace', $this->app->getNamespace().'Widgets');
 
-        $widgetClass = class_exists($this->widgetName)
-            ? $this->widgetName
-            : $rootNamespace.'\\'.$this->widgetName;
+        $fqcn = $rootNamespace.'\\'.$this->widgetName;
+        $widgetClass = class_exists($fqcn) ? $fqcn : $this->widgetName;
 
-        $widget = new $widgetClass($this->widgetConfig);
-        if ($widget instanceof AbstractWidget === false) {
-            throw new InvalidWidgetClassException();
+        if (!is_subclass_of($widgetClass, 'Arrilot\Widgets\AbstractWidget')) {
+            throw new InvalidWidgetClassException('Class "'.$widgetClass.'" must extend "Arrilot\Widgets\AbstractWidget" class');
         }
 
-        $this->widget = $widget;
+        $this->widget = new $widgetClass($this->widgetConfig);
     }
 
     /**

tests/Dummies/Exception.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Arrilot\Widgets\Test\Dummies;
+
+use Arrilot\Widgets\AbstractWidget;
+
+class Exception extends AbstractWidget
+{
+    public function run()
+    {
+        return "Exception widget was executed instead of predefined php class";
+    }
+}

tests/WidgetFactoryTest.php

@@ -69,6 +69,13 @@ public function testItCanRunWidgetsUsingFQCN()
         $this->assertEquals('Default test slider was executed with $slides = 6', $output);
     }
 
+    public function testItLoadsWidgetsFromRootNamespaceFirst()
+    {
+        $output = $this->factory->run('Exception');
+
+        $this->assertEquals('Exception widget was executed instead of predefined php class', $output);
+    }
+
     public function testItCanRunNestedWidgets()
     {
         $output = $this->factory->run('Profile\TestNamespace\TestFeed');