@@ -2,7 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace SilverStripe\Forms\GridField; |
| 4 | 4 | |
| 5 | -use SilverStripe\Control\Session; |
|
| 6 | 5 | use SilverStripe\Core\Injector\Injectable; |
| 7 | 6 | use SilverStripe\Forms\Form; |
| 8 | 7 | use SilverStripe\View\ArrayData; |
@@ -238,7 +238,7 @@ |
||
| 238 | 238 | |
| 239 | 239 | /** |
| 240 | 240 | * @param array $properties |
| 241 | - * @return string |
|
| 241 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText |
|
| 242 | 242 | */ |
| 243 | 243 | public function Field($properties = array()) |
| 244 | 244 | { |
@@ -37,6 +37,9 @@ discard block |
||
| 37 | 37 | return $this->title; |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | + /** |
|
| 41 | + * @param string $title |
|
| 42 | + */ |
|
| 40 | 43 | function setTitle($title) |
| 41 | 44 | { |
| 42 | 45 | $this->title = $title; |
@@ -48,6 +51,9 @@ discard block |
||
| 48 | 51 | return $this->value; |
| 49 | 52 | } |
| 50 | 53 | |
| 54 | + /** |
|
| 55 | + * @param string $Value |
|
| 56 | + */ |
|
| 51 | 57 | function setValue($Value) |
| 52 | 58 | { |
| 53 | 59 | $this->value = $Value; |
@@ -97,7 +97,6 @@ |
||
| 97 | 97 | * for each of these categories |
| 98 | 98 | * |
| 99 | 99 | * @param string $category Category name |
| 100 | - * @param string,... $categories Additional category names |
|
| 101 | 100 | * @return $this |
| 102 | 101 | */ |
| 103 | 102 | public function setAllowedFileCategories($category) |
@@ -12,7 +12,6 @@ |
||
| 12 | 12 | use SilverStripe\ORM\ValidationException; |
| 13 | 13 | use SilverStripe\ORM\FieldType\DBComposite; |
| 14 | 14 | use SilverStripe\Security\Permission; |
| 15 | -use SilverStripe\Core\Convert; |
|
| 16 | 15 | |
| 17 | 16 | /** |
| 18 | 17 | * Represents a file reference stored in a database |
@@ -4,7 +4,6 @@ discard block |
||
| 4 | 4 | |
| 5 | 5 | use SilverStripe\Control\Controller; |
| 6 | 6 | use SilverStripe\Control\HTTPResponse; |
| 7 | -use SilverStripe\Core\Convert; |
|
| 8 | 7 | use SilverStripe\Control\Session; |
| 9 | 8 | use SilverStripe\Control\Director; |
| 10 | 9 | use SilverStripe\Control\HTTP; |
@@ -14,7 +13,6 @@ discard block |
||
| 14 | 13 | use SilverStripe\Forms\FormAction; |
| 15 | 14 | use SilverStripe\Forms\HiddenField; |
| 16 | 15 | use SilverStripe\Forms\Form; |
| 17 | -use SilverStripe\ORM\ValidationResult; |
|
| 18 | 16 | |
| 19 | 17 | /** |
| 20 | 18 | * Standard Change Password Form |
@@ -1,6 +1,5 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -use SilverStripe\Dev\Debug; |
|
| 4 | 3 | use SilverStripe\ORM\DataObjectSchema; |
| 5 | 4 | use SilverStripe\ORM\DB; |
| 6 | 5 | use SilverStripe\ORM\HasManyList; |
@@ -32,6 +32,7 @@ |
||
| 32 | 32 | |
| 33 | 33 | /** |
| 34 | 34 | * Get Mink session from MinkContext |
| 35 | + * @return \Behat\Mink\Session |
|
| 35 | 36 | */ |
| 36 | 37 | public function getSession($name = null) |
| 37 | 38 | { |
@@ -163,6 +163,9 @@ discard block |
||
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | |
| 166 | + /** |
|
| 167 | + * @param string $fileID |
|
| 168 | + */ |
|
| 166 | 169 | public function getOriginalFilename($fileID) |
| 167 | 170 | { |
| 168 | 171 | return parent::getOriginalFilename($fileID); |
@@ -173,6 +176,9 @@ discard block |
||
| 173 | 176 | return parent::removeVariant($fileID); |
| 174 | 177 | } |
| 175 | 178 | |
| 179 | + /** |
|
| 180 | + * @param null|string $variant |
|
| 181 | + */ |
|
| 176 | 182 | public function getDefaultConflictResolution($variant) |
| 177 | 183 | { |
| 178 | 184 | return parent::getDefaultConflictResolution($variant); |