Commit9277bc2

committed

[HttpFoundation] MakeSessionHandlerProxy implementSessionIdInterface

1 parent52a9292 commit9277bc2Copy full SHA for 9277bc2

File tree

+53

-1

lines changed

+53

-1

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ CHANGELOG`
`5`	`5`	`---`
`6`	`6`
`7`	`7`	* Make`HeaderBag::getDate()`,`Response::getDate()`,`getExpires()` and`getLastModified()` return a`DateTimeImmutable`
	`8`	+* Make`SessionHandlerProxy` implement`SessionIdInterface`
`8`	`9`
`9`	`10`	`6.3`
`10`	`11`	`---`

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,20 @@`
	`1`	`+<?php`
	`2`	`+`
	`3`	`+/*`
	`4`	`+ * This file is part of the Symfony package.`
	`5`	`+ *`
	`6`	`+ * (c) Fabien Potencier <fabien@symfony.com>`
	`7`	`+ *`
	`8`	`+ * For the full copyright and license information, please view the LICENSE`
	`9`	`+ * file that was distributed with this source code.`
	`10`	`+ */`
	`11`	`+`
	`12`	`+namespaceSymfony\Component\HttpFoundation\Exception;`
	`13`	`+`
	`14`	`+class SessionIdCreationExceptionextends \RuntimeException`
	`15`	`+{`
	`16`	`+publicfunction__construct(string$message ='Could not create a session id.',int$code =0,\Throwable$previous =null)`
	`17`	`+ {`
	`18`	`+parent::__construct($message,$code,$previous);`
	`19`	`+ }`
	`20`	`+}`

Lines changed: 15 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,13 @@`
`11`	`11`
`12`	`12`	`namespaceSymfony\Component\HttpFoundation\Session\Storage\Proxy;`
`13`	`13`
	`14`	`+useSymfony\Component\HttpFoundation\Exception\SessionIdCreationException;`
`14`	`15`	`useSymfony\Component\HttpFoundation\Session\Storage\Handler\StrictSessionHandler;`
`15`	`16`
`16`	`17`	`/**`
`17`	`18`	`* @author Drak <drak@zikula.org>`
`18`	`19`	`*/`
`19`		`-class SessionHandlerProxyextends AbstractProxyimplements \SessionHandlerInterface, \SessionUpdateTimestampHandlerInterface`
	`20`	`+class SessionHandlerProxyextends AbstractProxyimplements \SessionHandlerInterface, \SessionUpdateTimestampHandlerInterface, \SessionIdInterface`
`20`	`21`	`{`
`21`	`22`	`protected$handler;`
`22`	`23`
`@@ -73,4 +74,17 @@ public function updateTimestamp(#[\SensitiveParameter] string $sessionId, string`
`73`	`74`	`{`
`74`	`75`	`return$this->handlerinstanceof \SessionUpdateTimestampHandlerInterface ?$this->handler->updateTimestamp($sessionId,$data) :$this->write($sessionId,$data);`
`75`	`76`	`}`
	`77`	`+`
	`78`	`+publicfunctioncreate_sid():string`
	`79`	`+ {`
	`80`	`+if ($this->handlerinstanceof \SessionIdInterface) {`
	`81`	`+return$this->handler->create_sid();`
	`82`	`+ }`
	`83`	`+`
	`84`	`+if (!$id =session_create_id()) {`
	`85`	`+thrownewSessionIdCreationException();`
	`86`	`+ }`
	`87`	`+`
	`88`	`+return$id;`
	`89`	`+ }`
`76`	`90`	`}`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -179,8 +179,25 @@ public static function provideNativeSessionStorageHandler()`
`179`	`179`	`[newSessionHandlerProxy(newStrictSessionHandler(new \SessionHandler()))],`
`180`	`180`	`];`
`181`	`181`	`}`
	`182`	`+`
	`183`	`+publicfunctiontestCreateSid()`
	`184`	`+ {`
	`185`	`+$mock =$this->createMock(SessionIdSessionHandler::class);`
	`186`	`+$mock->expects($this->once())`
	`187`	`+ ->method('create_sid');`
	`188`	`+`
	`189`	`+$proxy =newSessionHandlerProxy($mock);`
	`190`	`+$proxy->create_sid();`
	`191`	`+`
	`192`	`+$this->proxy->create_sid();`
	`193`	`+$this->addToAssertionCount(1);`
	`194`	`+ }`
`182`	`195`	`}`
`183`	`196`
`184`	`197`	`abstractclass TestSessionHandlerimplements \SessionHandlerInterface, \SessionUpdateTimestampHandlerInterface`
`185`	`198`	`{`
`186`	`199`	`}`
	`200`	`+`
	`201`	`+abstractclass SessionIdSessionHandlerimplements \SessionHandlerInterface, \SessionIdInterface`
	`202`	`+{`
	`203`	`+}`

Comments

(0)