Skip to content

Commit 10cdfe3

Browse files
authored
Merge branch refs/heads/2.1.x into 2.2.x
2 parents 1e85273 + febae0c commit 10cdfe3

File tree

4 files changed

+4
-16
lines changed

4 files changed

+4
-16
lines changed

changelog-generator/run.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
use function exec;
3030
use function explode;
3131
use function implode;
32+
use function preg_replace;
3233
use function sprintf;
3334

3435
(function (): void {
@@ -201,7 +202,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
201202
$thanksText = '';
202203
}
203204

204-
$output->writeln(sprintf('* %s (%s)%s%s', $commit['message'], $parenthesis, count($issuesToReference) > 0 ? ', ' . implode(', ', $issuesToReference) : '', $thanksText));
205+
$message = preg_replace('/\s*\(#\d+\)$/', '', $commit['message']);
206+
$output->writeln(sprintf('* %s (%s)%s%s', $message, $parenthesis, count($issuesToReference) > 0 ? ', ' . implode(', ', $issuesToReference) : '', $thanksText));
205207
}
206208

207209
return 0;

composer.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,6 @@
128128
"patches/DependencyChecker.patch",
129129
"patches/Resolver.patch"
130130
],
131-
"ralouphie/getallheaders": [
132-
"patches/getallheaders.patch"
133-
],
134131
"symfony/console": [
135132
"patches/OutputFormatter.patch"
136133
]

composer.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

patches/getallheaders.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)