@@ -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) |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | * greater than or equal to this version, a message will be raised |
| 76 | 76 | * |
| 77 | 77 | * @static |
| 78 | - * @param $ver string - |
|
| 78 | + * @param string $ver string - |
|
| 79 | 79 | * A php standard version string, see http://php.net/manual/en/function.version-compare.php for details. |
| 80 | 80 | * @param null $forModule string - |
| 81 | 81 | * The name of a module. The passed version will be used as the check value for |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | /** |
| 142 | 142 | * Determine if deprecation notices should be displayed |
| 143 | 143 | * |
| 144 | - * @return bool |
|
| 144 | + * @return boolean|string |
|
| 145 | 145 | */ |
| 146 | 146 | public static function get_enabled() |
| 147 | 147 | { |
@@ -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); |
@@ -12,11 +12,22 @@ discard block |
||
| 12 | 12 | Extending_Extension::class, |
| 13 | 13 | ); |
| 14 | 14 | |
| 15 | + /** |
|
| 16 | + * @param integer $first |
|
| 17 | + * @param integer $second |
|
| 18 | + * @param integer $third |
|
| 19 | + */ |
|
| 15 | 20 | public function getResults(&$first, &$second, &$third) |
| 16 | 21 | { |
| 17 | 22 | // Before extending should be invoked second |
| 18 | 23 | $this->beforeExtending( |
| 19 | 24 | 'updateResult', |
| 25 | + |
|
| 26 | + /** |
|
| 27 | + * @param integer $first |
|
| 28 | + * @param integer $second |
|
| 29 | + * @param integer $third |
|
| 30 | + */ |
|
| 20 | 31 | function (&$first, &$second, &$third) { |
| 21 | 32 | if ($first === 1 && $second === 2 && $third === 3) { |
| 22 | 33 | $first = 11; |
@@ -31,6 +42,12 @@ discard block |
||
| 31 | 42 | // After extending should be invoked fourth |
| 32 | 43 | $this->afterExtending( |
| 33 | 44 | 'updateResult', |
| 45 | + |
|
| 46 | + /** |
|
| 47 | + * @param integer $first |
|
| 48 | + * @param integer $second |
|
| 49 | + * @param integer $third |
|
| 50 | + */ |
|
| 34 | 51 | function (&$first, &$second, &$third) { |
| 35 | 52 | if ($first === 21 && $second === 22 && $third = 23) { |
| 36 | 53 | $first = 31; |