@@ -889,9 +889,9 @@ discard block |
||
| 889 | 889 | * }); |
| 890 | 890 | * </code> |
| 891 | 891 | * |
| 892 | - * @param Member|null|int $member Member or member ID to log in as. |
|
| 892 | + * @param null|Member $member Member or member ID to log in as. |
|
| 893 | 893 | * Set to null or 0 to act as a logged out user. |
| 894 | - * @param $callback |
|
| 894 | + * @param \Closure $callback |
|
| 895 | 895 | */ |
| 896 | 896 | public static function actAs($member, $callback) |
| 897 | 897 | { |
@@ -1661,7 +1661,7 @@ discard block |
||
| 1661 | 1661 | * This is likely to be customized for social sites etc. with a looser permission model. |
| 1662 | 1662 | * |
| 1663 | 1663 | * @param Member $member |
| 1664 | - * @return bool |
|
| 1664 | + * @return boolean|string |
|
| 1665 | 1665 | */ |
| 1666 | 1666 | public function canView($member = null) |
| 1667 | 1667 | { |
@@ -1692,7 +1692,7 @@ discard block |
||
| 1692 | 1692 | * Otherwise they'll need ADMIN or CMS_ACCESS_SecurityAdmin permissions |
| 1693 | 1693 | * |
| 1694 | 1694 | * @param Member $member |
| 1695 | - * @return bool |
|
| 1695 | + * @return boolean|string |
|
| 1696 | 1696 | */ |
| 1697 | 1697 | public function canEdit($member = null) |
| 1698 | 1698 | { |
@@ -1727,7 +1727,7 @@ discard block |
||
| 1727 | 1727 | * Otherwise they'll need ADMIN or CMS_ACCESS_SecurityAdmin permissions |
| 1728 | 1728 | * |
| 1729 | 1729 | * @param Member $member |
| 1730 | - * @return bool |
|
| 1730 | + * @return boolean|string |
|
| 1731 | 1731 | */ |
| 1732 | 1732 | public function canDelete($member = null) |
| 1733 | 1733 | { |
@@ -5,7 +5,6 @@ |
||
| 5 | 5 | use SilverStripe\Core\Config\Config; |
| 6 | 6 | use SilverStripe\Core\Injector\Injectable; |
| 7 | 7 | use SilverStripe\Core\Injector\Injector; |
| 8 | -use SilverStripe\Dev\Deprecation; |
|
| 9 | 8 | |
| 10 | 9 | /** |
| 11 | 10 | * Handles all manipulation of the session. |
@@ -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); |
@@ -7,7 +7,6 @@ |
||
| 7 | 7 | use SilverStripe\Control\RequestHandler; |
| 8 | 8 | use SilverStripe\Core\ClassInfo; |
| 9 | 9 | use SilverStripe\Core\Convert; |
| 10 | -use SilverStripe\Dev\Deprecation; |
|
| 11 | 10 | use SilverStripe\ORM\DataObject; |
| 12 | 11 | use SilverStripe\ORM\DataObjectInterface; |
| 13 | 12 | use SilverStripe\ORM\FieldType\DBField; |
@@ -8,7 +8,6 @@ |
||
| 8 | 8 | use SilverStripe\Core\Manifest\ClassLoader; |
| 9 | 9 | use SilverStripe\Dev\SapphireTest; |
| 10 | 10 | use SilverStripe\Dev\TestOnly; |
| 11 | -use SilverStripe\Dev\Deprecation; |
|
| 12 | 11 | use SilverStripe\Versioned\Versioned; |
| 13 | 12 | use SilverStripe\Security\Security; |
| 14 | 13 | use SilverStripe\Security\Permission; |
@@ -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) |
@@ -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 | /** |
@@ -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( |