Skip to content

Commit 6a4dfed

Browse files
Merge branch '4.3' into 4.4
* 4.3: (34 commits) [PhpunitBridge] Read environment variable from superglobals [Bridge/PhpUnit] Fix PHP5.5 compat [PhpUnitBridge] More accurate grouping fixed CS Extract unrecoverable exception to interface [FrameworkBundle] Fix calling Client::getProfile() before sending a request Fix type error [Security/Core] require libsodium >= 1.0.14 [Workflow] re-add workflow.definition tag to workflow services [Security/Core] Don't use ParagonIE_Sodium_Compat revert #30525 due to performance penalty collect called listeners information only once [Lock] fix missing inherit docs in RedisStore [Messenger] fix retrying handlers using DoctrineTransactionMiddleware [Mailgun Mailer] fixed issue when using html body [HttpClient] fix timing measurements with NativeHttpClient [HttpClient] fix dealing with 1xx informational responses add test to avoid regressions fix mirroring directory into parent directory fix typos ...
2 parents 8be4a75 + 5aab516 commit 6a4dfed

File tree

6 files changed

+12
-6
lines changed

6 files changed

+12
-6
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ CHANGELOG
2323
* [BC Break] When using Messenger, the default transport changed from
2424
using Symfony's serializer service to use `PhpSerializer`, which uses
2525
PHP's native `serialize()` and `unserialize()` functions. To use the
26-
original serialization method, set the `framework.messenger.defaut_serializer`
26+
original serialization method, set the `framework.messenger.default_serializer`
2727
config option to `messenger.transport.symfony_serializer`. Or set the
2828
`serializer` option under one specific `transport`.
2929
* [BC Break] The `framework.messenger.serializer` config key changed to

Client.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function getKernel()
6666
*/
6767
public function getProfile()
6868
{
69-
if (!$this->kernel->getContainer()->has('profiler')) {
69+
if (null === $this->response || !$this->kernel->getContainer()->has('profiler')) {
7070
return false;
7171
}
7272

DependencyInjection/FrameworkExtension.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -652,6 +652,10 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
652652
$definitionDefinition->addArgument($transitions);
653653
$definitionDefinition->addArgument($initialMarking);
654654
$definitionDefinition->addArgument($metadataStoreDefinition);
655+
$definitionDefinition->addTag('workflow.definition', [
656+
'name' => $name,
657+
'type' => $type,
658+
]);
655659

656660
// Create MarkingStore
657661
if (isset($workflow['marking_store']['type'])) {

Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,8 @@ public function testWorkflowLegacy()
311311
$workflowDefinition->getArgument(0),
312312
'Places are passed to the workflow definition'
313313
);
314+
315+
$this->assertSame(['workflow.definition' => [['name' => 'legacy', 'type' => 'state_machine']]], $workflowDefinition->getTags());
314316
}
315317

316318
/**

Tests/Functional/ProfilerTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ public function testProfilerIsDisabled($insulate)
2828

2929
// enable the profiler for the next request
3030
$client->enableProfiler();
31-
$crawler = $client->request('GET', '/profiler');
32-
$profile = $client->getProfile();
33-
$this->assertInternalType('object', $profile);
31+
$this->assertFalse($client->getProfile());
32+
$client->request('GET', '/profiler');
33+
$this->assertInternalType('object', $client->getProfile());
3434

3535
$client->request('GET', '/profiler');
3636
$this->assertFalse($client->getProfile());

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"symfony/security-http": "^3.4|^4.0|^5.0",
4949
"symfony/serializer": "^4.3|^5.0",
5050
"symfony/stopwatch": "^3.4|^4.0|^5.0",
51-
"symfony/translation": "^4.2|^5.0",
51+
"symfony/translation": "^4.3|^5.0",
5252
"symfony/templating": "^3.4|^4.0|^5.0",
5353
"symfony/twig-bundle": "^3.4|^4.0|^5.0",
5454
"symfony/validator": "^4.1|^5.0",

0 commit comments

Comments
 (0)