Merge pull request #18 from rubyqorn/1.0.0

Constructor property promotion

Author: rubyqorn

src/AbstractSocket.php

@@ -4,20 +4,16 @@
 
 abstract class AbstractSocket
 {
-    /**
-     * @var \Qonsillium\SocketFacade|null 
-     */ 
-    protected ?SocketFacade $facade = null;
-
     /**
      * Initiate AbstractSocket constructor method 
      * and set SocketFacade property
      * @param \Qonsillium\SocketFacade $facade
      * @return void 
-     */ 
-    public function __construct(SocketFacade $facade)
-    {
-        $this->facade = $facade;
+     */
+    public function __construct(
+        protected SocketFacade $facade
+    ){
+        //
     }
 
     /**

src/ActionFactory.php

@@ -13,20 +13,16 @@
 
 class ActionFactory
 {
-    /**
-     * @var \Qonsillium\Credential\SocketCredentials|null; 
-     */ 
-    private ?SocketCredentials $credentials = null;
-
     /**
      * Initiate ActionFactory constructor method and
      * set SocketCredetials property
      * @param \Qonsillium\Credential\SocketCredentials $credentials
      * @return void 
-     */ 
-    public function __construct(SocketCredentials $credentials)
-    {
-        $this->credentials = $credentials;
+     */
+    public function __construct(
+        private SocketCredentials $credentials
+    ){
+        //
     }
 
     /**

src/Actions/SocketConnector.php

@@ -6,26 +6,27 @@
 
 class SocketConnector extends AbstractSocketAction
 {
-    /**
-     * @var string 
-     */ 
-    private string $address;
+    // /**
+    //  * @var string 
+    //  */ 
+    // private string $address;
 
-    /**
-     * @var string 
-     */ 
-    private string $type;
+    // /**
+    //  * @var string 
+    //  */ 
+    // private string $type;
 
     /**
      * Initiate SocketConnector constructor method
      * @param string $method
      * @param string $type
-     * @return void 
+     * @return void  
      */ 
-    public function __construct(string $address, string $type)
-    {
-        $this->address = $address;
-        $this->type = $type;
+    public function __construct(
+        private string $address,
+        private string $type
+    ){
+        //    
     }
 
     /**

src/Actions/SocketReader.php

@@ -9,19 +9,15 @@ class SocketReader extends AbstractSocketAction
      */ 
     private string $message;
 
-    /**
-     * @var int 
-     */ 
-    private int $length;
-
     /**
      * Initiate SocketReader constructor method 
      * @param int $length 
      * @return void 
      */ 
-    public function __construct(int $length)
-    {   
-        $this->length = $length;
+    public function __construct(
+        private int $length
+    ){
+        //
     }
 
     /**

src/Bootstrapper.php

@@ -10,13 +10,6 @@
 
 class Bootstrapper
 {
-    /**
-     * Configuration file with 
-     * yaml(yml) or json extension
-     * @var string 
-     */ 
-    protected string $configFile;
-
     /**
      * List with domain, type, protocol,
      * host and port socket settings
@@ -42,9 +35,9 @@ class Bootstrapper
      * @param string $configFile
      * @return void  
      */ 
-    public function __construct(string $configFile)
-    {
-        $this->configFile = $configFile;
+    public function __construct(
+        protected string $configFile
+    ){
         $this->services = new ServiceProvider();
         $this->settings = $this->parseConfigFile();
         $this->configuration = $this->configureSettingsFromFile();

src/Parsers/ConfigParser.php

@@ -4,23 +4,17 @@
 
 abstract class ConfigParser
 {
-    /**
-     * Configuration file 
-     * with settings
-     * @var string 
-     */ 
-    protected string $file;
-
     /**
      * Initiate ConfigParser constructor method.
      * Configuration file can be only with json
      * or yaml(yml) extensions
      * @param string $file
-     * @return void 
+     * @return void  
      */ 
-    public function __construct(string $file)
-    {
-        $this->file = $file;
+    public function __construct(
+        protected string $file
+    ){
+        //   
     }
 
     /**

src/Parsers/ConfigParsersFactory.php

@@ -4,13 +4,6 @@
 
 class ConfigParsersFactory
 {
-    /**
-     * Configuration file which
-     * will be parsed
-     * @var string 
-     */ 
-    protected string $configFile;
-
     /**
      * File extension
      * @var string 
@@ -20,20 +13,13 @@ class ConfigParsersFactory
     /**
      * Null object which make stub action.
      * Read: https://en.wikipedia.org/wiki/Null_object_pattern
-     * @var \Qonsillium\Parsers\NullConfigFile 
+     * @var \Qonsillium\Parsers\ConfigParser 
      */ 
-    protected $nullObj;
+    protected ConfigParser $nullObj;
 
-    /**
-     * Initiate ConfigParsersFactory constructor
-     * method and set config file, extension and
-     * null object
-     * @param string $configFile
-     * @return void 
-     */ 
-    public function __construct(string $configFile)
-    {
-        $this->configFile = $configFile;
+    public function __construct(
+        protected string $configFile,
+    ){
         $this->configFileExtension = pathinfo($this->configFile)['extension'];
         $this->nullObj = new NullConfigFile($this->configFile);
     }

src/Parsers/JSONConfigParser.php

@@ -6,19 +6,7 @@ class JSONConfigParser extends ConfigParser
 {
     /**
      * Parse json file with settings and return 
-     * it in assoc array interpretation.
-     * 
-     * JSON config file example:
-     * {
-     *    "settings": {
-     *      "domain": "AF_INET",
-     *      "type": "SOCK_STREAM",
-     *      "protocol": "SOL_TCP",
-     *      "host": "127.0.0.1",
-     *      "port": "8000",
-     *    }
-     * } 
-     * 
+     * it in assoc array interpretation
      * @return array
      */ 
     public function parse(): array

src/Parsers/NullConfigFile.php

@@ -4,6 +4,10 @@
 
 class NullConfigFile extends ConfigParser
 {
+    /**
+     * Stub method 
+     * @return array 
+     */ 
     public function parse(): array
     {
         return [];

src/Parsers/YAMLConfigParser.php

@@ -7,15 +7,6 @@ class YAMLConfigParser extends ConfigParser
     /**
      * Parse yaml(yml) file with settings and return 
      * it in assoc array interpretation.
-     * 
-     * YAML config file example:
-     * settings:
-     *  domain: "AF_INET"
-     *  type: "SOCK_STREAM"
-     *  protocol: "SOL_TCP"
-     *  host: "127.0.0.1"
-     *  port: "8000"
-     * 
      * @return array
      */ 
     public function parse(): array