[TwigBridge] Fix missing path and separators in loader paths list on debug:twig output

yceruto · nicolas-grekas · commit ba7a4ca86345 · 2018-07-07T17:04:14.000+02:00
diff --git a/src/Symfony/Bridge/Twig/Command/DebugCommand.php b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
@@ -151,19 +151,27 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $rows = array();
+        $firstNamespace = true;
+        $prevHasSeparator = false;
         foreach ($this->getLoaderPaths() as $namespace => $paths) {
-            if (count($paths) > 1) {
+            if (!$firstNamespace && !$prevHasSeparator && count($paths) > 1) {
                 $rows[] = array('', '');
             }
+            $firstNamespace = false;
             foreach ($paths as $path) {
-                $rows[] = array($namespace, '- '.$path);
+                $rows[] = array($namespace, $path.DIRECTORY_SEPARATOR);
                 $namespace = '';
             }
             if (count($paths) > 1) {
                 $rows[] = array('', '');
+                $prevHasSeparator = true;
+            } else {
+                $prevHasSeparator = false;
             }
         }
-        array_pop($rows);
+        if ($prevHasSeparator) {
+            array_pop($rows);
+        }
         $io->section('Loader Paths');
         $io->table(array('Namespace', 'Paths'), $rows);
 
diff --git a/src/Symfony/Bridge/Twig/Tests/Command/DebugCommandTest.php b/src/Symfony/Bridge/Twig/Tests/Command/DebugCommandTest.php
@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\Twig\Tests\Command;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\Twig\Command\DebugCommand;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Tester\CommandTester;
+use Twig\Loader\FilesystemLoader;
+use Twig\Environment;
+
+class DebugCommandTest extends TestCase
+{
+    public function testDebugCommand()
+    {
+        $tester = $this->createCommandTester();
+        $ret = $tester->execute(array(), array('decorated' => false));
+
+        $this->assertEquals(0, $ret, 'Returns 0 in case of success');
+        $this->assertContains('Functions', trim($tester->getDisplay()));
+    }
+
+    public function testLineSeparatorInLoaderPaths()
+    {
+        // these paths aren't realistic,
+        // they're configured to force the line separator
+        $tester = $this->createCommandTester(array(
+            'Acme' => array('extractor', 'extractor'),
+            '!Acme' => array('extractor', 'extractor'),
+            FilesystemLoader::MAIN_NAMESPACE => array('extractor', 'extractor'),
+        ));
+        $ret = $tester->execute(array(), array('decorated' => false));
+        $ds = DIRECTORY_SEPARATOR;
+        $loaderPaths = <<<TXT
+Loader Paths
+------------
+
+ ----------- ------------ 
+  Namespace   Paths       
+ ----------- ------------ 
+  @Acme       extractor$ds  
+              extractor$ds  
+                          
+  @!Acme      extractor$ds  
+              extractor$ds  
+                          
+  (None)      extractor$ds  
+              extractor$ds  
+ ----------- ------------
+TXT;
+
+        $this->assertEquals(0, $ret, 'Returns 0 in case of success');
+        $this->assertContains($loaderPaths, trim($tester->getDisplay(true)));
+    }
+
+    private function createCommandTester(array $paths = array())
+    {
+        $filesystemLoader = new FilesystemLoader(array(), dirname(__DIR__).'/Fixtures');
+        foreach ($paths as $namespace => $relDirs) {
+            foreach ($relDirs as $relDir) {
+                $filesystemLoader->addPath($relDir, $namespace);
+            }
+        }
+        $command = new DebugCommand(new Environment($filesystemLoader));
+
+        $application = new Application();
+        $application->add($command);
+        $command = $application->find('debug:twig');
+
+        return new CommandTester($command);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -151,19 +151,27 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`$rows = array();`
	`154`	`+ $firstNamespace = true;`
	`155`	`+ $prevHasSeparator = false;`
`154`	`156`	`foreach ($this->getLoaderPaths() as $namespace => $paths) {`
`155`		`- if (count($paths) > 1) {`
	`157`	`+ if (!$firstNamespace && !$prevHasSeparator && count($paths) > 1) {`
`156`	`158`	`$rows[] = array('', '');`
`157`	`159`	`}`
	`160`	`+ $firstNamespace = false;`
`158`	`161`	`foreach ($paths as $path) {`
`159`		`- $rows[] = array($namespace, '- '.$path);`
	`162`	`+ $rows[] = array($namespace, $path.DIRECTORY_SEPARATOR);`
`160`	`163`	`$namespace = '';`
`161`	`164`	`}`
`162`	`165`	`if (count($paths) > 1) {`
`163`	`166`	`$rows[] = array('', '');`
	`167`	`+ $prevHasSeparator = true;`
	`168`	`+ } else {`
	`169`	`+ $prevHasSeparator = false;`
`164`	`170`	`}`
`165`	`171`	`}`
`166`		`- array_pop($rows);`
	`172`	`+ if ($prevHasSeparator) {`
	`173`	`+ array_pop($rows);`
	`174`	`+ }`
`167`	`175`	`$io->section('Loader Paths');`
`168`	`176`	`$io->table(array('Namespace', 'Paths'), $rows);`
`169`	`177`