diff options
Diffstat (limited to 'Core/Tests')
| -rw-r--r-- | Core/Tests/Authorization/AccessDecisionManagerTest.php | 4 | ||||
| -rw-r--r-- | Core/Tests/Authorization/AuthorizationCheckerTest.php | 2 | ||||
| -rw-r--r-- | Core/Tests/LegacySecurityContextTest.php | 5 | ||||
| -rw-r--r-- | Core/Tests/User/UserTest.php | 9 | ||||
| -rw-r--r-- | Core/Tests/Util/SecureRandomTest.php | 8 | ||||
| -rw-r--r-- | Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php | 1 |
6 files changed, 21 insertions, 8 deletions
diff --git a/Core/Tests/Authorization/AccessDecisionManagerTest.php b/Core/Tests/Authorization/AccessDecisionManagerTest.php index ae5894d..126bfe8 100644 --- a/Core/Tests/Authorization/AccessDecisionManagerTest.php +++ b/Core/Tests/Authorization/AccessDecisionManagerTest.php @@ -107,8 +107,8 @@ class AccessDecisionManagerTest extends \PHPUnit_Framework_TestCase $voter->expects($this->exactly(2)) ->method('vote') ->will($this->returnValueMap(array( - array($token, null, array("ROLE_FOO"), $vote1), - array($token, null, array("ROLE_BAR"), $vote2), + array($token, null, array('ROLE_FOO'), $vote1), + array($token, null, array('ROLE_BAR'), $vote2), ))) ; diff --git a/Core/Tests/Authorization/AuthorizationCheckerTest.php b/Core/Tests/Authorization/AuthorizationCheckerTest.php index 64de6ef..aafc12f 100644 --- a/Core/Tests/Authorization/AuthorizationCheckerTest.php +++ b/Core/Tests/Authorization/AuthorizationCheckerTest.php @@ -21,7 +21,7 @@ class AuthorizationCheckerTest extends \PHPUnit_Framework_TestCase private $authorizationChecker; private $tokenStorage; - public function setUp() + protected function setUp() { $this->authenticationManager = $this->getMock('Symfony\Component\Security\Core\Authentication\AuthenticationManagerInterface'); $this->accessDecisionManager = $this->getMock('Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface'); diff --git a/Core/Tests/LegacySecurityContextTest.php b/Core/Tests/LegacySecurityContextTest.php index 4d1adf8..f1f7861 100644 --- a/Core/Tests/LegacySecurityContextTest.php +++ b/Core/Tests/LegacySecurityContextTest.php @@ -15,13 +15,16 @@ use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage; use Symfony\Component\Security\Core\Authorization\AuthorizationChecker; use Symfony\Component\Security\Core\SecurityContext; +/** + * @group legacy + */ class LegacySecurityContextTest extends \PHPUnit_Framework_TestCase { private $tokenStorage; private $authorizationChecker; private $securityContext; - public function setUp() + protected function setUp() { $this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED); diff --git a/Core/Tests/User/UserTest.php b/Core/Tests/User/UserTest.php index 2fe6daa..f514eda 100644 --- a/Core/Tests/User/UserTest.php +++ b/Core/Tests/User/UserTest.php @@ -123,4 +123,13 @@ class UserTest extends \PHPUnit_Framework_TestCase $user->eraseCredentials(); $this->assertEquals('superpass', $user->getPassword()); } + + /** + * @covers Symfony\Component\Security\Core\User\User::__toString + */ + public function testToString() + { + $user = new User('fabien', 'superpass'); + $this->assertEquals('fabien', (string) $user); + } } diff --git a/Core/Tests/Util/SecureRandomTest.php b/Core/Tests/Util/SecureRandomTest.php index 6e12ef2..590efd3 100644 --- a/Core/Tests/Util/SecureRandomTest.php +++ b/Core/Tests/Util/SecureRandomTest.php @@ -41,7 +41,7 @@ class SecureRandomTest extends \PHPUnit_Framework_TestCase for ($j = 1; $j <= 5000; $j++) { $k = 4 * $j - 1; - $c[8 * $b[$k - 3] + 4 * $b[$k - 2] + 2 * $b[$k - 1] + $b[$k]] += 1; + ++$c[8 * $b[$k - 3] + 4 * $b[$k - 2] + 2 * $b[$k - 1] + $b[$k]]; } $f = 0; @@ -73,14 +73,14 @@ class SecureRandomTest extends \PHPUnit_Framework_TestCase $run = 6; } - $runs[$run] += 1; + ++$runs[$run]; }; $currentRun = 0; $lastBit = null; for ($i = 0; $i < 20000; $i++) { if ($lastBit === $b[$i]) { - $currentRun += 1; + ++$currentRun; } else { if ($currentRun > 0) { $addRun($currentRun); @@ -115,7 +115,7 @@ class SecureRandomTest extends \PHPUnit_Framework_TestCase $lastBit = null; for ($i = 0; $i < 20000; $i++) { if ($lastBit === $b[$i]) { - $currentRun += 1; + ++$currentRun; } else { if ($currentRun > $longestRun) { $longestRun = $currentRun; diff --git a/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php b/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php index 5cfe444..54258e3 100644 --- a/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php +++ b/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php @@ -16,6 +16,7 @@ use Symfony\Component\Validator\Validation; /** * @since 2.5.4 * @author Bernhard Schussek <bschussek@gmail.com> + * @group legacy */ class LegacyUserPasswordValidatorApiTest extends UserPasswordValidatorTest { |