@@ -6,9 +6,7 @@ |
||
| 6 | 6 | use SilverStripe\Control\Controller; |
| 7 | 7 | use SilverStripe\Forms\DatetimeField; |
| 8 | 8 | use SilverStripe\Forms\RequiredFields; |
| 9 | -use SilverStripe\Forms\DateField; |
|
| 10 | 9 | use SilverStripe\Forms\Tests\DatetimeFieldTest\Model; |
| 11 | -use SilverStripe\Forms\TimeField; |
|
| 12 | 10 | use SilverStripe\Forms\FieldList; |
| 13 | 11 | use SilverStripe\Forms\FormAction; |
| 14 | 12 | use SilverStripe\Forms\Form; |
@@ -270,6 +270,9 @@ discard block |
||
| 270 | 270 | |
| 271 | 271 | |
| 272 | 272 | |
| 273 | + /** |
|
| 274 | + * @param boolean $disabled |
|
| 275 | + */ |
|
| 273 | 276 | public function setDisabled($disabled) |
| 274 | 277 | { |
| 275 | 278 | parent::setDisabled($disabled); |
@@ -279,6 +282,9 @@ discard block |
||
| 279 | 282 | return $this; |
| 280 | 283 | } |
| 281 | 284 | |
| 285 | + /** |
|
| 286 | + * @param boolean $readonly |
|
| 287 | + */ |
|
| 282 | 288 | public function setReadonly($readonly) |
| 283 | 289 | { |
| 284 | 290 | parent::setReadonly($readonly); |
@@ -371,6 +377,10 @@ discard block |
||
| 371 | 377 | $this->children->removeByName($fieldName, $dataFieldOnly); |
| 372 | 378 | } |
| 373 | 379 | |
| 380 | + /** |
|
| 381 | + * @param string $fieldName |
|
| 382 | + * @param FormField $newField |
|
| 383 | + */ |
|
| 374 | 384 | public function replaceField($fieldName, $newField) |
| 375 | 385 | { |
| 376 | 386 | return $this->children->replaceField($fieldName, $newField); |
@@ -456,6 +466,7 @@ discard block |
||
| 456 | 466 | * the children collection. Doesn't work recursively. |
| 457 | 467 | * |
| 458 | 468 | * @param string|FormField |
| 469 | + * @param string $field |
|
| 459 | 470 | * @return int Position in children collection (first position starts with 0). Returns FALSE if the field can't |
| 460 | 471 | * be found. |
| 461 | 472 | */ |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | /** |
| 141 | - * @param $bool |
|
| 141 | + * @param boolean $bool |
|
| 142 | 142 | * @return $this |
| 143 | 143 | */ |
| 144 | 144 | public function setHTML5($bool) |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | * Assign value posted from form submission, based on {@link $datetimeFormat}. |
| 152 | 152 | * When $html5=true, this needs to be normalised ISO format (with "T" separator). |
| 153 | 153 | * |
| 154 | - * @param mixed $value |
|
| 154 | + * @param string $value |
|
| 155 | 155 | * @param mixed $data |
| 156 | 156 | * @return $this |
| 157 | 157 | */ |
@@ -317,7 +317,7 @@ discard block |
||
| 317 | 317 | * When $html5=true, assign value from ISO 8601 normalised string (with a "T" separator). |
| 318 | 318 | * Falls back to an ISO 8601 string (with a whitespace separator). |
| 319 | 319 | * |
| 320 | - * @param mixed $value |
|
| 320 | + * @param string $value |
|
| 321 | 321 | * @param mixed $data |
| 322 | 322 | * @return $this |
| 323 | 323 | */ |
@@ -492,6 +492,9 @@ discard block |
||
| 492 | 492 | return $this; |
| 493 | 493 | } |
| 494 | 494 | |
| 495 | + /** |
|
| 496 | + * @param boolean $bool |
|
| 497 | + */ |
|
| 495 | 498 | public function setReadonly($bool) |
| 496 | 499 | { |
| 497 | 500 | parent::setReadonly($bool); |
@@ -2165,7 +2165,7 @@ discard block |
||
| 2165 | 2165 | * Called by {@link __get()} and any getFieldName() methods you might create. |
| 2166 | 2166 | * |
| 2167 | 2167 | * @param string $field The name of the field |
| 2168 | - * @return mixed The field value |
|
| 2168 | + * @return string|null The field value |
|
| 2169 | 2169 | */ |
| 2170 | 2170 | public function getField($field) |
| 2171 | 2171 | { |
@@ -2447,6 +2447,7 @@ discard block |
||
| 2447 | 2447 | |
| 2448 | 2448 | /** |
| 2449 | 2449 | * {@inheritdoc} |
| 2450 | + * @param string $field |
|
| 2450 | 2451 | */ |
| 2451 | 2452 | public function castingHelper($field) |
| 2452 | 2453 | { |
@@ -2552,7 +2553,7 @@ discard block |
||
| 2552 | 2553 | * </code> |
| 2553 | 2554 | * |
| 2554 | 2555 | * @param string $methodName Method on the same object, e.g. {@link canEdit()} |
| 2555 | - * @param Member|int $member |
|
| 2556 | + * @param Member|null $member |
|
| 2556 | 2557 | * @param array $context Optional context |
| 2557 | 2558 | * @return boolean|null |
| 2558 | 2559 | */ |
@@ -2575,7 +2576,7 @@ discard block |
||
| 2575 | 2576 | |
| 2576 | 2577 | /** |
| 2577 | 2578 | * @param Member $member |
| 2578 | - * @return boolean |
|
| 2579 | + * @return boolean|string |
|
| 2579 | 2580 | */ |
| 2580 | 2581 | public function canView($member = null) |
| 2581 | 2582 | { |
@@ -2588,7 +2589,7 @@ discard block |
||
| 2588 | 2589 | |
| 2589 | 2590 | /** |
| 2590 | 2591 | * @param Member $member |
| 2591 | - * @return boolean |
|
| 2592 | + * @return boolean|string |
|
| 2592 | 2593 | */ |
| 2593 | 2594 | public function canEdit($member = null) |
| 2594 | 2595 | { |
@@ -2601,7 +2602,7 @@ discard block |
||
| 2601 | 2602 | |
| 2602 | 2603 | /** |
| 2603 | 2604 | * @param Member $member |
| 2604 | - * @return boolean |
|
| 2605 | + * @return boolean|string |
|
| 2605 | 2606 | */ |
| 2606 | 2607 | public function canDelete($member = null) |
| 2607 | 2608 | { |
@@ -2616,7 +2617,7 @@ discard block |
||
| 2616 | 2617 | * @param Member $member |
| 2617 | 2618 | * @param array $context Additional context-specific data which might |
| 2618 | 2619 | * affect whether (or where) this object could be created. |
| 2619 | - * @return boolean |
|
| 2620 | + * @return boolean|string |
|
| 2620 | 2621 | */ |
| 2621 | 2622 | public function canCreate($member = null, $context = array()) |
| 2622 | 2623 | { |
@@ -2731,7 +2732,7 @@ discard block |
||
| 2731 | 2732 | * Traverses to a field referenced by relationships between data objects, returning the value |
| 2732 | 2733 | * The path to the related field is specified with dot separated syntax (eg: Parent.Child.Child.FieldName) |
| 2733 | 2734 | * |
| 2734 | - * @param $fieldName string |
|
| 2735 | + * @param string $fieldName string |
|
| 2735 | 2736 | * @return string | null - will return null on a missing value |
| 2736 | 2737 | */ |
| 2737 | 2738 | public function relField($fieldName) |
@@ -2809,7 +2810,7 @@ discard block |
||
| 2809 | 2810 | * @param string $callerClass The class of objects to be returned |
| 2810 | 2811 | * @param string|array $filter A filter to be inserted into the WHERE clause. |
| 2811 | 2812 | * Supports parameterised queries. See SQLSelect::addWhere() for syntax examples. |
| 2812 | - * @param string|array $sort A sort expression to be inserted into the ORDER |
|
| 2813 | + * @param string $sort A sort expression to be inserted into the ORDER |
|
| 2813 | 2814 | * BY clause. If omitted, self::$default_sort will be used. |
| 2814 | 2815 | * @param string $join Deprecated 3.0 Join clause. Use leftJoin($table, $joinClause) instead. |
| 2815 | 2816 | * @param string|array $limit A limit expression to be inserted into the LIMIT clause. |
@@ -49,6 +49,9 @@ discard block |
||
| 49 | 49 | return parent::login($request, Authenticator::CMS_LOGIN); |
| 50 | 50 | } |
| 51 | 51 | |
| 52 | + /** |
|
| 53 | + * @param string $action |
|
| 54 | + */ |
|
| 52 | 55 | public function Link($action = null) |
| 53 | 56 | { |
| 54 | 57 | /** @skipUpgrade */ |
@@ -79,6 +82,9 @@ discard block |
||
| 79 | 82 | return null; |
| 80 | 83 | } |
| 81 | 84 | |
| 85 | + /** |
|
| 86 | + * @param string $title |
|
| 87 | + */ |
|
| 82 | 88 | public function getResponseController($title) |
| 83 | 89 | { |
| 84 | 90 | // Use $this to prevent use of Page to render underlying templates |
@@ -8,9 +8,7 @@ |
||
| 8 | 8 | use SilverStripe\Core\Convert; |
| 9 | 9 | use SilverStripe\Control\Director; |
| 10 | 10 | use SilverStripe\Control\Controller; |
| 11 | -use SilverStripe\Core\Injector\Injector; |
|
| 12 | 11 | use SilverStripe\ORM\FieldType\DBField; |
| 13 | -use SilverStripe\Security\MemberAuthenticator\CMSMemberAuthenticator; |
|
| 14 | 12 | use SilverStripe\View\Requirements; |
| 15 | 13 | |
| 16 | 14 | /** |
@@ -111,7 +111,7 @@ |
||
| 111 | 111 | /** |
| 112 | 112 | * Global permissions required to edit |
| 113 | 113 | * |
| 114 | - * @param array $permissions |
|
| 114 | + * @param string[] $permissions |
|
| 115 | 115 | * @return $this |
| 116 | 116 | */ |
| 117 | 117 | public function setGlobalEditPermissions($permissions) |
@@ -601,7 +601,7 @@ discard block |
||
| 601 | 601 | * Combine the given forms into a formset with a tabbed interface |
| 602 | 602 | * |
| 603 | 603 | * @param $forms |
| 604 | - * @return string |
|
| 604 | + * @return \SilverStripe\ORM\FieldType\DBHTMLText |
|
| 605 | 605 | */ |
| 606 | 606 | protected function generateLoginFormSet($forms) |
| 607 | 607 | { |
@@ -1241,6 +1241,7 @@ discard block |
||
| 1241 | 1241 | |
| 1242 | 1242 | /** |
| 1243 | 1243 | * For the database_is_ready call to return a certain value - used for testing |
| 1244 | + * @param boolean $isReady |
|
| 1244 | 1245 | */ |
| 1245 | 1246 | public static function force_database_is_ready($isReady) |
| 1246 | 1247 | { |
@@ -1284,7 +1285,7 @@ discard block |
||
| 1284 | 1285 | /** |
| 1285 | 1286 | * Set to true to ignore access to disallowed actions, rather than returning permission failure |
| 1286 | 1287 | * Note that this is just a flag that other code needs to check with Security::ignore_disallowed_actions() |
| 1287 | - * @param $flag True or false |
|
| 1288 | + * @param boolean $flag True or false |
|
| 1288 | 1289 | */ |
| 1289 | 1290 | public static function set_ignore_disallowed_actions($flag) |
| 1290 | 1291 | { |
@@ -161,7 +161,7 @@ |
||
| 161 | 161 | } |
| 162 | 162 | |
| 163 | 163 | /** |
| 164 | - * @param string|bool|array $content If passed as an array, values will be concatenated with a comma. |
|
| 164 | + * @param string $content If passed as an array, values will be concatenated with a comma. |
|
| 165 | 165 | * @return array |
| 166 | 166 | */ |
| 167 | 167 | public static function getHTMLChunks($content) |
@@ -479,6 +479,7 @@ |
||
| 479 | 479 | * |
| 480 | 480 | * @When /^(?:|I )fill in the "(?P<field>(?:[^"]|\\")*)" dropdown with "(?P<value>(?:[^"]|\\")*)"$/ |
| 481 | 481 | * @When /^(?:|I )fill in "(?P<value>(?:[^"]|\\")*)" for the "(?P<field>(?:[^"]|\\")*)" dropdown$/ |
| 482 | + * @param string $field |
|
| 482 | 483 | */ |
| 483 | 484 | public function theIFillInTheDropdownWith($field, $value) |
| 484 | 485 | { |
@@ -6,7 +6,6 @@ |
||
| 6 | 6 | use Behat\Mink\Session; |
| 7 | 7 | use Behat\Behat\Context\Context; |
| 8 | 8 | use SilverStripe\BehatExtension\Context\MainContextAwareTrait; |
| 9 | -use SilverStripe\BehatExtension\Context\RetryableContextTrait; |
|
| 10 | 9 | use SilverStripe\BehatExtension\Utility\StepHelper; |
| 11 | 10 | |
| 12 | 11 | /** |