From 34d83a70b371f98fb61d35492d599722dcc1809b Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 15 May 2015 15:45:10 +0200 Subject: [PATCH 1/2] fixed CS --- src/Symfony/Component/Console/Application.php | 12 ++++++------ .../Component/Validator/Constraints/False.php | 4 +++- .../Validator/Constraints/FalseValidator.php | 4 +++- src/Symfony/Component/Validator/Constraints/Null.php | 4 +++- .../Validator/Constraints/NullValidator.php | 4 +++- src/Symfony/Component/Validator/Constraints/True.php | 4 +++- .../Validator/Constraints/TrueValidator.php | 4 +++- 7 files changed, 24 insertions(+), 12 deletions(-) diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php index b4c7109012..badcce6473 100644 --- a/src/Symfony/Component/Console/Application.php +++ b/src/Symfony/Component/Console/Application.php @@ -936,12 +936,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'), )); } diff --git a/src/Symfony/Component/Validator/Constraints/False.php b/src/Symfony/Component/Validator/Constraints/False.php index 6ec76ee3d1..b377c3255e 100644 --- a/src/Symfony/Component/Validator/Constraints/False.php +++ b/src/Symfony/Component/Validator/Constraints/False.php @@ -19,4 +19,6 @@ namespace Symfony\Component\Validator\Constraints; * * @api */ -class False extends IsFalse {} +class False extends IsFalse +{ +} diff --git a/src/Symfony/Component/Validator/Constraints/FalseValidator.php b/src/Symfony/Component/Validator/Constraints/FalseValidator.php index 72fd1d44d1..140945f76e 100644 --- a/src/Symfony/Component/Validator/Constraints/FalseValidator.php +++ b/src/Symfony/Component/Validator/Constraints/FalseValidator.php @@ -16,4 +16,6 @@ namespace Symfony\Component\Validator\Constraints; * * @api */ -class FalseValidator extends IsFalseValidator {} +class FalseValidator extends IsFalseValidator +{ +} diff --git a/src/Symfony/Component/Validator/Constraints/Null.php b/src/Symfony/Component/Validator/Constraints/Null.php index 5ad789cef8..2be06df0bb 100644 --- a/src/Symfony/Component/Validator/Constraints/Null.php +++ b/src/Symfony/Component/Validator/Constraints/Null.php @@ -19,4 +19,6 @@ namespace Symfony\Component\Validator\Constraints; * * @api */ -class Null extends IsNull {} +class Null extends IsNull +{ +} diff --git a/src/Symfony/Component/Validator/Constraints/NullValidator.php b/src/Symfony/Component/Validator/Constraints/NullValidator.php index 876924f375..9b165eaa80 100644 --- a/src/Symfony/Component/Validator/Constraints/NullValidator.php +++ b/src/Symfony/Component/Validator/Constraints/NullValidator.php @@ -16,4 +16,6 @@ namespace Symfony\Component\Validator\Constraints; * * @api */ -class NullValidator extends IsNullValidator {} +class NullValidator extends IsNullValidator +{ +} diff --git a/src/Symfony/Component/Validator/Constraints/True.php b/src/Symfony/Component/Validator/Constraints/True.php index 832b84b92b..626f6d8571 100644 --- a/src/Symfony/Component/Validator/Constraints/True.php +++ b/src/Symfony/Component/Validator/Constraints/True.php @@ -19,4 +19,6 @@ namespace Symfony\Component\Validator\Constraints; * * @api */ -class True extends IsTrue {} +class True extends IsTrue +{ +} diff --git a/src/Symfony/Component/Validator/Constraints/TrueValidator.php b/src/Symfony/Component/Validator/Constraints/TrueValidator.php index fb0b7d6cdd..7ab44ca3c3 100644 --- a/src/Symfony/Component/Validator/Constraints/TrueValidator.php +++ b/src/Symfony/Component/Validator/Constraints/TrueValidator.php @@ -16,4 +16,6 @@ namespace Symfony\Component\Validator\Constraints; * * @api */ -class TrueValidator extends IsTrueValidator {} +class TrueValidator extends IsTrueValidator +{ +} From 0678b3e6f87ddcdcf41ec580d4625fca5c9cbc22 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 15 May 2015 15:53:19 +0200 Subject: [PATCH 2/2] fixed CS --- .../DebugBundle/DependencyInjection/DebugExtension.php | 2 +- .../Bundle/FrameworkBundle/Command/RouterDebugCommand.php | 2 +- .../FrameworkBundle/Console/Helper/DescriptorHelper.php | 6 +++--- .../Provider/PreAuthenticatedAuthenticationProvider.php | 2 +- .../Constraints/LegacyUserPasswordValidatorTest.php | 2 +- .../Security/Http/Tests/Firewall/RememberMeListenerTest.php | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Symfony/Bundle/DebugBundle/DependencyInjection/DebugExtension.php b/src/Symfony/Bundle/DebugBundle/DependencyInjection/DebugExtension.php index 4e5351c0e0..a6169889c4 100644 --- a/src/Symfony/Bundle/DebugBundle/DependencyInjection/DebugExtension.php +++ b/src/Symfony/Bundle/DebugBundle/DependencyInjection/DebugExtension.php @@ -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']) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php index 8901522e1c..ef8e8b6a90 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php @@ -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)'), )) diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Helper/DescriptorHelper.php b/src/Symfony/Bundle/FrameworkBundle/Console/Helper/DescriptorHelper.php index 8d46ae1624..2599f0090e 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Helper/DescriptorHelper.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Helper/DescriptorHelper.php @@ -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()) ; } } diff --git a/src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php b/src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php index c17a9545a0..4f732542ea 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php +++ b/src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php @@ -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); diff --git a/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php b/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php index 54258e34ca..72e08c0a73 100644 --- a/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php +++ b/src/Symfony/Component/Security/Core/Tests/Validator/Constraints/LegacyUserPasswordValidatorTest.php @@ -18,7 +18,7 @@ use Symfony\Component\Validator\Validation; * @author Bernhard Schussek * @group legacy */ -class LegacyUserPasswordValidatorApiTest extends UserPasswordValidatorTest +class LegacyUserPasswordValidatorTest extends UserPasswordValidatorTest { protected function getApiVersion() { diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php index 12ced6bf12..3f43fb2337 100644 --- a/src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php +++ b/src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php @@ -106,7 +106,7 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase */ public function testOnCoreSecurityIgnoresAuthenticationOptionallyRethrowsExceptionThrownAuthenticationManagerImplementation() { - list($listener, $context, $service, $manager,) = $this->getListener(false, false); + list($listener, $context, $service, $manager) = $this->getListener(false, false); $context ->expects($this->once())