Commita930a67

committed

When session is active, do not change options with PHP 7.2

1 parentcfb86c0 commita930a67Copy full SHA for a930a67

File tree

+19

-22

lines changed

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

+19

-22

lines changed

Lines changed: 14 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -105,25 +105,23 @@ public function __construct(array $options = array(), $handler = null, MetadataB`
`105`	`105`	`$this->setMetadataBag($metaBag);`
`106`	`106`
`107`	`107`	`if (PHP_VERSION_ID >=70200 && \PHP_SESSION_ACTIVE ===session_status()) {`
`108`		`-if (!empty($options) \|\|null !==$handler) {`
`109`		`-thrownew \LogicException('Cannot change options or handler of an active session');`
`110`		`- }`
`111`		`- }else {`
`112`		`-$options +=array(`
`113`		`-// disable by default because it's managed by HeaderBag (if used)`
`114`		`-'cache_limiter' =>'',`
`115`		`-'use_cookies' =>1,`
`116`		`- );`
	`108`	`+return;`
	`109`	`+ }`
`117`	`110`
`118`		`-if (\PHP_VERSION_ID >=50400) {`
`119`		`-session_register_shutdown();`
`120`		`-}else {`
`121`		`-register_shutdown_function('session_write_close');`
`122`		`- }`
	`111`	`+$options +=array(`
	`112`	`+// disable by default because it's managed by HeaderBag (if used)`
	`113`	`+'cache_limiter' =>'',`
	`114`	`+'use_cookies' =>1,`
	`115`	`+);`
`123`	`116`
`124`		`-$this->setOptions($options);`
`125`		`-$this->setSaveHandler($handler);`
	`117`	`+if (\PHP_VERSION_ID >=50400) {`
	`118`	`+session_register_shutdown();`
	`119`	`+ }else {`
	`120`	`+register_shutdown_function('session_write_close');`
`126`	`121`	`}`
	`122`	`+`
	`123`	`+$this->setOptions($options);`
	`124`	`+$this->setSaveHandler($handler);`
`127`	`125`	`}`
`128`	`126`
`129`	`127`	`/**`

Lines changed: 5 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -283,17 +283,16 @@ public function testCanCreateNativeSessionStorageWhenSessionAlreadyStarted()`
`283`	`283`	`}`
`284`	`284`
`285`	`285`	`/**`
`286`		`- * @expectedException \LogicException`
	`286`	`+ * @requires PHP 7.2`
`287`	`287`	`*/`
`288`		`-publicfunctiontestCannotSetSessionOptionsOnceSessionStarted()`
	`288`	`+publicfunctiontestSetSessionOptionsOnceSessionStartedIsIgnored()`
`289`	`289`	`{`
`290`		`-if (PHP_VERSION_ID <70200) {`
`291`		`-$this->markTestSkipped('Limitation from PHP 7.2 only');`
`292`		`- }`
`293`		`-`
`294`	`290`	`session_start();`
`295`	`291`	`$this->getStorage(array(`
`296`	`292`	`'name' =>'something-else',`
`297`	`293`	`));`
	`294`	`+`
	`295`	+// Assert no exception has been thrown by `getStorage()`
	`296`	`+$this->assertTrue(true);`
`298`	`297`	`}`
`299`	`298`	`}`

Comments

(0)