diff --git a/.github/workflows/coding-standard.yml b/.github/workflows/coding-standard.yml index 20e55b12fcc..d861ff8cf5d 100644 --- a/.github/workflows/coding-standard.yml +++ b/.github/workflows/coding-standard.yml @@ -10,6 +10,4 @@ on: jobs: coding-standards: - uses: "doctrine/.github/.github/workflows/coding-standards.yml@1.4.1" - with: - php-version: "8.1" + uses: "doctrine/.github/.github/workflows/coding-standards.yml@2.0.0" diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 003a2ff9d94..b44eb524962 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -14,7 +14,7 @@ env: jobs: phpunit-smoke-check: name: "PHPUnit with SQLite" - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-22.04" strategy: matrix: @@ -76,7 +76,7 @@ jobs: phpunit-postgres: name: "PHPUnit with PostgreSQL" - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-22.04" needs: "phpunit-smoke-check" strategy: @@ -142,7 +142,7 @@ jobs: phpunit-mariadb: name: "PHPUnit with MariaDB" - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-22.04" needs: "phpunit-smoke-check" strategy: @@ -218,7 +218,7 @@ jobs: phpunit-mysql: name: "PHPUnit with MySQL" - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-22.04" needs: "phpunit-smoke-check" strategy: @@ -301,7 +301,7 @@ jobs: phpunit-lower-php-versions: name: "PHPUnit with SQLite" - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-22.04" strategy: matrix: @@ -334,7 +334,7 @@ jobs: upload_coverage: name: "Upload coverage to Codecov" - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-22.04" needs: - "phpunit-smoke-check" - "phpunit-postgres" diff --git a/.github/workflows/phpbench.yml b/.github/workflows/phpbench.yml index 2c4872a8b53..4924834a396 100644 --- a/.github/workflows/phpbench.yml +++ b/.github/workflows/phpbench.yml @@ -15,7 +15,7 @@ env: jobs: phpbench: name: "PHPBench" - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-22.04" strategy: matrix: diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml index b8645ec65cd..0e473ab4780 100644 --- a/.github/workflows/release-on-milestone-closed.yml +++ b/.github/workflows/release-on-milestone-closed.yml @@ -7,7 +7,7 @@ on: jobs: release: - uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@1.4.1" + uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@2.0.0" secrets: GIT_AUTHOR_EMAIL: ${{ secrets.GIT_AUTHOR_EMAIL }} GIT_AUTHOR_NAME: ${{ secrets.GIT_AUTHOR_NAME }} diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index d2ac0fb6d66..830c9635858 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -12,7 +12,7 @@ on: jobs: static-analysis-phpstan: name: "Static Analysis with PHPStan" - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-22.04" strategy: fail-fast: false @@ -68,7 +68,7 @@ jobs: static-analysis-psalm: name: "Static Analysis with Psalm" - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-22.04" strategy: fail-fast: false diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php index 03af35672a0..734b0fc5260 100644 --- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php +++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php @@ -901,7 +901,7 @@ protected function setUpDBALTypes(): void final protected function isQueryLogAvailable(): bool { - return $this->_em->getConnection() instanceof DbalExtensions\Connection; + return $this->_em && $this->_em->getConnection() instanceof DbalExtensions\Connection; } final protected function getQueryLog(): QueryLog