summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGraham Campbell <graham@mineuk.com>2014-12-04 20:26:11 +0000
committerGraham Campbell <graham@mineuk.com>2014-12-04 20:26:11 +0000
commit1aaa26cad526c885a0ffd4fcef8a855a63024725 (patch)
tree24442a903e08d2e8f01438820b48a26e3faafce3
parent3598ef3378bcfb03fba1e368e168f30bb8169eb2 (diff)
downloadsymfony-security-1aaa26cad526c885a0ffd4fcef8a855a63024725.zip
symfony-security-1aaa26cad526c885a0ffd4fcef8a855a63024725.tar.gz
symfony-security-1aaa26cad526c885a0ffd4fcef8a855a63024725.tar.bz2
CS fixes
-rw-r--r--Acl/Dbal/MutableAclProvider.php8
-rw-r--r--Csrf/CsrfTokenManagerInterface.php2
-rw-r--r--Csrf/TokenStorage/NativeSessionTokenStorage.php4
-rw-r--r--Csrf/TokenStorage/TokenStorageInterface.php2
-rw-r--r--Http/Firewall/SimplePreAuthenticationListener.php10
-rw-r--r--Http/Tests/Firewall/SwitchUserListenerTest.php2
6 files changed, 16 insertions, 12 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/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/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/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&section=2');