Merge branch '2.4'
* 2.4: fix some cs use restore_error_handler instead of set_error_handler($previous) fix #9321 Crawler::addHtmlContent add gbk encoding support [Console] fixed column width when using the Table helper with some decoration in cells [Security] Fixed problem with losing ROLE_PREVIOUS_ADMIN role. Fix for cache-key conflict when having a \Traversable as choices [Security] removed obsolete comment
This commit is contained in:
commit
c15175ab00
@ -89,6 +89,13 @@ abstract class DoctrineType extends AbstractType
|
||||
array_walk_recursive($choiceHashes, function (&$value) {
|
||||
$value = spl_object_hash($value);
|
||||
});
|
||||
} elseif ($choiceHashes instanceof \Traversable) {
|
||||
$hashes = array();
|
||||
foreach ($choiceHashes as $value) {
|
||||
$hashes[] = spl_object_hash($value);
|
||||
}
|
||||
|
||||
$choiceHashes = $hashes;
|
||||
}
|
||||
|
||||
$preferredChoiceHashes = $options['preferred_choices'];
|
||||
|
@ -427,6 +427,8 @@ class TableHelper extends Helper
|
||||
$width += strlen($cell) - mb_strlen($cell, $encoding);
|
||||
}
|
||||
|
||||
$width += $this->strlen($cell) - $this->computeLengthWithoutDecoration($cell);
|
||||
|
||||
$content = sprintf($this->cellRowContentFormat, $cell);
|
||||
|
||||
$this->output->write(sprintf($cellFormat, str_pad($content, $width, $this->paddingChar, $this->padType)));
|
||||
@ -484,15 +486,7 @@ class TableHelper extends Helper
|
||||
*/
|
||||
private function getCellWidth(array $row, $column)
|
||||
{
|
||||
if ($column < 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (isset($row[$column])) {
|
||||
return $this->strlen($row[$column]);
|
||||
}
|
||||
|
||||
return $this->getCellWidth($row, $column - 1);
|
||||
return isset($row[$column]) ? $this->computeLengthWithoutDecoration($row[$column]) : 0;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -504,6 +498,18 @@ class TableHelper extends Helper
|
||||
$this->numberOfColumns = null;
|
||||
}
|
||||
|
||||
private function computeLengthWithoutDecoration($string)
|
||||
{
|
||||
$formatter = $this->output->getFormatter();
|
||||
$isDecorated = $formatter->isDecorated();
|
||||
$formatter->setDecorated(false);
|
||||
|
||||
$string = $formatter->format($string);
|
||||
$formatter->setDecorated($isDecorated);
|
||||
|
||||
return $this->strlen($string);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
|
@ -216,6 +216,40 @@ TABLE
|
||||
TableHelper::LAYOUT_DEFAULT,
|
||||
'',
|
||||
),
|
||||
'Cell text with tags used for Output styling' => array(
|
||||
array('ISBN', 'Title', 'Author'),
|
||||
array(
|
||||
array('<info>99921-58-10-7</info>', '<error>Divine Comedy</error>', '<fg=blue;bg=white>Dante Alighieri</fg=blue;bg=white>'),
|
||||
array('9971-5-0210-0', 'A Tale of Two Cities', '<info>Charles Dickens</>'),
|
||||
),
|
||||
TableHelper::LAYOUT_DEFAULT,
|
||||
<<<TABLE
|
||||
+---------------+----------------------+-----------------+
|
||||
| ISBN | Title | Author |
|
||||
+---------------+----------------------+-----------------+
|
||||
| 99921-58-10-7 | Divine Comedy | Dante Alighieri |
|
||||
| 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens |
|
||||
+---------------+----------------------+-----------------+
|
||||
|
||||
TABLE
|
||||
),
|
||||
'Cell text with tags not used for Output styling' => array(
|
||||
array('ISBN', 'Title', 'Author'),
|
||||
array(
|
||||
array('<strong>99921-58-10-700</strong>', '<f>Divine Com</f>', 'Dante Alighieri'),
|
||||
array('9971-5-0210-0', 'A Tale of Two Cities', 'Charles Dickens'),
|
||||
),
|
||||
TableHelper::LAYOUT_DEFAULT,
|
||||
<<<TABLE
|
||||
+----------------------------------+----------------------+-----------------+
|
||||
| ISBN | Title | Author |
|
||||
+----------------------------------+----------------------+-----------------+
|
||||
| <strong>99921-58-10-700</strong> | <f>Divine Com</f> | Dante Alighieri |
|
||||
| 9971-5-0210-0 | A Tale of Two Cities | Charles Dickens |
|
||||
+----------------------------------+----------------------+-----------------+
|
||||
|
||||
TABLE
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
|
@ -157,8 +157,18 @@ class Crawler extends \SplObjectStorage
|
||||
$dom = new \DOMDocument('1.0', $charset);
|
||||
$dom->validateOnParse = true;
|
||||
|
||||
if (function_exists('mb_convert_encoding') && in_array(strtolower($charset), array_map('strtolower', mb_list_encodings()))) {
|
||||
$content = mb_convert_encoding($content, 'HTML-ENTITIES', $charset);
|
||||
if (function_exists('mb_convert_encoding')) {
|
||||
$hasError = false;
|
||||
set_error_handler(function () use (&$hasError) {
|
||||
$hasError = true;
|
||||
});
|
||||
$tmpContent = @mb_convert_encoding($content, 'HTML-ENTITIES', $charset);
|
||||
|
||||
restore_error_handler();
|
||||
|
||||
if (!$hasError) {
|
||||
$content = $tmpContent;
|
||||
}
|
||||
}
|
||||
|
||||
@$dom->loadHTML($content);
|
||||
|
@ -113,6 +113,18 @@ class CrawlerTest extends \PHPUnit_Framework_TestCase
|
||||
$this->assertEquals('Žťčýů', $crawler->filterXPath('//p')->text());
|
||||
}
|
||||
|
||||
/**
|
||||
* @covers Symfony\Component\DomCrawler\Crawler::addHtmlContent
|
||||
*/
|
||||
public function testAddHtmlContentCharsetGbk()
|
||||
{
|
||||
$crawler = new Crawler();
|
||||
//gbk encode of <html><p>中文</p></html>
|
||||
$crawler->addHtmlContent(base64_decode('PGh0bWw+PHA+1tDOxDwvcD48L2h0bWw+'), 'gbk');
|
||||
|
||||
$this->assertEquals('中文', $crawler->filterXPath('//p')->text());
|
||||
}
|
||||
|
||||
/**
|
||||
* @covers Symfony\Component\DomCrawler\Crawler::addHtmlContent
|
||||
*/
|
||||
|
@ -19,6 +19,7 @@ use Symfony\Component\Security\Core\Exception\BadCredentialsException;
|
||||
use Symfony\Component\Security\Core\Exception\AuthenticationServiceException;
|
||||
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
|
||||
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
|
||||
use Symfony\Component\Security\Core\Role\SwitchUserRole;
|
||||
|
||||
/**
|
||||
* UserProviderInterface retrieves users for UsernamePasswordToken tokens.
|
||||
@ -92,7 +93,7 @@ abstract class UserAuthenticationProvider implements AuthenticationProviderInter
|
||||
throw $e;
|
||||
}
|
||||
|
||||
$authenticatedToken = new UsernamePasswordToken($user, $token->getCredentials(), $this->providerKey, $user->getRoles());
|
||||
$authenticatedToken = new UsernamePasswordToken($user, $token->getCredentials(), $this->providerKey, $this->getRoles($user, $token));
|
||||
$authenticatedToken->setAttributes($token->getAttributes());
|
||||
|
||||
return $authenticatedToken;
|
||||
@ -106,6 +107,29 @@ abstract class UserAuthenticationProvider implements AuthenticationProviderInter
|
||||
return $token instanceof UsernamePasswordToken && $this->providerKey === $token->getProviderKey();
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieves roles from user and appends SwitchUserRole if original token contained one.
|
||||
*
|
||||
* @param UserInterface $user The user
|
||||
* @param TokenInterface $token The token
|
||||
*
|
||||
* @return Role[] The user roles
|
||||
*/
|
||||
private function getRoles(UserInterface $user, TokenInterface $token)
|
||||
{
|
||||
$roles = $user->getRoles();
|
||||
|
||||
foreach ($token->getRoles() as $role) {
|
||||
if ($role instanceof SwitchUserRole) {
|
||||
$roles[] = $role;
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return $roles;
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieves the user from an implementation-specific location.
|
||||
*
|
||||
|
@ -13,6 +13,7 @@ namespace Symfony\Component\Security\Core\Tests\Authentication\Provider;
|
||||
|
||||
use Symfony\Component\Security\Core\Authentication\Provider\UserAuthenticationProvider;
|
||||
use Symfony\Component\Security\Core\Role\Role;
|
||||
use Symfony\Component\Security\Core\Role\SwitchUserRole;
|
||||
use Symfony\Component\Security\Core\Exception\BadCredentialsException;
|
||||
|
||||
class UserAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
|
||||
@ -172,6 +173,11 @@ class UserAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
|
||||
->will($this->returnValue('foo'))
|
||||
;
|
||||
|
||||
$token->expects($this->once())
|
||||
->method('getRoles')
|
||||
->will($this->returnValue(array()))
|
||||
;
|
||||
|
||||
$authToken = $provider->authenticate($token);
|
||||
|
||||
$this->assertInstanceOf('Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken', $authToken);
|
||||
@ -181,9 +187,45 @@ class UserAuthenticationProviderTest extends \PHPUnit_Framework_TestCase
|
||||
$this->assertEquals(array('foo' => 'bar'), $authToken->getAttributes(), '->authenticate() copies token attributes');
|
||||
}
|
||||
|
||||
public function testAuthenticateWithPreservingRoleSwitchUserRole()
|
||||
{
|
||||
$user = $this->getMock('Symfony\Component\Security\Core\User\UserInterface');
|
||||
$user->expects($this->once())
|
||||
->method('getRoles')
|
||||
->will($this->returnValue(array('ROLE_FOO')))
|
||||
;
|
||||
|
||||
$provider = $this->getProvider();
|
||||
$provider->expects($this->once())
|
||||
->method('retrieveUser')
|
||||
->will($this->returnValue($user))
|
||||
;
|
||||
|
||||
$token = $this->getSupportedToken();
|
||||
$token->expects($this->once())
|
||||
->method('getCredentials')
|
||||
->will($this->returnValue('foo'))
|
||||
;
|
||||
|
||||
$switchUserRole = new SwitchUserRole('foo', $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface'));
|
||||
$token->expects($this->once())
|
||||
->method('getRoles')
|
||||
->will($this->returnValue(array($switchUserRole)))
|
||||
;
|
||||
|
||||
$authToken = $provider->authenticate($token);
|
||||
|
||||
$this->assertInstanceOf('Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken', $authToken);
|
||||
$this->assertSame($user, $authToken->getUser());
|
||||
$this->assertContains(new Role('ROLE_FOO'), $authToken->getRoles(), '', false, false);
|
||||
$this->assertContains($switchUserRole, $authToken->getRoles());
|
||||
$this->assertEquals('foo', $authToken->getCredentials());
|
||||
$this->assertEquals(array('foo' => 'bar'), $authToken->getAttributes(), '->authenticate() copies token attributes');
|
||||
}
|
||||
|
||||
protected function getSupportedToken()
|
||||
{
|
||||
$mock = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken', array('getCredentials', 'getProviderKey'), array(), '', false);
|
||||
$mock = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken', array('getCredentials', 'getProviderKey', 'getRoles'), array(), '', false);
|
||||
$mock
|
||||
->expects($this->any())
|
||||
->method('getProviderKey')
|
||||
|
Reference in New Issue
Block a user