@@ -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 | { |
@@ -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) |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | * left. |
| 117 | 117 | * @param array $attributes an array of attributes to include on the link. |
| 118 | 118 | * |
| 119 | - * @return boolean The result of the operation. |
|
| 119 | + * @return boolean|null The result of the operation. |
|
| 120 | 120 | */ |
| 121 | 121 | public static function add_link($code, $menuTitle, $url, $priority = -1, $attributes = null) |
| 122 | 122 | { |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | * have the rights to access some other part of the admin area. |
| 138 | 138 | * @param int $priority |
| 139 | 139 | * @param array $attributes an array of attributes to include on the link. |
| 140 | - * @return bool Success |
|
| 140 | + * @return boolean|null Success |
|
| 141 | 141 | */ |
| 142 | 142 | public static function add_menu_item( |
| 143 | 143 | $code, |
@@ -308,7 +308,7 @@ discard block |
||
| 308 | 308 | * have the rights to access some other part of the admin area. |
| 309 | 309 | * @param int $priority |
| 310 | 310 | * @param array $attributes an array of attributes to include on the link. |
| 311 | - * @return bool Success |
|
| 311 | + * @return boolean|null Success |
|
| 312 | 312 | */ |
| 313 | 313 | public static function replace_menu_item( |
| 314 | 314 | $code, |
@@ -24,6 +24,10 @@ |
||
| 24 | 24 | */ |
| 25 | 25 | protected $group; |
| 26 | 26 | |
| 27 | + /** |
|
| 28 | + * @param SecurityAdmin $controller |
|
| 29 | + * @param string $name |
|
| 30 | + */ |
|
| 27 | 31 | public function __construct($controller, $name, $fields = null, $actions = null, $validator = null) |
| 28 | 32 | { |
| 29 | 33 | if (!$fields) { |
@@ -25,6 +25,10 @@ discard block |
||
| 25 | 25 | */ |
| 26 | 26 | protected $group; |
| 27 | 27 | |
| 28 | + /** |
|
| 29 | + * @param SecurityAdmin $controller |
|
| 30 | + * @param string $name |
|
| 31 | + */ |
|
| 28 | 32 | public function __construct($controller, $name, $fields = null, $actions = null, $validator = null) |
| 29 | 33 | { |
| 30 | 34 | if (!$fields) { |
@@ -127,7 +131,7 @@ discard block |
||
| 127 | 131 | } |
| 128 | 132 | |
| 129 | 133 | /** |
| 130 | - * @param $group Group |
|
| 134 | + * @param Group $group Group |
|
| 131 | 135 | */ |
| 132 | 136 | public function setGroup($group) |
| 133 | 137 | { |
@@ -260,7 +260,7 @@ discard block |
||
| 260 | 260 | /** |
| 261 | 261 | * @see SecurityAdmin_MemberImportForm |
| 262 | 262 | * |
| 263 | - * @return Form |
|
| 263 | + * @return null|MemberImportForm |
|
| 264 | 264 | */ |
| 265 | 265 | public function MemberImportForm() |
| 266 | 266 | { |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | * @see SecurityAdmin_MemberImportForm |
| 298 | 298 | * |
| 299 | 299 | * @skipUpgrade |
| 300 | - * @return Form |
|
| 300 | + * @return null|GroupImportForm |
|
| 301 | 301 | */ |
| 302 | 302 | public function GroupImportForm() |
| 303 | 303 | { |
@@ -38,6 +38,7 @@ |
||
| 38 | 38 | |
| 39 | 39 | /** |
| 40 | 40 | * Get Mink session from MinkContext |
| 41 | + * @return \Behat\Mink\Session |
|
| 41 | 42 | */ |
| 42 | 43 | public function getSession($name = null) |
| 43 | 44 | { |
@@ -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); |
@@ -25,6 +25,7 @@ discard block |
||
| 25 | 25 | |
| 26 | 26 | /** |
| 27 | 27 | * This is a helper method for displaying a relevant message about a parsing failure |
| 28 | + * @param string $path |
|
| 28 | 29 | */ |
| 29 | 30 | protected function getParsedAsMessage($path) |
| 30 | 31 | { |
@@ -50,7 +51,7 @@ discard block |
||
| 50 | 51 | /** |
| 51 | 52 | * A helper method to return a mock of the manifest in order to test expectations and reduce dependency |
| 52 | 53 | * |
| 53 | - * @param $methods |
|
| 54 | + * @param string[] $methods |
|
| 54 | 55 | * @return ConfigManifest |
| 55 | 56 | */ |
| 56 | 57 | protected function getManifestMock($methods) |