Commit00a1357

authored and

committed

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

1 parentefb4891 commit00a1357Copy full SHA for 00a1357

File tree

+32

-1

lines changed

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

+32

-1

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,12 @@ class NativeSessionStorage implements SessionStorageInterface`
`102`	`102`	`*/`
`103`	`103`	`publicfunction__construct(array$options =array(),$handler =null,MetadataBag$metaBag =null)`
`104`	`104`	`{`
	`105`	`+$this->setMetadataBag($metaBag);`
	`106`	`+`
	`107`	`+if (\PHP_VERSION_ID >=50400 && \PHP_SESSION_ACTIVE ===session_status()) {`
	`108`	`+return;`
	`109`	`+ }`
	`110`	`+`
`105`	`111`	`$options +=array(`
`106`	`112`	`// disable by default because it's managed by HeaderBag (if used)`
`107`	`113`	`'cache_limiter' =>'',`
`@@ -114,7 +120,6 @@ public function __construct(array $options = array(), $handler = null, MetadataB`
`114`	`120`	`register_shutdown_function('session_write_close');`
`115`	`121`	`}`
`116`	`122`
`117`		`-$this->setMetadataBag($metaBag);`
`118`	`123`	`$this->setOptions($options);`
`119`	`124`	`$this->setSaveHandler($handler);`
`120`	`125`	`}`

Lines changed: 26 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -270,4 +270,30 @@ public function testRestart()`
`270`	`270`	`$this->assertSame($id,$storage->getId(),'Same session ID after restarting');`
`271`	`271`	`$this->assertSame(7,$storage->getBag('attributes')->get('lucky'),'Data still available');`
`272`	`272`	`}`
	`273`	`+`
	`274`	`+/**`
	`275`	`+ * @requires PHP 5.4`
	`276`	`+ */`
	`277`	`+publicfunctiontestCanCreateNativeSessionStorageWhenSessionAlreadyStarted()`
	`278`	`+ {`
	`279`	`+session_start();`
	`280`	`+$this->getStorage();`
	`281`	`+`
	`282`	+// Assert no exception has been thrown by `getStorage()`
	`283`	`+$this->addToAssertionCount(1);`
	`284`	`+ }`
	`285`	`+`
	`286`	`+/**`
	`287`	`+ * @requires PHP 5.4`
	`288`	`+ */`
	`289`	`+publicfunctiontestSetSessionOptionsOnceSessionStartedIsIgnored()`
	`290`	`+ {`
	`291`	`+session_start();`
	`292`	`+$this->getStorage(array(`
	`293`	`+'name' =>'something-else',`
	`294`	`+ ));`
	`295`	`+`
	`296`	+// Assert no exception has been thrown by `getStorage()`
	`297`	`+$this->addToAssertionCount(1);`
	`298`	`+ }`
`273`	`299`	`}`

Comments

(0)