Skip to content

Commit c89a153

Browse files
Merge branch '4.4' into 5.1
* 4.4: Fix transient tests Fix class resolution in Doctrine EventListenerPass [Serializer] Fix tests marked as incomplete [Translator] fix handling plural for floating numbers fix redis messenger options with dsn Update ConsoleEvents.php allow Doctrine persistence 2 too [Messenger] Fix transporting non-UTF8 payloads by encoding them using base 64 add doctrine/persistence as a dev requirement Exclude non-initialized properties accessed with getters
2 parents aa9e042 + c0d5cc5 commit c89a153

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

Tests/Controller/AbstractControllerTest.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,6 @@ public function testGetUserWithEmptyContainer()
157157
$controller->getUser();
158158
}
159159

160-
/**
161-
* @param $token
162-
*/
163160
private function getContainerWithTokenStorage($token = null): Container
164161
{
165162
$tokenStorage = $this->getMockBuilder(\Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage::class)->getMock();
@@ -484,10 +481,10 @@ public function testGenerateUrl()
484481
public function testRedirect()
485482
{
486483
$controller = $this->createController();
487-
$response = $controller->redirect('http://dunglas.fr', 301);
484+
$response = $controller->redirect('https://dunglas.fr', 301);
488485

489486
$this->assertInstanceOf(\Symfony\Component\HttpFoundation\RedirectResponse::class, $response);
490-
$this->assertSame('http://dunglas.fr', $response->getTargetUrl());
487+
$this->assertSame('https://dunglas.fr', $response->getTargetUrl());
491488
$this->assertSame(301, $response->getStatusCode());
492489
}
493490

@@ -532,7 +529,7 @@ public function testCreateFormBuilder()
532529

533530
public function testGetDoctrine()
534531
{
535-
$doctrine = $this->getMockBuilder(\Doctrine\Persistence\ManagerRegistry::class)->getMock();
532+
$doctrine = $this->createMock(ManagerRegistry::class);
536533

537534
$container = new Container();
538535
$container->set('doctrine', $doctrine);

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"require-dev": {
3636
"doctrine/annotations": "^1.10.4",
3737
"doctrine/cache": "~1.0",
38+
"doctrine/persistence": "^1.3|^2.0",
3839
"symfony/asset": "^5.1",
3940
"symfony/browser-kit": "^4.4|^5.0",
4041
"symfony/console": "^4.4|^5.0",

0 commit comments

Comments
 (0)