@@ -2,14 +2,12 @@  | 
                                                    ||
| 2 | 2 | |
| 3 | 3 | namespace SilverStripe\Widgets\Tests;  | 
                                                        
| 4 | 4 | |
| 5 | -use Page;  | 
                                                        |
| 6 | 5 | use SilverStripe\CMS\Controllers\ContentController;  | 
                                                        
| 7 | 6 | use SilverStripe\CMS\Model\SiteTree;  | 
                                                        
| 8 | 7 | use SilverStripe\Control\HTTPRequest;  | 
                                                        
| 9 | 8 | use SilverStripe\Forms\FieldList;  | 
                                                        
| 10 | 9 | use SilverStripe\Forms\Form;  | 
                                                        
| 11 | 10 | use SilverStripe\Dev\SapphireTest;  | 
                                                        
| 12 | -use SilverStripe\Dev\TestOnly;  | 
                                                        |
| 13 | 11 | use SilverStripe\Widgets\Extensions\WidgetPageExtension;  | 
                                                        
| 14 | 12 | use SilverStripe\Widgets\Forms\WidgetAreaEditor;  | 
                                                        
| 15 | 13 | use SilverStripe\Widgets\Model\Widget;  | 
                                                        
@@ -4,12 +4,7 @@  | 
                                                    ||
| 4 | 4 | |
| 5 | 5 | use SilverStripe\Dev\FunctionalTest;  | 
                                                        
| 6 | 6 | use SilverStripe\Widgets\Model\Widget;  | 
                                                        
| 7 | -use SilverStripe\Dev\TestOnly;  | 
                                                        |
| 8 | -use SilverStripe\Forms\TextField;  | 
                                                        |
| 9 | -use SilverStripe\Forms\FieldList;  | 
                                                        |
| 10 | -use SilverStripe\Forms\FormAction;  | 
                                                        |
| 11 | 7 | use SilverStripe\Forms\Form;  | 
                                                        
| 12 | -use SilverStripe\Widgets\Controllers\WidgetController;  | 
                                                        |
| 13 | 8 | use SilverStripe\Widgets\Tests\WidgetControllerTest\TestPage;  | 
                                                        
| 14 | 9 | use SilverStripe\Widgets\Tests\WidgetControllerTest\TestWidget;  | 
                                                        
| 15 | 10 | |
@@ -83,7 +83,7 @@ discard block  | 
                                                    ||
| 83 | 83 |       * Overloaded from {@link Widget->Content()} to allow for controller / form | 
                                                        
| 84 | 84 | * linking.  | 
                                                        
| 85 | 85 | *  | 
                                                        
| 86 | - * @return string HTML  | 
                                                        |
| 86 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText HTML  | 
                                                        |
| 87 | 87 | */  | 
                                                        
| 88 | 88 | public function Content()  | 
                                                        
| 89 | 89 |      { | 
                                                        
@@ -94,7 +94,7 @@ discard block  | 
                                                    ||
| 94 | 94 |       * Overloaded from {@link Widget->WidgetHolder()} to allow for controller/ | 
                                                        
| 95 | 95 | * form linking.  | 
                                                        
| 96 | 96 | *  | 
                                                        
| 97 | - * @return string HTML  | 
                                                        |
| 97 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText HTML  | 
                                                        |
| 98 | 98 | */  | 
                                                        
| 99 | 99 | public function WidgetHolder()  | 
                                                        
| 100 | 100 |      { | 
                                                        
@@ -36,7 +36,7 @@  | 
                                                    ||
| 36 | 36 | /**  | 
                                                        
| 37 | 37 | * @param array $properties  | 
                                                        
| 38 | 38 | *  | 
                                                        
| 39 | - * @return string - HTML  | 
                                                        |
| 39 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText - HTML  | 
                                                        |
| 40 | 40 | */  | 
                                                        
| 41 | 41 | public function FieldHolder($properties = array())  | 
                                                        
| 42 | 42 |      { | 
                                                        
@@ -103,7 +103,7 @@ discard block  | 
                                                    ||
| 103 | 103 | /**  | 
                                                        
| 104 | 104 |       * Note: Overloaded in {@link WidgetController}. | 
                                                        
| 105 | 105 | *  | 
                                                        
| 106 | - * @return string HTML  | 
                                                        |
| 106 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText HTML  | 
                                                        |
| 107 | 107 | */  | 
                                                        
| 108 | 108 | public function WidgetHolder()  | 
                                                        
| 109 | 109 |      { | 
                                                        
@@ -112,7 +112,7 @@ discard block  | 
                                                    ||
| 112 | 112 | |
| 113 | 113 | /**  | 
                                                        
| 114 | 114 | * Default way to render widget in templates.  | 
                                                        
| 115 | - * @return string HTML  | 
                                                        |
| 115 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText HTML  | 
                                                        |
| 116 | 116 | */  | 
                                                        
| 117 | 117 | public function forTemplate($holder = true)  | 
                                                        
| 118 | 118 |      { | 
                                                        
@@ -132,7 +132,7 @@ discard block  | 
                                                    ||
| 132 | 132 | *  | 
                                                        
| 133 | 133 |       * Note: Overloaded in {@link WidgetController}. | 
                                                        
| 134 | 134 | *  | 
                                                        
| 135 | - * @return string HTML  | 
                                                        |
| 135 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText HTML  | 
                                                        |
| 136 | 136 | */  | 
                                                        
| 137 | 137 | public function Content()  | 
                                                        
| 138 | 138 |      { | 
                                                        
@@ -167,7 +167,7 @@ discard block  | 
                                                    ||
| 167 | 167 | }  | 
                                                        
| 168 | 168 | |
| 169 | 169 | /**  | 
                                                        
| 170 | - * @return string - HTML  | 
                                                        |
| 170 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText - HTML  | 
                                                        |
| 171 | 171 | */  | 
                                                        
| 172 | 172 | public function DescriptionSegment()  | 
                                                        
| 173 | 173 |      { | 
                                                        
@@ -177,7 +177,7 @@ discard block  | 
                                                    ||
| 177 | 177 | /**  | 
                                                        
| 178 | 178 | * @see WidgetController::editablesegment()  | 
                                                        
| 179 | 179 | *  | 
                                                        
| 180 | - * @return string - HTML  | 
                                                        |
| 180 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText - HTML  | 
                                                        |
| 181 | 181 | */  | 
                                                        
| 182 | 182 | public function EditableSegment()  | 
                                                        
| 183 | 183 |      { | 
                                                        
@@ -36,7 +36,7 @@ discard block  | 
                                                    ||
| 36 | 36 | * controller, making it easier to access and process form logic and  | 
                                                        
| 37 | 37 |       * actions stored in {@link WidgetController}. | 
                                                        
| 38 | 38 | *  | 
                                                        
| 39 | -     * @return SS_List - Collection of {@link WidgetController} instances. | 
                                                        |
| 39 | +     * @return ArrayList - Collection of {@link WidgetController} instances. | 
                                                        |
| 40 | 40 | */  | 
                                                        
| 41 | 41 | public function WidgetControllers()  | 
                                                        
| 42 | 42 |      { | 
                                                        
@@ -71,7 +71,7 @@ discard block  | 
                                                    ||
| 71 | 71 | }  | 
                                                        
| 72 | 72 | |
| 73 | 73 | /**  | 
                                                        
| 74 | - * @return string - HTML  | 
                                                        |
| 74 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText - HTML  | 
                                                        |
| 75 | 75 | */  | 
                                                        
| 76 | 76 | public function forTemplate()  | 
                                                        
| 77 | 77 |      { |