🚿 constructor promotion with docblocks makes me wanna stab my eyes out

Author: codemasher

src/Core/OAuthProvider.php

@@ -36,6 +36,41 @@
  */
 abstract class OAuthProvider implements OAuthInterface{
 
+	/**
+	 * The options instance
+	 */
+	protected OAuthOptions|SettingsContainerInterface $options;
+
+	/**
+	 * The PSR-18 HTTP client
+	 */
+	protected ClientInterface $http;
+
+	/**
+	 * A PSR-17 request factory
+	 */
+	protected RequestFactoryInterface $requestFactory;
+
+	/**
+	 * A PSR-17 stream factory
+	 */
+	protected StreamFactoryInterface $streamFactory;
+
+	/**
+	 * A PSR-17 URI factory
+	 */
+	protected UriFactoryInterface $uriFactory;
+
+	/**
+	 * A storage instance
+	 */
+	protected OAuthStorageInterface $storage;
+
+	/**
+	 * A PSR-3 logger
+	 */
+	protected LoggerInterface $logger;
+
 	/**
 	 * the authorization URL
 	 */
@@ -76,22 +111,23 @@ abstract class OAuthProvider implements OAuthInterface{
 	 * OAuthProvider constructor.
 	 */
 	final public function __construct(
-		/** The options instance */
-		protected OAuthOptions|SettingsContainerInterface $options,
-		/** The PSR-18 HTTP client */
-		protected ClientInterface                         $http,
-		/** A PSR-17 request factory */
-		protected RequestFactoryInterface                 $requestFactory,
-		/** A PSR-17 stream factory */
-		protected StreamFactoryInterface                  $streamFactory,
-		/** A PSR-17 URI factory */
-		protected UriFactoryInterface                     $uriFactory,
-		/** A storage instance */
-		protected OAuthStorageInterface                   $storage = new MemoryStorage,
-		/** A PSR-3 logger */
-		protected LoggerInterface                         $logger = new NullLogger,
+		OAuthOptions|SettingsContainerInterface $options,
+		ClientInterface                         $http,
+		RequestFactoryInterface                 $requestFactory,
+		StreamFactoryInterface                  $streamFactory,
+		UriFactoryInterface                     $uriFactory,
+		OAuthStorageInterface                   $storage = new MemoryStorage,
+		LoggerInterface                         $logger = new NullLogger,
 	){
-		$this->name = (new ReflectionClass($this))->getShortName();
+		$this->options        = $options;
+		$this->http           = $http;
+		$this->requestFactory = $requestFactory;
+		$this->streamFactory  = $streamFactory;
+		$this->uriFactory     = $uriFactory;
+		$this->storage        = $storage;
+		$this->logger         = $logger;
+
+		$this->name           = (new ReflectionClass($this))->getShortName();
 
 		$this->construct();
 	}

src/Storage/FileStorage.php

@@ -33,17 +33,21 @@ class FileStorage extends OAuthStorageAbstract{
 
 	final protected const ENCRYPT_FORMAT = Utilities::ENCRYPT_FORMAT_BINARY;
 
+	/**
+	 * A *unique* ID to identify the user within your application, e.g. database row id or UUID
+	 */
+	protected string|int $oauthUser;
+
 	/**
 	 * OAuthStorageAbstract constructor.
 	 */
 	public function __construct(
-		/** A *unique* ID to identify the user within your application, e.g. database row id or UUID */
-		protected string|int $oauthUser,
-		/** The options instance */
-		protected OAuthOptions|SettingsContainerInterface $options = new OAuthOptions,
-		/** A PSR-3 logger */
-		protected LoggerInterface                         $logger = new NullLogger
+		string|int                              $oauthUser,
+		OAuthOptions|SettingsContainerInterface $options = new OAuthOptions,
+		LoggerInterface                         $logger = new NullLogger
 	){
+		$this->oauthUser = $oauthUser;
+
 		parent::__construct($options, $logger);
 	}
 

src/Storage/OAuthStorageAbstract.php

@@ -26,22 +26,38 @@ abstract class OAuthStorageAbstract implements OAuthStorageInterface{
 	final protected const KEY_STATE    = 'STATE';
 	final protected const KEY_VERIFIER = 'VERIFIER';
 
+	/**
+	 * Output format for encrypted data
+	 *
+	 * @var int
+	 */
 	protected const ENCRYPT_FORMAT = Utilities::ENCRYPT_FORMAT_HEX;
 
+	/**
+	 * The options instance
+	 */
+	protected OAuthOptions|SettingsContainerInterface $options;
+
+	/**
+	 * A PSR-3 logger
+	 */
+	protected LoggerInterface $logger;
+
 	/**
 	 * OAuthStorageAbstract constructor.
 	 */
 	public function __construct(
-		/** The options instance */
-		protected OAuthOptions|SettingsContainerInterface $options = new OAuthOptions,
-		/** A PSR-3 logger */
-		protected LoggerInterface                         $logger = new NullLogger
+		OAuthOptions|SettingsContainerInterface $options = new OAuthOptions,
+		LoggerInterface                         $logger = new NullLogger
 	){
 
 		if($this->options->useStorageEncryption === true && empty($this->options->storageEncryptionKey)){
 			throw new OAuthStorageException('no encryption key given');
 		}
 
+		$this->options = $options;
+		$this->logger  = $logger;
+
 		$this->construct();
 	}