From 66e8f4a3a2a56599b623ef9c39109fb79a088e18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dalibor=20Karlovi=C4=87?= <dalibor.karlovic@sigwin.hr>
Date: Sat, 25 Mar 2023 10:17:02 +0100
Subject: [PATCH] bump: PHPQA 1.86.0, now with PHP 8.2 fully supported (#120)

---
 .github/workflows/build.yaml      | 5 +++++
 resources/PHP/common.mk           | 4 ++--
 tests/functional/PHP/PhpTrait.php | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index fa86bd4..a024aab 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -7,6 +7,11 @@ on:
 jobs:
     CodeQualityAnalysis:
         runs-on: ubuntu-latest
+        env:
+            PHP_VERSION: ${{ matrix.php }}
+        strategy:
+            matrix:
+                php: [ "8.1", "8.2" ]
         steps:
             -
                 name: Repo checkout
diff --git a/resources/PHP/common.mk b/resources/PHP/common.mk
index 4ff1c3a..a653efd 100644
--- a/resources/PHP/common.mk
+++ b/resources/PHP/common.mk
@@ -4,11 +4,11 @@ endif
 include ${SIGWIN_INFRA_ROOT:%/=%}/Common/default.mk
 
 ifndef PHP_VERSION
-PHP_VERSION=8.1
+PHP_VERSION=8.2
 endif
 
 ifndef PHPQA_DOCKER_IMAGE
-PHPQA_DOCKER_IMAGE=jakzal/phpqa:1.85.2-php${PHP_VERSION}-alpine
+PHPQA_DOCKER_IMAGE=jakzal/phpqa:1.86.0-php${PHP_VERSION}-alpine
 endif
 
 ifndef PHPQA_DOCKER_COMMAND
diff --git a/tests/functional/PHP/PhpTrait.php b/tests/functional/PHP/PhpTrait.php
index bbf078c..e0f4643 100644
--- a/tests/functional/PHP/PhpTrait.php
+++ b/tests/functional/PHP/PhpTrait.php
@@ -129,10 +129,10 @@ private function paths(): array
 
     private function generatePhpqaExecutionPath(string $command, ?float $phpVersion = null): string
     {
-        $phpVersion ??= 8.1;
+        $phpVersion ??= 8.2;
 
         return $this->normalize(sprintf(
-            'docker run --init --interactive  --rm --env "COMPOSER_CACHE_DIR=/composer/cache" %2$s --volume "$ROOT/var/phpqa:/cache" --volume "$ROOT:/project" --volume "$HOME/.composer:/composer" --workdir /project jakzal/phpqa:1.85.2-php%3$s-alpine %1$s',
+            'docker run --init --interactive  --rm --env "COMPOSER_CACHE_DIR=/composer/cache" %2$s --volume "$ROOT/var/phpqa:/cache" --volume "$ROOT:/project" --volume "$HOME/.composer:/composer" --workdir /project jakzal/phpqa:1.86.0-php%3$s-alpine %1$s',
             sprintf($command, $phpVersion),
             $this->generateDockerComposeExecutionUser(),
             $phpVersion