From f89811d8d1fb3f1a44dae551a07fbbe9d30ab813 Mon Sep 17 00:00:00 2001 From: Jakub Zalas Date: Thu, 31 Jul 2014 21:49:10 +0100 Subject: [PATCH 1/2] [Console] Roll back changes made to fixture files. Original change was made in e9022adaef40330a92bdf0916bf0b995f942c7fa. --- .../Console/Tests/Fixtures/application_1.xml | 22 +++++++++---------- .../Console/Tests/Fixtures/application_2.xml | 22 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml b/src/Symfony/Component/Console/Tests/Fixtures/application_1.xml index 1989971cc1..d5c57be401 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 c4affaf1a0..9aa77bbeec 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> From 88b4e7008d71da9b7d1d87020c491bd674c55351 Mon Sep 17 00:00:00 2001 From: Jakub Zalas Date: Thu, 31 Jul 2014 22:03:37 +0100 Subject: [PATCH 2/2] [DependencyInjection] Roll back changes made to generated files. Original change was made in e9022adaef40330a92bdf0916bf0b995f942c7fa. --- .../Tests/Fixtures/php/services9_compiled.php | 2 +- .../DependencyInjection/Tests/Fixtures/yaml/services1.yml | 1 + .../DependencyInjection/Tests/Fixtures/yaml/services8.yml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) 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 b53bb55006..629499a608 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 e69de29bb2..8b13789179 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services1.yml +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services1.yml @@ -0,0 +1 @@ + diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services8.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services8.yml index 8850818f86..a1fb590358 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services8.yml +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services8.yml @@ -4,3 +4,4 @@ parameters: bar: 'foo is %%foo bar' escape: '@@escapeme' values: [true, false, null, 0, 1000.3, 'true', 'false', 'null'] +