summaryrefslogtreecommitdiffstats
path: root/Core
diff options
context:
space:
mode:
Diffstat (limited to 'Core')
-rw-r--r--Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php16
-rw-r--r--Core/Authentication/Token/AbstractToken.php2
-rw-r--r--Core/Tests/Authentication/Token/AbstractTokenTest.php14
-rw-r--r--Core/Tests/Authorization/AccessDecisionManagerTest.php5
-rw-r--r--Core/Tests/Authorization/Voter/RoleVoterTest.php1
-rw-r--r--Core/Tests/Encoder/EncoderFactoryTest.php20
-rw-r--r--Core/Util/ClassUtils.php4
-rw-r--r--Core/Util/StringUtils.php4
8 files changed, 39 insertions, 27 deletions
diff --git a/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php b/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
index 21ce8d0..b1e6c38 100644
--- a/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
+++ b/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
@@ -56,9 +56,9 @@ class PreAuthenticatedAuthenticationProvider implements AuthenticationProviderIn
return;
}
- if (!$user = $token->getUser()) {
- throw new BadCredentialsException('No pre-authenticated principal found in request.');
- }
+ if (!$user = $token->getUser()) {
+ throw new BadCredentialsException('No pre-authenticated principal found in request.');
+ }
/*
if (null === $token->getCredentials()) {
throw new BadCredentialsException('No pre-authenticated credentials found in request.');
@@ -66,13 +66,13 @@ class PreAuthenticatedAuthenticationProvider implements AuthenticationProviderIn
*/
$user = $this->userProvider->loadUserByUsername($user);
- $this->userChecker->checkPostAuth($user);
+ $this->userChecker->checkPostAuth($user);
- $authenticatedToken = new PreAuthenticatedToken($user, $token->getCredentials(), $this->providerKey, $user->getRoles());
- $authenticatedToken->setAttributes($token->getAttributes());
+ $authenticatedToken = new PreAuthenticatedToken($user, $token->getCredentials(), $this->providerKey, $user->getRoles());
+ $authenticatedToken->setAttributes($token->getAttributes());
- return $authenticatedToken;
- }
+ return $authenticatedToken;
+ }
/**
* {@inheritdoc}
diff --git a/Core/Authentication/Token/AbstractToken.php b/Core/Authentication/Token/AbstractToken.php
index 4590939..b54d25e 100644
--- a/Core/Authentication/Token/AbstractToken.php
+++ b/Core/Authentication/Token/AbstractToken.php
@@ -150,7 +150,7 @@ abstract class AbstractToken implements TokenInterface
is_object($this->user) ? clone $this->user : $this->user,
$this->authenticated,
$this->roles,
- $this->attributes
+ $this->attributes,
)
);
}
diff --git a/Core/Tests/Authentication/Token/AbstractTokenTest.php b/Core/Tests/Authentication/Token/AbstractTokenTest.php
index 098017e..6f2b6ed 100644
--- a/Core/Tests/Authentication/Token/AbstractTokenTest.php
+++ b/Core/Tests/Authentication/Token/AbstractTokenTest.php
@@ -52,7 +52,9 @@ class ConcreteToken extends AbstractToken
parent::unserialize($parentStr);
}
- public function getCredentials() {}
+ public function getCredentials()
+ {
+ }
}
class AbstractTokenTest extends \PHPUnit_Framework_TestCase
@@ -227,13 +229,13 @@ class AbstractTokenTest extends \PHPUnit_Framework_TestCase
'foo', $user,
),
array(
- 'foo', $advancedUser
+ 'foo', $advancedUser,
),
array(
- $user, 'foo'
+ $user, 'foo',
),
array(
- $advancedUser, 'foo'
+ $advancedUser, 'foo',
),
array(
$user, new TestUser('foo'),
@@ -254,10 +256,10 @@ class AbstractTokenTest extends \PHPUnit_Framework_TestCase
new TestUser('foo'), $advancedUser,
),
array(
- $user, $advancedUser
+ $user, $advancedUser,
),
array(
- $advancedUser, $user
+ $advancedUser, $user,
),
);
}
diff --git a/Core/Tests/Authorization/AccessDecisionManagerTest.php b/Core/Tests/Authorization/AccessDecisionManagerTest.php
index 0db50cf..15603e7 100644
--- a/Core/Tests/Authorization/AccessDecisionManagerTest.php
+++ b/Core/Tests/Authorization/AccessDecisionManagerTest.php
@@ -93,7 +93,7 @@ class AccessDecisionManagerTest extends \PHPUnit_Framework_TestCase
array($token, 'consensus', $this->getVoter(VoterInterface::ACCESS_DENIED), false),
array($token, 'consensus', $this->getVoter(VoterInterface::ACCESS_GRANTED), true),
-
+
array($token, 'unanimous', $this->getVoterFor2Roles($token, VoterInterface::ACCESS_DENIED, VoterInterface::ACCESS_DENIED), false),
array($token, 'unanimous', $this->getVoterFor2Roles($token, VoterInterface::ACCESS_DENIED, VoterInterface::ACCESS_GRANTED), false),
array($token, 'unanimous', $this->getVoterFor2Roles($token, VoterInterface::ACCESS_GRANTED, VoterInterface::ACCESS_DENIED), false),
@@ -172,7 +172,6 @@ class AccessDecisionManagerTest extends \PHPUnit_Framework_TestCase
$voter->expects($this->any())
->method('vote')
->will($this->returnValue($vote));
- ;
return $voter;
}
@@ -183,7 +182,6 @@ class AccessDecisionManagerTest extends \PHPUnit_Framework_TestCase
$voter->expects($this->any())
->method('supportsClass')
->will($this->returnValue($ret));
- ;
return $voter;
}
@@ -194,7 +192,6 @@ class AccessDecisionManagerTest extends \PHPUnit_Framework_TestCase
$voter->expects($this->any())
->method('supportsAttribute')
->will($this->returnValue($ret));
- ;
return $voter;
}
diff --git a/Core/Tests/Authorization/Voter/RoleVoterTest.php b/Core/Tests/Authorization/Voter/RoleVoterTest.php
index 62e3013..03ab2da 100644
--- a/Core/Tests/Authorization/Voter/RoleVoterTest.php
+++ b/Core/Tests/Authorization/Voter/RoleVoterTest.php
@@ -55,7 +55,6 @@ class RoleVoterTest extends \PHPUnit_Framework_TestCase
$token->expects($this->once())
->method('getRoles')
->will($this->returnValue($roles));
- ;
return $token;
}
diff --git a/Core/Tests/Encoder/EncoderFactoryTest.php b/Core/Tests/Encoder/EncoderFactoryTest.php
index 18c8c4a..f847a0f 100644
--- a/Core/Tests/Encoder/EncoderFactoryTest.php
+++ b/Core/Tests/Encoder/EncoderFactoryTest.php
@@ -82,11 +82,21 @@ class EncoderFactoryTest extends \PHPUnit_Framework_TestCase
class SomeUser implements UserInterface
{
- public function getRoles() {}
- public function getPassword() {}
- public function getSalt() {}
- public function getUsername() {}
- public function eraseCredentials() {}
+ public function getRoles()
+ {
+ }
+ public function getPassword()
+ {
+ }
+ public function getSalt()
+ {
+ }
+ public function getUsername()
+ {
+ }
+ public function eraseCredentials()
+ {
+ }
}
class SomeChildUser extends SomeUser
diff --git a/Core/Util/ClassUtils.php b/Core/Util/ClassUtils.php
index 26bf1a1..1d40c8d 100644
--- a/Core/Util/ClassUtils.php
+++ b/Core/Util/ClassUtils.php
@@ -39,7 +39,9 @@ class ClassUtils
/**
* This class should not be instantiated
*/
- private function __construct() {}
+ private function __construct()
+ {
+ }
/**
* Gets the real class name of a class name that could be a proxy.
diff --git a/Core/Util/StringUtils.php b/Core/Util/StringUtils.php
index acf8e9e..01441cb 100644
--- a/Core/Util/StringUtils.php
+++ b/Core/Util/StringUtils.php
@@ -21,7 +21,9 @@ class StringUtils
/**
* This class should not be instantiated
*/
- private function __construct() {}
+ private function __construct()
+ {
+ }
/**
* Compares two strings.
generated by cgit v1.1 at 2025-05-17 15:43:04 +0000