sminnee / silverstripe-framework

src/Dev/FunctionalTest.php

Doc Comments +2 added lines, -3 removed lines

@@ -230,7 +230,7 @@ 
      * Find an attribute in a SimpleXMLElement object by name.
      * @param SimpleXMLElement $object
      * @param string $attribute Name of attribute to find
-     * @return SimpleXMLElement object of the attribute
+     * @return boolean object of the attribute
      */
     public function findAttribute($object, $attribute)
     {
@@ -264,7 +264,7 @@ 
      * Note:   characters are stripped from the content; make sure that your assertions take this into account.
      *
      * @param string $selector A basic CSS selector, e.g. 'li.jobs h3'
-     * @param array|string $expectedMatches The content of at least one of the matched tags
+     * @param string[] $expectedMatches The content of at least one of the matched tags
      * @param string $message
      * @throws PHPUnit_Framework_AssertionFailedError
      */
@@ -419,7 +419,6 @@ 
     /**
      * Log in as the given member
      *
-     * @param Member|int|string $member The ID, fixture codename, or Member object of the member that you want to log in
      */
     public function logOut()
     {

src/Security/Member.php

Doc Comments +5 added lines, -6 removed lines

@@ -422,7 +422,6 @@ 
     /**
      * @deprecated Use Security::setCurrentUser() or IdentityStore::logIn()
      *
-     * @param bool $remember If set to TRUE, the member will be logged in automatically the next time.
      */
     public function logIn()
     {
@@ -735,9 +734,9 @@ 
      * });
      * </code>
      *
-     * @param Member|null|int $member Member or member ID to log in as.
+     * @param Member|null $member Member or member ID to log in as.
      * Set to null or 0 to act as a logged out user.
-     * @param $callback
+     * @param \Closure $callback
      */
     public static function actAs($member, $callback)
     {
@@ -1485,7 +1484,7 @@ 
      * This is likely to be customized for social sites etc. with a looser permission model.
      *
      * @param Member $member
-     * @return bool
+     * @return boolean|string
      */
     public function canView($member = null)
     {
@@ -1516,7 +1515,7 @@ 
      * Otherwise they'll need ADMIN or CMS_ACCESS_SecurityAdmin permissions
      *
      * @param Member $member
-     * @return bool
+     * @return boolean|string
      */
     public function canEdit($member = null)
     {
@@ -1551,7 +1550,7 @@ 
      * Otherwise they'll need ADMIN or CMS_ACCESS_SecurityAdmin permissions
      *
      * @param Member $member
-     * @return bool
+     * @return boolean|string
      */
     public function canDelete($member = null)
     {

Unused Use Statements -3 removed lines

@@ -12,7 +12,6 @@ 
 use SilverStripe\Control\Session;
 use SilverStripe\Core\Convert;
 use SilverStripe\Core\Injector\Injector;
-use SilverStripe\Dev\SapphireTest;
 use SilverStripe\Dev\TestMailer;
 use SilverStripe\Forms\ConfirmedPasswordField;
 use SilverStripe\Forms\DropdownField;
@@ -31,9 +30,7 @@ 
 use SilverStripe\ORM\Map;
 use SilverStripe\ORM\ValidationException;
 use SilverStripe\ORM\ValidationResult;
-use SilverStripe\View\SSViewer;
 use SilverStripe\View\TemplateGlobalProvider;
-use DateTime;
 
 /**
  * The member class which represents the users of the system

src/Security/MemberAuthenticator/CookieAuthenticationHandler.php

Doc Comments +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
     /**
      * Set the name of the cookie used to track this device
      *
-     * @param string $cookieName
+     * @param string $deviceCookieName
      * @return null
      */
     public function setDeviceCookieName($deviceCookieName)
@@ -57,7 +57,7 @@ 
     /**
      * Set the name of the cookie used to store an login token
      *
-     * @param string $cookieName
+     * @param string $tokenCookieName
      * @return null
      */
     public function setTokenCookieName($tokenCookieName)

Unused Use Statements -2 removed lines

@@ -2,10 +2,8 @@
 
 namespace SilverStripe\Security\MemberAuthenticator;
 
-use SilverStripe\ORM\DataObject;
 use SilverStripe\Security\Member;
 use SilverStripe\Control\HTTPRequest;
-use SilverStripe\Control\HTTPResponse;
 use SilverStripe\Security\AuthenticationHandler as AuthenticationHandlerInterface;
 use SilverStripe\Security\IdentityStore;
 use SilverStripe\Security\RememberLoginHash;

src/Security/MemberAuthenticator/LoginHandler.php

Doc Comments +3 added lines, -1 removed lines

@@ -137,7 +137,6 @@ 
      *   [Optional: 'Remember' => 1 ]
      * )
      *
-     * @param array $data
      * @return HTTPResponse
      */
     protected function redirectAfterSuccessfulLogin()
@@ -219,6 +218,8 @@ 
      * Try to authenticate the user
      *
      * @param array $data Submitted data
+     * @param Member $member
+     * @param \SilverStripe\Control\HTTPRequest $request
      * @return Member Returns the member object on successful authentication
      *                or NULL on failure.
      */
@@ -249,6 +250,7 @@ 
 
     /**
      * @todo copypaste from FormRequestHandler - refactor
+     * @param string $link
      */
     protected function addBackURLParam($link)
     {

src/Security/MemberAuthenticator/SessionAuthenticationHandler.php

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 use SilverStripe\ORM\DataObject;
 use SilverStripe\Security\Member;
 use SilverStripe\Control\HTTPRequest;
-use SilverStripe\Control\HTTPResponse;
 use SilverStripe\Control\Session;
 use SilverStripe\Control\Director;
 use SilverStripe\Security\AuthenticationHandler as AuthenticationHandlerInterface;

tests/php/Security/MemberAuthenticatorTest.php

Unused Use Statements -5 removed lines

@@ -3,12 +3,8 @@ 
 namespace SilverStripe\Security\Tests;
 
 use SilverStripe\Core\Injector\Injector;
-use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\FieldType\DBDatetime;
-use SilverStripe\ORM\ValidationResult;
 use SilverStripe\Security\MemberAuthenticator\CMSAuthenticator;
-use SilverStripe\Security\PasswordEncryptor;
-use SilverStripe\Security\PasswordEncryptor_PHPHash;
 use SilverStripe\Security\Security;
 use SilverStripe\Security\Member;
 use SilverStripe\Security\MemberAuthenticator\Authenticator;
@@ -17,7 +13,6 @@ 
 use SilverStripe\Security\IdentityStore;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Dev\SapphireTest;
-use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\Form;
 use SilverStripe\Control\HTTPRequest;