Fix outputted paths (#17)

Author: janedbal

phpstan.neon.dist

@@ -40,3 +40,8 @@ parameters:
 
     shipmonkBaselinePerIdentifier:
         directory: %currentWorkingDirectory%
+
+    ignoreErrors:
+        - # allow uncatched exceptions in tests
+            identifier: missingType.checkedException
+            path: tests/*

src/BaselineSplitter.php

@@ -5,7 +5,6 @@
 use ShipMonk\PHPStan\Baseline\Exception\ErrorException;
 use ShipMonk\PHPStan\Baseline\Handler\HandlerFactory;
 use SplFileInfo;
-use function array_keys;
 use function assert;
 use function count;
 use function dirname;
@@ -56,14 +55,16 @@ public function split(string $loaderFilePath): array
 
         $groupedErrors = $this->groupErrorsByIdentifier($ignoredErrors, $folder);
 
-        $createdBaselines = [];
+        $outputInfo = [];
+        $baselineFiles = [];
 
         foreach ($groupedErrors as $identifier => $errors) {
             $fileName = $identifier . '.' . $extension;
             $filePath = $folder . '/' . $fileName;
             $errorsCount = count($errors);
 
-            $createdBaselines[$fileName] = $errorsCount;
+            $outputInfo[$filePath] = $errorsCount;
+            $baselineFiles[] = $fileName;
 
             $plural = $errorsCount === 1 ? '' : 's';
             $prefix = "total $errorsCount error$plural";
@@ -72,12 +73,12 @@ public function split(string $loaderFilePath): array
             $this->writeFile($filePath, $encodedData);
         }
 
-        $baselineLoaderData = $handler->encodeBaselineLoader(array_keys($createdBaselines), $this->indent);
-        $this->writeFile($loaderFilePath, $baselineLoaderData);
+        $baselineLoaderData = $handler->encodeBaselineLoader($baselineFiles, $this->indent);
+        $this->writeFile($realPath, $baselineLoaderData);
 
-        $createdBaselines[$loaderFilePath] = null;
+        $outputInfo[$realPath] = null;
 
-        return $createdBaselines;
+        return $outputInfo;
     }
 
     /**

tests/BinTest.php renamed to tests/SplitterTest.php

@@ -14,10 +14,10 @@
 use function uniqid;
 use function var_export;
 
-class BinTest extends TestCase
+class SplitterTest extends TestCase
 {
 
-    public function testNeon(): void
+    public function testBinaryWithNeon(): void
     {
         $fakeRoot = $this->prepareSampleFolder();
         $squashed = $this->getSampleErrors();
@@ -32,7 +32,7 @@ public function testNeon(): void
         self::assertFileEquals(__DIR__ . '/Rule/data/baselines-neon/missing-identifier.neon', $fakeRoot . '/baselines/missing-identifier.neon');
     }
 
-    public function testPhp(): void
+    public function testBinaryWithPhp(): void
     {
         $fakeRoot = $this->prepareSampleFolder();
         $squashed = $this->getSampleErrors();
@@ -47,6 +47,25 @@ public function testPhp(): void
         self::assertFileEquals(__DIR__ . '/Rule/data/baselines-php/missing-identifier.php', $fakeRoot . '/baselines/missing-identifier.php');
     }
 
+    public function testSplitter(): void
+    {
+        $folder = $this->prepareSampleFolder();
+        $squashed = $this->getSampleErrors();
+
+        $loaderPath = $folder . '/baselines/loader.neon';
+        file_put_contents($loaderPath, Neon::encode($squashed));
+
+        $splitter = new BaselineSplitter("\t");
+        $written = $splitter->split($loaderPath);
+
+        self::assertSame([
+            $folder . '/baselines/another.identifier.neon' => 1,
+            $folder . '/baselines/missing-identifier.neon' => 1,
+            $folder . '/baselines/sample.identifier.neon' => 1,
+            $folder . '/baselines/loader.neon' => null,
+        ], $written);
+    }
+
     private function prepareSampleFolder(): string
     {
         $folder = sys_get_temp_dir() . '/' . uniqid('split');