Nice diff output

Author: ondrejmirtes

.github/scripts/diffPrefixes.php

@@ -0,0 +1,65 @@
+<?php declare(strict_types = 1);
+
+use SebastianBergmann\Diff\Differ;
+
+require_once __DIR__ . '/../../vendor/autoload.php';
+
+$diffFile = $argv[1] ?? null;
+$oldDir = $argv[2] ?? null;
+$newDir = $argv[3] ?? null;
+if ($diffFile === null || !is_file($diffFile)) {
+	exit(1);
+}
+
+if ($oldDir === null || !is_dir($oldDir)) {
+	exit(1);
+}
+
+if ($newDir === null || !is_dir($newDir)) {
+	exit(1);
+}
+
+$diffLines = explode("\n", file_get_contents($diffFile));
+$differ = new Differ(new \SebastianBergmann\Diff\Output\UnifiedDiffOutputBuilder(''));
+$isDifferent = false;
+foreach ($diffLines as $diffLine) {
+	$operation = $diffLine[0];
+	if ($operation === ' ') {
+		continue;
+	}
+
+	$path = substr($diffLine, 1);
+	$oldFilePath = $oldDir . '/' . $path;
+	if (!is_file($oldFilePath)) {
+		continue;
+	}
+
+	$newFilePath = $newDir . '/' . $path;
+	if (!is_file($newFilePath)) {
+		continue;
+	}
+
+	$stringDiff = $differ->diff(file_get_contents($oldFilePath), file_get_contents($newFilePath));
+	if ($stringDiff === '') {
+		continue;
+	}
+
+	$isDifferent = true;
+
+	echo "$path:\n";
+	foreach (explode("\n", $stringDiff) as $line) {
+		if (str_starts_with($line, '+')) {
+			echo "\033[32m$line\033[0m\n";
+		} elseif (str_starts_with($line, '-')) {
+			echo "\033[31m$line\033[0m\n";
+		} else {
+			echo "$line\n";
+		}
+	}
+
+	echo "\n";
+}
+
+if ($isDifferent) {
+	exit(1);
+}

.github/workflows/phar.yml

@@ -268,7 +268,10 @@ jobs:
         run: "php .github/scripts/listPrefix.php ${{ github.workspace }}/phar-new > phar-new.txt"
 
       - name: "Diff locations"
-        run: "diff -u phar-old.txt phar-new.txt"
+        run: "diff -u phar-old.txt phar-new.txt > diff.txt || true"
+
+      - name: "Diff files where prefix changed"
+        run: "php .github/scripts/diffPrefixes.php ${{ github.workspace }}/diff.txt ${{ github.workspace }}/phar-old ${{ github.workspace }}/phar-new"
 
   commit:
     name: "Commit PHAR"