Reformats negated export-ignore directives

Author: raphaelstolt

CHANGELOG.md

@@ -11,7 +11,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ### Added
 - Expanded the `validation` to also validate __negated__ export-ignore directives. Closes [#70](https://github.com/raphaelstolt/lean-package-validator/issues/70).
-- New `--flavour` option for the `create` command which influences the `.gitattributes` generation. Closes [#71](https://github.com/raphaelstolt/lean-package-validator/issues/71).
+- New `--flavour` option for the `create` command which influences the `.gitattributes` file generation. Closes [#71](https://github.com/raphaelstolt/lean-package-validator/issues/71).
+- Expanded the `reformatting` to also reformat __negated__ export-ignore directives. Closes [#72](https://github.com/raphaelstolt/lean-package-validator/issues/72).
 
 ## [v5.9.1] - 2026-05-17
 

src/Analyser.php

@@ -970,8 +970,13 @@ public function getReformattedGitattributesContent(): string
                 continue;
             }
 
+
             [$pattern] = \explode('export-ignore', $line, 2);
 
+            if ($this->isNegatedExportIgnoreLine($line)) {
+                [$pattern] = \explode('-export-ignore', $line, 2);
+            }
+
             $exportIgnorePatterns[] = \rtrim($pattern);
         }
 
@@ -985,8 +990,14 @@ public function getReformattedGitattributesContent(): string
             if ($this->isAlignableExportIgnoreLine($line) === false) {
                 return $line;
             }
+            $exportIgnorePattern = 'export-ignore';
+
+            if ($this->isNegatedExportIgnoreLine($line)) {
+                $exportIgnorePattern = '-export-ignore';
+            }
+
+            [$pattern, $suffix] = \explode($exportIgnorePattern, $line, 2);
 
-            [$pattern, $suffix] = \explode('export-ignore', $line, 2);
             $pattern = \trim($pattern);
 
             if (\str_starts_with($pattern, '/')) {
@@ -1001,7 +1012,7 @@ public function getReformattedGitattributesContent(): string
                 $longestPattern = \strlen($pattern);
             }
 
-            return $pattern . \str_repeat(' ', $longestPattern - \strlen($pattern) + 1) . 'export-ignore' . $suffix;
+            return $pattern . \str_repeat(' ', $longestPattern - \strlen($pattern) + 1) . $exportIgnorePattern . $suffix;
         }, $gitattributesLines);
 
         if ($this->sortAlphabetically === true) {
@@ -1131,10 +1142,16 @@ private function collapseAndTrimBlankLines(array $lines): array
 
     private function isAlignableExportIgnoreLine(string $line): bool
     {
-        return \str_contains($line, 'export-ignore')
+        return (\str_contains($line, 'export-ignore') || \str_contains($line, '-export-ignore'))
+            && \str_starts_with(\trim($line), '* export-ignore') === false
             && \str_starts_with(\ltrim($line), '#') === false;
     }
 
+    private function isNegatedExportIgnoreLine(string $line): bool
+    {
+        return \str_contains($line, '-export-ignore') && \str_starts_with(\ltrim($line), '#') === false;
+    }
+
     /**
      * Reorganise lines into a non-export-ignore section followed by an
      * export-ignore section. A comment immediately preceding an export-ignore

tests/AnalyserTest.php

@@ -37,6 +37,93 @@ protected function tearDown(): void
         }
     }
 
+    #[Test]
+    public function returnExpectedReformattedGitattributesContentForClassicExportIgnoreDirectives(): void
+    {
+        $mockedAnalyser = Mockery::mock(Analyser::class)->makePartial();
+
+        $gitattributesContent = <<<CONTENT
+* text=auto eol=lf
+
+bin/ export-ignore
+composer.json export-ignore
+resources/ export-ignore
+src/ export-ignore
+CHANGELOG.md export-ignore
+CONTENT;
+
+        $mockedAnalyser->shouldReceive('getPresentGitAttributesContent')
+            ->once()
+            ->withNoArgs()
+            ->andReturn($gitattributesContent);
+
+        $mockedAnalyser->setDirectory($this->temporaryDirectory);
+
+        $reformattedGitattributesContent = $mockedAnalyser->getReformattedGitattributesContent();
+
+        $expectedReformattedGitattributesContent = <<<CONTENT
+* text=auto eol=lf
+
+bin/          export-ignore
+composer.json export-ignore
+resources/    export-ignore
+src/          export-ignore
+CHANGELOG.md  export-ignore
+CONTENT;
+
+        $this->assertStringContainsStringIgnoringLineEndings(
+            $expectedReformattedGitattributesContent,
+            $reformattedGitattributesContent
+        );
+    }
+
+    #[Test]
+    public function returnExpectedReformattedGitattributesContentForNegatedExportIgnoreDirectives(): void
+    {
+        $mockedAnalyser = Mockery::mock(Analyser::class)->makePartial();
+
+        $gitattributesContent = <<<CONTENT
+* text=auto eol=lf
+
+# Exclude all per default
+* export-ignore
+
+# re-include required files
+bin/ -export-ignore
+composer.json -export-ignore
+resources/ -export-ignore
+src/ -export-ignore
+CONTENT;
+
+        $mockedAnalyser->shouldReceive('getPresentGitAttributesContent')
+            ->once()
+            ->withNoArgs()
+            ->andReturn($gitattributesContent);
+
+        $mockedAnalyser->setDirectory($this->temporaryDirectory);
+
+        $reformattedGitattributesContent = $mockedAnalyser->getReformattedGitattributesContent();
+
+        $expectedReformattedGitattributesContent = <<<CONTENT
+* text=auto eol=lf
+
+# Exclude all per default
+* export-ignore
+
+# re-include required files
+bin/          -export-ignore
+composer.json -export-ignore
+resources/    -export-ignore
+src/          -export-ignore
+CONTENT;
+
+        $this->assertStringContainsStringIgnoringLineEndings(
+            $expectedReformattedGitattributesContent,
+            $reformattedGitattributesContent
+        );
+    }
+
+
     #[Test]
     public function throwsExceptionOnNonExpectedFlavour(): void
     {