Ver.23 release.

Author: msyk

.travis.yml

@@ -1,4 +1,4 @@
-# FMDataAPI Ver.22 [![Build Status](https://github.com/msyk/FMDataAPI/actions/workflows/php.yml/badge.svg)](https://github.com/msyk/FMDataAPI/actions/workflows/php.yml)
+# FMDataAPI Ver.23 [![Build Status](https://github.com/msyk/FMDataAPI/actions/workflows/php.yml/badge.svg)](https://github.com/msyk/FMDataAPI/actions/workflows/php.yml)
 
 by Masayuki Nii (nii@msyk.net)
 
@@ -59,29 +59,28 @@ Bug reports and contribution are welcome.
 
 ## Installing to Your Project
 
-The file "FMDataAPI.php" contains all you need to access FileMaker Data API.
-You can download it or clone this repository.
-
 FMDataAPI has "composer.json," so you can add your composer.json file in your project as below.
 
 ```
 ...
 "require": {
   ...
-  "inter-mediator/fmdataapi":"22"
+  "inter-mediator/fmdataapi":"23"
 } ...
 ```
 
 ## About Files and Directories
 
-- FMDataAPI.php
+- src/FMDataAPI.php
     - The core class, and you just use this for your application.
-     This class and inner private classes are object-oriented REST API
+     This class and supporting classes are object-oriented REST API
      wrappers.
+- src/Supporting/*.php
+    - The supporting classes for the FMDataAPI class. Perhaps you don't need to create these classes, but you have to handle methods on them.
 - composer.json, composer.lock
     - Composer information files.
 - Sample_results.ipynb
-    - Sample program and results with Jupyter Notebook style.
+    - Sample program and results with Jupyter Notebook style. Sorry for slight old version results.
 - samples/FMDataAPI_Sample.php and cat.jpg
     - This is the sample program of FMDataAPI class, and shows how to
     use FMDataAPI class. It includes rich comments,
@@ -90,8 +89,8 @@ FMDataAPI has "composer.json," so you can add your composer.json file in your pr
     - These are for GitHub.
 - test
     - Some files for unit testing.
-- .travis.yml
-    - Setting file for TravisCI.
+- .github, docker-compose.yml, Dockerfile
+    - For the GitHub action with testing.
 
 ## Licence
 
@@ -158,6 +157,8 @@ MIT License
     Checked on the FileMaker Server 19.
 - 2021-02-10: [Ver.22]
     Setting the timeout value about cURL. Thanks to @montaniasystemab. Also thanks to @AnnoyingTechnology for correcting.
+- 2021-02-10: [Ver.23]
+    File structure is updated for PSR-4. Thanks to tkuijer.
 
 ## API Differences between ver.8 and 7.
 ### FMDataAPI class

README.md

@@ -1,6 +1,6 @@
 {
   "name": "inter-mediator/fmdataapi",
-  "version": "22",
+  "version": "23",
   "time": "2021-02-10",
   "repositories": [
     {
@@ -53,6 +53,18 @@
     },
     {
       "name": "Bernhard Schulz (Contributor)"
+    },
+    {
+      "name": "montaniasystemab (Contributor)"
+    },
+    {
+      "name": "Rickard Andersson (Contributor)"
+    },
+    {
+      "name": "Julien @AnnoyingTechnology (Contributor)"
+    },
+    {
+      "name": "Tom Kuijer (Contributor)"
     }
   ],
   "support": {
@@ -66,7 +78,7 @@
       "./vendor/bin/phpunit --bootstrap ./vendor/autoload.php --configuration ./test/phpunit.xml ./test/FMDataAPIUnitTest.php"
     ],
     "doc": [
-      "./vendor/bin/phpdoc -f ./FMDataAPI.php -t ../INTER-Mediator_Documents/FMDataAPI"
+      "./vendor/bin/phpdoc -f ./src/FMDataAPI.php -t ../INTER-Mediator_Documents/FMDataAPI"
     ]
   }
 }

composer.json

@@ -5,6 +5,9 @@
  * Date: 2017/04/24
  * Time: 17:41
  */
+/*******************************************
+ * Before you try to this sample program, you have to execute "composer update" on this root directory.
+ *******************************************/
 // First of all, the FMDataAPI.php file has to be included. All classes are defined in it.
 include_once "../vendor/autoload.php";
 
@@ -234,7 +237,7 @@
 
     // The 'query()' method can have several parameters. The portal specification has to be an array
     // with the object name of the portal not the table occurrence name.
-    $portal = array("contact_to");
+    $portal = array("Contact");
     $result = $fmdb->person_layout->query(array(array("id" => "1")), null, 1, -1, $portal);
     if (!is_null($result)) {
         foreach ($result as $record) {
@@ -245,7 +248,7 @@
         }
     }
     // The 'query()' method can have several parameters. The second parameter is for sorting.
-    $portal = array("contact_to");
+    $portal = array("Contact");
     $result = $fmdb->person_layout->query(array(array("id" => "1...")), array(array("id", "descend")), 1, -1, $portal);
     if (!is_null($result)) {
         foreach ($result as $record) {

composer.lock

@@ -13,7 +13,7 @@
  * @link https://github.com/msyk/FMDataAPI GitHub Repository
  * @property-read FileMakerLayout $<<layout_name>> 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 22
+ * @version 23
  * @author Masayuki Nii <nii@msyk.net>
  * @copyright 2017-2021 Masayuki Nii (Claris FileMaker is registered trademarks of Claris International Inc. in the U.S. and other countries.)
  * @source 1 100000 The source code.

samples/FMDataAPI_Sample.php

@@ -7,7 +7,7 @@
  *
  * @package INTER-Mediator\FileMakerServer\RESTAPI
  * @link https://github.com/msyk/FMDataAPI GitHub Repository
- * @version 22
+ * @version 23
  * @author Masayuki Nii <nii@msyk.net>
  * @copyright 2017-2021 Masayuki Nii (Claris FileMaker is registered trademarks of Claris International Inc. in the U.S. and other countries.)
  */

src/FMDataAPI.php

@@ -10,7 +10,7 @@
  *
  * @package INTER-Mediator\FileMakerServer\RESTAPI
  * @link https://github.com/msyk/FMDataAPI GitHub Repository
- * @version 22
+ * @version 23
  * @author Masayuki Nii <nii@msyk.net>
  * @copyright 2017-2021 Masayuki Nii (Claris FileMaker is registered trademarks of Claris International Inc. in the U.S. and other countries.)
  */

src/Supporting/CommunicationProvider.php

@@ -14,7 +14,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.
- * @version 22
+ * @version 23
  * @author Masayuki Nii <nii@msyk.net>
  * @copyright 2017-2021 Masayuki Nii (Claris FileMaker is registered trademarks of Claris International Inc. in the U.S. and other countries.)
  */

src/Supporting/FileMakerLayout.php

@@ -1 +1 @@
-{"version":1,"defects":[],"times":{"INTERMediator\\FileMakerServer\\RESTAPI\\FMDataAPIUnitTest::test_initializeObjects":0.009,"INTERMediator\\FileMakerServer\\RESTAPI\\FMDataAPIUnitTest::test_Query":0.005,"INTERMediator\\FileMakerServer\\RESTAPI\\FMDataAPIUnitTest::test_ErrorQuery":0}}
+{"version":1,"defects":[],"times":{"INTERMediator\\FileMakerServer\\RESTAPI\\FMDataAPIUnitTest::test_initializeObjects":0.005,"INTERMediator\\FileMakerServer\\RESTAPI\\FMDataAPIUnitTest::test_Query":0.001,"INTERMediator\\FileMakerServer\\RESTAPI\\FMDataAPIUnitTest::test_ErrorQuery":0}}