8000 Merge branch '4.4' · symfony/symfony@409ccd1 · GitHub
[go: up one dir, main page]

Skip to content

Commit 409ccd1

Browse files
Merge branch '4.4'
* 4.4: [FrameworkBundle] minor: fix typo in SessionTest [Debug] workaround BC break in PHP 7.3 [CACHE] Correct required file added in #32054 remove bc break code
2 parents 6f21ccf + d31b716 commit 409ccd1

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/Symfony/Bundle/FrameworkBundle/Controller/AbstractController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,14 +395,14 @@ protected function isCsrfTokenValid(string $id, ?string $token): bool
395395
*
396396
* @param object|Envelope $message The message or the message pre-wrapped in an envelope
397397
*/
398-
protected function dispatchMessage($message): Envelope
398+
protected function dispatchMessage($message, array $stamps = []): Envelope
399399
{
400400
if (!$this->container->has('messenger.default_bus')) {
401401
$message = class_exists(Envelope::class) ? 'You need to define the "messenger.default_bus" configuration option.' : 'Try running "composer require symfony/messenger".';
402402
throw new \LogicException('The message bus is not enabled in your application. '.$message);
403403
}
404404

405-
return $this->container->get('messenger.default_bus')->dispatch($message);
405+
return $this->container->get('messenger.default_bus')->dispatch($message, $stamps);
406406
}
407407

408408
/**

src/Symfony/Bundle/FrameworkBundle/Tests/Controller/TestAbstractController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,9 @@ public function isCsrfTokenValid(string $id, ?string $token): bool
167167
return parent::isCsrfTokenValid($id, $token);
168168
}
169169

170-
public function dispatchMessage($message): Envelope
170+
public function dispatchMessage($message, array $stamps = []): Envelope
171171
{
172-
return parent::dispatchMessage($message);
172+
return parent::dispatchMessage($message, $stamps);
173173
}
174174

175175
public function addLink(Request $request, Link $link): void

src/Symfony/Bundle/FrameworkBundle/Tests/Functional/SessionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public function testFlash($config, $insulate)
7171

7272
/**
7373
* See if two separate insulated clients can run without
74-
* polluting eachother's session data.
74+
* polluting each other's session data.
7575
*
7676
* @dataProvider getConfigs
7777
*/

src/Symfony/Component/Cache/Exception/LogicException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Psr\SimpleCache\LogicException as SimpleCacheInterface;
1515

1616
if (interface_exists(SimpleCacheInterface::class)) {
17-
require __DIR__.\DIRECTORY_SEPARATOR.'LogicException-psr16.php';
17+
require __DIR__.\DIRECTORY_SEPARATOR.'LogicException+psr16.php';
1818
} else {
1919
require __DIR__.\DIRECTORY_SEPARATOR.'LogicException-psr16.php';
2020
}

0 commit comments

Comments
 (0)
0