[FrameworkBundle] improve usage of Table helper

xabbuh · xabbuh · commit 71d84e66e425 · 2015-04-13T17:21:02.000+02:00
Use the `Table` helper if present in favor of the deprecated
`TableHelper` class.
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AbstractConfigCommand.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\FrameworkBundle\Command;
 
 use Symfony\Component\Config\Definition\ConfigurationInterface;
+use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\DependencyInjection\Extension\ExtensionInterface;
 
@@ -28,14 +29,23 @@ protected function listBundles(OutputInterface $output)
     {
         $output->writeln('Available registered bundles with their extension alias if available:');
 
-        $table = $this->getHelperSet()->get('table');
+        if (class_exists('Symfony\Component\Console\Helper\Table')) {
+            $table = new Table($output);
+        } else {
+            $table = $this->getHelperSet()->get('table');
+        }
+
         $table->setHeaders(array('Bundle name', 'Extension alias'));
         foreach ($this->getContainer()->get('kernel')->getBundles() as $bundle) {
             $extension = $bundle->getContainerExtension();
             $table->addRow(array($bundle->getName(), $extension ? $extension->getAlias() : ''));
         }
 
-        $table->render($output);
+        if (class_exists('Symfony\Component\Console\Helper\Table')) {
+            $table->render();
+        } else {
+            $table->render($output);
+        }
     }
 
     protected function findExtension($name)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
@@ -131,8 +131,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
         }
 
-        /** @var \Symfony\Component\Console\Helper\Table $table */
-        $table = new Table($output);
+        if (class_exists('Symfony\Component\Console\Helper\Table')) {
+            $table = new Table($output);
+        } else {
+            $table = $this->getHelperSet()->get('table');
+        }
 
         // Display header line
         $headers = array('State(s)', 'Id', sprintf('Message Preview (%s)', $locale));
@@ -177,7 +180,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
         }
 
-        $table->render();
+        if (class_exists('Symfony\Component\Console\Helper\Table')) {
+            $table->render();
+        } else {
+            $table->render($output);
+        }
 
         $output->writeln('');
         $output->writeln('<info>Legend:</info>');

Original file line number	Diff line number	Diff line change
`@@ -131,8 +131,11 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`
`134`		`- /** @var \Symfony\Component\Console\Helper\Table $table */`
`135`		`- $table = new Table($output);`
	`134`	`+ if (class_exists('Symfony\Component\Console\Helper\Table')) {`
	`135`	`+ $table = new Table($output);`
	`136`	`+ } else {`
	`137`	`+ $table = $this->getHelperSet()->get('table');`
	`138`	`+ }`
`136`	`139`
`137`	`140`	`// Display header line`
`138`	`141`	`$headers = array('State(s)', 'Id', sprintf('Message Preview (%s)', $locale));`
`@@ -177,7 +180,11 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`177`	`180`	`}`
`178`	`181`	`}`
`179`	`182`
`180`		`- $table->render();`
	`183`	`+ if (class_exists('Symfony\Component\Console\Helper\Table')) {`
	`184`	`+ $table->render();`
	`185`	`+ } else {`
	`186`	`+ $table->render($output);`
	`187`	`+ }`
`181`	`188`
`182`	`189`	`$output->writeln('');`
`183`	`190`	`$output->writeln('<info>Legend:</info>');`