diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 7c276c769f5..1ce1a90c1b0 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -24,4 +24,4 @@ on: jobs: coding-standards: - uses: "doctrine/.github/.github/workflows/coding-standards.yml@2.1.0" + uses: "doctrine/.github/.github/workflows/coding-standards.yml@3.0.0" diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml index 2dfa3c02645..c4389142616 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@2.1.0" + uses: "doctrine/.github/.github/workflows/release-on-milestone-closed.yml@3.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 fd5a67aee69..9d76c55bddc 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -1,4 +1,3 @@ - name: "Static Analysis" on: @@ -31,18 +30,14 @@ jobs: strategy: fail-fast: false matrix: - php-version: - - "8.1" dbal-version: - "default" persistence-version: - "default" include: - - php-version: "8.1" - dbal-version: "2.13" + - dbal-version: "2.13" persistence-version: "default" - - php-version: "8.1" - dbal-version: "default" + - dbal-version: "default" persistence-version: "2.5" steps: @@ -53,7 +48,7 @@ jobs: uses: "shivammathur/setup-php@v2" with: coverage: "none" - php-version: "${{ matrix.php-version }}" + php-version: "8.2" - name: "Require specific DBAL version" run: "composer require doctrine/dbal ^${{ matrix.dbal-version }} --no-update" @@ -86,9 +81,6 @@ jobs: strategy: fail-fast: false - matrix: - php-version: - - "8.1" steps: - name: "Checkout code" @@ -98,7 +90,7 @@ jobs: uses: "shivammathur/setup-php@v2" with: coverage: "none" - php-version: "${{ matrix.php-version }}" + php-version: "8.2" - name: "Install dependencies with Composer" uses: "ramsey/composer-install@v2" diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index b76a0247a8c..6d10ccd1a08 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -510,6 +510,11 @@ parameters: count: 1 path: lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php + - + message: "#^Access to an undefined property Doctrine\\\\ORM\\\\Query\\\\AST\\\\Node\\:\\:\\$pathExpression\\.$#" + count: 1 + path: lib/Doctrine/ORM/Query/SqlWalker.php + - message: "#^Call to function is_string\\(\\) with Doctrine\\\\ORM\\\\Query\\\\AST\\\\Node will always evaluate to false\\.$#" count: 1 diff --git a/phpstan-params.neon b/phpstan-params.neon index 784f63e2d2b..60abffb720f 100644 --- a/phpstan-params.neon +++ b/phpstan-params.neon @@ -8,4 +8,4 @@ parameters: earlyTerminatingMethodCalls: Doctrine\ORM\Query\Parser: - syntaxError - phpVersion: 80100 + phpVersion: 80200 diff --git a/psalm.xml b/psalm.xml index 2c417d07e8a..972826a754f 100644 --- a/psalm.xml +++ b/psalm.xml @@ -1,7 +1,7 @@