Merge pull request #12 from hacfi/skip_blank_groups

Add option "group-skip-empty" to skip empty groups

Author: mmoreram

src/PHPFormatter/Command/UseSortCommand.php

@@ -78,6 +78,12 @@ protected function configure()
                 InputOption::VALUE_OPTIONAL,
                 "Type of grouping"
             )
+            ->addOption(
+                'group-skip-empty',
+                null,
+                InputOption::VALUE_NONE,
+                "Skip empty groups"
+            )
             ->addOption(
                 '--config',
                 '-c',
@@ -182,12 +188,14 @@ private function getUsableConfig(InputInterface $input)
             array(
                 'group' => $input->getOption('group'),
                 'group-type' => $input->getOption('group-type'),
+                'group-skip-empty' => $input->getOption('group-skip-empty'),
                 'sort-type' => $input->getOption('sort-type'),
                 'sort-direction' => $input->getOption('sort-direction')
             ),
             array(
                 'group' => array('_main'),
                 'group-type' => UseSorter::GROUP_TYPE_EACH,
+                'group-skip-empty' => false,
                 'sort-type' => UseSorter::SORT_TYPE_ALPHABETIC,
                 'sort-direction' => UseSorter::SORT_DIRECTION_ASC
             )
@@ -263,6 +271,11 @@ private function printConfigUsed(
                 $output->writeln('#   --group-type="' . $options['group-type'] . '"');
             }
 
+            if (!empty($options['group-skip-empty'])) {
+
+                $output->writeln('#   --group-skip-empty="' . $options['group-skip-empty'] . '"');
+            }
+
             if (!empty($options['sort-type'])) {
 
                 $output->writeln('#   --sort-type="' . $options['sort-type'] . '"');
@@ -344,6 +357,7 @@ private function createUseSorter(array $options)
         $useSorter
             ->setGroups($options['group'])
             ->setGroupType($options['group-type'])
+            ->setGroupSkipEmpty($options['group-skip-empty'])
             ->setSortType($options['sort-type'])
             ->setSortDirection($options['sort-direction']);
 

src/PHPFormatter/Sorter/UseSorter.php

@@ -96,6 +96,13 @@ class UseSorter implements SorterInterface
      */
     protected $groupType = self::GROUP_TYPE_EACH;
 
+    /**
+     * @var boolean
+     *
+     * Skip empty groups
+     */
+    protected $groupSkipEmpty = false;
+
     /**
      * Sets Groups
      *
@@ -152,6 +159,21 @@ public function setGroupType($groupType)
         return $this;
     }
 
+    /**
+     * Sets GroupSkipEmpty
+     *
+     * @param boolean $groupSkipEmpty
+     *
+     * @return UseSorter Self object
+     */
+    public function setGroupSkipEmpty($groupSkipEmpty)
+    {
+        $this->groupSkipEmpty = $groupSkipEmpty;
+
+        return $this;
+    }
+
+
     /**
      * Sort any piece of code given as parameter
      *
@@ -208,6 +230,10 @@ public function sort($data)
          * Every block is sorted as desired
          */
         foreach ($groups as $groupKey => $group) {
+            if ($this->groupSkipEmpty && empty($group)) {
+                unset($groups[$groupKey]);
+                continue;
+            }
 
             $groups[$groupKey] = $this->sortGroup($group);
         }