diff options
20 files changed, 35 insertions, 37 deletions
diff --git a/Acl/Dbal/MutableAclProvider.php b/Acl/Dbal/MutableAclProvider.php index b1c28c6..1bf105f 100644 --- a/Acl/Dbal/MutableAclProvider.php +++ b/Acl/Dbal/MutableAclProvider.php @@ -114,6 +114,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf * ACL entries have the CASCADE option on their foreign key so they will also get deleted * * @param SecurityIdentityInterface $sid + * * @throws \InvalidArgumentException */ public function deleteSecurityIdentity(SecurityIdentityInterface $sid) @@ -368,7 +369,7 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf * Updates a user security identity when the user's username changes * * @param UserSecurityIdentity $usid - * @param string $oldUsername + * @param string $oldUsername */ public function updateUserSecurityIdentity(UserSecurityIdentity $usid, $oldUsername) { @@ -653,7 +654,9 @@ QUERY; * Constructs the SQL to delete a security identity. * * @param SecurityIdentityInterface $sid + * * @throws \InvalidArgumentException + * * @return string */ protected function getDeleteSecurityIdentityIdSql(SecurityIdentityInterface $sid) @@ -692,7 +695,8 @@ QUERY; * Constructs the SQL for updating a user security identity. * * @param UserSecurityIdentity $usid - * @param string $oldUsername + * @param string $oldUsername + * * @return string */ protected function getUpdateUserSecurityIdentitySql(UserSecurityIdentity $usid, $oldUsername) diff --git a/Acl/Domain/SecurityIdentityRetrievalStrategy.php b/Acl/Domain/SecurityIdentityRetrievalStrategy.php index b95fddc..43f1d38 100644 --- a/Acl/Domain/SecurityIdentityRetrievalStrategy.php +++ b/Acl/Domain/SecurityIdentityRetrievalStrategy.php @@ -12,7 +12,6 @@ namespace Symfony\Component\Security\Acl\Domain; use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken; - use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Acl\Model\SecurityIdentityRetrievalStrategyInterface; use Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolver; diff --git a/Acl/Model/MutableAclProviderInterface.php b/Acl/Model/MutableAclProviderInterface.php index f5bb198..f94ddc5 100644 --- a/Acl/Model/MutableAclProviderInterface.php +++ b/Acl/Model/MutableAclProviderInterface.php @@ -24,7 +24,7 @@ interface MutableAclProviderInterface extends AclProviderInterface * @param ObjectIdentityInterface $oid * * @throws AclAlreadyExistsException when there already is an ACL for the given - * object identity + * object identity * * @return MutableAclInterface */ diff --git a/Acl/Tests/Domain/AclTest.php b/Acl/Tests/Domain/AclTest.php index ff29bcf..84b9ba9 100644 --- a/Acl/Tests/Domain/AclTest.php +++ b/Acl/Tests/Domain/AclTest.php @@ -12,7 +12,6 @@ namespace Symfony\Component\Security\Acl\Tests\Domain; use Symfony\Component\Security\Acl\Domain\UserSecurityIdentity; - use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity; use Symfony\Component\Security\Acl\Domain\PermissionGrantingStrategy; use Symfony\Component\Security\Acl\Domain\ObjectIdentity; diff --git a/Core/Authentication/Provider/AuthenticationProviderInterface.php b/Core/Authentication/Provider/AuthenticationProviderInterface.php index 401df6d..8007234 100644 --- a/Core/Authentication/Provider/AuthenticationProviderInterface.php +++ b/Core/Authentication/Provider/AuthenticationProviderInterface.php @@ -24,12 +24,12 @@ use Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterfac */ interface AuthenticationProviderInterface extends AuthenticationManagerInterface { - /** - * Checks whether this provider supports the given token. - * - * @param TokenInterface $token A TokenInterface instance - * - * @return bool true if the implementation supports the Token, false otherwise - */ + /** + * Checks whether this provider supports the given token. + * + * @param TokenInterface $token A TokenInterface instance + * + * @return bool true if the implementation supports the Token, false otherwise + */ public function supports(TokenInterface $token); } diff --git a/Core/Authorization/Voter/AbstractVoter.php b/Core/Authorization/Voter/AbstractVoter.php index 5d51090..43ca558 100644 --- a/Core/Authorization/Voter/AbstractVoter.php +++ b/Core/Authorization/Voter/AbstractVoter.php @@ -54,7 +54,7 @@ abstract class AbstractVoter implements VoterInterface * @param object $object The object to secure * @param array $attributes An array of attributes associated with the method being invoked * - * @return int either ACCESS_GRANTED, ACCESS_ABSTAIN, or ACCESS_DENIED + * @return int either ACCESS_GRANTED, ACCESS_ABSTAIN, or ACCESS_DENIED */ public function vote(TokenInterface $token, $object, array $attributes) { @@ -85,14 +85,14 @@ abstract class AbstractVoter implements VoterInterface /** * Return an array of supported classes. This will be called by supportsClass * - * @return array an array of supported classes, i.e. array('Acme\DemoBundle\Model\Product') + * @return array an array of supported classes, i.e. array('Acme\DemoBundle\Model\Product') */ abstract protected function getSupportedClasses(); /** * Return an array of supported attributes. This will be called by supportsAttribute * - * @return array an array of supported attributes, i.e. array('CREATE', 'READ') + * @return array an array of supported attributes, i.e. array('CREATE', 'READ') */ abstract protected function getSupportedAttributes(); diff --git a/Core/SecurityContext.php b/Core/SecurityContext.php index 1f46cd6..545d4cb 100644 --- a/Core/SecurityContext.php +++ b/Core/SecurityContext.php @@ -41,7 +41,7 @@ class SecurityContext implements SecurityContextInterface private $authorizationChecker; /** - * For backwords compatibility, the signature of sf <2.6 still works + * For backwards compatibility, the signature of sf <2.6 still works * * @param TokenStorageInterface|AuthenticationManagerInterface $tokenStorage * @param AuthorizationCheckerInterface|AccessDecisionManagerInterface $authorizationChecker diff --git a/Core/Tests/Authentication/Provider/DaoAuthenticationProviderTest.php b/Core/Tests/Authentication/Provider/DaoAuthenticationProviderTest.php index ae96f10..3eedb8e 100644 --- a/Core/Tests/Authentication/Provider/DaoAuthenticationProviderTest.php +++ b/Core/Tests/Authentication/Provider/DaoAuthenticationProviderTest.php @@ -12,7 +12,6 @@ namespace Symfony\Component\Security\Core\Tests\Authentication\Provider; use Symfony\Component\Security\Core\Encoder\PlaintextPasswordEncoder; - use Symfony\Component\Security\Core\Authentication\Provider\DaoAuthenticationProvider; use Symfony\Component\Security\Core\Exception\UsernameNotFoundException; diff --git a/Core/Tests/User/ChainUserProviderTest.php b/Core/Tests/User/ChainUserProviderTest.php index 57873cf..ab01f47 100644 --- a/Core/Tests/User/ChainUserProviderTest.php +++ b/Core/Tests/User/ChainUserProviderTest.php @@ -12,9 +12,7 @@ namespace Symfony\Component\Security\Core\Tests\User; use Symfony\Component\Security\Core\Exception\UnsupportedUserException; - use Symfony\Component\Security\Core\User\ChainUserProvider; - use Symfony\Component\Security\Core\Exception\UsernameNotFoundException; class ChainUserProviderTest extends \PHPUnit_Framework_TestCase diff --git a/Csrf/CsrfTokenManagerInterface.php b/Csrf/CsrfTokenManagerInterface.php index 050b6c1..5abe47c 100644 --- a/Csrf/CsrfTokenManagerInterface.php +++ b/Csrf/CsrfTokenManagerInterface.php @@ -62,7 +62,7 @@ interface CsrfTokenManagerInterface * * @param CsrfToken $token A CSRF token * - * @return bool Returns true if the token is valid, false otherwise + * @return bool Returns true if the token is valid, false otherwise */ public function isTokenValid(CsrfToken $token); } diff --git a/Csrf/TokenStorage/NativeSessionTokenStorage.php b/Csrf/TokenStorage/NativeSessionTokenStorage.php index bb1a417..60145c6 100644 --- a/Csrf/TokenStorage/NativeSessionTokenStorage.php +++ b/Csrf/TokenStorage/NativeSessionTokenStorage.php @@ -40,8 +40,8 @@ class NativeSessionTokenStorage implements TokenStorageInterface /** * Initializes the storage with a session namespace. * - * @param string $namespace The namespace under which the token is stored - * in the session + * @param string $namespace The namespace under which the token is stored + * in the session */ public function __construct($namespace = self::SESSION_NAMESPACE) { diff --git a/Csrf/TokenStorage/TokenStorageInterface.php b/Csrf/TokenStorage/TokenStorageInterface.php index ea3a6a8..0fadfa3 100644 --- a/Csrf/TokenStorage/TokenStorageInterface.php +++ b/Csrf/TokenStorage/TokenStorageInterface.php @@ -53,7 +53,7 @@ interface TokenStorageInterface * * @param string $tokenId The token ID * - * @return bool Whether a token exists with the given ID + * @return bool Whether a token exists with the given ID */ public function hasToken($tokenId); } diff --git a/Http/Authentication/AuthenticationUtils.php b/Http/Authentication/AuthenticationUtils.php index 38763dc..317c8a0 100644 --- a/Http/Authentication/AuthenticationUtils.php +++ b/Http/Authentication/AuthenticationUtils.php @@ -38,7 +38,8 @@ class AuthenticationUtils /** * @param bool $clearSession - * @return null|AuthenticationException + * + * @return AuthenticationException|null */ public function getLastAuthenticationError($clearSession = true) { diff --git a/Http/Authentication/CustomAuthenticationFailureHandler.php b/Http/Authentication/CustomAuthenticationFailureHandler.php index 35bfc05..36d4a78 100644 --- a/Http/Authentication/CustomAuthenticationFailureHandler.php +++ b/Http/Authentication/CustomAuthenticationFailureHandler.php @@ -24,8 +24,8 @@ class CustomAuthenticationFailureHandler implements AuthenticationFailureHandler /** * Constructor. * - * @param AuthenticationFailureHandlerInterface $handler An AuthenticationFailureHandlerInterface instance - * @param array $options Options for processing a successful authentication attempt + * @param AuthenticationFailureHandlerInterface $handler An AuthenticationFailureHandlerInterface instance + * @param array $options Options for processing a successful authentication attempt */ public function __construct(AuthenticationFailureHandlerInterface $handler, array $options) { diff --git a/Http/Firewall/SimplePreAuthenticationListener.php b/Http/Firewall/SimplePreAuthenticationListener.php index a6f4f77..e80cc98 100644 --- a/Http/Firewall/SimplePreAuthenticationListener.php +++ b/Http/Firewall/SimplePreAuthenticationListener.php @@ -38,11 +38,11 @@ class SimplePreAuthenticationListener implements ListenerInterface /** * Constructor. * - * @param SecurityContextInterface $securityContext A SecurityContext instance - * @param AuthenticationManagerInterface $authenticationManager An AuthenticationManagerInterface instance - * @param string $providerKey - * @param SimplePreAuthenticatorInterface $simpleAuthenticator A SimplePreAuthenticatorInterface instance - * @param LoggerInterface $logger A LoggerInterface instance + * @param SecurityContextInterface $securityContext A SecurityContext instance + * @param AuthenticationManagerInterface $authenticationManager An AuthenticationManagerInterface instance + * @param string $providerKey + * @param SimplePreAuthenticatorInterface $simpleAuthenticator A SimplePreAuthenticatorInterface instance + * @param LoggerInterface $logger A LoggerInterface instance */ public function __construct(SecurityContextInterface $securityContext, AuthenticationManagerInterface $authenticationManager, $providerKey, SimplePreAuthenticatorInterface $simpleAuthenticator, LoggerInterface $logger = null) { diff --git a/Http/Tests/Firewall/RememberMeListenerTest.php b/Http/Tests/Firewall/RememberMeListenerTest.php index 4a33ed1..edc27a1 100644 --- a/Http/Tests/Firewall/RememberMeListenerTest.php +++ b/Http/Tests/Firewall/RememberMeListenerTest.php @@ -183,7 +183,7 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase public function testOnCoreSecurityInteractiveLoginEventIsDispatchedIfDispatcherIsPresent() { - list($listener, $context, $service, $manager,, $dispatcher) = $this->getListener(true); + list($listener, $context, $service, $manager, , $dispatcher) = $this->getListener(true); $context ->expects($this->once()) diff --git a/Http/Tests/Firewall/RemoteUserAuthenticationListenerTest.php b/Http/Tests/Firewall/RemoteUserAuthenticationListenerTest.php index 2bc1ad6..6e6b979 100644 --- a/Http/Tests/Firewall/RemoteUserAuthenticationListenerTest.php +++ b/Http/Tests/Firewall/RemoteUserAuthenticationListenerTest.php @@ -19,7 +19,7 @@ class RemoteUserAuthenticationListenerTest extends \PHPUnit_Framework_TestCase public function testGetPreAuthenticatedData() { $serverVars = array( - 'REMOTE_USER' => 'TheUser' + 'REMOTE_USER' => 'TheUser', ); $request = new Request(array(), array(), array(), array(), array(), $serverVars); @@ -69,7 +69,7 @@ class RemoteUserAuthenticationListenerTest extends \PHPUnit_Framework_TestCase $userCredentials = array('TheUser', null); $request = new Request(array(), array(), array(), array(), array(), array( - 'TheUserKey' => 'TheUser' + 'TheUserKey' => 'TheUser', )); $context = $this->getMock('Symfony\Component\Security\Core\SecurityContextInterface'); diff --git a/Http/Tests/Firewall/SwitchUserListenerTest.php b/Http/Tests/Firewall/SwitchUserListenerTest.php index 9e149a2..9fb4e50 100644 --- a/Http/Tests/Firewall/SwitchUserListenerTest.php +++ b/Http/Tests/Firewall/SwitchUserListenerTest.php @@ -157,7 +157,7 @@ class SwitchUserListenerTest extends \PHPUnit_Framework_TestCase $this->securityContext->expects($this->any())->method('getToken')->will($this->returnValue($token)); $this->request->expects($this->any())->method('get')->with('_switch_user')->will($this->returnValue('kuba')); $this->request->query->expects($this->once())->method('remove', '_switch_user'); - $this->request->query->expects($this->any())->method('all')->will($this->returnValue(array('page' => 3,'section' => 2))); + $this->request->query->expects($this->any())->method('all')->will($this->returnValue(array('page' => 3, 'section' => 2))); $this->request->expects($this->any())->method('getUri')->will($this->returnValue('/')); $this->request->server->expects($this->once())->method('set')->with('QUERY_STRING', 'page=3§ion=2'); diff --git a/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php b/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php index 5914259..29cf5d1 100644 --- a/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php +++ b/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php @@ -12,7 +12,6 @@ namespace Symfony\Component\Security\Http\Tests\RememberMe; use Symfony\Component\Security\Http\RememberMe\RememberMeServicesInterface; - use Symfony\Component\Security\Core\Authentication\Token\RememberMeToken; use Symfony\Component\Security\Core\Exception\UsernameNotFoundException; use Symfony\Component\Security\Core\Authentication\RememberMe\PersistentToken; diff --git a/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php b/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php index 2bc0419..ac41207 100644 --- a/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php +++ b/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php @@ -12,7 +12,6 @@ namespace Symfony\Component\Security\Http\Tests\RememberMe; use Symfony\Component\Security\Http\RememberMe\RememberMeServicesInterface; - use Symfony\Component\Security\Core\Authentication\Token\RememberMeToken; use Symfony\Component\Security\Core\Exception\UsernameNotFoundException; use Symfony\Component\HttpFoundation\Request; |