Add PHP 8.1 compatibility

steevanb · steevanb · commit a3d5e0091d39 · 2021-12-15T21:07:45.000+01:00
diff --git a/bin/ci/env b/bin/ci/env
@@ -8,4 +8,4 @@ source "${ROOT_DIR}"/bin/common.inc.bash
 BIN_DIR=bin/ci
 source "${ROOT_DIR}"/bin/dockerise.inc.bash
 
-php8.0 "${ROOT_DIR}"/"${BIN_DIR}"/env.php "${@}"
+php8.1 "${ROOT_DIR}"/"${BIN_DIR}"/env.php "${@}"
diff --git a/bin/ci/phpstan b/bin/ci/phpstan
@@ -27,7 +27,7 @@ if [ "${clearCache}" == true ] && [ -d "${ROOT_DIR}"/var/ci/phpstan ]; then
 fi
 
 if [ "${phpVersion}" == "" ]; then
-    php8.0 "${ROOT_DIR}"/bin/ci/phpstan.php ${phpstanParameters}
+    php8.1 "${ROOT_DIR}"/bin/ci/phpstan.php ${phpstanParameters}
 else
     echo "PHP ${phpVersion}"
 
diff --git a/bin/ci/phpstan.php b/bin/ci/phpstan.php
@@ -15,7 +15,7 @@
 
 function createPhpstanProcesses(string $phpVersion = null): ProcessArray
 {
-    $phpVersions = new StringCollection(is_string($phpVersion) ? [$phpVersion] : ['7.4', '8.0']);
+    $phpVersions = new StringCollection(is_string($phpVersion) ? [$phpVersion] : ['7.4', '8.0', '8.1']);
 
     $return = new ProcessArray();
     foreach ($phpVersions as $loopPhpVersion) {
diff --git a/bin/ci/phpunit b/bin/ci/phpunit
@@ -19,7 +19,7 @@ for arg in "${@}"; do
 done
 
 if [ "${phpVersion}" == "" ]; then
-    php8.0 "${ROOT_DIR}"/bin/ci/phpunit.php "${@}"
+    php8.1 "${ROOT_DIR}"/bin/ci/phpunit.php "${@}"
 else
     echo "PHP ${phpVersion}"
 
diff --git a/bin/ci/phpunit-coverage b/bin/ci/phpunit-coverage
@@ -8,12 +8,12 @@ source "${ROOT_DIR}"/bin/common.inc.bash
 BIN_DIR=bin/ci
 source "${ROOT_DIR}"/bin/dockerise.inc.bash
 
-echo "PHP 8.0"
+echo "PHP 8.1"
 XDEBUG_MODE=coverage \
-    php8.0 \
+    php8.1 \
         "${ROOT_DIR}"/vendor/bin/phpunit \
             --coverage-html "${ROOT_DIR}"/var/ci/phpunit/coverage/html \
-            --configuration "${ROOT_DIR}"/config/ci/phpunit.php-8.0.xml \
+            --configuration "${ROOT_DIR}"/config/ci/phpunit.php-8.1.xml \
             "${@}"
 
 printf "Open \e[33mvar/ci/phpunit/coverage/html/index.html\e[0m in your browser to see code coverage results.\n"
diff --git a/bin/ci/phpunit.php b/bin/ci/phpunit.php
@@ -15,7 +15,7 @@
 
 function createPhpunitProcesses(string $phpVersion = null): ProcessArray
 {
-    $phpVersions = new StringCollection(is_string($phpVersion) ? [$phpVersion] : ['7.4', '8.0']);
+    $phpVersions = new StringCollection(is_string($phpVersion) ? [$phpVersion] : ['7.4', '8.0', '8.1']);
 
     $return = new ProcessArray();
     foreach ($phpVersions as $loopPhpVersion) {
diff --git a/bin/ci/validate b/bin/ci/validate
@@ -8,4 +8,4 @@ source "${ROOT_DIR}"/bin/common.inc.bash
 BIN_DIR=bin/ci
 source "${ROOT_DIR}"/bin/dockerise.inc.bash
 
-php8.0 "${ROOT_DIR}"/bin/ci/validate.php "${@}"
+php8.1 "${ROOT_DIR}"/bin/ci/validate.php "${@}"
diff --git a/bin/dev/env b/bin/dev/env
@@ -8,4 +8,4 @@ source "${ROOT_DIR}"/bin/common.inc.bash
 BIN_DIR=bin/dev
 source "${ROOT_DIR}"/bin/dockerise.inc.bash
 
-php8.0 "${ROOT_DIR}"/"${BIN_DIR}"/env.php "${@}"
+php8.1 "${ROOT_DIR}"/"${BIN_DIR}"/env.php "${@}"
diff --git a/bin/prod/env b/bin/prod/env
@@ -8,4 +8,4 @@ source "${ROOT_DIR}"/bin/common.inc.bash
 BIN_DIR=bin/prod
 source "${ROOT_DIR}"/bin/dockerise.inc.bash
 
-php8.0 "${ROOT_DIR}/${BIN_DIR}/env.php" "${@}"
+php8.1 "${ROOT_DIR}/${BIN_DIR}/env.php" "${@}"
diff --git a/config/ci/phpstan.php-8.1.neon b/config/ci/phpstan.php-8.1.neon
@@ -0,0 +1,4 @@
+includes:
+    - phpstan.neon
+parameters:
+    tmpDir: ../../var/ci/phpstan/php-8-1
diff --git a/config/ci/phpunit.php-8.1.xml b/config/ci/phpunit.php-8.1.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    cacheResultFile="../../var/ci/phpunit/php-8.1/.phpunit.result.cache"
+    colors="true"
+    forceCoversAnnotation="true"
+    failOnRisky="true"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+>
+    <testsuites>
+        <testsuite name="default">
+            <directory>../../tests</directory>
+        </testsuite>
+    </testsuites>
+    <coverage>
+        <include>
+            <directory>../../src</directory>
+        </include>
+    </coverage>
+</phpunit>
diff --git a/config/ci/phpunit.xml b/config/ci/phpunit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    cacheResultFile="../../var/ci/phpunit/php-8.0/.phpunit.result.cache"
+    cacheResultFile="../../var/ci/phpunit/php-8.1/.phpunit.result.cache"
     colors="true"
     forceCoversAnnotation="true"
     failOnRisky="true"
diff --git a/docker/ci/Dockerfile b/docker/ci/Dockerfile
@@ -22,10 +22,13 @@ RUN \
         php8.0-cli \
         php8.0-simplexml \
         php8.0-mbstring \
+        php8.1-cli \
+        php8.1-simplexml \
+        php8.1-mbstring \
         # For coverage
-        php8.0-xdebug \
+        php8.1-xdebug \
         # For Composer
-        curl zip php8.0-curl php8.0-zip \
+        curl zip php8.1-curl php8.1-zip \
 
     # Configure Composer
     && mkdir /composer \
diff --git a/docker/release/Dockerfile b/docker/release/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.0.12-cli-alpine3.14
+FROM php:8.1.0-cli-alpine3.15
 
 COPY --from=composer:2.1.12 /usr/bin/composer /usr/local/bin/composer
 
@@ -15,7 +15,7 @@ RUN \
 
     # Install xdebug
     && apk add --no-cache --virtual .build-deps $PHPIZE_DEPS \
-    && pecl install xdebug-3.0.4 \
+    && pecl install xdebug-3.1.2 \
     && docker-php-ext-enable xdebug \
     && apk del .build-deps \
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`
`16`	`16`	`function createPhpstanProcesses(string $phpVersion = null): ProcessArray`
`17`	`17`	`{`
`18`		`- $phpVersions = new StringCollection(is_string($phpVersion) ? [$phpVersion] : ['7.4', '8.0']);`
	`18`	`+ $phpVersions = new StringCollection(is_string($phpVersion) ? [$phpVersion] : ['7.4', '8.0', '8.1']);`
`19`	`19`
`20`	`20`	`$return = new ProcessArray();`
`21`	`21`	`foreach ($phpVersions as $loopPhpVersion) {`