clean up commands from framework bundle

cordoval · cordoval · commit 09843131baf7 · 2014-03-12T23:58:17.000-05:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinder.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinder.php
@@ -55,7 +55,7 @@ public function findAllTemplates()
 
         $templates = array();
 
-        foreach ($this->kernel->getBundles() as $name => $bundle) {
+        foreach ($this->kernel->getBundles() as $bundle) {
             $templates = array_merge($templates, $this->findTemplatesInBundle($bundle));
         }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php
@@ -16,7 +16,7 @@
 use Symfony\Component\DependencyInjection\Extension\Extension;
 
 /**
- * A console command for dumping available configuration reference
+ * A console command for dumping available configuration reference.
  *
  * @author Kevin Bond <kevinbond@gmail.com>
  * @author Wouter J <waldio.webdesign@gmail.com>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
@@ -83,7 +83,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $bundlesDir = $targetArg.'/bundles/';
         $filesystem->mkdir($bundlesDir, 0777);
 
-        $output->writeln(sprintf("Installing assets using the <comment>%s</comment> option", $input->getOption('symlink') ? 'symlink' : 'hard copy'));
+        $output->writeln(sprintf('Installing assets %s the <comment>symlink</comment> option', $input->getOption('symlink') ? 'using' : 'without'));
 
         foreach ($this->getContainer()->get('kernel')->getBundles() as $bundle) {
             if (is_dir($originDir = $bundle->getPath().'/Resources/public')) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
@@ -43,6 +43,7 @@ protected function configure()
 
 <info>php %command.full_name% --env=dev</info>
 <info>php %command.full_name% --env=prod --no-debug</info>
+
 EOF
             )
         ;
@@ -107,9 +108,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
     }
 
     /**
-     * @param string $warmupDir
-     * @param string $realCacheDir
-     * @param bool   $enableOptionalWarmers
+     * @param string  $warmupDir
+     * @param string  $realCacheDir
+     * @param Boolean $enableOptionalWarmers
      */
     protected function warmup($warmupDir, $realCacheDir, $enableOptionalWarmers = true)
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheWarmupCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheWarmupCommand.php
@@ -42,6 +42,7 @@ protected function configure()
 command, too many classes that should be part of the cache are already loaded
 in memory). Use <comment>curl</comment> or any other similar tool to warm up
 the classes cache if you want.
+
 EOF
             )
         ;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php
@@ -15,11 +15,10 @@
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\Yaml\Yaml;
 
 /**
- * A console command for dumping available configuration reference
+ * A console command for dumping available configuration reference.
  *
  * @author Grégoire Pineau <lyrixx@lyrixx.info>
  */
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
@@ -19,7 +19,7 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
- * A console command for dumping available configuration reference
+ * A console command for dumping available configuration reference.
  *
  * @author Kevin Bond <kevinbond@gmail.com>
  * @author Wouter J <waldio.webdesign@gmail.com>
@@ -53,6 +53,7 @@ protected function configure()
 When the option is not provided, <comment>yaml</comment> is used.
 
   <info>php %command.full_name% FrameworkBundle --format=xml</info>
+
 EOF
             )
         ;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
@@ -21,7 +21,7 @@
 use Symfony\Component\Config\FileLocator;
 
 /**
- * A console command for retrieving information about services
+ * A console command for retrieving information about services.
  *
  * @author Ryan Weaver <ryan@thatsquality.com>
  */
@@ -41,8 +41,8 @@ protected function configure()
             ->setName('container:debug')
             ->setDefinition(array(
                 new InputArgument('name', InputArgument::OPTIONAL, 'A service name (foo)'),
-                new InputOption('show-private', null, InputOption::VALUE_NONE, 'Use to show public *and* private services'),
-                new InputOption('tag', null, InputOption::VALUE_REQUIRED, 'Show all services with a specific tag'),
+                new InputOption('show-private', null, InputOption::VALUE_NONE, 'Used to show public *and* private services'),
+                new InputOption('tag', null, InputOption::VALUE_REQUIRED, 'Shows all services with a specific tag'),
                 new InputOption('tags', null, InputOption::VALUE_NONE, 'Displays tagged services for an application'),
                 new InputOption('parameter', null, InputOption::VALUE_REQUIRED, 'Displays a specific parameter for an application'),
                 new InputOption('parameters', null, InputOption::VALUE_NONE, 'Displays parameters for an application'),
@@ -79,6 +79,7 @@ protected function configure()
 Display a specific parameter by specifying his name with the --parameter option:
 
   <info>php %command.full_name% --parameter=kernel.debug</info>
+
 EOF
             )
         ;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php
@@ -63,6 +63,7 @@ protected function configure()
 matching.
 
   <info>php %command.full_name%</info>
+
 EOF
             )
         ;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
@@ -20,7 +20,7 @@
 use Symfony\Component\Routing\Route;
 
 /**
- * A console command for retrieving information about routes
+ * A console command for retrieving information about routes.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Tobias Schultze <http://tobion.de>
@@ -61,6 +61,7 @@ protected function configure()
 The <info>%command.name%</info> displays the configured routes:
 
   <info>php %command.full_name%</info>
+
 EOF
             )
         ;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php
@@ -56,6 +56,7 @@ protected function configure()
 The <info>%command.name%</info> simulates a path info match:
 
   <info>php %command.full_name% /foo</info>
+
 EOF
             )
         ;
@@ -72,7 +73,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $traces = $matcher->getTraces($input->getArgument('path_info'));
 
         $matches = false;
-        foreach ($traces as $i => $trace) {
+        foreach ($traces as $trace) {
             if (TraceableUrlMatcher::ROUTE_ALMOST_MATCHES == $trace['level']) {
                 $output->writeln(sprintf('<fg=yellow>Route "%s" almost matches but %s</>', $trace['name'], lcfirst($trace['log'])));
             } elseif (TraceableUrlMatcher::ROUTE_MATCHES == $trace['level']) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
@@ -18,7 +18,7 @@
 use Symfony\Component\Process\ProcessBuilder;
 
 /**
- * Runs Symfony2 application using PHP built-in web server
+ * Runs Symfony2 application using PHP built-in web server.
  *
  * @author Michał Pipa <michal.pipa.xsolve@gmail.com>
  */
@@ -68,6 +68,7 @@ protected function configure()
   <info>%command.full_name% --router=app/config/router.php</info>
 
 See also: http://www.php.net/manual/en/features.commandline.webserver.php
+
 EOF
             )
         ;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
@@ -67,6 +67,7 @@ protected function configure()
 You can only display unused messages:
 
 <info>php %command.full_name% --only-unused en AcmeDemoBundle</info>
+
 EOF
             )
         ;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
@@ -66,6 +66,7 @@ protected function configure()
 
 <info>php %command.full_name% --dump-messages en AcmeBundle</info>
 <info>php %command.full_name% --force --prefix="new_" fr AcmeBundle</info>
+
 EOF
             )
         ;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/YamlLintCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/YamlLintCommand.php
@@ -24,7 +24,7 @@
 use Symfony\Component\Yaml\Parser;
 
 /**
- * Validates YAML files syntax and output encountered errors.
+ * Validates YAML files syntax and outputs encountered errors.
  *
  * @author Grégoire Pineau <lyrixx@lyrixx.info>
  */
@@ -57,6 +57,7 @@ protected function configure()
 You can also pass the YAML contents from STDIN:
 
 <info>cat filename | php %command.full_name%</info>
+
 EOF
             )
         ;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php
@@ -19,7 +19,7 @@
 use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
 
 /**
- * @author Marcin Sikon<marcin.sikon@gmail.com>
+ * @author Marcin Sikon <marcin.sikon@gmail.com>
  */
 class RedirectControllerTest extends TestCase
 {

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function findAllTemplates()`
`55`	`55`
`56`	`56`	`$templates = array();`
`57`	`57`
`58`		`- foreach ($this->kernel->getBundles() as $name => $bundle) {`
	`58`	`+ foreach ($this->kernel->getBundles() as $bundle) {`
`59`	`59`	`$templates = array_merge($templates, $this->findTemplatesInBundle($bundle));`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`use Symfony\Component\DependencyInjection\Extension\Extension;`
`17`	`17`
`18`	`18`	`/**`
`19`		`- * A console command for dumping available configuration reference`
	`19`	`+ * A console command for dumping available configuration reference.`
`20`	`20`	`*`
`21`	`21`	`* @author Kevin Bond <kevinbond@gmail.com>`
`22`	`22`	`* @author Wouter J <waldio.webdesign@gmail.com>`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ protected function configure()`
`43`	`43`
`44`	`44`	`<info>php %command.full_name% --env=dev</info>`
`45`	`45`	`<info>php %command.full_name% --env=prod --no-debug</info>`
	`46`	`+`
`46`	`47`	`EOF`
`47`	`48`	`)`
`48`	`49`	`;`
`@@ -107,9 +108,9 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`107`	`108`	`}`
`108`	`109`
`109`	`110`	`/**`
`110`		`- * @param string $warmupDir`
`111`		`- * @param string $realCacheDir`
`112`		`- * @param bool $enableOptionalWarmers`
	`111`	`+ * @param string $warmupDir`
	`112`	`+ * @param string $realCacheDir`
	`113`	`+ * @param Boolean $enableOptionalWarmers`
`113`	`114`	`*/`
`114`	`115`	`protected function warmup($warmupDir, $realCacheDir, $enableOptionalWarmers = true)`
`115`	`116`	`{`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ protected function configure()`
`42`	`42`	`command, too many classes that should be part of the cache are already loaded`
`43`	`43`	`in memory). Use <comment>curl</comment> or any other similar tool to warm up`
`44`	`44`	`the classes cache if you want.`
	`45`	`+`
`45`	`46`	`EOF`
`46`	`47`	`)`
`47`	`48`	`;`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`use Symfony\Component\Console\Output\OutputInterface;`
`20`	`20`
`21`	`21`	`/**`
`22`		`- * A console command for dumping available configuration reference`
	`22`	`+ * A console command for dumping available configuration reference.`
`23`	`23`	`*`
`24`	`24`	`* @author Kevin Bond <kevinbond@gmail.com>`
`25`	`25`	`* @author Wouter J <waldio.webdesign@gmail.com>`
`@@ -53,6 +53,7 @@ protected function configure()`
`53`	`53`	`When the option is not provided, <comment>yaml</comment> is used.`
`54`	`54`
`55`	`55`	`<info>php %command.full_name% FrameworkBundle --format=xml</info>`
	`56`	`+`
`56`	`57`	`EOF`
`57`	`58`	`)`
`58`	`59`	`;`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ protected function configure()`
`63`	`63`	`matching.`
`64`	`64`
`65`	`65`	`<info>php %command.full_name%</info>`
	`66`	`+`
`66`	`67`	`EOF`
`67`	`68`	`)`
`68`	`69`	`;`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`use Symfony\Component\Routing\Route;`
`21`	`21`
`22`	`22`	`/**`
`23`		`- * A console command for retrieving information about routes`
	`23`	`+ * A console command for retrieving information about routes.`
`24`	`24`	`*`
`25`	`25`	`* @author Fabien Potencier <fabien@symfony.com>`
`26`	`26`	`* @author Tobias Schultze <http://tobion.de>`
`@@ -61,6 +61,7 @@ protected function configure()`
`61`	`61`	`The <info>%command.name%</info> displays the configured routes:`
`62`	`62`
`63`	`63`	`<info>php %command.full_name%</info>`
	`64`	`+`
`64`	`65`	`EOF`
`65`	`66`	`)`
`66`	`67`	`;`