From 09843131baf7098e7e7ca8f158b309e4984c64f0 Mon Sep 17 00:00:00 2001 From: Luis Cordova Date: Wed, 12 Mar 2014 23:05:55 -0500 Subject: [PATCH] clean up commands from framework bundle --- .../Bundle/FrameworkBundle/CacheWarmer/TemplateFinder.php | 2 +- .../FrameworkBundle/Command/AbstractConfigCommand.php | 2 +- .../FrameworkBundle/Command/AssetsInstallCommand.php | 2 +- .../Bundle/FrameworkBundle/Command/CacheClearCommand.php | 7 ++++--- .../Bundle/FrameworkBundle/Command/CacheWarmupCommand.php | 1 + .../Bundle/FrameworkBundle/Command/ConfigDebugCommand.php | 3 +-- .../FrameworkBundle/Command/ConfigDumpReferenceCommand.php | 3 ++- .../FrameworkBundle/Command/ContainerDebugCommand.php | 7 ++++--- .../FrameworkBundle/Command/RouterApacheDumperCommand.php | 1 + .../Bundle/FrameworkBundle/Command/RouterDebugCommand.php | 3 ++- .../Bundle/FrameworkBundle/Command/RouterMatchCommand.php | 3 ++- .../Bundle/FrameworkBundle/Command/ServerRunCommand.php | 3 ++- .../FrameworkBundle/Command/TranslationDebugCommand.php | 1 + .../FrameworkBundle/Command/TranslationUpdateCommand.php | 1 + .../Bundle/FrameworkBundle/Command/YamlLintCommand.php | 3 ++- .../Tests/Controller/RedirectControllerTest.php | 2 +- 16 files changed, 27 insertions(+), 17 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinder.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinder.php index 7c441a8748..07f81f5878 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinder.php +++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinder.php @@ -55,7 +55,7 @@ class TemplateFinder implements TemplateFinderInterface $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 index 99e2e87f5f..21b23c9aa4 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php @@ -16,7 +16,7 @@ use Symfony\Component\Console\Output\OutputInterface; 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 * @author Wouter J diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php index 48a8543689..33e1982eff 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php @@ -83,7 +83,7 @@ EOT $bundlesDir = $targetArg.'/bundles/'; $filesystem->mkdir($bundlesDir, 0777); - $output->writeln(sprintf("Installing assets using the %s option", $input->getOption('symlink') ? 'symlink' : 'hard copy')); + $output->writeln(sprintf('Installing assets %s the symlink 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 index 28dac98e35..efe27319bb 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php @@ -43,6 +43,7 @@ and debug mode: php %command.full_name% --env=dev php %command.full_name% --env=prod --no-debug + EOF ) ; @@ -107,9 +108,9 @@ EOF } /** - * @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 index 71f071105b..8e08153d4a 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/CacheWarmupCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/CacheWarmupCommand.php @@ -42,6 +42,7 @@ This command does not generate the classes cache (as when executing this command, too many classes that should be part of the cache are already loaded in memory). Use curl 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 index f434d91c7c..a60d4f237f 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDebugCommand.php @@ -15,11 +15,10 @@ use Symfony\Component\Config\Definition\Processor; 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 */ diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php index 036b2c9a1c..4a92fd63a8 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php @@ -19,7 +19,7 @@ use Symfony\Component\Console\Input\InputInterface; 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 * @author Wouter J @@ -53,6 +53,7 @@ this is either yaml or xml. When the option is not provided, yaml is used. php %command.full_name% FrameworkBundle --format=xml + EOF ) ; diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php index 1d8ca9a4f9..84be032173 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php @@ -21,7 +21,7 @@ use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\Config\FileLocator; /** - * A console command for retrieving information about services + * A console command for retrieving information about services. * * @author Ryan Weaver */ @@ -41,8 +41,8 @@ class ContainerDebugCommand extends ContainerAwareCommand ->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 @@ Use the --parameters option to display all parameters: Display a specific parameter by specifying his name with the --parameter option: php %command.full_name% --parameter=kernel.debug + EOF ) ; diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php index c122576fd5..63487b750a 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php @@ -63,6 +63,7 @@ These can then be used with the ApacheUrlMatcher to use Apache for route matching. php %command.full_name% + EOF ) ; diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php index e4b49a2679..5607ae357b 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php @@ -20,7 +20,7 @@ use Symfony\Component\Routing\RouterInterface; use Symfony\Component\Routing\Route; /** - * A console command for retrieving information about routes + * A console command for retrieving information about routes. * * @author Fabien Potencier * @author Tobias Schultze @@ -61,6 +61,7 @@ class RouterDebugCommand extends ContainerAwareCommand The %command.name% displays the configured routes: php %command.full_name% + EOF ) ; diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php index 405996902b..591ccb7349 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php @@ -56,6 +56,7 @@ class RouterMatchCommand extends ContainerAwareCommand The %command.name% simulates a path info match: php %command.full_name% /foo + EOF ) ; @@ -72,7 +73,7 @@ EOF $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('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 index f3acd367f3..5b160744c4 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php @@ -18,7 +18,7 @@ use Symfony\Component\Console\Output\OutputInterface; 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 */ @@ -68,6 +68,7 @@ router script using --router option: %command.full_name% --router=app/config/router.php 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 index a1f1360053..eff9dc1947 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php @@ -67,6 +67,7 @@ You can only display missing messages: You can only display unused messages: php %command.full_name% --only-unused en AcmeDemoBundle + EOF ) ; diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php index 2ef9d04465..b4c1e3efd7 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php @@ -66,6 +66,7 @@ message. php %command.full_name% --dump-messages en AcmeBundle php %command.full_name% --force --prefix="new_" fr AcmeBundle + EOF ) ; diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/YamlLintCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/YamlLintCommand.php index b7f46d1e9d..967c3b18a3 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/YamlLintCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/YamlLintCommand.php @@ -24,7 +24,7 @@ use Symfony\Component\Yaml\Exception\ParseException; 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 */ @@ -57,6 +57,7 @@ Or all YAML files in a bundle: You can also pass the YAML contents from STDIN: cat filename | php %command.full_name% + EOF ) ; diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/RedirectControllerTest.php index 34d1eeac28..8cadf13612 100644 --- 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\Controller\RedirectController; use Symfony\Bundle\FrameworkBundle\Tests\TestCase; /** - * @author Marcin Sikon + * @author Marcin Sikon */ class RedirectControllerTest extends TestCase {