@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | * Find an attribute in a SimpleXMLElement object by name. |
| 227 | 227 | * @param SimpleXMLElement $object |
| 228 | 228 | * @param string $attribute Name of attribute to find |
| 229 | - * @return SimpleXMLElement object of the attribute |
|
| 229 | + * @return boolean object of the attribute |
|
| 230 | 230 | */ |
| 231 | 231 | public function findAttribute($object, $attribute) |
| 232 | 232 | { |
@@ -260,7 +260,7 @@ discard block |
||
| 260 | 260 | * Note: characters are stripped from the content; make sure that your assertions take this into account. |
| 261 | 261 | * |
| 262 | 262 | * @param string $selector A basic CSS selector, e.g. 'li.jobs h3' |
| 263 | - * @param array|string $expectedMatches The content of at least one of the matched tags |
|
| 263 | + * @param string[] $expectedMatches The content of at least one of the matched tags |
|
| 264 | 264 | * @param string $message |
| 265 | 265 | * @throws PHPUnit_Framework_AssertionFailedError |
| 266 | 266 | */ |
@@ -19,6 +19,11 @@ |
||
| 19 | 19 | parent::__construct(); |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | + /** |
|
| 23 | + * @param ManifestFileFinder $finder |
|
| 24 | + * @param null|string $base |
|
| 25 | + * @param string[] $expect |
|
| 26 | + */ |
|
| 22 | 27 | public function assertFinderFinds($finder, $base, $expect, $message = null) |
| 23 | 28 | { |
| 24 | 29 | if (!$base) { |
@@ -8,7 +8,6 @@ |
||
| 8 | 8 | use SilverStripe\ORM\DataModel; |
| 9 | 9 | use SilverStripe\ORM\FieldType\DBHTMLText; |
| 10 | 10 | use SilverStripe\Security\BasicAuth; |
| 11 | -use SilverStripe\Security\Member; |
|
| 12 | 11 | use SilverStripe\Security\Security; |
| 13 | 12 | use SilverStripe\View\SSViewer; |
| 14 | 13 | use SilverStripe\View\TemplateGlobalProvider; |
@@ -310,6 +310,9 @@ |
||
| 310 | 310 | |
| 311 | 311 | private static $method_from_cache = array(); |
| 312 | 312 | |
| 313 | + /** |
|
| 314 | + * @param string $method |
|
| 315 | + */ |
|
| 313 | 316 | public static function has_method_from($class, $method, $compclass) |
| 314 | 317 | { |
| 315 | 318 | $lClass = strtolower($class); |
@@ -4,7 +4,6 @@ |
||
| 4 | 4 | |
| 5 | 5 | use SilverStripe\Core\Injector\Injectable; |
| 6 | 6 | use Iterator; |
| 7 | - |
|
| 8 | 7 | use SilverStripe\Control\Director; |
| 9 | 8 | |
| 10 | 9 | /** |
@@ -6,7 +6,6 @@ |
||
| 6 | 6 | use SilverStripe\ORM\DataObjectInterface; |
| 7 | 7 | use SilverStripe\Security\Member; |
| 8 | 8 | use SilverStripe\Security\Security; |
| 9 | -use SilverStripe\View\Requirements; |
|
| 10 | 9 | |
| 11 | 10 | /** |
| 12 | 11 | * Two masked input fields, checks for matching passwords. |
@@ -190,7 +190,7 @@ |
||
| 190 | 190 | /** |
| 191 | 191 | * Ensure that the query is ready to execute. |
| 192 | 192 | * |
| 193 | - * @param array|null $queriedColumns Any columns to filter the query by |
|
| 193 | + * @param string[] $queriedColumns Any columns to filter the query by |
|
| 194 | 194 | * @return SQLSelect The finalised sql query |
| 195 | 195 | */ |
| 196 | 196 | public function getFinalisedQuery($queriedColumns = null) |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | * @param Member $member The member to log in. |
| 19 | 19 | * @param Boolean $persistent boolean If set to true, the login may persist beyond the current session. |
| 20 | 20 | * @param HTTPRequest $request The request of the visitor that is logging in, to get, for example, cookies. |
| 21 | - * @param HTTPResponse $response The response object to modify, if needed. |
|
| 21 | + * @return void |
|
| 22 | 22 | */ |
| 23 | 23 | public function logIn(Member $member, $persistent, HTTPRequest $request); |
| 24 | 24 | |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | * Log any logged-in member out of this identity store. |
| 27 | 27 | * |
| 28 | 28 | * @param HTTPRequest $request The request of the visitor that is logging out, to get, for example, cookies. |
| 29 | - * @param HTTPResponse $response The response object to modify, if needed. |
|
| 29 | + * @return void |
|
| 30 | 30 | */ |
| 31 | 31 | public function logOut(HTTPRequest $request); |
| 32 | 32 | } |
@@ -6,11 +6,9 @@ |
||
| 6 | 6 | /** @skipUpgrade */ |
| 7 | 7 | use SilverStripe\Admin\ModelAdmin; |
| 8 | 8 | /** @skipUpgrade */ |
| 9 | -use SilverStripe\Control\Controller as Cont ; |
|
| 10 | 9 | /** @skipUpgrade */ |
| 11 | -use SilverStripe\Control\HTTPRequest as Request, SilverStripe\Control\HTTPResponse as Response, SilverStripe\Security\PermissionProvider as P; |
|
| 10 | +use SilverStripe\Security\PermissionProvider as P; |
|
| 12 | 11 | /** @skipUpgrade */ |
| 13 | -use silverstripe\test\ClassA; |
|
| 14 | 12 | /** @skipUpgrade */ |
| 15 | 13 | use \SilverStripe\Core\ClassInfo; |
| 16 | 14 | |