@@ -3,12 +3,10 @@ |
||
3 | 3 | namespace SilverStripe\Security\MemberAuthenticator; |
4 | 4 | |
5 | 5 | use SilverStripe\Control\Controller; |
6 | -use SilverStripe\Control\Cookie; |
|
7 | 6 | use SilverStripe\Control\HTTPResponse; |
8 | 7 | use SilverStripe\Control\Session; |
9 | 8 | use SilverStripe\Control\RequestHandler; |
10 | 9 | use SilverStripe\ORM\ValidationResult; |
11 | -use SilverStripe\Security\RememberLoginHash; |
|
12 | 10 | use SilverStripe\Security\Security; |
13 | 11 | use SilverStripe\Security\Member; |
14 | 12 | use SilverStripe\Core\Injector\Injector; |
@@ -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 | /** |
@@ -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( |
@@ -19,7 +19,7 @@ |
||
19 | 19 | /** |
20 | 20 | * Common method for setting up form, since that will always be a dependency for the validator. |
21 | 21 | * |
22 | - * @param array $fieldNames |
|
22 | + * @param string[] $fieldNames |
|
23 | 23 | * @return Form |
24 | 24 | */ |
25 | 25 | protected function getForm(array $fieldNames = array()) |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace SilverStripe\Logging\Tests; |
4 | 4 | |
5 | 5 | use Monolog\Handler\HandlerInterface; |
6 | -use PhpParser\Node\Scalar\MagicConst\Dir; |
|
7 | 6 | use SilverStripe\Control\Director; |
8 | 7 | use SilverStripe\Core\Injector\Injector; |
9 | 8 | use SilverStripe\Dev\SapphireTest; |
@@ -42,6 +42,9 @@ |
||
42 | 42 | return Injector::inst()->get(PermissionChecker::class.'.testpermissions'); |
43 | 43 | } |
44 | 44 | |
45 | + /** |
|
46 | + * @param DataObject $member |
|
47 | + */ |
|
45 | 48 | public function canEdit($member = null) |
46 | 49 | { |
47 | 50 | if (!$member) { |
@@ -159,6 +159,10 @@ discard block |
||
159 | 159 | ]); |
160 | 160 | } |
161 | 161 | |
162 | + /** |
|
163 | + * @param \SilverStripe\ORM\FieldType\DBHTMLText $result |
|
164 | + * @param string[] $expected |
|
165 | + */ |
|
162 | 166 | private function assertExpectedStrings($result, $expected) |
163 | 167 | { |
164 | 168 | foreach ($expected as $expectedStr) { |
@@ -1089,6 +1093,10 @@ discard block |
||
1089 | 1093 | $this->assertEquals('A A1 A1 i A1 ii A2 A3', $rationalisedResult); |
1090 | 1094 | } |
1091 | 1095 | |
1096 | + /** |
|
1097 | + * @param string $a |
|
1098 | + * @param string $b |
|
1099 | + */ |
|
1092 | 1100 | public function assertEqualIgnoringWhitespace($a, $b, $message = '') |
1093 | 1101 | { |
1094 | 1102 | $this->assertEquals(preg_replace('/\s+/', '', $a), preg_replace('/\s+/', '', $b), $message); |
@@ -1817,6 +1825,11 @@ discard block |
||
1817 | 1825 | $this->_renderWithSourceFileComments('SSViewerTestComments/'.$template['name'], $template['expected']); |
1818 | 1826 | } |
1819 | 1827 | } |
1828 | + |
|
1829 | + /** |
|
1830 | + * @param string $name |
|
1831 | + * @param string $expected |
|
1832 | + */ |
|
1820 | 1833 | private function _renderWithSourceFileComments($name, $expected) |
1821 | 1834 | { |
1822 | 1835 | $viewer = new SSViewer(array($name)); |