Add PHP 8.5 support (#499)

- Register PHP 8.5 in Scrutinizer CI
- Refactor Dockerfile to support testing across PHP versions
- Refactor Makefile to support testing across PHP versions

Author: ycchuang99

.scrutinizer.yml

@@ -33,18 +33,22 @@ build:
       - vendor/bin/phpunit
 
   nodes:
+    php85:
+      environment:
+        php: 8.5.0
+
     php84:
       environment:
         php: 8.4.13
 
     php83:
       environment:
-        php: 8.3.12
+        php: 8.3.28
 
     php82:
       environment:
-        php: 8.2.24
+        php: 8.2.29
 
     php81:
       environment:
-        php: 8.1.13
+        php: 8.1.31

CONTRIBUTING.md

@@ -38,7 +38,22 @@ You should also remember that the request options object is an object used by us
 An example pull request to learn from: https://github.com/amabnl/amadeus-ws-client/pull/74
 
 ## Testing your changes
-If you have docker installed, simply run `make test`, that will 
-- build a basic docker image (`make build-docker-image-once`)
-- install all dependencies (`make composer-install`)
-- and finally run the tests (`make phpunit`)
+
+The project provides a Docker-based test environment to ensure consistency across different PHP versions.
+
+To run the full test suite using the default PHP version (8.5):
+
+```bash
+make test
+```
+
+To run tests against a specific PHP version (e.g., 8.4):
+
+```bash
+php_version=8.4 make test
+```
+
+Running `make test` will automatically:
+1. Build the Docker image if it doesn't exist (`make build-docker-image-once`).
+2. Install dependencies via Composer inside the container (`make composer-install`).
+3. Execute the PHPUnit test suite (`make phpunit`).

Dockerfile

@@ -1,22 +1,11 @@
-FROM php:8.3-apache
+ARG PHP_VERSION=8.5
 
-# Requirements
-RUN apt-get update \
-    && apt-get install -y libxslt1-dev libzip-dev unzip git curl
+FROM php:${PHP_VERSION}-cli-alpine
 
-# PHP extensions
-RUN docker-php-ext-install soap
-RUN docker-php-ext-install xsl
+RUN apk update && apk add --no-cache \
+    libxml2-dev \
+    libxslt-dev
 
-# Add the application
-ADD . /var/www
-WORKDIR /var/www
+RUN docker-php-ext-install soap xsl
 
-RUN git config --system --add safe.directory /var/www
-
-# Install composer
-RUN curl -sS https://getcomposer.org/installer | php \
-    && mv composer.phar /usr/bin/composer
-
-# Install dependencies
-RUN composer i
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer

Makefile

@@ -1,15 +1,16 @@
-image_name = amadeus-ws-client:build
+php_version ?= 8.5
+image_name = amadeus-ws-client:${php_version}
 
 SHELL = /bin/sh
 
 build-docker-image:
-	docker build -t $(image_name) -f Dockerfile .
+	docker build -t $(image_name) -f Dockerfile --build-arg PHP_VERSION=$(php_version) .
 
 build-docker-image-once:
 	make verify-docker-image-exists || make build-docker-image
 
 build-docker-image-no-cache:
-	docker build --no-cache -t $(image_name) -f Dockerfile .
+	docker build --no-cache -t $(image_name) -f Dockerfile --build-arg PHP_VERSION=$(php_version) .
 
 verify-docker-image-exists:
 	docker image inspect $(image_name) >/dev/null 2>&1

src/Amadeus/Client/ResponseHandler/StandardResponseHandler.php

@@ -299,10 +299,10 @@ protected function makeStatusFromErrorQualifier($qualifier, $defaultStatus = Res
             'ZZZ' => Result::STATUS_UNKNOWN
         ];
 
-        if (array_key_exists($qualifier, $statusQualMapping)) {
-            $status = $statusQualMapping[$qualifier];
-        } elseif (is_null($qualifier)) {
+        if (is_null($qualifier)) {
             $status = $defaultStatus;
+        } elseif (array_key_exists($qualifier, $statusQualMapping)) {
+            $status = $statusQualMapping[$qualifier];
         } else {
             $status = Result::STATUS_UNKNOWN;
         }

src/Amadeus/Client/Session/Handler/Base.php

@@ -362,7 +362,7 @@ protected function getWsdlIdFor($messageName)
     {
         $msgAndVer = $this->getMessagesAndVersions();
 
-        if (isset($msgAndVer[$messageName]) && isset($msgAndVer[$messageName]['wsdl'])) {
+        if (!empty($messageName) && isset($msgAndVer[$messageName]) && isset($msgAndVer[$messageName]['wsdl'])) {
             return $msgAndVer[$messageName]['wsdl'];
         }
 
@@ -401,7 +401,6 @@ protected function getSoapClient($msgName)
      */
     protected function initSoapClient($wsdlId)
     {
-//        d($wsdlId);
         $wsdlPath = WsdlAnalyser::$wsdlIds[$wsdlId];
 
         $client = new Client\SoapClient(

src/Amadeus/Client/SoapClient.php

@@ -67,12 +67,13 @@ public function __construct($wsdl, $options, ?Log\LoggerInterface $logger = null
      * @param string $action The SOAP action.
      * @param int $version The SOAP version.
      * @param int|null $oneWay
+     * @param string|null $uriParserClass
      * @uses parent::__doRequest
      * @return string The XML SOAP response.
      * @throws Exception When PHP XSL extension is not enabled or WSDL file isn't readable.
      */
     #[\ReturnTypeWillChange]
-    public function __doRequest($request, $location, $action, $version, $oneWay = null)
+    public function __doRequest($request, $location, $action, $version, $oneWay = null, $uriParserClass = null)
     {
         if (!extension_loaded('xsl')) {
             throw new Exception('PHP XSL extension is not enabled.');

tests/Amadeus/BaseTestCase.php

@@ -41,7 +41,6 @@ class BaseTestCase extends TestCase
     protected static function getMethod($helper, $name)
     {
         $method = new \ReflectionMethod($helper, $name);
-        $method->setAccessible(true);
         return $method;
     }
 
@@ -55,7 +54,6 @@ protected static function getMethod($helper, $name)
     protected static function getProperty($helper, $name)
     {
         $property = new \ReflectionProperty($helper, $name);
-        $property->setAccessible(true);
         return $property;
     }
 

tests/Amadeus/Client/Struct/Pnr/AddMultiElements/TravellerInfoTest.php

@@ -38,7 +38,6 @@ public function testDateOfBirthFormat()
         $travellerInfoClass = new \ReflectionClass('\Amadeus\Client\Struct\Pnr\AddMultiElements\TravellerInfo');
 
         $method = $travellerInfoClass->getMethod('formatDateOfBirth');
-        $method->setAccessible(true);
 
         $travellerInfo = new TravellerInfo();