diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4fd26f7f854..2abe509c757 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -172,6 +172,7 @@ jobs: if: matrix.coverage uses: codecov/codecov-action@v3 with: + directory: build/logs/phpunit name: phpunit-php${{ matrix.php }} flags: phpunit fail_ci_if_error: true @@ -257,6 +258,7 @@ jobs: if: matrix.coverage uses: codecov/codecov-action@v3 with: + directory: build/logs/behat name: behat-php${{ matrix.php }} flags: behat fail_ci_if_error: true @@ -469,6 +471,7 @@ jobs: - name: Upload coverage results to Codecov uses: codecov/codecov-action@v3 with: + directory: build/logs/behat name: behat-php${{ matrix.php }} flags: behat fail_ci_if_error: true diff --git a/composer.json b/composer.json index c674192ed26..621ef2022e2 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,6 @@ "require-dev": { "behat/behat": "^3.1", "behat/mink": "^1.9@dev", - "soyuka/contexts": "dev-main", "doctrine/cache": "^1.11 || ^2.1", "doctrine/common": "^2.11 || ^3.0", "doctrine/data-fixtures": "^1.2.2", @@ -56,7 +55,7 @@ "psr/log": "^1.0 || ^2.0 || ^3.0", "ramsey/uuid": "^3.7 || ^4.0", "ramsey/uuid-doctrine": "^1.4", - "rector/rector": "^0.13.9", + "soyuka/contexts": "^3.3.6", "soyuka/stubs-mongodb": "^1.0", "symfony/asset": "^6.1", "symfony/browser-kit": "^6.1", diff --git a/src/Doctrine/Orm/Util/QueryBuilderHelper.php b/src/Doctrine/Orm/Util/QueryBuilderHelper.php index 24555ee2754..38f33864336 100644 --- a/src/Doctrine/Orm/Util/QueryBuilderHelper.php +++ b/src/Doctrine/Orm/Util/QueryBuilderHelper.php @@ -43,9 +43,9 @@ public static function addJoinOnce(QueryBuilder $queryBuilder, QueryNameGenerato $query = "$alias.$association"; if (Join::LEFT_JOIN === $joinType || QueryChecker::hasLeftJoin($queryBuilder)) { - $queryBuilder->leftJoin($query, $associationAlias, $conditionType, $condition); // @phpstan-ignore-line + $queryBuilder->leftJoin($query, $associationAlias, $conditionType, $condition); } else { - $queryBuilder->innerJoin($query, $associationAlias, $conditionType, $condition); // @phpstan-ignore-line + $queryBuilder->innerJoin($query, $associationAlias, $conditionType, $condition); } return $associationAlias; diff --git a/tests/Doctrine/Orm/Extension/EagerLoadingExtensionTest.php b/tests/Doctrine/Orm/Extension/EagerLoadingExtensionTest.php index 387116ed35a..c9b1da162cd 100644 --- a/tests/Doctrine/Orm/Extension/EagerLoadingExtensionTest.php +++ b/tests/Doctrine/Orm/Extension/EagerLoadingExtensionTest.php @@ -830,7 +830,7 @@ public function testApplyToCollectionWithExistingJoin(string $joinType): void $queryBuilderProphecy->getEntityManager()->willReturn($emProphecy); $queryBuilderProphecy->getDQLPart('join')->willReturn([ 'o' => [ - new Join($joinType, 'o.relatedDummy', 'existing_join_alias'), // @phpstan-ignore-line + new Join($joinType, 'o.relatedDummy', 'existing_join_alias'), ], ]); $queryBuilderProphecy->getDQLPart('select')->willReturn([]);