Merge pull request #155 from ovh/php8.4

Php8.4
ovh · Jan 2, 2025 · 062420d · 062420d
2 parents 3bebadd + 1aa0a1e
commit 062420d
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 32 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: [ '7.4', '8.0', '8.1', '8.2' ]
+        php-version: [ '8.1', '8.2', '8.3', '8.4' ]
     steps:
       - uses: "actions/checkout@v2"
       - uses: "shivammathur/setup-php@v2"
@@ -81,7 +81,7 @@ jobs:
       max-parallel: 1
       fail-fast: false
       matrix:
-        php-version: [ '7.4', '8.0', '8.1', '8.2' ]
+        php-version: [ '8.1', '8.2', '8.3', '8.4' ]
     steps:
       - uses: "actions/checkout@v2"
       - uses: "shivammathur/setup-php@v2"
@@ -94,4 +94,4 @@ jobs:
         run: "mkdir -p build/logs"
       - uses: "ramsey/composer-install@v2"
       - name: "Run unit tests"
-        run: "composer phpunit"
+        run: "composer phpunit -- --no-coverage"
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
     "require-dev": {
         "php-parallel-lint/php-parallel-lint": "^1.3.1",
         "phpdocumentor/shim": "^3",
-        "phpunit/phpunit": "^9.6",
+        "phpunit/phpunit": "^10.5",
         "squizlabs/php_codesniffer": "^3.6"
     },
     "autoload": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,31 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
     bootstrap="./vendor/autoload.php"
     colors="true"
-    convertErrorsToExceptions="true"
-    convertWarningsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertDeprecationsToExceptions="true"
->
-    <testsuites>
-        <testsuite name="all">
-            <directory>./tests</directory>
-        </testsuite>
-    </testsuites>
-
-    <coverage>
-        <include>
-            <directory suffix=".php">src/</directory>
-        </include>
-
-        <report>
-            <clover outputFile="build/logs/clover.xml" />
-            <html outputDirectory="build/coverage" />
-            <text outputFile="php://stdout" />
-        </report>
-    </coverage>
-
-    <logging>
-        <junit outputFile="build/report.junit.xml"/>
-    </logging>
-</phpunit>
+    cacheDirectory=".phpunit.cache"
+    failOnEmptyTestSuite="true"
+    failOnWarning="true"
+    failOnRisky="true"
+    failOnDeprecation="true"
+    failOnPhpunitDeprecation="true"
+    failOnNotice="true"
+    failOnIncomplete="true"
+    >
+  <testsuites>
+    <testsuite name="all">
+      <directory>./tests</directory>
+    </testsuite>
+  </testsuites>
+  <coverage>
+    <report>
+      <clover outputFile="build/logs/clover.xml"/>
+      <html outputDirectory="build/coverage"/>
+      <text outputFile="php://stdout"/>
+    </report>
+  </coverage>
+  <logging>
+    <junit outputFile="build/report.junit.xml"/>
+  </logging>
+  <source>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </source>
+</phpunit>
diff --git a/src/Api.php b/src/Api.php
@@ -142,7 +142,7 @@ public function __construct(
         $application_secret,
         $api_endpoint,
         $consumer_key = null,
-        Client $http_client = null
+        ?Client $http_client = null
     ) {
         if (!isset($api_endpoint)) {
             throw new Exceptions\InvalidParameterException("Endpoint parameter is empty");