Merge branch refs/heads/2.1.x into 2.2.x

phpstan-bot · web-flow · commit 182c774d9f60 · 2026-03-16T14:02:07.000+01:00
diff --git a/changelog-generator/run.php b/changelog-generator/run.php
@@ -203,7 +203,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 				}
 
 				$message = preg_replace('/\s*\(#\d+\)$/', '', $commit['message']);
-			$output->writeln(sprintf('* %s (%s)%s%s', $message, $parenthesis, count($issuesToReference) > 0 ? ', ' . implode(', ', $issuesToReference) : '', $thanksText));
+				$output->writeln(sprintf('* %s (%s)%s%s', $message, $parenthesis, count($issuesToReference) > 0 ? ', ' . implode(', ', $issuesToReference) : '', $thanksText));
 			}
 
 			return 0;

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`$message = preg_replace('/\s*\(#\d+\)$/', '', $commit['message']);`
`206`		`- $output->writeln(sprintf('* %s (%s)%s%s', $message, $parenthesis, count($issuesToReference) > 0 ? ', ' . implode(', ', $issuesToReference) : '', $thanksText));`
	`206`	`+ $output->writeln(sprintf('* %s (%s)%s%s', $message, $parenthesis, count($issuesToReference) > 0 ? ', ' . implode(', ', $issuesToReference) : '', $thanksText));`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`return 0;`