Skip to content

Commit bc62067

Browse files
Merge branch '6.2' into 6.3
* 6.2: Revert "minor #47721 [Notifier] Use local copy of stella-maris/clock when testing (nicolas-grekas)" [Yaml] Minor: Update Inline parse phpdoc [FrameworkBundle] Fix deprecation when accessing a "container.private" service from the test container [VarExporter] Fix signature of `Lazy*Trait::createLazy*()` [DependencyInjection] Fix dumping inlined withers [HttpClient] Move Http clients data collecting at a late level [Serializer] Fix SerializerInterface for PHPStan [DependencyInjection] Fix support for named arguments on non-autowired services [FrameworkBundle] restore call to addGlobalIgnoredName Allow EmailValidator 4 Fix detecting mapping with one line annotations [Intl] Get emoji-test.txt from unicode.org
2 parents 9d8403b + 3e5671e commit bc62067

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

Resources/emoji/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ update: ## Update sources
55
@composer update
66
@curl https://api.github.com/emojis > vendor/github-emojis.json
77
@curl https://raw.githubusercontent.com/iamcal/emoji-data/master/emoji.json > vendor/slack-emojis.json
8+
@curl https://unicode.org/Public/emoji/latest/emoji-test.txt > vendor/emoji-test.txt
89

910
build: ## Build rules
1011
@./build.php

Resources/emoji/README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,17 @@ This folder contains the tool to build all transliterator rules.
66

77
* composer
88
* PHP
9+
* curl
10+
* make
911

1012
## Update the rules
1113

1214
To update the rules, you need to update the version of `unicode-org/cldr` in the
13-
`composer.json` file, then run `make update`.
15+
`composer.json` file, then run:
16+
17+
```bash
18+
make update
19+
```
1420

1521
Finally, run the following command:
1622

Resources/emoji/build.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ final class Builder
2929

3030
public static function getEmojisCodePoints(): array
3131
{
32-
$lines = file(__DIR__.'/vendor/unicode-org/cldr/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/emoji/emoji-test.txt');
32+
$lines = file(__DIR__.'/vendor/emoji-test.txt');
3333

3434
$emojisCodePoints = [];
3535
foreach ($lines as $line) {

0 commit comments

Comments
 (0)