🚿 OAuthStorageAbstract: remove pseudo constructor

Author: codemasher

src/Storage/FileStorage.php

@@ -46,16 +46,9 @@ public function __construct(
 		OAuthOptions|SettingsContainerInterface $options = new OAuthOptions,
 		LoggerInterface                         $logger = new NullLogger
 	){
-		$this->oauthUser = $oauthUser;
-
 		parent::__construct($options, $logger);
-	}
 
-	/**
-	 * @inheritDoc
-	 */
-	protected function construct():void{
-		$this->oauthUser = trim((string)$this->oauthUser);
+		$this->oauthUser = trim((string)$oauthUser);
 
 		if($this->oauthUser === ''){
 			throw new OAuthStorageException('invalid OAuth user');

src/Storage/OAuthStorageAbstract.php

@@ -50,23 +50,13 @@ public function __construct(
 		OAuthOptions|SettingsContainerInterface $options = new OAuthOptions,
 		LoggerInterface                         $logger = new NullLogger
 	){
+		$this->options = $options;
+		$this->logger  = $logger;
 
 		if($this->options->useStorageEncryption === true && empty($this->options->storageEncryptionKey)){
 			throw new OAuthStorageException('no encryption key given');
 		}
 
-		$this->options = $options;
-		$this->logger  = $logger;
-
-		$this->construct();
-	}
-
-	/**
-	 * A replacement constructor that you can call in extended classes,
-	 * so that you don't have to implement the monstrous original `__construct()`
-	 */
-	protected function construct():void{
-		// noop
 	}
 
 	/**

src/Storage/SessionStorage.php

@@ -11,7 +11,10 @@
 
 namespace chillerlan\OAuth\Storage;
 
+use chillerlan\OAuth\OAuthOptions;
 use chillerlan\OAuth\Core\AccessToken;
+use chillerlan\Settings\SettingsContainerInterface;
+use Psr\Log\{LoggerInterface, NullLogger};
 use function session_start, session_status, session_write_close;
 use const PHP_SESSION_ACTIVE, PHP_SESSION_DISABLED;
 
@@ -28,9 +31,14 @@ class SessionStorage extends OAuthStorageAbstract{
 	protected string $storageVar;
 
 	/**
-	 * SessionStorage (pseudo-) constructor.
+	 * @inheritDoc
 	 */
-	public function construct():void{
+	public function __construct(
+		OAuthOptions|SettingsContainerInterface $options = new OAuthOptions,
+		LoggerInterface                         $logger = new NullLogger
+	){
+		parent::__construct($options, $logger);
+
 		$this->storageVar = $this->options->sessionStorageVar;
 
 		// Determine if the session has started.