Merge pull request msyk#104 from matsuo/reduce-errors-detected-by-phpstan

Reduce errors detected by PHPStan

Author: msyk

src/FMDataAPI.php

@@ -12,7 +12,7 @@
  *
  * @package INTER-Mediator\FileMakerServer\RESTAPI
  * @link https://github.com/msyk/FMDataAPI GitHub Repository
- * @property-read FileMakerLayout <<layout_name>> Returns the FileMakerLayout object from the layout named with the property.
+ * @property-read FileMakerLayout $layout Returns the FileMakerLayout object from the layout named with the property.
  *    If the layout doesn't exist, no error arises here. Any errors might arise on methods of FileMakerLayout class.
  * @version 31
  * @author Masayuki Nii <nii@msyk.net>

src/Supporting/FileMakerLayout.php

@@ -359,7 +359,7 @@ public function delete(int|null   $recordId,
      * Keys are field names and values is these initial values.
      * @param int $modId The modId to allow updating. This parameter is for detect to modifying other users.
      * If you omit this parameter, update operation does not care the value of modId special field.
-     * @param array|null $portal Associated array contains the modifying values in the portal.
+     * @param array|object|null $portal Associated array contains the modifying values in the portal.
      * Ex.: {"<PortalName>"=>{"<FieldName>"=>"<Value>", "recordId"=>"12"}}. FieldName has to "<TOCName>::<FieldName>".
      * The recordId key specifiy the record to edit in portal.
      * @param array|null $script scripts that should execute the right timings. See FileMakerRelation::query().
@@ -368,7 +368,7 @@ public function delete(int|null   $recordId,
     public function update(int|null   $recordId,
                            array|null $data,
                            int        $modId = -1,
-                           array|null $portal = null,
+                           array|object|null $portal = null,
                            array|null $script = null): void
     {
         if (is_null($recordId)) {

src/Supporting/FileMakerRelation.php

@@ -69,12 +69,12 @@ class FileMakerRelation implements Iterator
      *
      * @ignore
      */
-    public function __construct(array|object          $responseData,
-                                object|array          $infoData,
-                                string                $result = "PORTAL",
-                                int                   $errorCode = 0,
-                                string|null           $portalName = null,
-                                CommunicationProvider $provider = null)
+    public function __construct(array|object           $responseData,
+                                object|array           $infoData,
+                                string                 $result = "PORTAL",
+                                int                    $errorCode = 0,
+                                string|null            $portalName = null,
+                                ?CommunicationProvider $provider = null)
     {
         $this->data = $responseData;
         $this->dataInfo = $infoData;
@@ -385,7 +385,7 @@ public function getPortalNames(): array
      * @see FMDataAPI::setFieldHTMLEncoding() Compatible mode for FileMaker API for PHP.
      *
      */
-    public function field(string $name, string $toName = null): string|FileMakerRelation
+    public function field(string $name, string|null $toName = null): string|FileMakerRelation
     {
         $toName = is_null($toName) ? "" : "{$toName}::";
         $fieldName = "{$toName}$name";

test/TestProvider.php

@@ -8,6 +8,8 @@
 
 namespace INTERMediator\FileMakerServer\RESTAPI\Supporting;
 
+use Exception;
+
 class TestProvider extends CommunicationProvider
 {
 
@@ -51,7 +53,7 @@ public function callRestAPI(array             $params,
                                 bool              $isAddToken,
                                 string            $method = 'GET',
                                 array|null|string $request = null,
-                                array             $addHeader = null,
+                                array|null        $addHeader = null,
                                 bool              $isSystem = false,
                                 string|null|false $directPath = null): void
     {