From e9022adaef40330a92bdf0916bf0b995f942c7fa Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 29 Jul 2014 20:09:11 +0200 Subject: [PATCH] fixed CS --- .../Console/Tests/Command/ListCommandTest.php | 2 +- .../Console/Tests/Fixtures/application_1.xml | 22 +++++++++---------- .../Console/Tests/Fixtures/application_2.xml | 22 +++++++++---------- .../Tests/Dumper/PhpDumperTest.php | 2 +- .../Tests/Fixtures/php/services9_compiled.php | 2 +- .../Tests/Fixtures/yaml/services1.yml | 1 - .../Tests/Fixtures/yaml/services8.yml | 1 - .../HttpFoundation/Tests/ResponseTest.php | 4 ++-- .../Tests/HttpCache/HttpCacheTest.php | 2 +- .../Process/Tests/ExecutableFinderTest.php | 8 +++---- .../Normalizer/GetSetMethodNormalizer.php | 2 +- .../Tests/Encoder/XmlEncoderTest.php | 4 ++-- 12 files changed, 35 insertions(+), 37 deletions(-) diff --git a/src/Symfony/Component/Console/Tests/Command/ListCommandTest.php b/src/Symfony/Component/Console/Tests/Command/ListCommandTest.php index 1df06f5d94..ca50874912 100644 --- a/src/Symfony/Component/Console/Tests/Command/ListCommandTest.php +++ b/src/Symfony/Component/Console/Tests/Command/ListCommandTest.php @@ -50,7 +50,7 @@ EOF; public function testExecuteListsCommandsWithNamespaceArgument() { - require_once(realpath(__DIR__.'/../Fixtures/FooCommand.php')); + require_once realpath(__DIR__.'/../Fixtures/FooCommand.php'); $application = new Application(); $application->add(new \FooCommand()); $commandTester = new CommandTester($command = $application->get('list')); diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml b/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml index d5c57be401..1989971cc1 100644 --- a/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml +++ b/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml @@ -5,13 +5,13 @@ help [--xml] [--format="..."] [--raw] [command_name] Displays help for a command The <info>help</info> command displays help for a given command: - + <info>php app/console help list</info> - + You can also output the help in other formats by using the <comment>--format</comment> option: - + <info>php app/console help --format=xml list</info> - + To display the list of available commands, please use the <info>list</info> command. @@ -60,19 +60,19 @@ list [--xml] [--raw] [--format="..."] [namespace] Lists commands The <info>list</info> command lists all commands: - + <info>php app/console list</info> - + You can also display the commands for a specific namespace: - + <info>php app/console list test</info> - + You can also output the information in other formats by using the <comment>--format</comment> option: - + <info>php app/console list --format=xml</info> - + It's also possible to get raw list of commands (useful for embedding command runner): - + <info>php app/console list --raw</info> diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml b/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml index 9aa77bbeec..c4affaf1a0 100644 --- a/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml +++ b/src/Symfony/Component/Console/Tests/Fixtures/application_2.xml @@ -5,13 +5,13 @@ help [--xml] [--format="..."] [--raw] [command_name] Displays help for a command The <info>help</info> command displays help for a given command: - + <info>php app/console help list</info> - + You can also output the help in other formats by using the <comment>--format</comment> option: - + <info>php app/console help --format=xml list</info> - + To display the list of available commands, please use the <info>list</info> command. @@ -60,19 +60,19 @@ list [--xml] [--raw] [--format="..."] [namespace] Lists commands The <info>list</info> command lists all commands: - + <info>php app/console list</info> - + You can also display the commands for a specific namespace: - + <info>php app/console list test</info> - + You can also output the information in other formats by using the <comment>--format</comment> option: - + <info>php app/console list --format=xml</info> - + It's also possible to get raw list of commands (useful for embedding command runner): - + <info>php app/console list --raw</info> diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php index 420671145f..1a64508413 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php @@ -140,7 +140,7 @@ class PhpDumperTest extends \PHPUnit_Framework_TestCase eval('?>'.$dumper->dump(array('class' => 'Symfony_DI_PhpDumper_Test_Aliases'))); $container = new \Symfony_DI_PhpDumper_Test_Aliases(); - $container->set('foo', $foo = new \stdClass); + $container->set('foo', $foo = new \stdClass()); $this->assertSame($foo, $container->get('foo')); $this->assertSame($foo, $container->get('alias_for_foo')); $this->assertSame($foo, $container->get('alias_for_alias')); diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php index 629499a608..b53bb55006 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php @@ -201,7 +201,7 @@ class ProjectServiceContainer extends Container $this->services['method_call1'] = $instance = new \FooClass(); $instance->setBar($this->get('foo')); - $instance->setBar(NULL); + $instance->setBar(null); return $instance; } diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services1.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services1.yml index 8b13789179..e69de29bb2 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services1.yml +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services1.yml @@ -1 +0,0 @@ - diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services8.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services8.yml index a1fb590358..8850818f86 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services8.yml +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services8.yml @@ -4,4 +4,3 @@ parameters: bar: 'foo is %%foo bar' escape: '@@escapeme' values: [true, false, null, 0, 1000.3, 'true', 'false', 'null'] - diff --git a/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php b/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php index f1e37fff7b..c94ace9af9 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php @@ -680,7 +680,7 @@ class ResponseTest extends ResponseTestCase public function validContentProvider() { return array( - 'obj' => array(new StringableObject), + 'obj' => array(new StringableObject()), 'string' => array('Foo'), 'int' => array(2), ); @@ -689,7 +689,7 @@ class ResponseTest extends ResponseTestCase public function invalidContentProvider() { return array( - 'obj' => array(new \stdClass), + 'obj' => array(new \stdClass()), 'array' => array(array()), 'bool' => array(true, '1'), ); diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php index e08f198281..71cdd37aa7 100644 --- a/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php @@ -1190,7 +1190,7 @@ class HttpCacheTest extends HttpCacheTestCase public function testEsiCacheRemoveValidationHeadersIfEmbeddedResponses() { - $time = new \DateTime; + $time = new \DateTime(); $responses = array( array( diff --git a/src/Symfony/Component/Process/Tests/ExecutableFinderTest.php b/src/Symfony/Component/Process/Tests/ExecutableFinderTest.php index 3b5bff26e9..5fbe1e0aa7 100644 --- a/src/Symfony/Component/Process/Tests/ExecutableFinderTest.php +++ b/src/Symfony/Component/Process/Tests/ExecutableFinderTest.php @@ -46,7 +46,7 @@ class ExecutableFinderTest extends \PHPUnit_Framework_TestCase $this->setPath(dirname(PHP_BINARY)); - $finder = new ExecutableFinder; + $finder = new ExecutableFinder(); $result = $finder->find($this->getPhpBinaryName()); $this->assertSamePath(PHP_BINARY, $result); @@ -62,7 +62,7 @@ class ExecutableFinderTest extends \PHPUnit_Framework_TestCase $this->setPath(''); - $finder = new ExecutableFinder; + $finder = new ExecutableFinder(); $result = $finder->find('foo', $expected); $this->assertEquals($expected, $result); @@ -82,7 +82,7 @@ class ExecutableFinderTest extends \PHPUnit_Framework_TestCase $extraDirs = array(dirname(PHP_BINARY)); - $finder = new ExecutableFinder; + $finder = new ExecutableFinder(); $result = $finder->find($this->getPhpBinaryName(), null, $extraDirs); $this->assertSamePath(PHP_BINARY, $result); @@ -104,7 +104,7 @@ class ExecutableFinderTest extends \PHPUnit_Framework_TestCase ini_set('open_basedir', dirname(PHP_BINARY).PATH_SEPARATOR.'/'); - $finder = new ExecutableFinder; + $finder = new ExecutableFinder(); $result = $finder->find($this->getPhpBinaryName()); $this->assertSamePath(PHP_BINARY, $result); diff --git a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php index e4e3d82291..24b5732f38 100644 --- a/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php @@ -141,7 +141,7 @@ class GetSetMethodNormalizer extends SerializerAwareNormalizer implements Normal $object = $reflectionClass->newInstanceArgs($params); } else { - $object = new $class; + $object = new $class(); } foreach ($data as $attribute => $value) { diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php index 73dee7d021..b07b18e24d 100644 --- a/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php +++ b/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php @@ -189,7 +189,7 @@ class XmlEncoderTest extends \PHPUnit_Framework_TestCase public function testEncodeSerializerXmlRootNodeNameOption() { $options = array('xml_root_node_name' => 'test'); - $this->encoder = new XmlEncoder; + $this->encoder = new XmlEncoder(); $serializer = new Serializer(array(), array('xml' => new XmlEncoder())); $this->encoder->setSerializer($serializer); @@ -272,7 +272,7 @@ class XmlEncoderTest extends \PHPUnit_Framework_TestCase public function testDecodeWithoutItemHash() { - $obj = new ScalarDummy; + $obj = new ScalarDummy(); $obj->xmlFoo = array( 'foo-bar' => array( '@key' => "value",