Skip to content

Commit d25c17d

Browse files
committed
Merge branch '2.3' into 2.6
* 2.3: [Validator] Add missing pt_BR translations Add parsing of hexadecimal strings for PHP 7 [Configuration] improve description for ignoreExtraKeys on ArrayNodeDefinition [Validator] Added missing Hungarian translation [Validator] Fixed grammar in Hungarian translation CS: Unary operators should be placed adjacent to their operands CS: Binary operators should be arounded by at least one space remove useless tests that fail in php 7 [Translator] fix test for php 7 compatibility Update phpdoc of ProcessBuilder#setPrefix() Conflicts: src/Symfony/Component/HttpFoundation/Session/Attribute/NamespacedAttributeBag.php src/Symfony/Component/PropertyAccess/PropertyAccessor.php src/Symfony/Component/Validator/Resources/translations/validators.pt_BR.xlf src/Symfony/Component/Yaml/Parser.php
2 parents 8c16267 + 8bd591e commit d25c17d

File tree

3 files changed

+3
-20
lines changed

3 files changed

+3
-20
lines changed

Authentication/Token/AbstractToken.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ public function setAttribute($name, $value)
231231
public function __toString()
232232
{
233233
$class = get_class($this);
234-
$class = substr($class, strrpos($class, '\\')+1);
234+
$class = substr($class, strrpos($class, '\\') + 1);
235235

236236
$roles = array();
237237
foreach ($this->roles as $role) {
@@ -248,7 +248,7 @@ private function hasUserChanged(UserInterface $user)
248248
}
249249

250250
if ($this->user instanceof EquatableInterface) {
251-
return ! (bool) $this->user->isEqualTo($user);
251+
return !(bool) $this->user->isEqualTo($user);
252252
}
253253

254254
if ($this->user->getPassword() !== $user->getPassword()) {

Tests/Authentication/Token/RememberMeTokenTest.php

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -52,23 +52,6 @@ public function testConstructorKeyCannotBeEmptyString()
5252
);
5353
}
5454

55-
/**
56-
* @expectedException \PHPUnit_Framework_Error
57-
* @dataProvider getUserArguments
58-
*/
59-
public function testConstructorUserCannotBeNull($user)
60-
{
61-
new RememberMeToken($user, 'foo', 'foo');
62-
}
63-
64-
public function getUserArguments()
65-
{
66-
return array(
67-
array(null),
68-
array('foo'),
69-
);
70-
}
71-
7255
protected function getUser($roles = array('ROLE_FOO'))
7356
{
7457
$user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');

Tests/Util/SecureRandomTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function testPoker($secureRandom)
4949
$f += $c[$i] * $c[$i];
5050
}
5151

52-
$Y = 16/5000 * $f - 5000;
52+
$Y = 16 / 5000 * $f - 5000;
5353

5454
$this->assertTrue($Y > 1.03 && $Y < 57.4, 'Poker test failed, Y = '.$Y);
5555
}

0 commit comments

Comments
 (0)