Skip to content

Commit

Permalink
bump: PHPQA 1.86.0, now with PHP 8.2 fully supported (#120)
Browse files Browse the repository at this point in the history
  • Loading branch information
dkarlovi authored Mar 25, 2023
1 parent 9b56ef1 commit 66e8f4a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions resources/PHP/common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/functional/PHP/PhpTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 66e8f4a

Please sign in to comment.