8000 Merge branch '6.0' into 6.1 · symfony/symfony@b2e7fcd · GitHub
[go: up one dir, main page]
Skip to content

Commit b2e7fcd

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '6.0' into 6.1
* 6.0: Revert "minor #44642 [Workflow] Fix Event constructor requirements (lyrixx)" [Workflow] Remove redundant type check Skip transient tests on macos [Workflow] Fix Event constructor requirements [Translation] Handle the blank-translation in Loco Adapter [Serializer] Fix symfony/uid requirement
2 parents 6be4729 + ba7d70f commit b2e7fcd

File tree

5 files changed

+15
-12
lines changed

5 files changed

+15
-12
lines changed

‎.github/workflows/unit-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
7373
7474
echo COLUMNS=120 >> $GITHUB_ENV
75-
echo PHPUNIT="$(pwd)/phpunit --exclude-group tty,benchmark,intl-data" >> $GITHUB_ENV
75+
echo PHPUNIT="$(pwd)/phpunit --exclude-group tty,benchmark,intl-data$([[ ${{ matrix.os }} = macos* ]] && echo ',transient-on-macos')" >> $GITHUB_ENV
7676
echo COMPOSER_UP='composer update --no-progress --ansi' >> $GITHUB_ENV
7777
7878
SYMFONY_VERSIONS=$(git ls-remote -q --heads | cut -f2 | grep -o '/[1-9][0-9]*\.[0-9].*' | sort -V)

‎src/Symfony/Component/Serializer/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
"symfony/dependency-injection": "<5.4",
4747
"symfony/property-access": "<5.4",
4848
"symfony/property-info": "<5.4",
49+
"symfony/uid": "<5.4",
4950
"symfony/yaml": "<5.4"
5051
},
5152
"suggest": {

‎src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public function read(array $domains, array $locales): TranslatorBag
9797
$response = $this->client->request('GET', sprintf('export/locale/%s.xlf', rawurlencode($locale)), [
9898
'query' => [
9999
'filter' => $domain,
100-
'status' => 'translated',
100+
'status' => 'translated,blank-translation',
101101
],
102102
]);
103103

‎src/Symfony/Component/Workflow/Workflow.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,6 @@ public function getMarking(object $subject, array $context = []): Marking
8383
{
8484
$marking = $this->markingStore->getMarking($subject);
8585

86-
if (!$marking instanceof Marking) {
87-
throw new LogicException(sprintf('The value returned by the MarkingStore is not an instance of "%s" for workflow "%s".', Marking::class, $this->name));
88-
}
89-
9086
// check if the subject is already in the workflow
9187
if (!$marking->getPlaces()) {
9288
if (!$this->definition->getInitialPlaces()) {

‎src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -835,19 +835,22 @@ public function testTimeoutWithActiveConcurrentStream()
835835
}
836836
}
837837

838+
/**
839+
* @group transient-on-macos
840+
*/
838841
public function testTimeoutOnInitialize()
839842
{
840843
$p1 = TestHttpServer::start(8067);
841-
$p2 = TestHttpServer::start(8078);
844+
$p2 = TestHttpServer::start(8077);
842845

843846
$client = $this->getHttpClient(__FUNCTION__);
844847
$start = microtime(true);
845848
$responses = [];
846849

847850
$responses[] = $client->request('GET', 'http://localhost:8067/timeout-header', ['timeout' => 0.25]);
848-
$responses[] = $client->request('GET', 'http://localhost:8078/timeout-header', ['timeout' => 0.25]);
851+
$responses[] = $client->request('GET', 'http://localhost:8077/timeout-header', ['timeout' => 0.25]);
849852
$responses[] = $client->request('GET', 'http://localhost:8067/timeout-header', ['timeout' => 0.25]);
850-
$responses[] = $client->request('GET', 'http://localhost:8078/timeout-header', ['timeout' => 0.25]);
853+
$responses[] = $client->request('GET', 'http://localhost:8077/timeout-header', ['timeout' => 0.25]);
851854

852855
try {
853856
foreach ($responses as $response) {
@@ -868,19 +871,22 @@ public function testTimeoutOnInitialize()
868871
}
869872
}
870873

874+
/**
875+
* @group transient-on-macos
876+
*/
871877
public function testTimeoutOnDestruct()
872878
{
873879
$p1 = TestHttpServer::start(8067);
874-
$p2 = TestHttpServer::start(8078);
880+
$p2 = TestHttpServer::start(8077);
875881

876882
$client = $this->getHttpClient(__FUNCTION__);
877883
$start = microtime(true);
878884
$responses = [];
879885

880886
$responses[] = $client->request('GET', 'http://localhost:8067/timeout-header', ['timeout' => 0.25]);
881-
$responses[] = $client->request('GET', 'http://localhost:8078/timeout-header', ['timeout' => 0.25]);
887+
$responses[] = $client->request('GET', 'http://localhost:8077/timeout-header', ['timeout' => 0.25]);
882888
$responses[] = $client->request('GET', 'http://localhost:8067/timeout-header', ['timeout' => 0.25]);
883-
$responses[] = $client->request('GET', 'http://localhost:8078/timeout-header', ['timeout' => 0.25]);
889+
$responses[] = $client->request('GET', 'http://localhost:8077/timeout-header', ['timeout' => 0.25]);
884890

885891
try {
886892
while ($response = array_shift($responses)) {

0 commit comments

Comments
 (0)
0