Session: added read_and_close configuration (#156)

Author: mabar

src/Bridges/HttpDI/SessionExtension.php

@@ -39,6 +39,7 @@ public function getConfigSchema(): Nette\Schema\Schema
 			'autoStart' => Expect::anyOf('smart', true, false)->default('smart'),
 			'expiration' => Expect::string()->dynamic(),
 			'handler' => Expect::string()->dynamic(),
+			'readAndClose' => Expect::bool(),
 		])->otherItems('mixed');
 	}
 
@@ -76,6 +77,9 @@ public function loadConfiguration()
 
 		$options = (array) $config;
 		unset($options['expiration'], $options['handler'], $options['autoStart'], $options['debugger']);
+		if ($options['readAndClose'] === null) {
+			unset($options['readAndClose']);
+		}
 		if (!empty($options)) {
 			$session->addSetup('setOptions', [$options]);
 		}

src/Http/Session.php

@@ -53,6 +53,9 @@ class Session
 	/** @var \SessionHandlerInterface */
 	private $handler;
 
+	/** @var bool */
+	private $readAndClose = false;
+
 
 	public function __construct(IRequest $request, IResponse $response)
 	{
@@ -90,7 +93,7 @@ public function start(): void
 
 		try {
 			// session_start returns false on failure only sometimes
-			Nette\Utils\Callback::invokeSafe('session_start', [], function (string $message) use (&$e): void {
+			Nette\Utils\Callback::invokeSafe('session_start', [['read_and_close' => $this->readAndClose]], function (string $message) use (&$e): void {
 				$e = new Nette\InvalidStateException($message);
 			});
 		} catch (\Exception $e) {
@@ -329,6 +332,13 @@ public function setOptions(array $options)
 			$key = strtolower(preg_replace('#(.)(?=[A-Z])#', '$1_', $key)); // camelCase -> snake_case
 			$normalized[$key] = $value;
 		}
+		if (!empty($normalized['read_and_close'])) {
+			if (session_status() === PHP_SESSION_ACTIVE) {
+				throw new Nette\InvalidStateException('Cannot configure "read_and_close" for already started session.');
+			}
+			$this->readAndClose = (bool) $normalized['read_and_close'];
+			unset($normalized['read_and_close']);
+		}
 		if (session_status() === PHP_SESSION_ACTIVE) {
 			$this->configure($normalized);
 		}