summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Core/Tests/Encoder/EncoderFactoryTest.php4
-rw-r--r--Core/User/UserInterface.php2
-rw-r--r--Core/composer.json2
-rw-r--r--Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php9
-rw-r--r--Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php3
-rw-r--r--composer.json2
6 files changed, 17 insertions, 5 deletions
diff --git a/Core/Tests/Encoder/EncoderFactoryTest.php b/Core/Tests/Encoder/EncoderFactoryTest.php
index 37cda72..21aaae4 100644
--- a/Core/Tests/Encoder/EncoderFactoryTest.php
+++ b/Core/Tests/Encoder/EncoderFactoryTest.php
@@ -139,15 +139,19 @@ class SomeUser implements UserInterface
public function getRoles()
{
}
+
public function getPassword()
{
}
+
public function getSalt()
{
}
+
public function getUsername()
{
}
+
public function eraseCredentials()
{
}
diff --git a/Core/User/UserInterface.php b/Core/User/UserInterface.php
index 1b52dab..7478842 100644
--- a/Core/User/UserInterface.php
+++ b/Core/User/UserInterface.php
@@ -47,7 +47,7 @@ interface UserInterface
* and populated in any number of different ways when the user object
* is created.
*
- * @return Role[] The user roles
+ * @return (Role|string)[] The user roles
*/
public function getRoles();
diff --git a/Core/composer.json b/Core/composer.json
index e5394ed..f6391e0 100644
--- a/Core/composer.json
+++ b/Core/composer.json
@@ -24,7 +24,7 @@
"symfony/event-dispatcher": "~2.8|~3.0",
"symfony/expression-language": "~2.8|~3.0",
"symfony/http-foundation": "~2.8|~3.0",
- "symfony/ldap": "~2.8|~3.0",
+ "symfony/ldap": "~2.8|~3.0.0",
"symfony/validator": "~2.8|~3.0",
"psr/log": "~1.0"
},
diff --git a/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php b/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php
index 581bdfa..30cf4a2 100644
--- a/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php
+++ b/Http/Tests/RememberMe/PersistentTokenBasedRememberMeServicesTest.php
@@ -23,6 +23,15 @@ use Symfony\Component\Security\Core\Exception\CookieTheftException;
class PersistentTokenBasedRememberMeServicesTest extends \PHPUnit_Framework_TestCase
{
+ public static function setUpBeforeClass()
+ {
+ try {
+ random_bytes(1);
+ } catch (\Exception $e) {
+ throw new \PHPUnit_Framework_SkippedTestError($e->getMessage());
+ }
+ }
+
public function testAutoLoginReturnsNullWhenNoCookie()
{
$service = $this->getService(null, array('name' => 'foo'));
diff --git a/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php b/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php
index f1fb897..ee8a99e 100644
--- a/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php
+++ b/Http/Tests/RememberMe/TokenBasedRememberMeServicesTest.php
@@ -172,9 +172,8 @@ class TokenBasedRememberMeServicesTest extends \PHPUnit_Framework_TestCase
{
$service = $this->getService(null, array('name' => 'foo', 'path' => '/foo', 'domain' => 'foodomain.foo'));
$request = new Request();
- $response = new Response();
- $service->loginFail($request, $response);
+ $service->loginFail($request);
$cookie = $request->attributes->get(RememberMeServicesInterface::COOKIE_ATTR_NAME);
$this->assertTrue($cookie->isCleared());
diff --git a/composer.json b/composer.json
index baddbfb..509bc28 100644
--- a/composer.json
+++ b/composer.json
@@ -37,7 +37,7 @@
"symfony/routing": "~2.8|~3.0",
"symfony/validator": "~2.8|~3.0",
"symfony/expression-language": "~2.8|~3.0",
- "symfony/ldap": "~2.8|~3.0",
+ "symfony/ldap": "~2.8|~3.0.0",
"psr/log": "~1.0"
},
"suggest": {