From 075622f0c02e4c7be8622503a459dbdc733f57d8 Mon Sep 17 00:00:00 2001 From: soyuka Date: Tue, 10 Jan 2023 15:47:00 +0100 Subject: [PATCH 1/3] chore: remove phpstan false positive --- src/Doctrine/Orm/Util/QueryBuilderHelper.php | 4 ++-- tests/Doctrine/Orm/Extension/EagerLoadingExtensionTest.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Doctrine/Orm/Util/QueryBuilderHelper.php b/src/Doctrine/Orm/Util/QueryBuilderHelper.php index 2d6790da33c..48845002dcb 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 966c0421556..25bf5e1f44f 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([]); From ac544e01f5440994a1d536b63776cc109e3eb979 Mon Sep 17 00:00:00 2001 From: soyuka Date: Tue, 10 Jan 2023 15:51:49 +0100 Subject: [PATCH 2/3] moar --- src/Test/DoctrineMongoDbOdmSetup.php | 2 +- src/Test/DoctrineMongoDbOdmTestCase.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Test/DoctrineMongoDbOdmSetup.php b/src/Test/DoctrineMongoDbOdmSetup.php index db1052522fb..9ae63e70fe1 100644 --- a/src/Test/DoctrineMongoDbOdmSetup.php +++ b/src/Test/DoctrineMongoDbOdmSetup.php @@ -39,7 +39,7 @@ class DoctrineMongoDbOdmSetup public static function createAnnotationMetadataConfiguration(array $paths, bool $isDevMode = false, string $proxyDir = null, string $hydratorDir = null, Cache $cache = null): Configuration { $config = self::createConfiguration($isDevMode, $proxyDir, $hydratorDir, $cache); - $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver($paths)); // @phpstan-ignore-line + $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver($paths)); return $config; } diff --git a/src/Test/DoctrineMongoDbOdmTestCase.php b/src/Test/DoctrineMongoDbOdmTestCase.php index 45c3b8f78fb..cf5de7121a7 100644 --- a/src/Test/DoctrineMongoDbOdmTestCase.php +++ b/src/Test/DoctrineMongoDbOdmTestCase.php @@ -40,7 +40,7 @@ public static function createTestDocumentManager($paths = []) $config->setHydratorDir(sys_get_temp_dir()); $config->setProxyNamespace('SymfonyTests\Doctrine'); $config->setHydratorNamespace('SymfonyTests\Doctrine'); - $config->setMetadataDriverImpl(new AnnotationDriver(new AnnotationReader(), $paths)); // @phpstan-ignore-line + $config->setMetadataDriverImpl(new AnnotationDriver(new AnnotationReader(), $paths)); if (method_exists($config, 'setMetadataCache')) { $config->setMetadataCache(new ArrayAdapter()); } else { From 7bb2f512e77a48e14a22408fe08508e31574b849 Mon Sep 17 00:00:00 2001 From: soyuka Date: Tue, 10 Jan 2023 17:15:34 +0100 Subject: [PATCH 3/3] foo --- src/Test/DoctrineMongoDbOdmSetup.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Test/DoctrineMongoDbOdmSetup.php b/src/Test/DoctrineMongoDbOdmSetup.php index 9ae63e70fe1..ed23666aef4 100644 --- a/src/Test/DoctrineMongoDbOdmSetup.php +++ b/src/Test/DoctrineMongoDbOdmSetup.php @@ -39,7 +39,7 @@ class DoctrineMongoDbOdmSetup public static function createAnnotationMetadataConfiguration(array $paths, bool $isDevMode = false, string $proxyDir = null, string $hydratorDir = null, Cache $cache = null): Configuration { $config = self::createConfiguration($isDevMode, $proxyDir, $hydratorDir, $cache); - $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver($paths)); + $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver($paths)); return $config; }