Merge and resolved conflicts.

Author: msyk

src/FMDataAPI.php

@@ -2,9 +2,9 @@
 
 namespace INTERMediator\FileMakerServer\RESTAPI;
 
-use INTERMediator\FileMakerServer\RESTAPI\Supporting\CommunicationProvider;
 use INTERMediator\FileMakerServer\RESTAPI\Supporting\FileMakerLayout;
 use INTERMediator\FileMakerServer\RESTAPI\Supporting\FileMakerRelation;
+use INTERMediator\FileMakerServer\RESTAPI\Supporting\CommunicationProvider;
 use Exception;
 
 /**
@@ -27,12 +27,13 @@ class FMDataAPI
      */
 
     /**
-     * Keeping the FileMakerLayout object for each layout
+     * @var FileMakerLayout[] Keeping the FileMakerLayout object for each layout.
      * @ignore
      */
-    private array $layoutTable = [];
+    private $layoutTable = [];
+
     /**
-     * Keeping the CommunicationProvider object
+     * @var null|CommunicationProvider Keeping the CommunicationProvider object.
      * @ignore
      */
     private CommunicationProvider|null $provider;
@@ -48,12 +49,12 @@ class FMDataAPI
      * If you’re going to call useOAuth method, you have to specify the data for X-FM-Data-OAuth-Identifier.
      * @param ?string $host FileMaker Server's host name or IP address. If omitted, 'localhost' is chosen.
      * The value "localserver" tries to connect directory 127.0.0.1, and you don't have to set $port and $protocol.
-     * @param ?int $port FileMaker Server's port number. If omitted, 443 is chosen.
-     * @param ?string $protocol FileMaker Server's protocol name. If omitted, 'https' is chosen.
-     * @param ?array $fmDataSource Authentication information for external data sources.
-     * Ex.  [{"database"=>"<databaseName>", "username"=>"<username>", "password"=>"<password>"}].
-     * If you use OAuth, "oAuthRequestId" and "oAuthIdentifier" keys have to be specified.
-     * @param bool $isUnitTest If it's set to true, the communication provider just works locally.
+     * @param int $port FileMaker Server's port number. If omitted, 443 is chosen.
+     * @param string $protocol FileMaker Server's protocol name. If omitted, 'https' is chosen.
+     * @param array $fmDataSource Authentication information for external data sources.
+     * Ex.  [{"database"=>"<databaseName>", "username"=>"<username>", "password"=>"<password>"].
+     * If you use OAuth, "oAuthRequestId" and "oAuthIdentifier" keys have to be spedified.
+     * @param boolean $isUnitTest If it's set to true, the communication provider just works locally.
      */
     public function __construct(
         string  $solution, string $user, string $password,

src/Supporting/CommunicationProvider.php

@@ -117,7 +117,7 @@ class CommunicationProvider
      */
     public null|int $foundCount = null;
     /**
-     * @varint
+     * @var int
      * @ignore
      */
     public null|int $returnedCount = null;
@@ -222,6 +222,12 @@ class CommunicationProvider
      * @param string|null $port
      * @param string|null $protocol
      * @param array|null $fmDataSource
+     * @param string $solution
+     * @param string $user
+     * @param string $password
+     * @param null|string $host
+     * @param null|int $port
+     * @param null|string $protocol
      * @ignore
      */
     public function __construct(string  $solution, string $user, string $password, ?string $host = null,
@@ -251,11 +257,11 @@ public function __construct(string  $solution, string $user, string $password, ?
     }
 
     /**
-     * @param array $params
-     * @param string|array|null $request
-     * @param string $methodLower
-     * @param bool $isSystem
-     * @param bool $directPath
+     * @param array $params Array to build the API path. Ex: `["layouts" => null]` or `["sessions" => $this->accessToken]`.
+     * @param null|array $request The query parameters as `"key" => "value"`.
+     * @param string $methodLower The method in lowercase. Ex: `"get"`, `"delete"`, etc.
+     * @param bool $isSystem If the query is for the system (sessions, databases, etc) or for a database.
+     * @param false|string $directPath If we don't want to build the path with the other parameters, you can provide the direct path.
      * @return string
      * @ignore
      */

src/Supporting/FileMakerLayout.php

@@ -22,15 +22,15 @@ class FileMakerLayout
      */
     private $restAPI = null;
     /**
-     * @var null
+     * @var null|string
      * @ignore
      */
     private $layout = null;
 
     /**
      * FileMakerLayout constructor.
-     * @param $restAPI
-     * @param $layout
+     * @param CommunicationProvider $restAPI
+     * @param string $layout
      * @ignore
      */
     public function __construct($restAPI, $layout)
@@ -86,7 +86,7 @@ private function buildPortalParameters($param, $shortKey = false, $method = "GET
     }
 
     /**
-     * @param $param
+     * @param array $param
      * @return array
      * @ignore
      */

src/Supporting/FileMakerRelation.php

@@ -2,7 +2,6 @@
 
 namespace INTERMediator\FileMakerServer\RESTAPI\Supporting;
 
-use Exception;
 use Iterator;
 
 /**
@@ -17,12 +16,12 @@
  *    The table occurrence name of the portal can be the 'portal_name,' and also the object name of the portal.
  * Ver * @version 31
  * @author Masayuki Nii <nii@msyk.net>
- * @copyright 2017-2024 Masayuki Nii (Claris FileMaker is registered trademarks of Claris International Inc. in the U.S. and other countries.)
+ * @copyright 2017-2023 Masayuki Nii (Claris FileMaker is registered trademarks of Claris International Inc. in the U.S. and other countries.)
  */
 class FileMakerRelation implements Iterator
 {
     /**
-     * @var null|array
+     * @var null|object
      * @ignore
      */
     private null|array|object $data;