Improves the section grouping

Author: raphaelstolt

CHANGELOG.md

@@ -7,6 +7,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## [Unreleased]
 
+### Changed
+- Improved the section grouping.
+
 ## [v5.9.0] - 2026-05-16
 
 ### Added

src/Analyser.php

@@ -1076,6 +1076,8 @@ private function applyGrouping(array $lines, string $eol): string
         $nonExportIgnoreLines = $this->collapseAndTrimBlankLines($nonExportIgnoreLines);
         $exportIgnoreLines = $this->collapseAndTrimBlankLines($exportIgnoreLines);
 
+        $nonExportIgnoreLines = $this->subGroupNonExportIgnoreLines($nonExportIgnoreLines);
+
         if ($nonExportIgnoreLines === [] && $exportIgnoreLines === []) {
             return '';
         }
@@ -1091,6 +1093,52 @@ private function applyGrouping(array $lines, string $eol): string
         return \implode($eol, $nonExportIgnoreLines) . $eol . $eol . \implode($eol, $exportIgnoreLines);
     }
 
+    /**
+     * Sub-group non-export-ignore lines: glob/wildcard patterns first,
+     * then specific-file attribute directives, comments before both.
+     *
+     * @param array<int, string> $lines
+     * @return array<int, string>
+     */
+    private function subGroupNonExportIgnoreLines(array $lines): array
+    {
+        $commentLines = [];
+        $globPatternLines = [];
+        $specificFileLines = [];
+
+        foreach ($lines as $line) {
+            if (\str_starts_with(\ltrim($line), '#')) {
+                $commentLines[] = $line;
+            } elseif ($line !== '' && \str_starts_with(\ltrim($line), '*')) {
+                $globPatternLines[] = $line;
+            } elseif ($line !== '') {
+                $specificFileLines[] = $line;
+            }
+        }
+
+        $result = [];
+
+        if ($commentLines !== []) {
+            $result = \array_merge($result, $commentLines);
+            if ($globPatternLines !== [] || $specificFileLines !== []) {
+                $result[] = '';
+            }
+        }
+
+        if ($globPatternLines !== []) {
+            $result = \array_merge($result, $globPatternLines);
+            if ($specificFileLines !== []) {
+                $result[] = '';
+            }
+        }
+
+        if ($specificFileLines !== []) {
+            $result = \array_merge($result, $specificFileLines);
+        }
+
+        return $result;
+    }
+
     /**
      * Get the present export-ignore entries of
      * the .gitattributes file.

tests/Commands/ReformatCommandTest.php

@@ -396,6 +396,8 @@ public function groupsNonExportIgnoreDirectivesAndWritesFile(): void
 .gitattributes export-ignore
 CHANGELOG.md merge=union
 .gitignore export-ignore
+
+*.phar    binary
 CONTENT;
 
         $this->createTemporaryGitattributesFile($gitattributesContent);
@@ -411,6 +413,7 @@ public function groupsNonExportIgnoreDirectivesAndWritesFile(): void
 # This file was reformatted by the lean package validator (http://git.io/lean-package-validator).
 
 * text=auto eol=lf
+*.phar    binary
 
 composer.lock diff=json
 CHANGELOG.md merge=union