Add subgroups to allow sorting within a group - fix rebase conflict

Author: hacfi

src/PHPFormatter/Sorter/UseSorter.php

@@ -235,6 +235,17 @@ public function sort($data)
                 continue;
             }
 
+            if (is_int($groupKey)) {
+                $subGroupSorted = array();
+                foreach ($group as $subGroupKey => $subGroup) {
+                    $subGroupSorted = array_merge($subGroupSorted, $this->sortGroup($subGroup));
+                }
+
+                $groups[$groupKey] = $subGroupSorted;
+            } else {
+                $groups[$groupKey] = $this->sortGroup($group);
+            }
+
             $groups[$groupKey] = $this->sortGroup($group);
         }