diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index 181385f..25f7b40 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -8,8 +8,8 @@ on: jobs: tests: env: - TNT_IMAGE: tarantool/tarantool:2.10 - PHP_IMAGE: php:8.1-cli + TNT_IMAGE: tarantool/tarantool:2.11 + PHP_IMAGE: php:8.2-cli strategy: matrix: operating-system: [ubuntu-latest] @@ -23,6 +23,7 @@ jobs: COVERAGE_FILE: coverage.clover - PHP_IMAGE: php:8.0-cli + - PHP_IMAGE: php:8.1-cli - TNT_IMAGE: tarantool/tarantool:1.7 - TNT_IMAGE: tarantool/tarantool:1.9 @@ -34,11 +35,12 @@ jobs: - TNT_IMAGE: tarantool/tarantool:2.6 - TNT_IMAGE: tarantool/tarantool:2.7 - TNT_IMAGE: tarantool/tarantool:2.8 + - TNT_IMAGE: tarantool/tarantool:2.10 runs-on: ${{ matrix.operating-system }} steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Build docker image env: ${{ matrix.env }} diff --git a/LICENSE b/LICENSE index 53a395b..752003b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015-2022 Eugene Leonovich +Copyright (c) 2015-2023 Eugene Leonovich Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/dockerfile.sh b/dockerfile.sh index 9625b90..0f8601e 100755 --- a/dockerfile.sh +++ b/dockerfile.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash if [[ -z "$PHP_IMAGE" ]] ; then - PHP_IMAGE='php:8.1-cli' + PHP_IMAGE='php:8.2-cli' fi if [[ -z "$TNT_LISTEN_URI" ]]; then diff --git a/tests/PhpUnitCompat.php b/tests/PhpUnitCompat.php index decf2e0..1f2950d 100644 --- a/tests/PhpUnitCompat.php +++ b/tests/PhpUnitCompat.php @@ -20,12 +20,8 @@ trait PhpUnitCompat { public function expectExceptionMessageMatches(string $regularExpression) : void { - if (\is_callable('parent::expectExceptionMessageMatches')) { - parent::expectExceptionMessageMatches($regularExpression); - - return; - } - - parent::expectExceptionMessageRegExp($regularExpression); + \is_callable(parent::class.'::expectExceptionMessageMatches') + ? parent::expectExceptionMessageMatches(...func_get_args()) + : parent::expectExceptionMessageRegExp(...func_get_args()); } }