Merge branch '2.1.x' into grouped-error-formatter

# Conflicts:
#	conf/config.neon

Author: FeBe95

.github/renovate.json

@@ -1,49 +1,76 @@
 {
   "extends": [
-    "config:base",
+    "config:recommended",
     "schedule:weekly"
   ],
   "dependencyDashboard": true,
   "rangeStrategy": "update-lockfile",
   "rebaseWhen": "conflicted",
-  "baseBranches": ["2.1.x"],
+  "baseBranches": [
+    "2.1.x"
+  ],
   "packageRules": [
     {
-      "matchPackagePatterns": ["*"],
-      "enabled": false
+      "enabled": false,
+      "matchPackageNames": [
+        "*"
+      ]
     },
     {
-      "matchPaths": ["+(composer.json)"],
+      "matchFileNames": [
+        "+(composer.json)"
+      ],
       "enabled": true,
-      "matchBaseBranches": ["2.1.x"]
+      "matchBaseBranches": [
+        "2.1.x"
+      ]
     },
     {
-      "matchPaths": ["build-cs/**"],
+      "matchFileNames": [
+        "build-cs/**"
+      ],
       "enabled": true,
       "groupName": "build-cs"
     },
     {
-      "matchPaths": ["apigen/**"],
+      "matchFileNames": [
+        "apigen/**"
+      ],
       "enabled": true,
       "groupName": "apigen"
     },
     {
-	  "matchPaths": ["issue-bot/**"],
-	  "enabled": true,
-	  "groupName": "issue-bot"
+      "matchFileNames": [
+        "issue-bot/**"
+      ],
+      "enabled": true,
+      "groupName": "issue-bot"
     },
     {
-      "matchPaths": ["changelog-generator/**"],
+      "matchFileNames": [
+        "changelog-generator/**"
+      ],
       "enabled": true,
       "groupName": "changelog-generator"
     },
     {
-      "matchPaths": ["compiler/**"],
+      "matchFileNames": [
+        "compiler/**"
+      ],
       "enabled": true,
       "groupName": "compiler"
     },
     {
-      "matchPaths": [".github/**"],
+      "matchFileNames": [
+        "tests/composer.json"
+      ],
+      "enabled": true,
+      "groupName": "paratest"
+    },
+    {
+      "matchFileNames": [
+        ".github/**"
+      ],
       "enabled": true,
       "groupName": "github-actions"
     }

.github/scripts/.gitignore

@@ -0,0 +1,2 @@
+node_modules
+dist

.github/scripts/diffPrefixes.php

@@ -0,0 +1,85 @@
+<?php declare(strict_types = 1);
+
+use Nette\Utils\Strings;
+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('', true));
+$isDifferent = false;
+foreach ($diffLines as $diffLine) {
+	$operation = $diffLine[0];
+	if ($operation === ' ') {
+		continue;
+	}
+
+	$pathWithLine = substr($diffLine, 1);
+	$pathParts = explode(':', $pathWithLine);
+	$path = $pathParts[0];
+	$lineNumber = $pathParts[1] ?? null;
+	if ($lineNumber === null) {
+		continue;
+	}
+	$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";
+	$startLine = 1;
+	$startContext = 1;
+	foreach (explode("\n", $stringDiff) as $i => $line) {
+		$matches = Strings::match($line, '/^@@ -(\d+),?(\d*) \+(\d+),?(\d*) @@/');
+		if ($matches !== null) {
+			$startLine = (int) $matches[1];
+			$startContext = (int) $matches[2];
+			continue;
+		}
+
+		if ($lineNumber < $startLine || $lineNumber > ($startLine + $startContext)) {
+			continue;
+		}
+
+		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/scripts/find-artifact.ts

@@ -0,0 +1,63 @@
+import * as core from "@actions/core";
+import * as github from "@actions/github";
+
+interface Inputs {
+	github: ReturnType<typeof github.getOctokit>;
+	context: typeof github.context;
+	core: typeof core;
+}
+
+module.exports = async ({github, context, core}: Inputs) => {
+	const commitSha = process.env.BASE_SHA;
+	const artifactName = process.env.ARTIFACT_NAME;
+	const workflowName = process.env.WORKFLOW_NAME;
+
+	// Get all workflow runs for this commit
+	const runs = await github.rest.actions.listWorkflowRunsForRepo({
+		owner: context.repo.owner,
+		repo: context.repo.repo,
+		per_page: 20,
+		event: "push",
+		head_sha: commitSha
+	});
+
+	if (runs.data.workflow_runs.length === 0) {
+		core.setFailed(`No workflow runs found for commit ${commitSha}`);
+		return;
+	}
+
+	const workflowRuns = runs.data.workflow_runs;
+	if (workflowRuns.length === 0) {
+		core.setFailed(`No workflow runs found for commit ${commitSha}`);
+		return;
+	}
+
+	let found = false;
+	for (const run of workflowRuns) {
+		if (run.status !== "completed" || run.conclusion !== "success") {
+			continue;
+		}
+
+		if (run.name !== workflowName) {
+			continue;
+		}
+
+		const artifactsResp = await github.rest.actions.listWorkflowRunArtifacts({
+			owner: context.repo.owner,
+			repo: context.repo.repo,
+			run_id: run.id,
+		});
+
+		const artifact = artifactsResp.data.artifacts.find(a => a.name === artifactName);
+		if (artifact) {
+			core.setOutput("artifact_id", artifact.id.toString());
+			core.setOutput("run_id", run.id.toString());
+			found = true;
+			break;
+		}
+	}
+
+	if (!found) {
+		core.setFailed(`No artifact named '${artifactName}' found for commit ${commitSha}`);
+	}
+}

.github/scripts/listPrefix.php

@@ -0,0 +1,32 @@
+<?php declare(strict_types = 1);
+
+require_once __DIR__ . '/../../vendor/autoload.php';
+
+$dir = $argv[1] ?? __DIR__;
+$iterator = new RecursiveDirectoryIterator($dir);
+$iterator->setFlags(RecursiveDirectoryIterator::SKIP_DOTS);
+$files = new RecursiveIteratorIterator($iterator);
+
+$locations = [];
+foreach ($files as $file) {
+	$path = $file->getPathname();
+	if ($file->getExtension() !== 'php') {
+		continue;
+	}
+	$contents = file_get_contents($path);
+	$lines = explode("\n", $contents);
+	foreach ($lines as $i => $line) {
+		if (!str_contains($line, '_PHPStan_checksum')) {
+			continue;
+		}
+
+		$trimmedPath = substr($path, strlen($dir) + 1);
+		if (str_starts_with($trimmedPath, 'vendor/composer/autoload_')) {
+			continue;
+		}
+		$locations[] = $trimmedPath . ':' . ($i + 1);
+	}
+}
+sort($locations);
+echo implode("\n", $locations);
+echo "\n";