8000 Merge branch '7.2' into 7.3 · wkania/symfony@1088f53 · GitHub
[go: up one dir, main page]
Skip to content

Commit 1088f53

Browse files
alexandre-dauboisalexandre-daubois
committed
Merge branch '7.2' into 7.3
* 7.2: Fix get-modified-packages for component_bridge [GitHub] Update .github/PULL_REQUEST_TEMPLATE.md to remove SF 7.1 as it's not supported anymore [Workflow] Fix dispatch of entered event when the subject is already in this marking [Emoji] Fix build of gitlab emoji + update them
2 parents d5b5581 + f914057 commit 1088f53

File tree

10 files changed

+7780
-1748
lines changed

10 files changed

+7780
-1748
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
| Q | A
22
| ------------- | ---
3-
| Branch? | 7.3 for features / 6.4, 7.1, and 7.2 for bug fixes <!-- see below -->
3+
| Branch? | 7.3 for features / 6.4, and 7.2 for bug fixes <!-- see below -->
44
| Bug fix? | yes/no
55
| New feature? | yes/no <!-- please update src/**/CHANGELOG.md files -->
66
| Deprecations? | yes/no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->

‎.github/get-modified-packages.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function getPackageType(string $packageDir): string
2222
return match (true) {
2323
str_contains($packageDir, 'Symfony/Bridge/') => 'bridge',
2424
str_contains($packageDir, 'Symfony/Bundle/') => 'bundle',
25-
preg_match('@Symfony/Component/[^/]+/Bridge/@', $packageDir) => 'component_bridge',
25+
1 === preg_match('@Symfony/Component/[^/]+/Bridge/@', $packageDir) => 'component_bridge',
2626
str_contains($packageDir, 'Symfony/Component/') => 'component',
2727
str_contains($packageDir, 'Symfony/Contracts/') => 'contract',
2828
str_ends_with($packageDir, 'Symfony/Contracts') => 'contracts',

‎src/Symfony/Component/Emoji/Resources/bin/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
update: ## Update sources
55
@composer update
66
@curl https://api.github.com/emojis > vendor/github-emojis.json
7-
@curl https://gitlab.com/gitlab-org/gitlab/-/raw/master/fixtures/emojis/index.json > vendor/gitlab-emojis.json
7+
@curl https://gitlab.com/gitlab-org/gitlab/-/raw/master/fixtures/emojis/digests.json > vendor/gitlab-emojis.json
88
@curl https://raw.githubusercontent.com/iamcal/emoji-data/master/emoji.json > vendor/slack-emojis.json
99
@curl -L https://unicode.org/Public/emoji/latest/emoji-test.txt > vendor/emoji-test.txt
1010

‎src/Symfony/Component/Emoji/Resources/bin/build.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,14 +149,10 @@ public static function buildGitlabMaps(array $emojisCodePoints): array
149149
$emojis = json_decode((new Filesystem())->readFile(__DIR__.'/vendor/gitlab-emojis.json'), true, flags: JSON_THROW_ON_ERROR);
150150
$maps = [];
151151

152-
foreach ($emojis as $emojiItem) {
152+
foreach ($emojis as $shortName => $emojiItem) {
153153
$emoji = $emojiItem['moji'];
154154
$emojiPriority = mb_strlen($emoji) << 1;
155-
$maps[$emojiPriority + 1][$emojiItem['shortname']] = $emoji;
156-
157-
foreach ($emojiItem['aliases'] as $alias) {
158-
$maps[$emojiPriority][$alias] = $emoji;
159-
}
155+
$maps[$emojiPriority + 1][":$shortName:"] = $emoji;
160156
}
161157

162158
return $maps;

‎src/Symfony/Component/Emoji/Resources/data/emoji-gitlab.php

Lines changed: 2196 additions & 211 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Symfony/Component/Emoji/Resources/data/emoji-text.php

Lines changed: 1642 additions & 184 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
0