Skip to content

Commit a9df157

Browse files
committed
Release version of Ver.32.
1 parent a3669b3 commit a9df157

3 files changed

Lines changed: 20 additions & 19 deletions

File tree

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# FMDataAPI Ver.31 [![Build Status](https://github.com/msyk/FMDataAPI/actions/workflows/php.yml/badge.svg)](https://github.com/msyk/FMDataAPI/actions/workflows/php.yml)
1+
# FMDataAPI Ver.32 [![Build Status](https://github.com/msyk/FMDataAPI/actions/workflows/php.yml/badge.svg)](https://github.com/msyk/FMDataAPI/actions/workflows/php.yml)
22

33
by Masayuki Nii (nii@msyk.net)
44

@@ -51,13 +51,13 @@ Although the Custom Web Publishing is the way to access the database
5151
for a long while, FileMaker Inc. has introduced the modern feature to operate
5252
the database. The current version of FMDataAPI works on just FileMaker 18 and 19 platform.
5353

54-
For now, I'm focusing to develop the web application framework "INTER-Mediator"
54+
For now, I'm focusing on developing the web application framework "INTER-Mediator"
5555
(https://inter-mediator.com/ or https://github.com/INTER-Mediator/INTER-Mediator.git)
5656
which can develop the core features of database-driven web application
5757
with declarative descriptions. INTER-Mediator has already supported the Custom
5858
Web Publishing with FX.php, and I develop codes here for support REST APIs.
5959

60-
Bug reports and contribution are welcome.
60+
Bug reports and contributions are welcome.
6161

6262
## Installing to Your Project
6363

@@ -101,7 +101,7 @@ MIT License
101101
## Acknoledgement
102102

103103
- Thanks to Atsushi Matsuo. Your script is quite helpful to implement the "localserver" feature.
104-
(https://gist.github.com/matsuo/ef5cb7c98bb494d507731886883bcbc1) Moreover thanks for updating and fixing bugs.
104+
(https://gist.github.com/matsuo/ef5cb7c98bb494d507731886883bcbc1) Moreover, thanks for updating and fixing bugs.
105105
- Thanks to Frank Gonzalez. Your bug report is brilliant, and I could fix it quickly.
106106
- Thanks to base64bits for coding about container field.
107107
- Thanks to phpsa for bug fix.
@@ -137,7 +137,7 @@ MIT License
137137
- 2023-11-24: [Ver.31]
138138
The curlErrorMessage() method returns the error message from curl (Thanks to @P1-Roger).
139139
Corrected phpdoc issue (Thanks to @patacra).
140-
- 2024-XX-XX: [Ver.32] (upcoming release)
140+
- 2024-10-10: [Ver.32]
141141
From this version, the minimum PHP version is 8.1.
142142
Fix SSL certificate check errors by using the system's certificate authorities (Thanks to @patacra).
143143
FileMakerLayout::getMetadataOld and getMetadata methods don't return the false value in the case of log-in error.

src/Supporting/CommunicationProvider.php

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ public function __construct(string $solution,
260260
* @param array $params Array to build the API path. Ex: `["layouts" => null]` or `["sessions" => $this->accessToken]`.
261261
* @param string|array|null $request The query parameters as `"key" => "value"`.
262262
* @param string $methodLower The method in lowercase. Ex: `"get"`, `"delete"`, etc.
263-
* @param bool $isSystem If the query is for the system (sessions, databases, etc) or for a database.
263+
* @param bool $isSystem If the query is for the system (sessions, databases, etc.) or for a database.
264264
* @param string|null|false $directPath If we don't want to build the path with the other parameters, you can provide the direct path.
265265
* @return string
266266
* @ignore
@@ -554,9 +554,9 @@ private function getSupportingProviders(): null|array
554554
$this->callRestAPI([], true, 'GET', [], [],
555555
false, "/fmws/oauthproviderinfo"); // Throw Exception
556556
$result = [];
557-
foreach ($this->responseBody as $key => $item) {
558-
559-
}
557+
// foreach ($this->responseBody as $key => $item) {
558+
//
559+
// }
560560
return $result;
561561
} catch (Exception $ex) {
562562
return null;
@@ -587,9 +587,9 @@ private function getOAuthIdentifier($provider): string|array|null
587587
false, "/oauth/getoauthurl"
588588
); // Throw Exception
589589
$result = [];
590-
foreach ($this->responseBody as $key => $item) {
591-
592-
}
590+
// foreach ($this->responseBody as $key => $item) {
591+
//
592+
// }
593593
return $result;
594594
} catch (Exception $ex) {
595595
return null;
@@ -600,7 +600,7 @@ private function getOAuthIdentifier($provider): string|array|null
600600
* @param array $params
601601
* @param bool $isAddToken
602602
* @param string $method
603-
* @param array|null $request
603+
* @param string|array|null $request
604604
* @param array|null $addHeader
605605
* @param bool $isSystem for Metadata
606606
* @param string|null|false $directPath
@@ -698,6 +698,7 @@ public function callRestAPI(array $params,
698698
* Thanks to 'base64bits' as https://github.com/msyk/FMDataAPI/issues/18.
699699
* @param string $url
700700
* @return string The base64 encoded data in container field.
701+
* @throws Exception
701702
* @ignore
702703
*/
703704
public function accessToContainer(string $url): string
@@ -732,7 +733,7 @@ public function accessToContainer(string $url): string
732733
/**
733734
* @ignore
734735
*/
735-
public function storeToProperties()
736+
public function storeToProperties(): void
736737
{
737738
$this->httpStatus = 0;
738739
$this->errorCode = -1;
@@ -790,7 +791,7 @@ public function storeToProperties()
790791
* @return string
791792
* @ignore
792793
*/
793-
public function adjustSortDirection($direction): string
794+
public function adjustSortDirection(string $direction): string
794795
{
795796
if (strtoupper($direction) == 'ASC') {
796797
$direction = 'ascend';
@@ -806,7 +807,7 @@ public function adjustSortDirection($direction): string
806807
* @return mixed
807808
* @ignore
808809
*/
809-
public function getCurlInfo($key)
810+
public function getCurlInfo($key): mixed
810811
{
811812
return $this->curlInfo[$key];
812813
}

src/Supporting/FileMakerLayout.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ private function buildScriptParameters(array|null $param): array
147147
* If you want to omit record match with condition set the "omit" element as like:
148148
* array("FamilyName"=>"Nii*", "omit"=>"true").
149149
* If you want to query all records in the layout, set the first parameter to null.
150-
* @param array|null $sort The array of array which has 2 elements as a field name and order key:
150+
* @param array|null $sort The array of array which has two elements as a field name and order key:
151151
* array(array("FamilyName", "ascend"), array("GivenName", "descend")).
152152
* The value of order key can be 'ascend', 'descend' or value list name. The default value is 'ascend'.
153153
* @param int $offset The start number of the record set, and the first record is 1, but the number 0
@@ -579,8 +579,8 @@ public function getScriptErrorPresort(): int|null
579579
}
580580

581581
/**
582-
* Get the return value from the presort script.
583-
* @return string|null The return value from the presort script.
582+
* Get the return value from the presorted script.
583+
* @return string|null The return value from the presorted script.
584584
* If any script wasn't called, returns null.
585585
*/
586586
public function getScriptResultPresort(): string|null

0 commit comments

Comments
 (0)