Handels preceding slashes and directories

Author: raphaelstolt

CHANGELOG.md

@@ -7,6 +7,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## [Unreleased]
 
+## [v5.8.1] - 2026-05-07
+
+### Fixed
+- Improved the output of the `reformat` command. Preceding slashes are removed and directories are postfixed with a slash.
+
 ## [v5.8.0] - 2026-05-07
 
 ### Added

src/Commands/ReformatCommand.php

@@ -34,7 +34,7 @@ public function __construct(private readonly Analyser $analyser,
      */
     protected function configure(): void
     {
-        $this->analyser->setDirectory(WORKING_DIRECTORY);
+        $this->analyser->setDirectory(\getcwd());
 
         $this
             ->setName('reformat')
@@ -67,16 +67,13 @@ protected function configure(): void
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $directory = (string)$input->getArgument('directory') ?: WORKING_DIRECTORY;
+        $directory = (string)$input->getArgument('directory') ?: \getcwd();
         $this->analyser->setDirectory($directory);
         $isAgenticRun = $this->isAgenticRun($input);
 
         return $this->reformatPresentExportIgnores($input, $output, $directory, $isAgenticRun);
     }
 
-
-
-
     private function reformatPresentExportIgnores(
         InputInterface  $input,
         OutputInterface $output,
@@ -174,10 +171,18 @@ private function getPresentGitattributesContentWithAlignedExportIgnores(): strin
             }
 
             [$pattern, $suffix] = \explode('export-ignore', $line, 2);
-            $pattern = \rtrim($pattern);
+            $pattern = \trim($pattern);
+
+            if (\str_starts_with($pattern, '/') && \str_ends_with($pattern, '/') === false) {
+                $pattern = \ltrim($pattern, '/');
+            }
+
+            if (\is_dir(\getcwd() . '/' . $pattern) && \str_ends_with($pattern, '/') === false) {
+                $pattern = $pattern . DIRECTORY_SEPARATOR;
+            }
 
-            if (str_starts_with($pattern, '/') && str_ends_with($pattern, '/') === false) {
-                $pattern = str_replace('/', '', $pattern);
+            if (\strlen($pattern) > $longestPattern) {
+                $longestPattern = \strlen($pattern);
             }
 
             return $pattern . \str_repeat(' ', $longestPattern - \strlen($pattern) + 1) . 'export-ignore' . $suffix;

tests/Commands/ReformatCommandTest.php

@@ -25,6 +25,55 @@ protected function tearDown(): void
         $this->removeDirectory($this->temporaryDirectory);
     }
 
+    #[Test]
+    public function addASlashToExportIgnoredDirectories(): void
+    {
+        $analyser = (new Analyser(new Finder(new PhpPreset())))->setDirectory($this->temporaryDirectory);
+        $repository = new GitattributesFileRepository($analyser);
+        $command = new ReformatCommand($analyser, $repository);
+
+        $gitattributesContent = <<<CONTENT
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/ChangeLog export-ignore
+/example export-ignore
+/README.rst export-ignore
+/tests export-ignore
+/.editorconfig export-ignore
+/.github export-ignore
+/contributing.rst export-ignore
+CONTENT;
+
+        $this->createTemporaryGitattributesFile($gitattributesContent);
+
+        $this->createTemporaryFiles(['.gitignore'], ['example', 'tests', '.github']);
+
+        $result = TestCommand::for($command)
+            ->addArgument($this->temporaryDirectory)
+            ->addOption('dry-run')
+            ->execute()
+            ->assertSuccessful();
+
+        $expectedGitattributesContent = <<<CONTENT
+.gitattributes    export-ignore
+.gitignore        export-ignore
+ChangeLog         export-ignore
+example/          export-ignore
+README.rst        export-ignore
+tests/            export-ignore
+.editorconfig     export-ignore
+.github/          export-ignore
+contributing.rst  export-ignore
+CONTENT;
+
+        $this->assertSame(trim($expectedGitattributesContent), trim($result->output()));
+
+        $this->assertStringEqualsFile(
+            $this->temporaryDirectory . DIRECTORY_SEPARATOR . '.gitattributes',
+            $gitattributesContent
+        );
+    }
+
     #[Test]
     public function alignsOnlyExistingExportIgnoresAndRemovesPrecedingSlashes(): void
     {