Merge branch '2.6' into 2.7
* 2.6: fixed CS fixed CS Conflicts: src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
This commit is contained in:
commit
c658fcdbca
@ -36,7 +36,7 @@ class DebugExtension extends Extension
|
||||
$loader->load('services.xml');
|
||||
|
||||
$container->getDefinition('var_dumper.cloner')
|
||||
->addMethodCall('setMaxItems', array($config['max_items']))
|
||||
->addMethodCall('setMaxItems', array($config['max_items']))
|
||||
->addMethodCall('setMaxString', array($config['max_string_length']));
|
||||
|
||||
if (null !== $config['dump_destination']) {
|
||||
|
@ -55,7 +55,7 @@ class RouterDebugCommand extends ContainerAwareCommand
|
||||
))
|
||||
->setDefinition(array(
|
||||
new InputArgument('name', InputArgument::OPTIONAL, 'A route name'),
|
||||
new InputOption('show-controllers', null, InputOption::VALUE_NONE, 'Show assigned controllers in overview'),
|
||||
new InputOption('show-controllers', null, InputOption::VALUE_NONE, 'Show assigned controllers in overview'),
|
||||
new InputOption('format', null, InputOption::VALUE_REQUIRED, 'To output route(s) in other formats', 'txt'),
|
||||
new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw route(s)'),
|
||||
))
|
||||
|
@ -30,10 +30,10 @@ class DescriptorHelper extends BaseDescriptorHelper
|
||||
public function __construct()
|
||||
{
|
||||
$this
|
||||
->register('txt', new TextDescriptor())
|
||||
->register('xml', new XmlDescriptor())
|
||||
->register('txt', new TextDescriptor())
|
||||
->register('xml', new XmlDescriptor())
|
||||
->register('json', new JsonDescriptor())
|
||||
->register('md', new MarkdownDescriptor())
|
||||
->register('md', new MarkdownDescriptor())
|
||||
;
|
||||
}
|
||||
}
|
||||
|
@ -925,12 +925,12 @@ class Application
|
||||
return new InputDefinition(array(
|
||||
new InputArgument('command', InputArgument::REQUIRED, 'The command to execute'),
|
||||
|
||||
new InputOption('--help', '-h', InputOption::VALUE_NONE, 'Display this help message'),
|
||||
new InputOption('--quiet', '-q', InputOption::VALUE_NONE, 'Do not output any message'),
|
||||
new InputOption('--verbose', '-v|vv|vvv', InputOption::VALUE_NONE, 'Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug'),
|
||||
new InputOption('--version', '-V', InputOption::VALUE_NONE, 'Display this application version'),
|
||||
new InputOption('--ansi', '', InputOption::VALUE_NONE, 'Force ANSI output'),
|
||||
new InputOption('--no-ansi', '', InputOption::VALUE_NONE, 'Disable ANSI output'),
|
||||
new InputOption('--help', '-h', InputOption::VALUE_NONE, 'Display this help message'),
|
||||
new InputOption('--quiet', '-q', InputOption::VALUE_NONE, 'Do not output any message'),
|
||||
new InputOption('--verbose', '-v|vv|vvv', InputOption::VALUE_NONE, 'Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug'),
|
||||
new InputOption('--version', '-V', InputOption::VALUE_NONE, 'Display this application version'),
|
||||
new InputOption('--ansi', '', InputOption::VALUE_NONE, 'Force ANSI output'),
|
||||
new InputOption('--no-ansi', '', InputOption::VALUE_NONE, 'Disable ANSI output'),
|
||||
new InputOption('--no-interaction', '-n', InputOption::VALUE_NONE, 'Do not ask any interactive question'),
|
||||
));
|
||||
}
|
||||
|
@ -60,7 +60,7 @@ class PreAuthenticatedAuthenticationProvider implements AuthenticationProviderIn
|
||||
throw new BadCredentialsException('No pre-authenticated principal found in request.');
|
||||
}
|
||||
|
||||
$user = $this->userProvider->loadUserByUsername($user);
|
||||
$user = $this->userProvider->loadUserByUsername($user);
|
||||
|
||||
$this->userChecker->checkPostAuth($user);
|
||||
|
||||
|
@ -18,7 +18,7 @@ use Symfony\Component\Validator\Validation;
|
||||
* @author Bernhard Schussek <bschussek@gmail.com>
|
||||
* @group legacy
|
||||
*/
|
||||
class LegacyUserPasswordValidatorApiTest extends UserPasswordValidatorTest
|
||||
class LegacyUserPasswordValidatorTest extends UserPasswordValidatorTest
|
||||
{
|
||||
protected function getApiVersion()
|
||||
{
|
||||
|
@ -106,7 +106,7 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase
|
||||
*/
|
||||
public function testOnCoreSecurityIgnoresAuthenticationOptionallyRethrowsExceptionThrownAuthenticationManagerImplementation()
|
||||
{
|
||||
list($listener, $tokenStorage, $service, $manager,) = $this->getListener(false, false);
|
||||
list($listener, $tokenStorage, $service, $manager) = $this->getListener(false, false);
|
||||
|
||||
$tokenStorage
|
||||
->expects($this->once())
|
||||
|
@ -21,4 +21,6 @@ trigger_error('The '.__NAMESPACE__.'\False class is deprecated since version 2.7
|
||||
*
|
||||
* @deprecated since version 2.7, to be removed in 3.0. Use IsFalse instead.
|
||||
*/
|
||||
class False extends IsFalse {}
|
||||
class False extends IsFalse
|
||||
{
|
||||
}
|
||||
|
@ -18,4 +18,6 @@ trigger_error('The '.__NAMESPACE__.'\FalseValidator class is deprecated since ve
|
||||
*
|
||||
* @deprecated since version 2.7, to be removed in 3.0. Use IsFalseValidator instead.
|
||||
*/
|
||||
class FalseValidator extends IsFalseValidator {}
|
||||
class FalseValidator extends IsFalseValidator
|
||||
{
|
||||
}
|
||||
|
@ -21,4 +21,6 @@ trigger_error('The '.__NAMESPACE__.'\Null class is deprecated since version 2.7
|
||||
*
|
||||
* @deprecated since version 2.7, to be removed in 3.0. Use IsNull instead.
|
||||
*/
|
||||
class Null extends IsNull {}
|
||||
class Null extends IsNull
|
||||
{
|
||||
}
|
||||
|
@ -18,4 +18,6 @@ trigger_error('The '.__NAMESPACE__.'\NullValidator class is deprecated since ver
|
||||
*
|
||||
* @deprecated since version 2.7, to be removed in 3.0. Use IsNullValidator instead.
|
||||
*/
|
||||
class NullValidator extends IsNullValidator {}
|
||||
class NullValidator extends IsNullValidator
|
||||
{
|
||||
}
|
||||
|
@ -21,4 +21,6 @@ trigger_error('The '.__NAMESPACE__.'\True class is deprecated since version 2.7
|
||||
*
|
||||
* @deprecated since version 2.7, to be removed in 3.0. Use IsTrue instead.
|
||||
*/
|
||||
class True extends IsTrue {}
|
||||
class True extends IsTrue
|
||||
{
|
||||
}
|
||||
|
@ -18,4 +18,6 @@ trigger_error('The '.__NAMESPACE__.'\TrueValidator class is deprecated since ver
|
||||
*
|
||||
* @deprecated since version 2.7, to be removed in 3.0. Use IsTrueValidator instead.
|
||||
*/
|
||||
class TrueValidator extends IsTrueValidator {}
|
||||
class TrueValidator extends IsTrueValidator
|
||||
{
|
||||
}
|
||||
|
Reference in New Issue
Block a user