Skip to content

Commit 5bf41ad

Browse files
Merge branch '6.1' into 6.2
* 6.1: [HttpKernel] fix merge [HttpKernel] fix merge Revert "bug #48089 [Console] Fix clear line with question in section (maxbeckers)"
2 parents 9ae51ee + 5b0af9d commit 5bf41ad

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ public function testAutowireAttribute()
467467
$container = new ContainerBuilder();
468468
$resolver = $container->register('argument_resolver.service', 'stdClass')->addArgument([]);
469469

470-
$container->register('some.id', \stdClass::class);
470+
$container->register('some.id', \stdClass::class)->setPublic(true);
471471
$container->setParameter('some.parameter', 'foo');
472472

473473
$container->register('foo', WithAutowireAttribute::class)

Tests/EventListener/SessionListenerTest.php

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -558,22 +558,27 @@ public function testUninitializedSessionWithoutInitializedSession()
558558
public function testResponseHeadersMaxAgeAndExpiresNotBeOverridenIfSessionStarted()
559559
{
560560
$session = $this->createMock(Session::class);
561-
$session->expects($this->exactly(2))->method('getUsageIndex')->will($this->onConsecutiveCalls(0, 1));
561+
$session->expects($this->once())->method('getUsageIndex')->willReturn(1);
562+
$session->expects($this->once())->method('getName')->willReturn('foo');
563+
$sessionFactory = $this->createMock(SessionFactory::class);
564+
$sessionFactory->expects($this->once())->method('createSession')->willReturn($session);
562565

563566
$container = new Container();
564-
$container->set('initialized_session', $session);
567+
$container->set('session_factory', $sessionFactory);
565568

566569
$listener = new SessionListener($container);
567570
$kernel = $this->createMock(HttpKernelInterface::class);
568571

569572
$request = new Request();
570573
$listener->onKernelRequest(new RequestEvent($kernel, $request, HttpKernelInterface::MAIN_REQUEST));
571574

575+
$request->getSession();
576+
572577
$response = new Response();
573578
$response->setPrivate();
574579
$expiresHeader = gmdate('D, d M Y H:i:s', time() + 600).' GMT';
575580
$response->setMaxAge(600);
576-
$listener->onKernelResponse(new ResponseEvent($kernel, new Request(), HttpKernelInterface::MAIN_REQUEST, $response));
581+
$listener->onKernelResponse(new ResponseEvent($kernel, $request, HttpKernelInterface::MAIN_REQUEST, $response));
577582

578583
$this->assertTrue($response->headers->has('expires'));
579584
$this->assertSame($expiresHeader, $response->headers->get('expires'));
@@ -588,20 +593,20 @@ public function testResponseHeadersMaxAgeAndExpiresNotBeOverridenIfSessionStarte
588593
public function testResponseHeadersMaxAgeAndExpiresDefaultValuesIfSessionStarted()
589594
{
590595
$session = $this->createMock(Session::class);
591-
$session->expects($this->exactly(2))->method('getUsageIndex')->will($this->onConsecutiveCalls(0, 1));
596+
$session->expects($this->once())->method('getUsageIndex')->willReturn(1);
592597

593598
$container = new Container();
594-
$container->set('initialized_session', $session);
595599

596600
$listener = new SessionListener($container);
597601
$kernel = $this->createMock(HttpKernelInterface::class);
598602

599603
$request = new Request();
604+
$request->setSession($session);
600605
$listener->onKernelRequest(new RequestEvent($kernel, $request, HttpKernelInterface::MAIN_REQUEST));
601606

602607
$response = new Response();
603608
$expiresHeader = gmdate('D, d M Y H:i:s', time()).' GMT';
604-
$listener->onKernelResponse(new ResponseEvent($kernel, new Request(), HttpKernelInterface::MAIN_REQUEST, $response));
609+
$listener->onKernelResponse(new ResponseEvent($kernel, $request, HttpKernelInterface::MAIN_REQUEST, $response));
605610

606611
$this->assertTrue($response->headers->has('expires'));
607612
$this->assertSame($expiresHeader, $response->headers->get('expires'));

0 commit comments

Comments
 (0)