Commiteaeb820

committed

Merge branch '3.3' into 3.4

* 3.3: [HttpFoundation] Fix forward-compat of NativeSessionStorage with PHP 7.2

2 parentse7cfaa9 +ed52036 commiteaeb820Copy full SHA for eaeb820

File tree

+26

-1

lines changed

src/Symfony/Component/HttpFoundation
- Session/Storage
  - NativeSessionStorage.php
- Tests/Session/Storage
  - NativeSessionStorageTest.php

+26

-1

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,12 @@ class NativeSessionStorage implements SessionStorageInterface`
`100`	`100`	`*/`
`101`	`101`	`publicfunction__construct(array$options =array(),$handler =null,MetadataBag$metaBag =null)`
`102`	`102`	`{`
	`103`	`+$this->setMetadataBag($metaBag);`
	`104`	`+`
	`105`	`+if (\PHP_SESSION_ACTIVE ===session_status()) {`
	`106`	`+return;`
	`107`	`+ }`
	`108`	`+`
`103`	`109`	`$options +=array(`
`104`	`110`	`'cache_limiter' =>'private_no_expire',`
`105`	`111`	`'cache_expire' =>0,`
`@@ -109,7 +115,6 @@ public function __construct(array $options = array(), $handler = null, MetadataB`
`109`	`115`
`110`	`116`	`session_register_shutdown();`
`111`	`117`
`112`		`-$this->setMetadataBag($metaBag);`
`113`	`118`	`$this->setOptions($options);`
`114`	`119`	`$this->setSaveHandler($handler);`
`115`	`120`	`}`

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -242,4 +242,24 @@ public function testRestart()`
`242`	`242`	`$this->assertSame($id,$storage->getId(),'Same session ID after restarting');`
`243`	`243`	`$this->assertSame(7,$storage->getBag('attributes')->get('lucky'),'Data still available');`
`244`	`244`	`}`
	`245`	`+`
	`246`	`+publicfunctiontestCanCreateNativeSessionStorageWhenSessionAlreadyStarted()`
	`247`	`+ {`
	`248`	`+session_start();`
	`249`	`+$this->getStorage();`
	`250`	`+`
	`251`	+// Assert no exception has been thrown by `getStorage()`
	`252`	`+$this->addToAssertionCount(1);`
	`253`	`+ }`
	`254`	`+`
	`255`	`+publicfunctiontestSetSessionOptionsOnceSessionStartedIsIgnored()`
	`256`	`+ {`
	`257`	`+session_start();`
	`258`	`+$this->getStorage(array(`
	`259`	`+'name' =>'something-else',`
	`260`	`+ ));`
	`261`	`+`
	`262`	+// Assert no exception has been thrown by `getStorage()`
	`263`	`+$this->addToAssertionCount(1);`
	`264`	`+ }`
`245`	`265`	`}`

Comments

(0)