Merge remote-tracking branch 'origin/master'

Author: msyk

src/Supporting/FileMakerLayout.php

@@ -178,7 +178,7 @@ public function query(array|null $condition = null,
                           int        $range = 0,
                           array|null $portal = null,
                           array|null $script = null,
-                          int        $dateformats = null): FileMakerRelation|null
+                          int|null   $dateformats = null): FileMakerRelation|null
     {
         if ($this->restAPI->login()) {
             $headers = ["Content-Type" => "application/json"];

src/Supporting/FileMakerRelation.php

@@ -15,7 +15,7 @@
  * @property string $<<field_name>> The field value named as the property name.
  * @property FileMakerRelation $<<portal_name>> FileMakerRelation object associated with the property name.
  *    The table occurrence name of the portal can be the 'portal_name,' and also the object name of the portal.
- * Ver * @version 32
+ * @version 32
  * @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.)
  */
@@ -107,7 +107,7 @@ public function getDataInfo(): object|array|null
      */
     public function getTargetTable(): null|string
     {
-        return ($this->dataInfo) ? $this->dataInfo->table : null;
+        return $this->dataInfo->table ?? null;
     }
 
     /**
@@ -118,8 +118,7 @@ public function getTargetTable(): null|string
      */
     public function getTotalCount(): null|int
     {
-        return ($this->dataInfo && property_exists($this->dataInfo, 'totalRecordCount')) ?
-            $this->dataInfo->totalRecordCount : null;
+        return $this->dataInfo->totalRecordCount ?? null;
     }
 
     /**
@@ -131,7 +130,7 @@ public function getTotalCount(): null|int
      */
     public function getFoundCount(): null|int
     {
-        return ($this->dataInfo) ? $this->dataInfo->foundCount : null;
+        return $this->dataInfo->foundCount ?? null;
     }
 
     /**
@@ -143,7 +142,7 @@ public function getFoundCount(): null|int
      */
     public function getReturnedCount(): null|int
     {
-        return ($this->dataInfo) ? $this->dataInfo->returnedCount : null;
+        return $this->dataInfo->returnedCount ?? null;
     }
 
     /**

test/phpstan.neon

@@ -3,3 +3,5 @@ includes:
 
 parameters:
 	reportUnmatchedIgnoredErrors: false
+	universalObjectCratesClasses:
+		- INTERMediator\FileMakerServer\RESTAPI\FMDataAPI