Added failing tests and the fix for extra whitespace being left with multiple empty groups.

Author: matt-usurp

src/PHPFormatter/Sorter/UseSorter.php

@@ -229,11 +229,6 @@ public function sort($data)
          * Every block is sorted as desired
          */
         foreach ($groups as $groupKey => $group) {
-            if ($this->groupSkipEmpty && empty($group)) {
-                unset($groups[$groupKey]);
-                continue;
-            }
-
             if (is_int($groupKey)) {
                 $subGroupSorted = [];
                 foreach ($group as $subGroupKey => $subGroup) {
@@ -244,6 +239,12 @@ public function sort($data)
             } else {
                 $groups[$groupKey] = $this->sortGroup($group);
             }
+
+            //  Remove empty groups (if configured) after the sorting has happened.
+            //  @see https://github.com/mmoreram/php-formatter/issues/24
+            if ($this->groupSkipEmpty && (0 === count($groups[$groupKey]))) {
+                unset($groups[$groupKey]);
+            }
         }
 
         $doubleEOL = PHP_EOL . PHP_EOL;
@@ -363,6 +364,9 @@ private function sortGroup(array $group)
      */
     private function renderGroup(array $group)
     {
+        if (empty($group)) {
+            return '';
+        }
         if ($this->groupType === self::GROUP_TYPE_EACH) {
             return implode(PHP_EOL, array_map(function ($namespace) {
 

tests/PHPFormatter/Sorter/UseSorterTest.php

@@ -326,6 +326,25 @@ public function dataSort()
 use Test1\\Myclass1;
 use Test1\\Myclass2;
 
+use Test3\\File;
+use Test3\\MyFolder\\Myclass;
+use Test4\\Myclass3;
+",
+            ],
+            [
+                ['Test1', ['TestEmpty1', 'TestEmpty2'], '_main'],
+                UseSorter::SORT_TYPE_ALPHABETIC,
+                UseSorter::SORT_DIRECTION_ASC,
+                UseSorter::GROUP_TYPE_EACH,
+"
+use Test1\\Myclass1;
+use Test1\\Myclass2;
+use Test1\\MyFolder5\\File as MyFile;
+
+
+
+use Test2\\Myclass3;
+use Test2\\Myclass4;
 use Test3\\File;
 use Test3\\MyFolder\\Myclass;
 use Test4\\Myclass3;
@@ -368,6 +387,55 @@ public function testGroupSkip()
  * Copyright
  */
 
+namespace PHPFormatter\\Tests\\Mocks;
+$result
+/**
+ * Class SimpleMock
+ */
+class SimpleMock
+{}";
+
+        $this->assertEquals(
+            $realResult,
+            $parsedData
+        );
+    }
+
+    /**
+     * Test skip empty where consecutive empty groups are between used groups.
+     *
+     * @see https://github.com/mmoreram/php-formatter/issues/24
+     */
+    public function testGroupSkipWithMissingGroups()
+    {
+        $parsedData = $this
+            ->useSorter
+            ->setGroups(['Test1', 'TestEmpty1', ['TestEmpty2', 'TestEmpty3'], '_main'])
+            ->setSortType(UseSorter::SORT_TYPE_ALPHABETIC)
+            ->setSortDirection(UseSorter::SORT_DIRECTION_ASC)
+            ->setGroupType(UseSorter::GROUP_TYPE_EACH)
+            ->setGroupSkipEmpty(true)
+            ->sort($this->data);
+
+        $result =
+"
+use Test1\\Myclass1;
+use Test1\\Myclass2;
+use Test1\\MyFolder5\\File as MyFile;
+
+use Test2\\Myclass3;
+use Test2\\Myclass4;
+use Test3\\File;
+use Test3\\MyFolder\\Myclass;
+use Test4\\Myclass3;
+";
+        $realResult =
+            "<?php
+
+/**
+ * Copyright
+ */
+
 namespace PHPFormatter\\Tests\\Mocks;
 $result
 /**