@@ -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 | { |
@@ -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 | { |
@@ -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 | { |
@@ -321,6 +321,7 @@ |
||
| 321 | 321 | * Forces the JavaScript requirements to the end of the body, right before the closing tag |
| 322 | 322 | * |
| 323 | 323 | * @param bool |
| 324 | + * @param boolean $var |
|
| 324 | 325 | * @return $this |
| 325 | 326 | */ |
| 326 | 327 | public function setForceJSToBottom($var) |
@@ -116,6 +116,8 @@ discard block |
||
| 116 | 116 | |
| 117 | 117 | /** |
| 118 | 118 | * Override the function that constructs the result arrays to also prepare a 'php' item in the array |
| 119 | + * @param string $matchrule |
|
| 120 | + * @param string $name |
|
| 119 | 121 | */ |
| 120 | 122 | public function construct($matchrule, $name, $arguments = null) |
| 121 | 123 | { |
@@ -184,9 +186,9 @@ discard block |
||
| 184 | 186 | |
| 185 | 187 | /** |
| 186 | 188 | * Ensures that the arguments to addOpenBlock and addClosedBlock are valid |
| 187 | - * @param $name |
|
| 188 | - * @param $callable |
|
| 189 | - * @param $type |
|
| 189 | + * @param string $name |
|
| 190 | + * @param callable $callable |
|
| 191 | + * @param string $type |
|
| 190 | 192 | * @throws InvalidArgumentException |
| 191 | 193 | */ |
| 192 | 194 | protected function validateExtensionBlock($name, $callable, $type) |
@@ -277,6 +279,7 @@ discard block |
||
| 277 | 279 | * The basic generated PHP of LookupStep and LastLookupStep is the same, except that LookupStep calls 'obj' to |
| 278 | 280 | * get the next ViewableData in the sequence, and LastLookupStep calls different methods (XML_val, hasValue, obj) |
| 279 | 281 | * depending on the context the lookup is used in. |
| 282 | + * @param string $method |
|
| 280 | 283 | */ |
| 281 | 284 | public function Lookup_AddLookupStep(&$res, $sub, $method) |
| 282 | 285 | { |
@@ -1279,6 +1282,7 @@ discard block |
||
| 1279 | 1282 | |
| 1280 | 1283 | /** |
| 1281 | 1284 | * @param string $code |
| 1285 | + * @param string $templateName |
|
| 1282 | 1286 | * @return string $code |
| 1283 | 1287 | */ |
| 1284 | 1288 | protected function includeDebuggingComments($code, $templateName) |
@@ -117,7 +117,7 @@ discard block |
||
| 117 | 117 | * @param array $attributes an array of attributes to include on the link. |
| 118 | 118 | * @param string $iconClass |
| 119 | 119 | * |
| 120 | - * @return boolean The result of the operation. |
|
| 120 | + * @return boolean|null The result of the operation. |
|
| 121 | 121 | */ |
| 122 | 122 | public static function add_link($code, $menuTitle, $url, $priority = -1, $attributes = null, $iconClass = null) |
| 123 | 123 | { |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | * @param array $attributes an array of attributes to include on the link. |
| 141 | 141 | * @param string $iconClass |
| 142 | 142 | * |
| 143 | - * @return bool Success |
|
| 143 | + * @return boolean|null Success |
|
| 144 | 144 | */ |
| 145 | 145 | public static function add_menu_item( |
| 146 | 146 | $code, |
@@ -322,7 +322,7 @@ discard block |
||
| 322 | 322 | * @param array $attributes an array of attributes to include on the link. |
| 323 | 323 | * @param string $iconClass |
| 324 | 324 | * |
| 325 | - * @return bool Success |
|
| 325 | + * @return boolean|null Success |
|
| 326 | 326 | */ |
| 327 | 327 | public static function replace_menu_item( |
| 328 | 328 | $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 | { |
@@ -153,6 +153,9 @@ discard block |
||
| 153 | 153 | } |
| 154 | 154 | } |
| 155 | 155 | |
| 156 | + /** |
|
| 157 | + * @param string $action |
|
| 158 | + */ |
|
| 156 | 159 | public function Link($action = null) |
| 157 | 160 | { |
| 158 | 161 | if (!$action) { |
@@ -404,7 +407,7 @@ discard block |
||
| 404 | 407 | /** |
| 405 | 408 | * Generate a CSV import form for a single {@link DataObject} subclass. |
| 406 | 409 | * |
| 407 | - * @return Form|false |
|
| 410 | + * @return Form |
|
| 408 | 411 | */ |
| 409 | 412 | public function ImportForm() |
| 410 | 413 | { |
@@ -23,7 +23,6 @@ discard block |
||
| 23 | 23 | use SilverStripe\Forms\GridField\GridFieldConfig_RecordEditor; |
| 24 | 24 | use SilverStripe\Forms\GridField\GridFieldPrintButton; |
| 25 | 25 | use SilverStripe\Forms\GridField\GridField; |
| 26 | -use SilverStripe\Forms\CompositeField; |
|
| 27 | 26 | use SilverStripe\Forms\GridField\GridFieldImportButton; |
| 28 | 27 | use SilverStripe\ORM\ArrayLib; |
| 29 | 28 | use SilverStripe\ORM\ArrayList; |
@@ -33,7 +32,6 @@ discard block |
||
| 33 | 32 | use SilverStripe\ORM\ValidationResult; |
| 34 | 33 | use SilverStripe\Security\Member; |
| 35 | 34 | use SilverStripe\View\ArrayData; |
| 36 | -use SilverStripe\View\SSViewer; |
|
| 37 | 35 | |
| 38 | 36 | /** |
| 39 | 37 | * Generates a three-pane UI for editing model classes, with an |