8000 Merge branch '5.0' · symfony/symfony@1ae3e04 · GitHub
[go: up one dir, main page]
Skip to content

Commit 1ae3e04

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.0'
* 5.0: (26 commits) [Filesystem] Handle paths on different drives [WebProfiler] Do not add src-elem CSP directives if they do not exist [Yaml] fix parse error when unindented collections contain a comment Execute docker dependent tests with github actions Update exception.html.php [3.4][Inflector] Improve testSingularize() argument name [Inflector] Fix testPluralize() arguments names [PhpUnitBridge] fix PHP 5.3 compat again Skip validation when email is an empty object fix sr_Latn translation [Validator] fix lazy property usage. Fix annotation [Debug][ErrorHandler] cleanup phpunit.xml.dist files [Translation] Fix for translation:update command updating ICU messages [PhpUnitBridge] fix compat with PHP 5.3 bumped Symfony version to 5.0.9 updated VERSION for 5.0.8 updated CHANGELOG for 5.0.8 bumped Symfony version to 4.4.9 updated VERSION for 4.4.8 ...
2 parents a910192 + ae226ee commit 1ae3e04

File tree

66 files changed

+600
-162
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+600
-162
lines changed

‎.github/workflows/tests.yml

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
name: Tests
2+
3+
on:
4+
push:
5+
pull_request:
6+
7+
jobs:
8+
9+
integration:
10+
name: Integration
11+
runs-on: ubuntu-latest
12+
13+
strategy:
14+
matrix:
15+
php: ['7.1', '7.4']
16+
17+
services:
18+
redis:
19+
image: redis:6.0.0
20+
ports:
21+
- 6379:6379
22+
redis-cluster:
23+
image: grokzen/redis-cluster:5.0.4
24+
ports:
25+
- 7000:7000
26+
- 7001:7001
27+
- 7002:7002
28+
- 7003:7003
29+
- 7004:7004
30+
- 7005:7005
31+
- 7006:7006
32+
- 7007:7007
33+
env:
34+
STANDALONE: true
35+
memcached:
36+
image: memcached:1.6.5
37< F438 /code>+
ports:
38+
- 11211:11211
39+
rabbitmq:
40+
image: rabbitmq:3.8.3
41+
ports:
42+
- 5672:5672
43+
44+
steps:
45+
- name: Checkout
46+
uses: actions/checkout@v2
47+
48+
- name: Setup PHP
49+
uses: shivammathur/setup-php@v2
50+
with:
51+
coverage: "none"
52+
extensions: "memcached,redis,xsl"
53+
ini-values: "memory_limit=-1"
54+
php-version: "${{ matrix.php }}"
55+
tools: flex
56+
57+
- name: Configure composer
58+
run: |
59+
([ -d ~/.composer ] || mkdir ~/.composer) && cp .github/composer-config.json ~/.composer/config.json
60+
SYMFONY_VERSION=$(cat composer.json | grep '^ *\"dev-master\". *\"[1-9]' | grep -o '[0-9.]*')
61+
echo "::set-env name=SYMFONY_VERSION::$SYMFONY_VERSION"
62+
echo "::set-env name=COMPOSER_ROOT_VERSION::$SYMFONY_VERSION.x-dev"
63+
64+
- name: Determine composer cache directory
65+
id: composer-cache
66+
run: echo "::set-output name=directory::$(composer config cache-dir)"
67+
68+
- name: Cache composer dependencies
69+
uses: actions/cache@v1
70+
with:
71+
path: ${{ steps.composer-cache.outputs.directory }}
72+
key: ${{ matrix.php }}-composer-${{ hashFiles('**/composer.lock') }}
73+
restore-keys: ${{ matrix.php }}-composer-
74+
75+
- name: Install dependencies
76+
run: |
77+
echo "::group::composer update"
78+
composer update --no-progress --no-suggest --ansi
79+
echo "::endgroup::"
80+
echo "::group::install phpunit"
81+
./phpunit install
82+
echo "::endgroup::"
83+
84+
- name: Run tests
85+
run: ./phpunit --verbose --group integration
86+
env:
87+
SYMFONY_DEPRECATIONS_HELPER: 'max[indirect]=7'
88+
REDIS_HOST: localhost
89+
REDIS_CLUSTER_HOSTS: 'localhost:7000 localhost:7001 localhost:7002 localhost:7003 localhost:7004 localhost:7005'
90+
MESSENGER_REDIS_DSN: redis://127.0.0.1:7006/messages
91+
MESSENGER_AMQP_DSN: amqp://localhost/%2f/messages
92+
MEMCACHED_HOST: localhost
93+
94+
- name: Run HTTP push tests
95+
if: matrix.php == '7.4'
96+
run: |
97+
[ -d .phpunit ] && mv .phpunit .phpunit.bak
98+
wget -q https://github.com/symfony/binary-utils/releases/download/v0.1/vulcain_0.1.3_Linux_x86_64.tar.gz -O - | tar xz && mv vulcain /usr/local/bin
99+
docker run --rm -e COMPOSER_ROOT_VERSION -e SYMFONY_VERSION -v $(pwd):/app -v $(which composer):/usr/local/bin/composer -v /usr/local/bin/vulcain:/usr/local/bin/vulcain -w /app php:7.4-alpine ./phpunit --verbose src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php --filter testHttp2Push
100+
sudo rm -rf .phpunit
101+
[ -d .phpunit.bak ] && mv .phpunit.bak .phpunit

‎.travis.yml

Lines changed: 1 addition & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,11 @@ addons:
1313
- slapd
1414
- zookeeperd
1515
- libzookeeper-mt-dev
16-
- rabbitmq-server
1716

1817
env:
1918
global:
2019
- MIN_PHP=7.2.5
2120
- SYMFONY_PROCESS_PHP_TEST_BINARY=~/.phpenv/shims/php
22-
- MESSENGER_AMQP_DSN=amqp://localhost/%2f/messages
23-
- MESSENGER_REDIS_DSN=redis://127.0.0.1:7006/messages
24-
- MESSENGER_SQS_DSN="sqs://localhost:9494/messages?sslmode=disable&poll_timeout=0.01"
25-
- MESSENGER_SQS_FIFO_QUEUE_DSN="sqs://localhost:9494/messages.fifo?sslmode=disable&poll_timeout=0.01"
2621
- SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE=1
2722

2823
matrix:
@@ -41,59 +36,15 @@ cache:
4136
- php-$MIN_PHP
4237
- ~/php-ext
4338

44-
services:
45-
- memcached
46-
- mongodb
47-
- redis-server
48-
- rabbitmq
49-
- docker
50-
5139
before_install:
5240
- |
5341
# Enable extra ppa
5442
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6B05F25D762E3157
5543
sudo add-apt-repository -y ppa:ondrej/php
5644
sudo rm /etc/apt/sources.list.d/google-chrome.list
5745
sudo rm /etc/apt/sources.list.d/mongodb-3.4.list
58-
sudo wget -O - http://packages.couchbase.com/ubuntu/couchbase.key | sudo apt-key add -
59-
echo "deb http://packages.couchbase.com/ubuntu xenial xenial/main" | sudo tee /etc/apt/sources.list.d/couchbase.list
6046
sudo apt update
61-
sudo apt install -y libcouchbase-dev librabbitmq-dev libsodium-dev php-uuid zlib1g-dev
62-
63-
- |
64-
# Start Couchbase
65-
docker pull couchbase:6.0.1
66-
docker run -d --name couchbase -p 8091-8094:8091-8094 -p 11210:11210 couchbase:6.0.1
67-
68-
- |
69-
# Start Redis cluster
70-
docker pull grokzen/redis-cluster:5.0.4
71-
docker run -d -p 7000:7000 -p 7001:7001 -p 7002:7002 -p 7003:7003 -p 7004:7004 -p 7005:7005 -p 7006:7006 -p 7007:7007 -e "STANDALONE=true" --name redis-cluster grokzen/redis-cluster:5.0.4
72-
export REDIS_CLUSTER_HOSTS='localhost:7000 localhost:7001 localhost:7002 localhost:7003 localhost:7004 localhost:7005'
73-
74-
- |
75-
# Start Sqs server
76-
docker pull asyncaws/testing-sqs
77-
docker run -d -p 9494:9494 --name sqs asyncaws/testing-sqs
78-
79-
- |
80-
# Start Kafka and install an up-to-date librdkafka
81-
docker network create kafka_network
82-
docker pull wurstmeister/zookeeper:3.4.6
83-
docker run -d --network kafka_network --name zookeeper wurstmeister/zookeeper:3.4.6
84-
docker pull wurstmeister/kafka:2.12-2.3.1
85-
docker run -d -p 9092:9092 --network kafka_network -e "KAFKA_AUTO_CREATE_TOPICS_ENABLE=false" -e "KAFKA_CREATE_TOPICS=test-topic:1:1:compact" -e "KAFKA_ADVERTISED_HOST_NAME=kafka" -e "KAFKA_ZOOKEEPER_CONNECT=zookeeper:2181" -e "KAFKA_ADVERTISED_PORT=9092" --name kafka wurstmeister/kafka:2.12-2.3.1
86-
export KAFKA_BROKER=kafka:9092
87-
sudo sh -c 'echo "\n127.0.0.1 kafka\n" >> /etc/hosts'
88-
89-
mkdir /tmp/librdkafka
90-
curl https://codeload.github.com/edenhill/librdkafka/tar.gz/v0.11.6 | tar xzf - -C /tmp/librdkafka
91-
(cd /tmp/librdkafka/librdkafka-0.11.6 && ./configure && make && sudo make install)
92-
93-
- |
94-
# Create new Couchbase Cluster and Bucket ephemeral
95-
docker exec couchbase /opt/couchbase/bin/couchbase-cli cluster-init -c localhost:8091 --cluster-username=Administrator --cluster-password=111111 --cluster-ramsize=256
96-
docker exec couchbase /opt/couchbase/bin/couchbase-cli bucket-create -c localhost:8091 --bucket=cache --bucket-type=ephemeral --bucket-ramsize=100 -u Administrator -p 111111
47+
sudo apt install -y librabbitmq-dev libsodium-dev php-uuid zlib1g-dev
9748
9849
- |
9950
# General configuration
@@ -174,12 +125,6 @@ before_install:
174125
(cd php-$MIN_PHP && ./configure --enable-sigchild --enable-pcntl && make -j2)
175126
fi
176127
177-
- |
178-
# Install vulcain
179-
wget https://github.com/symfony/binary-utils/releases/download/v0.1/vulcain_0.1.3_Linux_x86_64.tar.gz -O - | tar xz
180-
sudo mv vulcain /usr/local/bin
181-
docker pull php:7.3-alpine
182-
183128
- |
184129
# php.ini configuration
185130
for PHP in $TRAVIS_PHP_VERSION $php_extra; do
@@ -208,9 +153,7 @@ before_install:
208153
tfold ext.igbinary tpecl igbinary-3.1.2 igbinary.so $INI
209154
tfold ext.zookeeper tpecl zookeeper-0.7.1 zookeeper.so $INI
210155
tfold ext.amqp tpecl amqp-1.9.4 amqp.so $INI
211-
tfold ext.rdkafka tpecl rdkafka-4.0.2 rdkafka.so $INI
212156
tfold ext.redis tpecl redis-4.3.0 redis.so $INI "no"
213-
tfold ext.couchbase tpecl couchbase-2.6.0 couchbase.so $INI
214157
done
215158
- |
216159
# List all php extensions with versions
@@ -303,15 +246,6 @@ install:
303246
export PHP=$1
304247
phpenv global $PHP
305248
306-
if [[ !$deps && $PHP = 7.2 ]]; then
307-
phpenv global $PHP
308-
tfold 'composer update' $COMPOSER_UP
309-
[ -d .phpunit ] && mv .phpunit .phpunit.bak
310-
tfold src/Symfony/Component/HttpClient.h2push "docker run -it --rm -v $(pwd):/app -v $(phpenv which composer):/usr/local/bin/composer -v /usr/local/bin/vulcain:/usr/local/bin/vulcain -w /app php:7.3-alpine ./phpunit src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php --filter testHttp2Push"
311-
sudo rm .phpunit -rf
312-
[ -d .phpunit.bak ] && mv .phpunit.bak .phpunit
313-
fi
314-
315249
if [[ $PHP != 7.4* && $PHP != $TRAVIS_PHP_VERSION && $TRAVIS_PULL_REQUEST != false ]]; then
316250
echo -e "\\n\\e[33;1mIntermediate PHP version $PHP is skipped for pull requests.\\e[0m"
317251
return

‎CHANGELOG-4.4.md

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,56 @@ in 4.4 minor versions.
77
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
88
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v4.4.0...v4.4.1
99

10+
* 4.4.8 (2020-04-28)
11+
12+
* bug #36536 [Cache] Allow invalidateTags calls to be traced by data collector (l-vo)
13+
* bug #36566 [PhpUnitBridge] Use COMPOSER_BINARY env var if available (fancyweb)
14+
* bug #36560 [YAML] escape DEL(\x7f) (sdkawata)
15+
* bug #36539 [PhpUnitBridge] fix compatibility with phpunit 9 (garak)
16+
* bug #36555 [Cache] skip APCu in chains when the backend is disabled (nicolas-grekas)
17+
* bug #36523 [Form] apply automatically step=1 for datetime-local input (ottaviano)
18+
* bug #36519 [FrameworkBundle] debug:autowiring: Fix wrong display when using class_alias (weaverryan)
19+
* bug #36454 [DependencyInjection][ServiceSubscriber] Support late aliases (fancyweb)
20+
* bug #36498 [Security/Core] fix escape for username in LdapBindAuthenticationProvider.php (stoccc)
21+
* bug #36506 [FrameworkBundle] Fix session.attribute_bag service definition (fancyweb)
22+
* bug #36500 [Routing][PrefixTrait] Add the _locale requirement (fancyweb)
23+
* bug #36457 [Cache] CacheItem with tag is never a hit after expired (alexander-schranz, nicolas-grekas)
24+
* bug #36490 [HttpFoundation] workaround PHP bug in the session module (nicolas-grekas)
25+
* bug #36483 [SecurityBundle] fix accepting env vars in remember-me configurations (zek)
26+
* bug #36343 [Form] Fixed handling groups sequence validation (HeahDude)
27+
* bug #36460 [Cache] Avoid memory leak in TraceableAdapter::reset() (lyrixx)
28+
* bug #36467 Mailer from sender fixes (fabpot)
29+
* bug #36408 [PhpUnitBridge] add PolyfillTestCaseTrait::expectExceptionMessageMatches to provide FC with recent phpunit versions (soyuka)
30+
* bug #36447 Remove return type for Twig function workflow_metadata() (gisostallenberg)
31+
* bug #36449 [Messenger] Make sure redis transports are initialized correctly (Seldaek)
32+
* bug #36411 [Form] RepeatedType should always have inner types mapped (biozshock)
33+
* bug #36441 [DI] fix loading defaults when using the PHP-DSL (nicolas-grekas)
34+
* bug #36434 [HttpKernel] silence E_NOTICE triggered since PHP 7.4 (xabbuh)
35+
* bug #36365 [Validator] Fixed default group for nested composite constraints (HeahDude)
36+
* bug #36422 [HttpClient] fix HTTP/2 support on non-SSL connections - CurlHttpClient only (nicolas-grekas)
37+
* bug #36417 Force ping after transport exception (oesteve)
38+
* bug #35591 [Validator] do not merge constraints within interfaces (greedyivan)
39+
* bug #36377 [HttpClient] Fix scoped client without query option configuration (X-Coder264)
40+
* bug #36387 [DI] fix detecting short service syntax in yaml (nicolas-grekas)
41+
* bug #36392 [DI] add missing property declarations in InlineServiceConfigurator (nicolas-grekas)
42+
* bug #36400 Allowing empty secrets to be set (weaverryan)
43+
* bug #36380 [Process] Fixed input/output error on PHP 7.4 (mbardelmeijer)
44+
* bug #36376 [Workflow] Use a strict comparison when retrieving raw marking in MarkingStore (lyrixx)
45+
* bug #36375 [Workflow] Use a strict comparison when retrieving raw marking in MarkingStore (lyrixx)
46+
* bug #36305 [PropertyInfo][ReflectionExtractor] Check the array mutator prefixes last when the property is singular (fancyweb)
47+
* bug #35656 [HttpFoundation] Fixed session migration with custom cookie lifetime (Guite)
48+
* bug #36342 [HttpKernel][FrameworkBundle] fix compat with Debug component (nicolas-grekas)
49+
* bug #36315 [WebProfilerBundle] Support for Content Security Policy style-src-elem and script-src-elem in WebProfiler (ampaze)
50+
* bug #36286 [Validator] Allow URL-encoded special characters in basic auth part of URLs (cweiske)
51+
* bug #36335 [Security] Track session usage whenever a new token is set (wouterj)
52+
* bug #36332 [Serializer] Fix unitialized properties (from PHP 7.4.2) when serializing context for the cache key (alanpoulain)
53+
* bug #36337 [MonologBridge] Fix $level type (fancyweb)
54+
* bug #36223 [Security][Http][SwitchUserListener] Ignore all non existent username protection errors (fancyweb)
55+
* bug #36239 [HttpKernel][LoggerDataCollector] Prevent keys collisions in the sanitized logs processing (fancyweb)
56+
* bug #36245 [Validator] Fixed calling getters before resolving groups (HeahDude)
57+
* bug #36265 Fix the reporting of deprecations in twig:lint (stof)
58+
* bug #36283 [Security] forward multiple attributes voting flag (xabbuh)
59+
1060
* 4.4.7 (2020-03-30)
1161

1262
* security #cve-2020-5255 [HttpFoundation] Do not set the default Content-Type based on the Accept header (yceruto)

‎CHANGELOG-5.0.md

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,59 @@ in 5.0 minor versions.
77
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
88
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v5.0.0...v5.0.1
99

10+
* 5.0.8 (2020-04-28)
11+
12+
* bug #36536 [Cache] Allow invalidateTags calls to be traced by data collector (l-vo)
13+
* bug #36566 [PhpUnitBridge] Use COMPOSER_BINARY env var if available (fancyweb)
14+
* bug #36560 [YAML] escape DEL(\x7f) (sdkawata)
15+
* bug #36539 [PhpUnitBridge] fix compatibility with phpunit 9 (garak)
16+
* bug #36555 [Cache] skip APCu in chains when the backend is disabled (nicolas-grekas)
17+
* bug #36523 [Form] apply automatically step=1 for datetime-local input (ottaviano)
18+
* bug #36519 [FrameworkBundle] debug:autowiring: Fix wrong display when using class_alias (weaverryan)
19+
* bug #36454 [DependencyInjection][ServiceSubscriber] Support late aliases (fancyweb)
20+
* bug #36162 [Profiler] Fix profiler nullable string type (mRoca)
21+
* bug #36498 [Security/Core] fix escape for username in LdapBindAuthenticationProvider.php (stoccc)
22+
* bug #36506 [FrameworkBundle] Fix session.attribute_bag service definition (fancyweb)
23+
* bug #36500 [Routing][PrefixTrait] Add the _locale requirement (fancyweb)
24+
* bug #36457 [Cache] CacheItem with tag is never a hit after expired (alexander-schranz, nicolas-grekas)
25+
* bug #36490 [HttpFoundation] workaround PHP bug in the session module (nicolas-grekas)
26+
* bug #36483 [SecurityBundle] fix accepting env vars in remember-me configurations (zek)
27+
* bug #36343 [Form] Fixed handling groups sequence validation (HeahDude)
28+
* bug #36463 [Mime] Ensure proper line-ending for SMIME (sstok)
29+
* bug #36460 [Cache] Avoid memory leak in TraceableAdapter::reset() (lyrixx)
30+
* bug #36467 Mailer from sender fixes (fabpot)
31+
* bug #36408 [PhpUnitBridge] add PolyfillTestCaseTrait::expectExceptionMessageMatches to provide FC with recent phpunit versions (soyuka)
32+
* bug #36447 Remove return type for Twig function workflow_metadata() (gisostallenberg)
33+
* bug #36449 [Messenger] Make sure redis transports are initialized correctly (Seldaek)
34+
* bug #36411 [Form] RepeatedType should always have inner types mapped (biozshock)
35+
* bug #36441 [DI] fix loading defaults when using the PHP-DSL (nicolas-grekas)
36+
* bug #36434 [HttpKernel] silence E_NOTICE triggered since PHP 7.4 (xabbuh)
37+
* bug #36365 [Validator] Fixed default group for nested composite constraints (HeahDude)
38+
* bug #36422 [HttpClient] fix HTTP/2 support on non-SSL connections - CurlHttpClient only (nicolas-grekas)
39+
* bug #36417 Force ping after transport exception (oesteve)
40+
* bug #35591 [Validator] do not merge constraints within interfaces (greedyivan)
41+
* bug #36377 [HttpClient] Fix scoped client without query option configuration (X-Coder264)
42+
* bug #36387 [DI] fix detecting short service syntax in yaml (nicolas-grekas)
43+
* bug #36392 [DI] add missing property declarations in InlineServiceConfigurator (nicolas-grekas)
44+
* bug #36400 Allowing empty secrets to be set (weaverryan)
45+
* bug #36380 [Process] Fixed input/output error on PHP 7.4 (mbardelmeijer)
46+
* bug #36376 [Workflow] Use a strict comparison when retrieving raw marking in MarkingStore (lyrixx)
47+
* bug #36375 [Workflow] Use a strict comparison when retrieving raw marking in MarkingStore (lyrixx)
48+
* bug #36305 [PropertyInfo][ReflectionExtractor] Check the array mutator prefixes last when the property is singular (fancyweb)
49+
* bug #35656 [HttpFoundation] Fixed session migration with custom cookie lifetime (Guite)
50+
* bug #36342 [HttpKernel][FrameworkBundle] fix compat with Debug component (nicolas-grekas)
51+
* bug #36315 [WebProfilerBundle] Support for Content Security Policy style-src-elem and script-src-elem in WebProfiler (ampaze)
52+
* bug #36286 [Validator] Allow URL-encoded special characters in basic auth part of URLs (cweiske)
53+
* bug #36335 [Security] Track session usage whenever a new token is set (wouterj)
54+
* bug #36332 [Serializer] Fix unitialized properties (from PHP 7.4.2) when serializing context for the cache key (alanpoulain)
55+
* bug #36338 [MonologBridge] Fix $level type (fancyweb)
56+
* bug #36337 [MonologBridge] Fix $level type (fancyweb)
57+
* bug #36223 [Security][Http][SwitchUserListener] Ignore all non existent username protection errors (fancyweb)
58+
* bug #36239 [HttpKernel][LoggerDataCollector] Prevent keys collisions in the sanitized logs processing (fancyweb)
59+
* bug #36245 [Validator] Fixed calling getters before resolving groups (HeahDude)
60+
* bug #36265 Fix the reporting of deprecations in twig:lint (stof)
61+
* bug #36283 [Security] forward multiple attributes voting flag (xabbuh)
62+
1063
* 5.0.7 (2020-03-30)
1164

1265
* security #cve-2020-5255 [HttpFoundation] Do not set the default Content-Type based on the Accept header (yceruto)

‎src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,14 @@ private function filterCatalogue(MessageCatalogue $catalogue, string $domain): M
318318
{
319319
$filteredCatalogue = new MessageCatalogue($catalogue->getLocale());
320320

321-
if ($messages = $catalogue->all($domain)) {
321+
// extract intl-icu messages only
322+
$intlDomain = $domain.MessageCatalogueInterface::INTL_DOMAIN_SUFFIX;
323+
if ($intlMessages = $catalogue->all($intlDomain)) {
324+
$filteredCatalogue->add($intlMessages, $intlDomain);
325+
}
326+
327+
// extract all messages and subtract intl-icu messages
328+
if ($messages = array_diff($catalogue->all($domain), $intlMessages)) {
322329
$filteredCatalogue->add($messages, $domain);
323330
}
324331
foreach ($catalogue->getResources() as $resource) {

0 commit comments

Comments
 (0)
0