Initialise session within GlobalSessionContainer

Author: Greg Bowler

src/Authenticator.php

@@ -16,5 +16,12 @@ public function __construct(
 		if(is_null($session)) {
 			$session = new GlobalSessionContainer();
 		}
+
+		if(!$session->contains(GlobalSessionContainer::SESSION_KEY)) {
+			$session->set(
+				GlobalSessionContainer::SESSION_KEY,
+				new SessionData()
+			);
+		}
 	}
 }

src/GlobalSessionContainer.php

@@ -4,23 +4,12 @@
 use Gt\Session\SessionArrayWrapper;
 
 class GlobalSessionContainer extends SessionArrayWrapper {
-	const DEFAULT_SESSION_KEY = "AUTHWAVE_SESSION";
+	const SESSION_KEY = "AUTHWAVE_SESSION_DATA";
 
-	public function __construct(
-		string $baseSessionKey = self::DEFAULT_SESSION_KEY
-	) {
-		if(session_status() !== PHP_SESSION_ACTIVE) {
-			session_start();
+	public function __construct() {
+		if(!isset($_SESSION)) {
+			throw new SessionNotStartedException();
 		}
-
-		if(!isset($_SESSION[$baseSessionKey])) {
-			$_SESSION[$baseSessionKey] = new SessionData();
-		}
-
-// TODO: Should this implement SessionContainer interface and define
-// the getters and setters to $_SESSION itself, rather than being an
-// instance of SessionArrayWrapper?
-
-		parent::__construct($_SESSION[$baseSessionKey]);
+		parent::__construct($_SESSION);
 	}
 }

src/SessionNotStartedException.php

@@ -0,0 +1,4 @@
+<?php
+namespace Authwave;
+
+class SessionNotStartedException extends AuthwaveException {}

test/phpunit/AuthenticatorTest.php

@@ -2,14 +2,30 @@
 namespace Authwave\Test;
 
 use Authwave\Authenticator;
+use Authwave\GlobalSessionContainer;
+use Authwave\SessionNotStartedException;
 use PHPUnit\Framework\TestCase;
 
 class AuthenticatorTest extends TestCase {
+	public function testConstructWithDefaultSessionNotStarted() {
+		self::expectException(SessionNotStartedException::class);
+		new Authenticator(
+			"test-key",
+			"test-secret",
+			"/"
+		);
+	}
+
 	public function testConstructWithDefaultSession() {
+		$_SESSION = [];
 		$sut = new Authenticator(
 			"test-key",
 			"test-secret",
 			"/"
 		);
+		self::assertArrayHasKey(
+			GlobalSessionContainer::SESSION_KEY,
+			$_SESSION
+		);
 	}
 }