From e638ccbe39dcaf408599ec7b8aa91ccb09ec3e47 Mon Sep 17 00:00:00 2001 From: Disquedur Date: Thu, 30 Oct 2014 21:17:55 +0100 Subject: [PATCH] Remove aligned '=>' and '=' --- .../AbstractDoctrineExtension.php | 6 +- .../DoctrineExtensionTest.php | 44 +++++++-------- .../Monolog/Formatter/ConsoleFormatter.php | 8 +-- .../Console/Descriptor/JsonDescriptor.php | 26 ++++----- .../Descriptor/AbstractDescriptorTest.php | 6 +- .../Console/Descriptor/ObjectsProvider.php | 4 +- .../DependencyInjection/ConfigurationTest.php | 6 +- .../Fixtures/php/validation_2_4_api.php | 4 +- .../Fixtures/php/validation_2_5_api.php | 4 +- .../Fixtures/php/validation_2_5_bc_api.php | 4 +- .../Fixtures/php/validation_auto_api.php | 4 +- .../Fixtures/php/validation_implicit_api.php | 2 +- .../validation_multiple_static_methods.php | 4 +- .../php/validation_no_static_method.php | 4 +- .../Routing/RedirectableUrlMatcherTest.php | 12 ++-- .../Tests/Templating/PhpEngineTest.php | 6 +- .../Translation/Translator.php | 2 +- .../Definition/Dumper/XmlReferenceDumper.php | 2 +- .../Component/Console/Command/HelpCommand.php | 2 +- .../Component/Console/Command/ListCommand.php | 4 +- .../Console/Descriptor/JsonDescriptor.php | 28 +++++----- .../Console/Helper/DescriptorHelper.php | 4 +- .../Component/Console/Helper/ProgressBar.php | 22 ++++---- .../Debug/TraceableEventDispatcher.php | 12 ++-- .../ExpressionLanguage/Node/BinaryNode.php | 10 ++-- .../Component/ExpressionLanguage/Parser.php | 56 +++++++++---------- .../Component/ExpressionLanguage/Token.php | 10 ++-- .../DataCollector/TimeDataCollector.php | 2 +- .../EventListener/ProfilerListenerTest.php | 2 +- .../Intl/NumberFormatter/NumberFormatter.php | 6 +- .../Routing/Loader/AnnotationClassLoader.php | 14 ++--- .../Authorization/AccessDecisionManager.php | 4 +- .../SimpleFormAuthenticationListener.php | 6 +- .../Normalizer/GetSetMethodNormalizerTest.php | 2 +- .../Validator/Tests/ExecutionContextTest.php | 2 +- 35 files changed, 167 insertions(+), 167 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php index 8faa8892b1..5918c8006c 100644 --- a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php +++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php @@ -382,9 +382,9 @@ abstract class AbstractDoctrineExtension extends Extension if (!isset($cacheDriver['namespace'])) { // generate a unique namespace for the given application - $env = $container->getParameter('kernel.root_dir').$container->getParameter('kernel.environment'); - $hash = hash('sha256', $env); - $namespace = 'sf2'.$this->getMappingResourceExtension().'_'.$objectManagerName.'_'.$hash; + $env = $container->getParameter('kernel.root_dir').$container->getParameter('kernel.environment'); + $hash = hash('sha256', $env); + $namespace = 'sf2'.$this->getMappingResourceExtension().'_'.$objectManagerName.'_'.$hash; $cacheDriver['namespace'] = $namespace; } diff --git a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php index c4e524ae3c..19e550f3ef 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php @@ -70,10 +70,10 @@ class DoctrineExtensionTest extends \PHPUnit_Framework_TestCase */ public function testLoadBasicCacheDriver($class, array $config, array $expectedCalls = array()) { - $container = $this->createContainer(); - $cacheName = 'metadata_cache'; - $objectManager = array( - 'name' => 'default', + $container = $this->createContainer(); + $cacheName = 'metadata_cache'; + $objectManager = array( + 'name' => 'default', 'metadata_cache_driver' => $config, ); @@ -81,10 +81,10 @@ class DoctrineExtensionTest extends \PHPUnit_Framework_TestCase $this->assertTrue($container->hasDefinition('doctrine.orm.default_metadata_cache')); - $definition = $container->getDefinition('doctrine.orm.default_metadata_cache'); - $defCalls = $definition->getMethodCalls(); + $definition = $container->getDefinition('doctrine.orm.default_metadata_cache'); + $defCalls = $definition->getMethodCalls(); $expectedCalls[] = 'setNamespace'; - $actualCalls = array_map(function ($call) { + $actualCalls = array_map(function ($call) { return $call[0]; }, $defCalls); @@ -98,14 +98,14 @@ class DoctrineExtensionTest extends \PHPUnit_Framework_TestCase public function testServiceCacheDriver() { - $cacheName = 'metadata_cache'; - $container = $this->createContainer(); - $definition = new Definition('%doctrine.orm.cache.apc.class%'); - $objectManager = array( - 'name' => 'default', + $cacheName = 'metadata_cache'; + $container = $this->createContainer(); + $definition = new Definition('%doctrine.orm.cache.apc.class%'); + $objectManager = array( + 'name' => 'default', 'metadata_cache_driver' => array( 'type' => 'service', - 'id' => 'service_driver', + 'id' => 'service_driver', ), ); @@ -122,10 +122,10 @@ class DoctrineExtensionTest extends \PHPUnit_Framework_TestCase */ public function testUnrecognizedCacheDriverException() { - $cacheName = 'metadata_cache'; - $container = $this->createContainer(); - $objectManager = array( - 'name' => 'default', + $cacheName = 'metadata_cache'; + $container = $this->createContainer(); + $objectManager = array( + 'name' => 'default', 'metadata_cache_driver' => array( 'type' => 'unrecognized_type', ), @@ -151,12 +151,12 @@ class DoctrineExtensionTest extends \PHPUnit_Framework_TestCase protected function createContainer(array $data = array()) { return new ContainerBuilder(new ParameterBag(array_merge(array( - 'kernel.bundles' => array('FrameworkBundle' => 'Symfony\\Bundle\\FrameworkBundle\\FrameworkBundle'), - 'kernel.cache_dir' => __DIR__, - 'kernel.debug' => false, + 'kernel.bundles' => array('FrameworkBundle' => 'Symfony\\Bundle\\FrameworkBundle\\FrameworkBundle'), + 'kernel.cache_dir' => __DIR__, + 'kernel.debug' => false, 'kernel.environment' => 'test', - 'kernel.name' => 'kernel', - 'kernel.root_dir' => __DIR__, + 'kernel.name' => 'kernel', + 'kernel.root_dir' => __DIR__, ), $data))); } } diff --git a/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php b/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php index ddf6308860..58bc426cb5 100644 --- a/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php +++ b/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php @@ -30,16 +30,16 @@ class ConsoleFormatter extends LineFormatter { if ($record['level'] >= Logger::ERROR) { $record['start_tag'] = ''; - $record['end_tag'] = ''; + $record['end_tag'] = ''; } elseif ($record['level'] >= Logger::NOTICE) { $record['start_tag'] = ''; - $record['end_tag'] = ''; + $record['end_tag'] = ''; } elseif ($record['level'] >= Logger::INFO) { $record['start_tag'] = ''; - $record['end_tag'] = ''; + $record['end_tag'] = ''; } else { $record['start_tag'] = ''; - $record['end_tag'] = ''; + $record['end_tag'] = ''; } return parent::format($record); diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php index 7a19cdc8f5..7748143702 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php @@ -168,15 +168,15 @@ class JsonDescriptor extends Descriptor unset($requirements['_scheme'], $requirements['_method']); return array( - 'path' => $route->getPath(), - 'host' => '' !== $route->getHost() ? $route->getHost() : 'ANY', - 'scheme' => $route->getSchemes() ? implode('|', $route->getSchemes()) : 'ANY', - 'method' => $route->getMethods() ? implode('|', $route->getMethods()) : 'ANY', - 'class' => get_class($route), - 'defaults' => $route->getDefaults(), + 'path' => $route->getPath(), + 'host' => '' !== $route->getHost() ? $route->getHost() : 'ANY', + 'scheme' => $route->getSchemes() ? implode('|', $route->getSchemes()) : 'ANY', + 'method' => $route->getMethods() ? implode('|', $route->getMethods()) : 'ANY', + 'class' => get_class($route), + 'defaults' => $route->getDefaults(), 'requirements' => $requirements ?: 'NO CUSTOM', - 'options' => $route->getOptions(), - 'pathRegex' => $route->compile()->getRegex(), + 'options' => $route->getOptions(), + 'pathRegex' => $route->compile()->getRegex(), ); } @@ -189,11 +189,11 @@ class JsonDescriptor extends Descriptor private function getContainerDefinitionData(Definition $definition, $omitTags = false) { $data = array( - 'class' => (string) $definition->getClass(), - 'scope' => $definition->getScope(), - 'public' => $definition->isPublic(), + 'class' => (string) $definition->getClass(), + 'scope' => $definition->getScope(), + 'public' => $definition->isPublic(), 'synthetic' => $definition->isSynthetic(), - 'file' => $definition->getFile(), + 'file' => $definition->getFile(), ); if (!$omitTags) { @@ -219,7 +219,7 @@ class JsonDescriptor extends Descriptor { return array( 'service' => (string) $alias, - 'public' => $alias->isPublic(), + 'public' => $alias->isPublic(), ); } } diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php index 3dc237870e..ad1a60e1c8 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/AbstractDescriptorTest.php @@ -133,9 +133,9 @@ abstract class AbstractDescriptorTest extends \PHPUnit_Framework_TestCase { $variations = array( 'services' => array('show_private' => true), - 'public' => array('show_private' => false), - 'tag1' => array('show_private' => true, 'tag' => 'tag1'), - 'tags' => array('group_by' => 'tags', 'show_private' => true), + 'public' => array('show_private' => false), + 'tag1' => array('show_private' => true, 'tag' => 'tag1'), + 'tags' => array('group_by' => 'tags', 'show_private' => true), ); $data = array(); diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php index d1fd0ff1c3..ca791b3327 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Console/Descriptor/ObjectsProvider.php @@ -59,9 +59,9 @@ class ObjectsProvider return array( 'parameters_1' => new ParameterBag(array( 'integer' => 12, - 'string' => 'Hello world!', + 'string' => 'Hello world!', 'boolean' => true, - 'array' => array(12, 'Hello world!', true), + 'array' => array(12, 'Hello world!', true), )), ); } diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php index f4aeb2599c..f2778fbd6a 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php @@ -126,10 +126,10 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase 'validation' => array( 'enabled' => false, 'enable_annotations' => false, - 'static_method' => array('loadValidatorMetadata'), + 'static_method' => array('loadValidatorMetadata'), 'translation_domain' => 'validators', - 'strict_email' => false, - 'api' => version_compare(PHP_VERSION, '5.3.9', '<') ? '2.4' : '2.5-bc', + 'strict_email' => false, + 'api' => version_compare(PHP_VERSION, '5.3.9', '<') ? '2.4' : '2.5-bc', ), 'annotations' => array( 'cache' => 'file', diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_2_4_api.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_2_4_api.php index 7b584f67e5..120b7eed52 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_2_4_api.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_2_4_api.php @@ -3,7 +3,7 @@ $container->loadFromExtension('framework', array( 'secret' => 's3cr3t', 'validation' => array( - 'enabled' => true, - 'api' => '2.4', + 'enabled' => true, + 'api' => '2.4', ), )); diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_2_5_api.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_2_5_api.php index 20fceba039..9fa01821b8 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_2_5_api.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_2_5_api.php @@ -3,7 +3,7 @@ $container->loadFromExtension('framework', array( 'secret' => 's3cr3t', 'validation' => array( - 'enabled' => true, - 'api' => '2.5', + 'enabled' => true, + 'api' => '2.5', ), )); diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_2_5_bc_api.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_2_5_bc_api.php index 02386dbe09..e975ee3cdd 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_2_5_bc_api.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_2_5_bc_api.php @@ -3,7 +3,7 @@ $container->loadFromExtension('framework', array( 'secret' => 's3cr3t', 'validation' => array( - 'enabled' => true, - 'api' => '2.5-bc', + 'enabled' => true, + 'api' => '2.5-bc', ), )); diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_auto_api.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_auto_api.php index 1d603a564f..4133928ff4 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_auto_api.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_auto_api.php @@ -3,7 +3,7 @@ $container->loadFromExtension('framework', array( 'secret' => 's3cr3t', 'validation' => array( - 'enabled' => true, - 'api' => 'auto', + 'enabled' => true, + 'api' => 'auto', ), )); diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_implicit_api.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_implicit_api.php index 855abbb39c..9eae9998cc 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_implicit_api.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_implicit_api.php @@ -3,6 +3,6 @@ $container->loadFromExtension('framework', array( 'secret' => 's3cr3t', 'validation' => array( - 'enabled' => true, + 'enabled' => true, ), )); diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_multiple_static_methods.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_multiple_static_methods.php index c3c81b72d6..476da7948e 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_multiple_static_methods.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_multiple_static_methods.php @@ -3,7 +3,7 @@ $container->loadFromExtension('framework', array( 'secret' => 's3cr3t', 'validation' => array( - 'enabled' => true, - 'static_method' => array('loadFoo', 'loadBar'), + 'enabled' => true, + 'static_method' => array('loadFoo', 'loadBar'), ), )); diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_no_static_method.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_no_static_method.php index f309dbfc1d..b428e06f5c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_no_static_method.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/validation_no_static_method.php @@ -3,7 +3,7 @@ $container->loadFromExtension('framework', array( 'secret' => 's3cr3t', 'validation' => array( - 'enabled' => true, - 'static_method' => false, + 'enabled' => true, + 'static_method' => false, ), )); diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RedirectableUrlMatcherTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RedirectableUrlMatcherTest.php index 719a0fc17b..70cf0fcffd 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RedirectableUrlMatcherTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RedirectableUrlMatcherTest.php @@ -67,12 +67,12 @@ class RedirectableUrlMatcherTest extends \PHPUnit_Framework_TestCase $this->assertEquals(array( '_controller' => 'Symfony\Bundle\FrameworkBundle\Controller\RedirectController::urlRedirectAction', - 'path' => '/foo', - 'permanent' => true, - 'scheme' => 'https', - 'httpPort' => $context->getHttpPort(), - 'httpsPort' => $context->getHttpsPort(), - '_route' => 'foo', + 'path' => '/foo', + 'permanent' => true, + 'scheme' => 'https', + 'httpPort' => $context->getHttpPort(), + 'httpsPort' => $context->getHttpsPort(), + '_route' => 'foo', ), $matcher->match('/foo') ); diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/PhpEngineTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/PhpEngineTest.php index f943668da5..b5eeb90134 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/PhpEngineTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/PhpEngineTest.php @@ -64,9 +64,9 @@ class PhpEngineTest extends TestCase protected function getContainer() { $container = new Container(); - $session = new Session(new MockArraySessionStorage()); - $request = new Request(); - $stack = new RequestStack(); + $session = new Session(new MockArraySessionStorage()); + $request = new Request(); + $stack = new RequestStack(); $stack->push($request); $request->setSession($session); diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php index 305d89deb0..8592e992c3 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php +++ b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php @@ -26,7 +26,7 @@ class Translator extends BaseTranslator protected $container; protected $options = array( 'cache_dir' => null, - 'debug' => false, + 'debug' => false, ); protected $loaderIds; diff --git a/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php index e26a79a582..10c4dd4f55 100644 --- a/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php +++ b/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php @@ -129,7 +129,7 @@ class XmlReferenceDumper // get attributes // metadata - $name = str_replace('_', '-', $child->getName()); + $name = str_replace('_', '-', $child->getName()); $value = '%%%%not_defined%%%%'; // use a string which isn't used in the normal world // comments diff --git a/src/Symfony/Component/Console/Command/HelpCommand.php b/src/Symfony/Component/Console/Command/HelpCommand.php index e76044a3a7..9d361a6436 100644 --- a/src/Symfony/Component/Console/Command/HelpCommand.php +++ b/src/Symfony/Component/Console/Command/HelpCommand.php @@ -83,7 +83,7 @@ EOF $helper = new DescriptorHelper(); $helper->describe($output, $this->command, array( 'format' => $input->getOption('format'), - 'raw' => $input->getOption('raw'), + 'raw' => $input->getOption('raw'), )); $this->command = null; diff --git a/src/Symfony/Component/Console/Command/ListCommand.php b/src/Symfony/Component/Console/Command/ListCommand.php index 25c21205e4..58868e4706 100644 --- a/src/Symfony/Component/Console/Command/ListCommand.php +++ b/src/Symfony/Component/Console/Command/ListCommand.php @@ -74,8 +74,8 @@ EOF $helper = new DescriptorHelper(); $helper->describe($output, $this->getApplication(), array( - 'format' => $input->getOption('format'), - 'raw_text' => $input->getOption('raw'), + 'format' => $input->getOption('format'), + 'raw_text' => $input->getOption('raw'), 'namespace' => $input->getArgument('namespace'), )); } diff --git a/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php index 05adf0fbd0..186da508d5 100644 --- a/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php +++ b/src/Symfony/Component/Console/Descriptor/JsonDescriptor.php @@ -97,11 +97,11 @@ class JsonDescriptor extends Descriptor private function getInputArgumentData(InputArgument $argument) { return array( - 'name' => $argument->getName(), + 'name' => $argument->getName(), 'is_required' => $argument->isRequired(), - 'is_array' => $argument->isArray(), + 'is_array' => $argument->isArray(), 'description' => $argument->getDescription(), - 'default' => $argument->getDefault(), + 'default' => $argument->getDefault(), ); } @@ -113,13 +113,13 @@ class JsonDescriptor extends Descriptor private function getInputOptionData(InputOption $option) { return array( - 'name' => '--'.$option->getName(), - 'shortcut' => $option->getShortcut() ? '-'.implode('|-', explode('|', $option->getShortcut())) : '', - 'accept_value' => $option->acceptValue(), + 'name' => '--'.$option->getName(), + 'shortcut' => $option->getShortcut() ? '-'.implode('|-', explode('|', $option->getShortcut())) : '', + 'accept_value' => $option->acceptValue(), 'is_value_required' => $option->isValueRequired(), - 'is_multiple' => $option->isArray(), - 'description' => $option->getDescription(), - 'default' => $option->getDefault(), + 'is_multiple' => $option->isArray(), + 'description' => $option->getDescription(), + 'default' => $option->getDefault(), ); } @@ -154,12 +154,12 @@ class JsonDescriptor extends Descriptor $command->mergeApplicationDefinition(false); return array( - 'name' => $command->getName(), - 'usage' => $command->getSynopsis(), + 'name' => $command->getName(), + 'usage' => $command->getSynopsis(), 'description' => $command->getDescription(), - 'help' => $command->getProcessedHelp(), - 'aliases' => $command->getAliases(), - 'definition' => $this->getInputDefinitionData($command->getNativeDefinition()), + 'help' => $command->getProcessedHelp(), + 'aliases' => $command->getAliases(), + 'definition' => $this->getInputDefinitionData($command->getNativeDefinition()), ); } } diff --git a/src/Symfony/Component/Console/Helper/DescriptorHelper.php b/src/Symfony/Component/Console/Helper/DescriptorHelper.php index d58e0bf144..ff2573d9aa 100644 --- a/src/Symfony/Component/Console/Helper/DescriptorHelper.php +++ b/src/Symfony/Component/Console/Helper/DescriptorHelper.php @@ -59,8 +59,8 @@ class DescriptorHelper extends Helper public function describe(OutputInterface $output, $object, array $options = array()) { $options = array_merge(array( - 'raw_text' => false, - 'format' => 'txt', + 'raw_text' => false, + 'format' => 'txt', ), $options); if (!isset($this->descriptors[$options['format']])) { diff --git a/src/Symfony/Component/Console/Helper/ProgressBar.php b/src/Symfony/Component/Console/Helper/ProgressBar.php index 99c0dfc59b..fe33f7fc1c 100644 --- a/src/Symfony/Component/Console/Helper/ProgressBar.php +++ b/src/Symfony/Component/Console/Helper/ProgressBar.php @@ -23,12 +23,12 @@ use Symfony\Component\Console\Output\OutputInterface; class ProgressBar { // options - private $barWidth = 28; - private $barChar = '='; + private $barWidth = 28; + private $barChar = '='; private $emptyBarChar = '-'; private $progressChar = '>'; - private $format = null; - private $redrawFreq = 1; + private $format = null; + private $redrawFreq = 1; /** * @var OutputInterface @@ -543,17 +543,17 @@ class ProgressBar private static function initFormats() { return array( - 'normal' => ' %current%/%max% [%bar%] %percent:3s%%', - 'normal_nomax' => ' %current% [%bar%]', + 'normal' => ' %current%/%max% [%bar%] %percent:3s%%', + 'normal_nomax' => ' %current% [%bar%]', - 'verbose' => ' %current%/%max% [%bar%] %percent:3s%% %elapsed:6s%', - 'verbose_nomax' => ' %current% [%bar%] %elapsed:6s%', + 'verbose' => ' %current%/%max% [%bar%] %percent:3s%% %elapsed:6s%', + 'verbose_nomax' => ' %current% [%bar%] %elapsed:6s%', - 'very_verbose' => ' %current%/%max% [%bar%] %percent:3s%% %elapsed:6s%/%estimated:-6s%', + 'very_verbose' => ' %current%/%max% [%bar%] %percent:3s%% %elapsed:6s%/%estimated:-6s%', 'very_verbose_nomax' => ' %current% [%bar%] %elapsed:6s%', - 'debug' => ' %current%/%max% [%bar%] %percent:3s%% %elapsed:6s%/%estimated:-6s% %memory:6s%', - 'debug_nomax' => ' %current% [%bar%] %elapsed:6s% %memory:6s%', + 'debug' => ' %current%/%max% [%bar%] %percent:3s%% %elapsed:6s%/%estimated:-6s% %memory:6s%', + 'debug_nomax' => ' %current% [%bar%] %elapsed:6s% %memory:6s%', ); } } diff --git a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php index b797667208..347c7d0739 100644 --- a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php +++ b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php @@ -283,10 +283,10 @@ class TraceableEventDispatcher implements TraceableEventDispatcherInterface $line = null; } $info += array( - 'type' => 'Function', + 'type' => 'Function', 'function' => $listener, - 'file' => $file, - 'line' => $line, + 'file' => $file, + 'line' => $line, 'pretty' => $listener, ); } elseif (is_array($listener) || (is_object($listener) && is_callable($listener))) { @@ -303,11 +303,11 @@ class TraceableEventDispatcher implements TraceableEventDispatcherInterface $line = null; } $info += array( - 'type' => 'Method', + 'type' => 'Method', 'class' => $class, 'method' => $listener[1], - 'file' => $file, - 'line' => $line, + 'file' => $file, + 'line' => $line, 'pretty' => $class.'::'.$listener[1], ); } diff --git a/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php b/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php index 0082254b45..cbbee60ccf 100644 --- a/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php +++ b/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php @@ -16,15 +16,15 @@ use Symfony\Component\ExpressionLanguage\Compiler; class BinaryNode extends Node { private static $operators = array( - '~' => '.', + '~' => '.', 'and' => '&&', - 'or' => '||', + 'or' => '||', ); private static $functions = array( - '**' => 'pow', - '..' => 'range', - 'in' => 'in_array', + '**' => 'pow', + '..' => 'range', + 'in' => 'in_array', 'not in' => '!in_array', ); diff --git a/src/Symfony/Component/ExpressionLanguage/Parser.php b/src/Symfony/Component/ExpressionLanguage/Parser.php index 1c385aceec..e08568ceef 100644 --- a/src/Symfony/Component/ExpressionLanguage/Parser.php +++ b/src/Symfony/Component/ExpressionLanguage/Parser.php @@ -38,37 +38,37 @@ class Parser $this->unaryOperators = array( 'not' => array('precedence' => 50), - '!' => array('precedence' => 50), - '-' => array('precedence' => 500), - '+' => array('precedence' => 500), + '!' => array('precedence' => 50), + '-' => array('precedence' => 500), + '+' => array('precedence' => 500), ); $this->binaryOperators = array( - 'or' => array('precedence' => 10, 'associativity' => Parser::OPERATOR_LEFT), - '||' => array('precedence' => 10, 'associativity' => Parser::OPERATOR_LEFT), - 'and' => array('precedence' => 15, 'associativity' => Parser::OPERATOR_LEFT), - '&&' => array('precedence' => 15, 'associativity' => Parser::OPERATOR_LEFT), - '|' => array('precedence' => 16, 'associativity' => Parser::OPERATOR_LEFT), - '^' => array('precedence' => 17, 'associativity' => Parser::OPERATOR_LEFT), - '&' => array('precedence' => 18, 'associativity' => Parser::OPERATOR_LEFT), - '==' => array('precedence' => 20, 'associativity' => Parser::OPERATOR_LEFT), - '===' => array('precedence' => 20, 'associativity' => Parser::OPERATOR_LEFT), - '!=' => array('precedence' => 20, 'associativity' => Parser::OPERATOR_LEFT), - '!==' => array('precedence' => 20, 'associativity' => Parser::OPERATOR_LEFT), - '<' => array('precedence' => 20, 'associativity' => Parser::OPERATOR_LEFT), - '>' => array('precedence' => 20, 'associativity' => Parser::OPERATOR_LEFT), - '>=' => array('precedence' => 20, 'associativity' => Parser::OPERATOR_LEFT), - '<=' => array('precedence' => 20, 'associativity' => Parser::OPERATOR_LEFT), - 'not in' => array('precedence' => 20, 'associativity' => Parser::OPERATOR_LEFT), - 'in' => array('precedence' => 20, 'associativity' => Parser::OPERATOR_LEFT), + 'or' => array('precedence' => 10, 'associativity' => Parser::OPERATOR_LEFT), + '||' => array('precedence' => 10, 'associativity' => Parser::OPERATOR_LEFT), + 'and' => array('precedence' => 15, 'associativity' => Parser::OPERATOR_LEFT), + '&&' => array('precedence' => 15, 'associativity' => Parser::OPERATOR_LEFT), + '|' => array('precedence' => 16, 'associativity' => Parser::OPERATOR_LEFT), + '^' => array('precedence' => 17, 'associativity' => Parser::OPERATOR_LEFT), + '&' => array('precedence' => 18, 'associativity' => Parser::OPERATOR_LEFT), + '==' => array('precedence' => 20, 'associativity' => Parser::OPERATOR_LEFT), + '===' => array('precedence' => 20, 'associativity' => Parser::OPERATOR_LEFT), + '!=' => array('precedence' => 20, 'associativity' => Parser::OPERATOR_LEFT), + '!==' => array('precedence' => 20, 'associativity' => Parser::OPERATOR_LEFT), + '<' => array('precedence' => 20, 'associativity' => Parser::OPERATOR_LEFT), + '>' => array('precedence' => 20, 'associativity' => Parser::OPERATOR_LEFT), + '>=' => array('precedence' => 20, 'associativity' => Parser::OPERATOR_LEFT), + '<=' => array('precedence' => 20, 'associativity' => Parser::OPERATOR_LEFT), + 'not in' => array('precedence' => 20, 'associativity' => Parser::OPERATOR_LEFT), + 'in' => array('precedence' => 20, 'associativity' => Parser::OPERATOR_LEFT), 'matches' => array('precedence' => 20, 'associativity' => Parser::OPERATOR_LEFT), - '..' => array('precedence' => 25, 'associativity' => Parser::OPERATOR_LEFT), - '+' => array('precedence' => 30, 'associativity' => Parser::OPERATOR_LEFT), - '-' => array('precedence' => 30, 'associativity' => Parser::OPERATOR_LEFT), - '~' => array('precedence' => 40, 'associativity' => Parser::OPERATOR_LEFT), - '*' => array('precedence' => 60, 'associativity' => Parser::OPERATOR_LEFT), - '/' => array('precedence' => 60, 'associativity' => Parser::OPERATOR_LEFT), - '%' => array('precedence' => 60, 'associativity' => Parser::OPERATOR_LEFT), - '**' => array('precedence' => 200, 'associativity' => Parser::OPERATOR_RIGHT), + '..' => array('precedence' => 25, 'associativity' => Parser::OPERATOR_LEFT), + '+' => array('precedence' => 30, 'associativity' => Parser::OPERATOR_LEFT), + '-' => array('precedence' => 30, 'associativity' => Parser::OPERATOR_LEFT), + '~' => array('precedence' => 40, 'associativity' => Parser::OPERATOR_LEFT), + '*' => array('precedence' => 60, 'associativity' => Parser::OPERATOR_LEFT), + '/' => array('precedence' => 60, 'associativity' => Parser::OPERATOR_LEFT), + '%' => array('precedence' => 60, 'associativity' => Parser::OPERATOR_LEFT), + '**' => array('precedence' => 200, 'associativity' => Parser::OPERATOR_RIGHT), ); } diff --git a/src/Symfony/Component/ExpressionLanguage/Token.php b/src/Symfony/Component/ExpressionLanguage/Token.php index 67b1ae2235..6b2bc6e49f 100644 --- a/src/Symfony/Component/ExpressionLanguage/Token.php +++ b/src/Symfony/Component/ExpressionLanguage/Token.php @@ -22,11 +22,11 @@ class Token public $type; public $cursor; - const EOF_TYPE = 'end of expression'; - const NAME_TYPE = 'name'; - const NUMBER_TYPE = 'number'; - const STRING_TYPE = 'string'; - const OPERATOR_TYPE = 'operator'; + const EOF_TYPE = 'end of expression'; + const NAME_TYPE = 'name'; + const NUMBER_TYPE = 'number'; + const STRING_TYPE = 'string'; + const OPERATOR_TYPE = 'operator'; const PUNCTUATION_TYPE = 'punctuation'; /** diff --git a/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php index eef94f4685..1ea25568c4 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php @@ -43,7 +43,7 @@ class TimeDataCollector extends DataCollector implements LateDataCollectorInterf } $this->data = array( - 'token' => $response->headers->get('X-Debug-Token'), + 'token' => $response->headers->get('X-Debug-Token'), 'start_time' => $startTime * 1000, 'events' => array(), ); diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/ProfilerListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/ProfilerListenerTest.php index d43bbfefd1..b242ede446 100644 --- a/src/Symfony/Component/HttpKernel/Tests/EventListener/ProfilerListenerTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/ProfilerListenerTest.php @@ -87,7 +87,7 @@ class ProfilerListenerTest extends \PHPUnit_Framework_TestCase ->getMock(); $onlyException = true; - $listener = new ProfilerListener($profiler, null, $onlyException); + $listener = new ProfilerListener($profiler, null, $onlyException); // master request $listener->onKernelRequest(new GetResponseEvent($kernel, $masterRequest, Kernel::MASTER_REQUEST)); diff --git a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php index 23acb25c1d..aaed431562 100644 --- a/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php +++ b/src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php @@ -225,9 +225,9 @@ class NumberFormatter */ private static $customRoundingList = array( self::ROUND_CEILING => true, - self::ROUND_FLOOR => true, - self::ROUND_DOWN => true, - self::ROUND_UP => true, + self::ROUND_FLOOR => true, + self::ROUND_DOWN => true, + self::ROUND_UP => true, ); /** diff --git a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php index f6d4425215..92abf3648a 100644 --- a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php +++ b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php @@ -209,14 +209,14 @@ abstract class AnnotationClassLoader implements LoaderInterface protected function getGlobals(\ReflectionClass $class) { $globals = array( - 'path' => '', + 'path' => '', 'requirements' => array(), - 'options' => array(), - 'defaults' => array(), - 'schemes' => array(), - 'methods' => array(), - 'host' => '', - 'condition' => '', + 'options' => array(), + 'defaults' => array(), + 'schemes' => array(), + 'methods' => array(), + 'host' => '', + 'condition' => '', ); if ($annot = $this->reader->getClassAnnotation($class, $this->routeAnnotationClass)) { diff --git a/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php b/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php index 84856f6545..b8b6a776e9 100644 --- a/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php +++ b/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php @@ -23,8 +23,8 @@ use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; class AccessDecisionManager implements AccessDecisionManagerInterface { const STRATEGY_AFFIRMATIVE = 'affirmative'; - const STRATEGY_CONSENSUS = 'consensus'; - const STRATEGY_UNANIMOUS = 'unanimous'; + const STRATEGY_CONSENSUS = 'consensus'; + const STRATEGY_UNANIMOUS = 'unanimous'; private $voters; private $strategy; diff --git a/src/Symfony/Component/Security/Http/Firewall/SimpleFormAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/SimpleFormAuthenticationListener.php index 20ce4f265d..5b905df2f2 100644 --- a/src/Symfony/Component/Security/Http/Firewall/SimpleFormAuthenticationListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/SimpleFormAuthenticationListener.php @@ -74,9 +74,9 @@ class SimpleFormAuthenticationListener extends AbstractAuthenticationListener $options = array_merge(array( 'username_parameter' => '_username', 'password_parameter' => '_password', - 'csrf_parameter' => '_csrf_token', - 'intention' => 'authenticate', - 'post_only' => true, + 'csrf_parameter' => '_csrf_token', + 'intention' => 'authenticate', + 'post_only' => true, ), $options); parent::__construct($securityContext, $authenticationManager, $sessionStrategy, $httpUtils, $providerKey, $successHandler, $failureHandler, $options, $logger, $dispatcher); } diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php index cc8de241ca..dc2e2f8a84 100644 --- a/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php +++ b/src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php @@ -265,7 +265,7 @@ class GetSetMethodNormalizerTest extends \PHPUnit_Framework_TestCase $serializer = $this->getMock('Symfony\Component\Serializer\SerializerInterface'); $this->normalizer->setSerializer($serializer); - $obj = new GetSetDummy(); + $obj = new GetSetDummy(); $object = new \stdClass(); $obj->setObject($object); diff --git a/src/Symfony/Component/Validator/Tests/ExecutionContextTest.php b/src/Symfony/Component/Validator/Tests/ExecutionContextTest.php index c0828d4add..3b54a9e472 100644 --- a/src/Symfony/Component/Validator/Tests/ExecutionContextTest.php +++ b/src/Symfony/Component/Validator/Tests/ExecutionContextTest.php @@ -283,7 +283,7 @@ class ExecutionContextTest extends \PHPUnit_Framework_TestCase $constraints = new Collection(array( 'shelves' => new All(array('constraints' => array( new Collection(array( - 'name' => new ConstraintA(), + 'name' => new ConstraintA(), 'books' => new All(array('constraints' => array( new ConstraintA(), ))),