Feature/new request handling logic inter 767

.github/workflows/functional.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       max-parallel: 1
       matrix:
-        php_version: [ "7.3", "7.4", "8.0", "8.1", "8.2" ]
+        php_version: [ "8.1", "8.2", "8.3" ]
     steps:
       - uses: actions/checkout@v4
         with:

.swagger-codegen-ignore

@@ -3,4 +3,8 @@ src/phpunit.xml.dist
 src/.travis.yml
 src/.php_cs
 src/git_push.sh
-src/test/**
+src/test/**
+src/Api/FingerprintApi.php
+src/HeaderSelector.php
+src/Model/EventResponse.php
+src/Model/Response.php

composer.json

@@ -30,7 +30,7 @@
         }
     ],
     "require": {
-        "php": ">=7.1",
+        "php": ">=8.1",
         "ext-curl": "*",
         "ext-json": "*",
         "ext-mbstring": "*",

contributing.md

@@ -5,8 +5,8 @@
 Most files in the project are autogenerated by [swagger-codegen](https://swagger.io/tools/swagger-codegen/) for php.
 
 - [template](./template) - folder contains redefined templates of `swagger-codegen`. Original templates you can find in [swagger-codegen repo](https://github.com/swagger-api/swagger-codegen/tree/751e59df060b1c3ecf54921e104f2086dfa9f820/modules/swagger-codegen/src/main/resources/php).
-- [docs](./docs) - generated documentation for models and [API Client](./docs/Api/FingerprintApi.md).
-- [src](./src) - API Client code is generated automatically.
+- [docs](./docs) - generated documentation for models and [API Client](docs/Api/FingerprintApi.md).
+- [src](./src) - API Client code and generated models.
 
 ## Code generation
 

docker-compose.yml

@@ -7,14 +7,14 @@ services:
     volumes:
       - ./:/app
   php:
-    image: php:7.2-cli
+    image: php:8.1-cli
     volumes:
       - ./:/app
     working_dir: /app
     env_file:
       - .env
   phpunit:
-    image: php:7.2-cli
+    image: php:8.1-cli
     volumes:
       - ./:/app
     working_dir: /app

run_checks.php

@@ -45,22 +45,32 @@
 
 try {
     $result = $client->getVisits($visitor_id);
-    fwrite(STDOUT, sprintf("Got visits: %s \n", $result));
+    $rawResponseDecoded = json_decode($result->getRawResponse(), true);
+    if ($rawResponseDecoded['visitorId'] !== $visitor_id) {
+        fwrite(STDERR, sprintf("Raw response for getVisits not working"));
+        exit(1);
+    }
+    fwrite(STDOUT, sprintf("Got visits: %s \n", $result->getRawResponse()));
 } catch (Exception $e) {
     fwrite(STDERR, sprintf("Exception when calling FingerprintApi->getVisits: %s\n", $e->getMessage()));
     exit(1);
 }
 
 try {
     $result = $client->getEvent($request_id);
-    fwrite(STDOUT, sprintf("Got event: %s \n", $result));
+    $rawResponseDecoded = json_decode($result->getRawResponse(), true);
+    if ($rawResponseDecoded['products']['identification']['data']['requestId'] !== $request_id) {
+        fwrite(STDERR, sprintf("Raw response for getEvent not working"));
+        exit(1);
+    }
+    fwrite(STDOUT, sprintf("\n\nGot event: %s \n", $result->getRawResponse()));
 } catch (Exception $e) {
-    fwrite(STDERR, sprintf("Exception when calling FingerprintApi->getVisits: %s\n", $e->getMessage()));
+    fwrite(STDERR, sprintf("\n\nException when calling FingerprintApi->getVisits: %s\n", $e->getMessage()));
     exit(1);
 }
 
 // Enable the deprecated ArrayAccess return type warning again if needed
 error_reporting(error_reporting() | E_DEPRECATED);
 
-fwrite(STDOUT, "Checks passed\n");
+fwrite(STDOUT, "\n\nChecks passed\n");
 exit(0);

scripts/functional.sh

@@ -1 +1 @@
-docker container run --env-file .env --rm -v $(pwd):/app/ php:7.2-cli php /app/run_checks.php
+docker container run --env-file .env --rm -v $(pwd):/app/ php:8.1-cli php /app/run_checks.php

scripts/generate.sh

@@ -67,3 +67,6 @@ mv -f src/README.md ./README.md
 mv -f src/composer.json composer.json
 find ./docs -type f ! -name "DecryptionKey.md" ! -name "Sealed.md" -exec rm {} +
 mv -f src/docs/* ./docs
+cp template/docs/FingerprintApi.md docs/Api
+cp template/Model/Response.php.template src/Model/Response.php
+cp template/Model/EventResponse.php.template src/Model/EventResponse.php