From 285b46fafb986da163faf92eec99db4bb67ad5ca Mon Sep 17 00:00:00 2001
From: Raissa North <raissa@silverstripe.com>
Date: Mon, 18 Dec 2017 16:30:49 +1300
Subject: [PATCH] FIX Add and optimise namespaces

---
 lang/en.yml                                         | 10 +++++-----
 src/Controllers/WidgetController.php                |  2 --
 src/Model/Widget.php                                |  1 -
 src/Model/WidgetArea.php                            |  1 -
 tests/WidgetAreaEditorTest.php                      |  5 +----
 tests/WidgetControllerTest.php                      |  8 +-------
 tests/WidgetControllerTest/TestWidgetController.php |  2 +-
 7 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/lang/en.yml b/lang/en.yml
index 4d96be6..d42321f 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -1,19 +1,19 @@
 en:
-  Widget:
+  SilverStripe\Widgets\Model\Widget:
     PLURALNAME: Widgets
     SINGULARNAME: Widget
-  WidgetArea:
+  SilverStripe\Widgets\Model\WidgetArea:
     PLURALNAME: 'Widget Areas'
     SINGULARNAME: 'Widget Area'
-  WidgetAreaEditor_ss:
+  SilverStripe\Widgets\Templates\SilverStripe\Widgets\Forms\WidgetAreaEditor_ss:
     AVAILABLE: 'Available Widgets'
     AVAILWIDGETS: 'Click a widget title below to use it on this page.'
     INUSE: 'Widgets currently used'
     NOAVAIL: 'There are currently no widgets available.'
     TOSORT: 'To sort currently used widgets on this page, drag them up and down.'
-  WidgetDescription_ss:
+  SilverStripe\Widgets\Templates\WidgetDescription_ss:
     CLICKTOADDWIDGET: 'Click to add this widget'
-  WidgetEditor_ss:
+  SilverStripe\Widgets\Templates\WidgetEditor_ss:
     DELETE: Delete
   WidgetPageExtension:
     INHERITSIDEBAR: 'Inherit Sidebar From Parent'
diff --git a/src/Controllers/WidgetController.php b/src/Controllers/WidgetController.php
index be09e7a..0dbc6aa 100644
--- a/src/Controllers/WidgetController.php
+++ b/src/Controllers/WidgetController.php
@@ -6,8 +6,6 @@ use SilverStripe\Admin\LeftAndMain;
 use SilverStripe\Control\Controller;
 use SilverStripe\Control\Director;
 use SilverStripe\Core\ClassInfo;
-use SilverStripe\i18n\i18n;
-use SilverStripe\Security\Member;
 use SilverStripe\Widgets\Model\Widget;
 
 /**
diff --git a/src/Model/Widget.php b/src/Model/Widget.php
index 210f552..cec10c0 100644
--- a/src/Model/Widget.php
+++ b/src/Model/Widget.php
@@ -10,7 +10,6 @@ use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\HiddenField;
 use SilverStripe\Forms\TextField;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Widgets\Model\WidgetArea;
 
 /**
  * Widgets let CMS authors drag and drop small pieces of functionality into
diff --git a/src/Model/WidgetArea.php b/src/Model/WidgetArea.php
index c371ca3..dbd862f 100644
--- a/src/Model/WidgetArea.php
+++ b/src/Model/WidgetArea.php
@@ -4,7 +4,6 @@ namespace SilverStripe\Widgets\Model;
 
 use SilverStripe\ORM\ArrayList;
 use SilverStripe\ORM\DataObject;
-use SilverStripe\Widgets\Model\Widget;
 
 /**
  * Represents a set of widgets shown on a page.
diff --git a/tests/WidgetAreaEditorTest.php b/tests/WidgetAreaEditorTest.php
index b67dc3f..0945ac4 100644
--- a/tests/WidgetAreaEditorTest.php
+++ b/tests/WidgetAreaEditorTest.php
@@ -2,17 +2,14 @@
 
 namespace SilverStripe\Widgets\Tests;
 
-use Page;
 use SilverStripe\CMS\Controllers\ContentController;
 use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Control\HTTPRequest;
+use SilverStripe\Dev\SapphireTest;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\Form;
-use SilverStripe\Dev\SapphireTest;
-use SilverStripe\Dev\TestOnly;
 use SilverStripe\Widgets\Extensions\WidgetPageExtension;
 use SilverStripe\Widgets\Forms\WidgetAreaEditor;
-use SilverStripe\Widgets\Model\Widget;
 use SilverStripe\Widgets\Tests\WidgetAreaEditorTest\FakePage;
 use SilverStripe\Widgets\Tests\WidgetAreaEditorTest\TestWidget;
 
diff --git a/tests/WidgetControllerTest.php b/tests/WidgetControllerTest.php
index f207fa5..1f6e47d 100644
--- a/tests/WidgetControllerTest.php
+++ b/tests/WidgetControllerTest.php
@@ -3,13 +3,7 @@
 namespace SilverStripe\Widgets\Tests;
 
 use SilverStripe\Dev\FunctionalTest;
-use SilverStripe\Widgets\Model\Widget;
-use SilverStripe\Dev\TestOnly;
-use SilverStripe\Forms\TextField;
-use SilverStripe\Forms\FieldList;
-use SilverStripe\Forms\FormAction;
 use SilverStripe\Forms\Form;
-use SilverStripe\Widgets\Controllers\WidgetController;
 use SilverStripe\Widgets\Tests\WidgetControllerTest\TestPage;
 use SilverStripe\Widgets\Tests\WidgetControllerTest\TestWidget;
 
@@ -35,7 +29,7 @@ class WidgetControllerTest extends FunctionalTest
 
         $response = $this->get($page->URLSegment);
 
-        $formAction = sprintf('%s/widget/%d/Form', $page->URLSegment, $widget->ID);
+        $formAction = sprintf('%s/widget/%d/%s', $page->URLSegment, $widget->ID, 'Form');
         $this->assertContains(
             $formAction,
             $response->getBody(),
diff --git a/tests/WidgetControllerTest/TestWidgetController.php b/tests/WidgetControllerTest/TestWidgetController.php
index 18831a6..41b3b49 100644
--- a/tests/WidgetControllerTest/TestWidgetController.php
+++ b/tests/WidgetControllerTest/TestWidgetController.php
@@ -23,7 +23,7 @@ class TestWidgetController extends WidgetController implements TestOnly
     {
         $widgetform = new Form(
             $this,
-            'Form',
+            __FUNCTION__,
             new FieldList(
                 new TextField('TestValue')
             ),