@@ -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. |
@@ -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) |
@@ -422,7 +422,6 @@ discard block |
||
| 422 | 422 | /** |
| 423 | 423 | * @deprecated Use Security::setCurrentUser() or IdentityStore::logIn() |
| 424 | 424 | * |
| 425 | - * @param bool $remember If set to TRUE, the member will be logged in automatically the next time. |
|
| 426 | 425 | */ |
| 427 | 426 | public function logIn() |
| 428 | 427 | { |
@@ -737,9 +736,9 @@ discard block |
||
| 737 | 736 | * }); |
| 738 | 737 | * </code> |
| 739 | 738 | * |
| 740 | - * @param Member|null|int $member Member or member ID to log in as. |
|
| 739 | + * @param null|Member $member Member or member ID to log in as. |
|
| 741 | 740 | * Set to null or 0 to act as a logged out user. |
| 742 | - * @param $callback |
|
| 741 | + * @param \Closure $callback |
|
| 743 | 742 | */ |
| 744 | 743 | public static function actAs($member, $callback) |
| 745 | 744 | { |
@@ -1489,7 +1488,7 @@ discard block |
||
| 1489 | 1488 | * This is likely to be customized for social sites etc. with a looser permission model. |
| 1490 | 1489 | * |
| 1491 | 1490 | * @param Member $member |
| 1492 | - * @return bool |
|
| 1491 | + * @return boolean|string |
|
| 1493 | 1492 | */ |
| 1494 | 1493 | public function canView($member = null) |
| 1495 | 1494 | { |
@@ -1520,7 +1519,7 @@ discard block |
||
| 1520 | 1519 | * Otherwise they'll need ADMIN or CMS_ACCESS_SecurityAdmin permissions |
| 1521 | 1520 | * |
| 1522 | 1521 | * @param Member $member |
| 1523 | - * @return bool |
|
| 1522 | + * @return boolean|string |
|
| 1524 | 1523 | */ |
| 1525 | 1524 | public function canEdit($member = null) |
| 1526 | 1525 | { |
@@ -1555,7 +1554,7 @@ discard block |
||
| 1555 | 1554 | * Otherwise they'll need ADMIN or CMS_ACCESS_SecurityAdmin permissions |
| 1556 | 1555 | * |
| 1557 | 1556 | * @param Member $member |
| 1558 | - * @return bool |
|
| 1557 | + * @return boolean|string |
|
| 1559 | 1558 | */ |
| 1560 | 1559 | public function canDelete($member = null) |
| 1561 | 1560 | { |
@@ -12,7 +12,6 @@ discard block |
||
| 12 | 12 | use SilverStripe\Control\Session; |
| 13 | 13 | use SilverStripe\Core\Convert; |
| 14 | 14 | use SilverStripe\Core\Injector\Injector; |
| 15 | -use SilverStripe\Dev\SapphireTest; |
|
| 16 | 15 | use SilverStripe\Dev\TestMailer; |
| 17 | 16 | use SilverStripe\Forms\ConfirmedPasswordField; |
| 18 | 17 | use SilverStripe\Forms\DropdownField; |
@@ -31,9 +30,6 @@ discard block |
||
| 31 | 30 | use SilverStripe\ORM\Map; |
| 32 | 31 | use SilverStripe\ORM\ValidationException; |
| 33 | 32 | use SilverStripe\ORM\ValidationResult; |
| 34 | -use SilverStripe\View\SSViewer; |
|
| 35 | -use SilverStripe\View\TemplateGlobalProvider; |
|
| 36 | -use DateTime; |
|
| 37 | 33 | |
| 38 | 34 | /** |
| 39 | 35 | * The member class which represents the users of the system |
@@ -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 | { |
@@ -13,16 +13,11 @@ discard block |
||
| 13 | 13 | use SilverStripe\Control\Session; |
| 14 | 14 | use SilverStripe\Control\RequestHandler; |
| 15 | 15 | use SilverStripe\Core\ClassInfo; |
| 16 | -use SilverStripe\Core\Config\Config; |
|
| 17 | 16 | use SilverStripe\Core\Convert; |
| 18 | 17 | use SilverStripe\Dev\Deprecation; |
| 19 | 18 | use SilverStripe\Dev\TestOnly; |
| 20 | -use SilverStripe\Forms\EmailField; |
|
| 21 | -use SilverStripe\Forms\FieldList; |
|
| 22 | 19 | use SilverStripe\Forms\Form; |
| 23 | -use SilverStripe\Forms\FormAction; |
|
| 24 | 20 | use SilverStripe\ORM\ArrayList; |
| 25 | -use SilverStripe\ORM\Connect\Database; |
|
| 26 | 21 | use SilverStripe\ORM\DataModel; |
| 27 | 22 | use SilverStripe\ORM\DB; |
| 28 | 23 | use SilverStripe\ORM\DataObject; |
@@ -32,8 +27,6 @@ discard block |
||
| 32 | 27 | use SilverStripe\View\ArrayData; |
| 33 | 28 | use SilverStripe\View\SSViewer; |
| 34 | 29 | use SilverStripe\View\TemplateGlobalProvider; |
| 35 | -use Exception; |
|
| 36 | -use SilverStripe\View\ViewableData_Customised; |
|
| 37 | 30 | use Subsite; |
| 38 | 31 | use SilverStripe\Core\Injector\Injector; |
| 39 | 32 | |
@@ -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 | /** |
@@ -5,7 +5,6 @@ discard block |
||
| 5 | 5 | use SilverStripe\Core\Config\Config; |
| 6 | 6 | use SilverStripe\Core\ClassInfo; |
| 7 | 7 | use SilverStripe\Dev\SapphireTest; |
| 8 | -use SilverStripe\Control\Controller; |
|
| 9 | 8 | use SilverStripe\Forms\FormField; |
| 10 | 9 | use SilverStripe\Forms\Tests\FormFieldTest\TestExtension; |
| 11 | 10 | use SilverStripe\Forms\TextField; |
@@ -13,7 +12,6 @@ discard block |
||
| 13 | 12 | use SilverStripe\Forms\FieldList; |
| 14 | 13 | use SilverStripe\Forms\Form; |
| 15 | 14 | use ReflectionClass; |
| 16 | -use SilverStripe\ORM\FieldType\DBField; |
|
| 17 | 15 | |
| 18 | 16 | class FormFieldTest extends SapphireTest |
| 19 | 17 | { |
@@ -88,6 +88,9 @@ |
||
| 88 | 88 | $this->mockButtonFragments($list, null); |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | + /** |
|
| 92 | + * @param \SilverStripe\ORM\DataObject $parent |
|
| 93 | + */ |
|
| 91 | 94 | protected function mockButtonFragments(SS_List $list, $parent = null) |
| 92 | 95 | { |
| 93 | 96 | $form = Form::create( |