Merge pull request #11 from athos7933/dump-command-change-style

Change style when dump dictionaries
biig-io · Jan 8, 2018 · c728e83 · c728e83
2 parents e866416 + 1e7bbde
commit c728e83
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed
+- Improve the format when call dump command
 
 ## [2.1.0] - 2017-12-22
 ### Added

diff --git a/src/Knp/DictionaryBundle/Command/DictionaryDumpCommand.php b/src/Knp/DictionaryBundle/Command/DictionaryDumpCommand.php
@@ -63,33 +63,36 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $io->newLine();
 
         // Read dictionaries information
-        $tableRows = $this->getDictionariesDetail($dictionaryName);
+        if (\is_null($dictionaryName)) {
+            $dictionaries = $this->registry->all();
+        } else {
+            $dictionaries = [$this->registry->get($dictionaryName)];
+        }
+
+        $tableRows = $this->getDictionariesDetail($dictionaries);
 
         // Output data
         if (\sizeof($tableRows) > 0) {
-            $io->table([], $tableRows);
+            foreach ($tableRows as $header => $raws) {
+                $io->table([$header], $raws);
+            }
         } elseif (!\is_null($dictionaryName) && 0 === \sizeof($tableRows)) {
             $errorIo->error("No dictionary named $dictionaryName");
         }
     }
 
     /**
      * Get all dictionaries with they values
-     * If $dictionaryName is set, only display dictionary matching dictionary
      *
-     * @param null|string $dictionaryName the dictionary name asked for filtering
+     * @param array $dictionaries
      * @return array rows to display
      */
-    private function getDictionariesDetail($dictionaryName = null)
+    private function getDictionariesDetail(array $dictionaries = [])
     {
         $tableRows = [];
-        /** @var Dictionary $dico */
-        foreach ($this->registry->all() as $dico) {
-            if (!\is_null($dictionaryName) && $dictionaryName === $dico->getName() || \is_null($dictionaryName)) {
-                $tableRows[] = ["<fg=cyan>{$dico->getName()}</fg=cyan>"];
-                foreach ($dico as $key => $value) {
-                    $tableRows[] = ["   $key\t| $value"];
-                }
+        foreach ($dictionaries as $dico) {
+            foreach ($dico as $key => $value) {
+                $tableRows["<fg=cyan>{$dico->getName()}</fg=cyan>"][] = [$key, $value];
             }
         }