Skip to content

Commit 68b0d70

Browse files
authored
Merge pull request msyk#96 from msyk/working
Moving to over PHP 8.1
2 parents aa1aa55 + f0c5dbe commit 68b0d70

13 files changed

Lines changed: 799 additions & 794 deletions

.github/workflows/php.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
matrix:
2121
# https://github.com/shivammathur/setup-php?tab=readme-ov-file#cloud-osplatform-support
2222
os: [ 'ubuntu-22.04', 'windows-2022', 'macos-14' ]
23-
php-version: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4' ]
23+
php-version: [ '8.1', '8.2', '8.3', '8.4' ]
2424
steps:
2525
- name: Checkout
2626
uses: actions/checkout@v4

README.md

Lines changed: 5 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ FMDataAPI has "composer.json," so you can add your composer.json file in your pr
7777
- The core class, and you just use this for your application.
7878
This class and supporting classes are object-oriented REST API
7979
wrappers.
80-
- src/Supporting/*.php
80+
- src/Supporting/**.php
8181
- The supporting classes for the FMDataAPI class. Perhaps you don't need to create these classes, but you have to handle methods on them.
8282
- composer.json, composer.lock
8383
- Composer information files.
@@ -111,52 +111,8 @@ MIT License
111111

112112
## History
113113

114-
- April 2017: Start to create these classes and codes.
115-
- 2017-05-05: README.md added.
116-
- 2017-05-26: [Ver.2] Support the "localserver" as host name.
117-
- 2017-05-31: [Ver.3] The query() method of FileMakerLayout class fixed.
118-
'Offset' and 'range' parameters could not set as an integer value.
119-
- 2017-11-06: [Ver.4] The getFieldNames() and getPortalNames() methods added.
120-
- 2018-02-03: [Ver.5] Bug fix of sorting parameters in query method.
121-
- 2018-02-18: [Ver.6] Bug fix of creating record with no default value.
122-
- 2018-03-25: [Ver.7] getSessionToken method added. OAuth handling implemented but not well debugged.
123-
- 2018-05-09: The Version 7 is the last version which supports FileMaker 16-based Data API.
124-
---
125-
- 2018-05-15: [Ver.8] Update for FileMaker 17. FileMaker Data API v1 is supported from this version.
126-
The preview version of FileMaker Data API doesn't support anymore.
127-
- 2018-05-27: [Ver.9] composer.json is added, and can install "inter-mediator/fmdataapi".
128-
FMDataAPITrial directory deleted because it's already discontinued api.
129-
Add the "samples" directory and move sample files into it.
130-
- 2018-06-22: [Ver.10] Added the getContainerData method (Thanks to base64bits!),
131-
bug fix (Thanks to phpsa!).
132-
- 2018-07-22: [Ver.11] Global field methods bug fixed and were available in FMDataAPI class (Tanks to Mr.Matsuo).
133-
The script errors and results can get from methods in FMLayout class.
134-
- 2018-07-29: [Ver.12] Bug fix for UUID Supporting (Thanks to Mr.Matsuo).
135-
Unit tests implemented but now for limited methods, als integrating Travis CI.
136-
- 2018-11-13: [Ver.13]
137-
Added getDebugInfo method (Thanks to Mr.Matsuo),
138-
modified and fixed the getFieldNames method (Thanks to phpsa),
139-
fixed handling portal object name (Thanks to Mr.Matsuo)
140-
fixed the getModId method (Thanks to Flexboom)
141-
- 2018-11-17: [Ver.15]
142-
Jupyter Notebook style sample and results.
143-
- 2019-05-19: [Ver.16]
144-
This is the final version for FileMaker 17 platform, and bug fix (Thanks to darnel)
145-
---
146-
- 2019-05-20: [Ver.17]
147-
Support the FileMaker 18 platform.
148-
Add getMetadataOld() and getMetadata() to FileMakerLayout class.
149-
Add getProductInfo(), getDatabaseNames(), getLayoutNames() and getScriptNames() to FMDataAPI class.
150-
- 2019-05-27: [Ver.18]
151-
Add getTargetTable(), getTotalCount(), getFoundCount(), getReturnedCount() to FileMakerRelation class.
152-
Add getTargetTable(), getTotalCount(), getFoundCount(), getReturnedCount() to FMDataAPI class.
153-
- 2019-09-12: [Ver.19]
154-
Add the duplicate() method to the FileMakerLayout class. Thanks to schube.
155-
- 2019-09-16: [Ver.20]
156-
The default values of limit and range parameters changed to 0 and both just applied for over 0 values. Thanks to schube.
157-
- 2020-08-23: [Ver.21]
158-
Bug fix about the field referencing of a related field without any portals. Thanks to frankeg.
159-
Checked on the FileMaker Server 19.
114+
(Previous history is [here](samples/HISTORY.md))
115+
160116
- 2021-02-10: [Ver.22]
161117
Setting the timeout value about cURL. Thanks to @montaniasystemab. Also thanks to @AnnoyingTechnology for correcting.
162118
- 2021-11-11: [Ver.23]
@@ -181,21 +137,5 @@ MIT License
181137
- 2023-11-24: [Ver.31]
182138
The curlErrorMessage() method returns the error message from curl (Thanks to @P1-Roger).
183139
Corrected phpdoc issue (Thanks to @patacra).
184-
185-
## API Differences between ver.8 and 7.
186-
### FMDataAPI class
187-
The setAPIVersion method added. This is for a future update of FileMaker Data API.
188-
As far as FMDataAPI Ver.8 goes, This isn't required.
189-
- public function __construct($solution, $user, $password, $host = NULL, $port = NULL, $protocol = NULL, [New]$fmDataSource = null)
190-
- [New]public function setAPIVersion($vNum)
191-
192-
### FileMakerRelation class
193-
The following methods added to script parameters. See the query method's document for specifying it.
194-
Twe methods added to portal parameter.
195-
196-
- public function query($condition = NULL, $sort = NULL, $offset = -1, $range = -1, $portal = null, [New]$script = null)
197-
- public function getRecord($recordId, $portal = null, [New]$script = null)
198-
- public function create($data = null, [New]$portal = null, [New]$script = null)
199-
- public function delete($recordId, [New]$script = null)
200-
- public function update($recordId, $data, $modId = -1, [New]$portal = null, [New]$script = null)
201-
- [New]public function uploadFile($filePath, $recordId, $containerFieldName, $containerFieldRepetition = null, $fileName = null)
140+
- 2024-XX-XX: [Ver.31] (upcoming release)
141+
Fix SSL certificate check errors by using the system's certificate authorities (Thanks to @patacra)

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
],
1111
"prefer-stable": true,
1212
"require": {
13-
"php": ">=7.1",
13+
"php": ">=8.1",
1414
"ext-curl": "*",
1515
"ext-json": "*"
1616
},

0 commit comments

Comments
 (0)