@@ -558,22 +558,27 @@ public function testUninitializedSessionWithoutInitializedSession()
558
558
public function testResponseHeadersMaxAgeAndExpiresNotBeOverridenIfSessionStarted ()
559
559
{
560
560
$ 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 );
562
565
563
566
$ container = new Container ();
564
- $ container ->set ('initialized_session ' , $ session );
567
+ $ container ->set ('session_factory ' , $ sessionFactory );
565
568
566
569
$ listener = new SessionListener ($ container );
567
570
$ kernel = $ this ->createMock (HttpKernelInterface::class);
568
571
569
572
$ request = new Request ();
570
573
$ listener ->onKernelRequest (new RequestEvent ($ kernel , $ request , HttpKernelInterface::MAIN_REQUEST ));
571
574
575
+ $ request ->getSession ();
576
+
572
577
$ response = new Response ();
573
578
$ response ->setPrivate ();
574
579
$ expiresHeader = gmdate ('D, d M Y H:i:s ' , time () + 600 ).' GMT ' ;
575
580
$ 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 ));
577
582
578
583
$ this ->assertTrue ($ response ->headers ->has ('expires ' ));
579
584
$ this ->assertSame ($ expiresHeader , $ response ->headers ->get ('expires ' ));
@@ -588,20 +593,20 @@ public function testResponseHeadersMaxAgeAndExpiresNotBeOverridenIfSessionStarte
588
593
public function testResponseHeadersMaxAgeAndExpiresDefaultValuesIfSessionStarted ()
589
594
{
590
595
$ 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 );
592
597
593
598
$ container = new Container ();
594
- $ container ->set ('initialized_session ' , $ session );
595
599
596
600
$ listener = new SessionListener ($ container );
597
601
$ kernel = $ this ->createMock (HttpKernelInterface::class);
598
602
599
603
$ request = new Request ();
604
+ $ request ->setSession ($ session );
600
605
$ listener ->onKernelRequest (new RequestEvent ($ kernel , $ request , HttpKernelInterface::MAIN_REQUEST ));
601
606
602
607
$ response = new Response ();
603
608
$ 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 ));
605
610
606
611
$ this ->assertTrue ($ response ->headers ->has ('expires ' ));
607
612
$ this ->assertSame ($ expiresHeader , $ response ->headers ->get ('expires ' ));
0 commit comments