@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | |
| 80 | 80 | /** |
| 81 | 81 | * @param Member $member |
| 82 | - * @return HTTPResponse |
|
| 82 | + * @return \SilverStripe\Control\HTTPResponse |
|
| 83 | 83 | */ |
| 84 | 84 | public function doLogOut($member) |
| 85 | 85 | { |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | /** |
| 102 | - * @return HTTPResponse |
|
| 102 | + * @return \SilverStripe\Control\HTTPResponse |
|
| 103 | 103 | */ |
| 104 | 104 | protected function redirectAfterLogout() |
| 105 | 105 | { |
@@ -5,7 +5,6 @@ |
||
| 5 | 5 | use InvalidArgumentException; |
| 6 | 6 | use SilverStripe\Control\HTTPRequest; |
| 7 | 7 | use SilverStripe\Core\Extensible; |
| 8 | -use SilverStripe\Dev\Debug; |
|
| 9 | 8 | use SilverStripe\ORM\ValidationResult; |
| 10 | 9 | use SilverStripe\Security\Authenticator; |
| 11 | 10 | use SilverStripe\Security\DefaultAdminService; |
@@ -84,11 +84,17 @@ |
||
| 84 | 84 | */ |
| 85 | 85 | private $token = null; |
| 86 | 86 | |
| 87 | + /** |
|
| 88 | + * @return string |
|
| 89 | + */ |
|
| 87 | 90 | public function getToken() |
| 88 | 91 | { |
| 89 | 92 | return $this->token; |
| 90 | 93 | } |
| 91 | 94 | |
| 95 | + /** |
|
| 96 | + * @param string $token |
|
| 97 | + */ |
|
| 92 | 98 | public function setToken($token) |
| 93 | 99 | { |
| 94 | 100 | $this->token = $token; |
@@ -12,7 +12,6 @@ |
||
| 12 | 12 | use SilverStripe\Control\HTTPResponse; |
| 13 | 13 | use SilverStripe\Control\HTTPResponse_Exception; |
| 14 | 14 | use SilverStripe\Control\RequestHandler; |
| 15 | -use SilverStripe\Control\Session; |
|
| 16 | 15 | use SilverStripe\Core\ClassInfo; |
| 17 | 16 | use SilverStripe\Core\Convert; |
| 18 | 17 | use SilverStripe\Core\Injector\Injector; |
@@ -4,10 +4,8 @@ |
||
| 4 | 4 | |
| 5 | 5 | use SilverStripe\Control\Controller; |
| 6 | 6 | use SilverStripe\Core\ClassInfo; |
| 7 | -use SilverStripe\Core\Config\Config; |
|
| 8 | 7 | use SilverStripe\Core\Extension; |
| 9 | 8 | use SilverStripe\Core\Injector\Injector; |
| 10 | -use SilverStripe\Core\Manifest\ClassLoader; |
|
| 11 | 9 | use SilverStripe\Core\Tests\ObjectTest\BaseObject; |
| 12 | 10 | use SilverStripe\Core\Tests\ObjectTest\ExtendTest1; |
| 13 | 11 | use SilverStripe\Core\Tests\ObjectTest\ExtendTest2; |
@@ -400,7 +400,7 @@ |
||
| 400 | 400 | * string of HTML. |
| 401 | 401 | * |
| 402 | 402 | * @param string $html HTML to scan for elements |
| 403 | - * @return SimpleXMLElement |
|
| 403 | + * @return \SimpleXMLElement[] |
|
| 404 | 404 | */ |
| 405 | 405 | public function findOptionElements($html) |
| 406 | 406 | { |
@@ -20,6 +20,11 @@ |
||
| 20 | 20 | |
| 21 | 21 | protected $id; |
| 22 | 22 | |
| 23 | + /** |
|
| 24 | + * @param \SilverStripe\Forms\GridField\GridField $gridField |
|
| 25 | + * @param string $id |
|
| 26 | + * @param string $link |
|
| 27 | + */ |
|
| 23 | 28 | public function __construct($gridField, $id, $link) |
| 24 | 29 | { |
| 25 | 30 | $this->gridField = $gridField; |
@@ -3,7 +3,6 @@ |
||
| 3 | 3 | namespace SilverStripe\Forms\Tests\GridField; |
| 4 | 4 | |
| 5 | 5 | use SilverStripe\Dev\CSSContentParser; |
| 6 | -use SilverStripe\Dev\Debug; |
|
| 7 | 6 | use SilverStripe\Dev\FunctionalTest; |
| 8 | 7 | use SilverStripe\Control\Controller; |
| 9 | 8 | use SilverStripe\Forms\HiddenField; |
@@ -102,6 +102,7 @@ |
||
| 102 | 102 | /** |
| 103 | 103 | * Determine if the current request is coming from a trusted proxy |
| 104 | 104 | * |
| 105 | + * @param HTTPRequest $request |
|
| 105 | 106 | * @return boolean True if the request's source IP is a trusted proxy |
| 106 | 107 | */ |
| 107 | 108 | protected function isTrustedProxy($request) |