throw IncompleteConfigException for mandatory configuration parameters

Author: gregor-j

src/Config/ConfigTypeA.php

@@ -54,11 +54,16 @@ protected function getAllowedKeys(): array
     /**
      * Get the host name of a specific SAP application server.
      * @return string The hostname of a specific SAP application server.
+     * @throws IncompleteConfigException
      * @throws InvalidArgumentException
      */
     public function getAshost(): string
     {
-        return $this->get(self::JSON_ASHOST);
+        $ashost = $this->get(self::JSON_ASHOST);
+        if (!is_string($ashost)) {
+            throw new IncompleteConfigException('Configuration is missing mandatory "ashost"!');
+        }
+        return $ashost;
     }
 
     /**
@@ -77,10 +82,15 @@ public function setAshost(string $ashost): IConfigTypeA
      * Get the SAP system number.
      * @return string The SAP system number.
      * @throws InvalidArgumentException
+     * @throws IncompleteConfigException
      */
     public function getSysnr(): string
     {
-        return $this->get(self::JSON_SYSNR);
+        $sysnr = $this->get(self::JSON_SYSNR);
+        if (!is_string($sysnr)) {
+            throw new IncompleteConfigException('Configuration is missing mandatory "sysnr"!');
+        }
+        return $sysnr;
     }
 
     /**
@@ -102,9 +112,6 @@ public function setSysnr(string $sysnr): IConfigTypeA
      */
     public function getGwhost(): ?string
     {
-        /**
-         * InvalidArgumentException will never be thrown.
-         */
         return $this->get(self::JSON_GWHOST);
     }
 
@@ -127,9 +134,6 @@ public function setGwhost(string $gwhost): IConfigTypeA
      */
     public function getGwserv(): ?string
     {
-        /**
-         * InvalidArgumentException will never be thrown.
-         */
         return $this->get(self::JSON_GWSERV);
     }
 

src/Config/ConfigTypeB.php

@@ -58,7 +58,11 @@ protected function getAllowedKeys(): array
      */
     public function getMshost(): string
     {
-        return $this->get(self::JSON_MSHOST);
+        $mshost = $this->get(self::JSON_MSHOST);
+        if (!is_string($mshost)) {
+            throw new IncompleteConfigException('Configuration is missing mandatory "mshost"!');
+        }
+        return $mshost;
     }
 
     /**
@@ -80,9 +84,6 @@ public function setMshost(string $mshost): IConfigTypeB
      */
     public function getR3name(): ?string
     {
-        /**
-         * InvalidArgumentException will never be thrown.
-         */
         return $this->get(self::JSON_R3NAME);
     }
 
@@ -105,9 +106,6 @@ public function setR3name(string $r3name): IConfigTypeB
      */
     public function getGroup(): ?string
     {
-        /**
-         * InvalidArgumentException will never be thrown.
-         */
         return $this->get(self::JSON_GROUP);
     }
 

src/Config/Traits/CommonTrait.php

@@ -34,11 +34,16 @@ protected function getCommonAllowedKeys(): array
     /**
      * Get the username to use for authentication.
      * @return string
+     * @throws IncompleteConfigException
      * @throws InvalidArgumentException
      */
     public function getUser(): string
     {
-        return $this->get(self::JSON_USER);
+        $user = $this->get(self::JSON_USER);
+        if (!is_string($user)) {
+            throw new IncompleteConfigException('Configuration is missing mandatory "user"!');
+        }
+        return $user;
     }
 
     /**
@@ -57,10 +62,15 @@ public function setUser(string $user): IConfiguration
      * Get the password to use for authentication.
      * @return string
      * @throws InvalidArgumentException
+     * @throws IncompleteConfigException
      */
     public function getPasswd(): string
     {
-        return $this->get(self::JSON_PASSWD);
+        $passwd = $this->get(self::JSON_PASSWD);
+        if (!is_string($passwd)) {
+            throw new IncompleteConfigException('Configuration is missing mandatory "passwd"!');
+        }
+        return $passwd;
     }
 
     /**
@@ -83,7 +93,11 @@ public function setPasswd(string $passwd): IConfiguration
      */
     public function getClient(): string
     {
-        return $this->get(self::JSON_CLIENT);
+        $client = $this->get(self::JSON_CLIENT);
+        if (!is_string($client)) {
+            throw new IncompleteConfigException('Configuration is missing mandatory "client"!');
+        }
+        return $client;
     }
 
     /**
@@ -107,9 +121,6 @@ public function setClient(string $client): IConfiguration
      */
     public function getSaprouter(): ?string
     {
-        /**
-         * InvalidArgumentException will never be thrown.
-         */
         return $this->get(self::JSON_SAPROUTER);
     }
 
@@ -140,9 +151,6 @@ public function setSaprouter(string $saprouter): IConfiguration
      */
     public function getTrace(): ?int
     {
-        /**
-         * InvalidArgumentException will never be thrown.
-         */
         return $this->get(self::JSON_TRACE);
     }
 
@@ -173,9 +181,6 @@ public function setTrace(int $trace): IConfiguration
      */
     public function getCodepage(): ?int
     {
-        /**
-         * InvalidArgumentException will never be thrown.
-         */
         return $this->get(self::JSON_CODEPAGE);
     }
 
@@ -201,9 +206,6 @@ public function setCodepage(int $codepage): IConfiguration
      */
     public function getLang(): ?string
     {
-        /**
-         * InvalidArgumentException will never be thrown.
-         */
         return $this->get(self::JSON_LANG);
     }
 
@@ -231,9 +233,6 @@ public function setLang(string $lang): IConfiguration
      */
     public function getDest(): ?string
     {
-        /**
-         * InvalidArgumentException will never be thrown.
-         */
         return $this->get(self::JSON_DEST);
     }