8000 Merge branch '5.2' into 5.3 · rubanooo/symfony@50ea886 · GitHub
[go: up one dir, main page]
Skip to content

Commit 50ea886

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.2' into 5.3
* 5.2: [Messenger] fix FlattenExceptionNormalizer Tweak GHA
2 parents 7cdd665 + 3c29298 commit 50ea886

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

‎.github/workflows/psalm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ jobs:
3434
COMPOSER_HOME="$(composer config home)"
3535
([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
3636
export COMPOSER_ROOT_VERSION=$(grep ' VERSION = ' src/Symfony/Component/HttpKernel/Kernel.php | grep -P -o '[0-9]+\.[0-9]+').x-dev
37-
composer remove --no-update --no-interaction symfony/phpunit-bridge
38-
composer require --no-update psalm/phar phpunit/phpunit:^9.5 php-http/discovery psr/event-dispatcher
37+
composer remove --dev --no-update --no-interaction symfony/phpunit-bridge
38+
composer require --no-update psalm/phar phpunit/phpunit:^9.5 php-http/discovery psr/event-dispatcher mongodb/mongodb
3939
4040
echo "::group::composer update"
4141
composer update --no-progress --ansi

‎.github/workflows/unit-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ jobs:
157157
if [[ $ok -ne 0 ]]; then
158158
printf "\n%-70s%10s\n" $title $(($end-$start))s
159159
echo "$OUTPUT"
160-
echo -e "\n::error::\\e[41mKO\\e[0m $title\\n"
160+
echo -e "\n::error::KO $title\\n"
161161
else
162162
printf "::group::%-68s%10s\n" $title $(($end-$start))s
163163
echo "$OUTPUT"

‎src/Symfony/Component/Messenger/Transport/Serialization/Normalizer/FlattenExceptionNormalizer.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,11 @@ public function normalize($object, $format = null, array $context = [])
4242
'file' => $object->getFile(),
4343
'line' => $object->getLine(),
4444
'previous' => null === $object->getPrevious() ? null : $this->normalize($object->getPrevious(), $format, $context),
45+
'status' => $object->getStatusCode(),
4546
'status_text' => $object->getStatusText(),
4647
'trace' => $object->getTrace(),
4748
'trace_as_string' => $object->getTraceAsString(),
4849
];
49-
if (null !== $status = $object->getStatusCode()) {
50-
$normalized['status'] = $status;
51-
}
5250

5351
return $normalized;
5452
}
@@ -70,7 +68,7 @@ public function denormalize($data, $type, $format = null, array $context = [])
7068

7169
$object->setMessage($data['message']);
7270
$object->setCode($data['code']);
73-
$object->setStatusCode($data['status'] ?? null);
71+
$object->setStatusCode($data['status'] ?? 500);
7472
$object->setClass($data['class']);
7573
$object->setFile($data['file']);
7674
$object->setLine($data['line']);

0 commit comments

Comments
 (0)
0