Commit 310ab0f

committed

Merge remote-tracking branch 'origin/1.3.x' into 1.4.x

2 parents eb6e8eb + 85def57 commit 310ab0fCopy full SHA for 310ab0f

File tree

+64

-1

lines changed

+64

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class ArgumentsProcessor`
`15`	`15`
`16`	`16`	`/**`
`17`	`17`	`* @param Arg[] $methodCallArgs`
`18`		`- * @return mixed[]`
	`18`	`+ * @return list<mixed>`
`19`	`19`	`* @throws DynamicQueryBuilderArgumentException`
`20`	`20`	`*/`
`21`	`21`	`public function processArgs(`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`use PHPStan\Type\Type;`
`25`	`25`	`use PHPStan\Type\TypeCombinator;`
`26`	`26`	`use Throwable;`
	`27`	`+use function array_slice;`
`27`	`28`	`use function count;`
`28`	`29`	`use function in_array;`
`29`	`30`	`use function method_exists;`
`@@ -152,6 +153,18 @@ public function getTypeFromMethodCall(`
`152`	`153`	`continue;`
`153`	`154`	`}`
`154`	`155`
	`156`	`+ if ($lowerMethodName === 'set') {`
	`157`	`+ try {`
	`158`	`+ $args = $this->argumentsProcessor->processArgs($scope, $methodName, array_slice($calledMethodCall->getArgs(), 0, 1));`
	`159`	`+ } catch (DynamicQueryBuilderArgumentException $e) {`
	`160`	`+ return $defaultReturnType;`
	`161`	`+ }`
	`162`	`+ if (count($args) === 1) {`
	`163`	`+ $queryBuilder->set($args[0], $args[0]);`
	`164`	`+ continue;`
	`165`	`+ }`
	`166`	`+ }`
	`167`	`+`
`155`	`168`	`if (!method_exists($queryBuilder, $methodName)) {`
`156`	`169`	`continue;`
`157`	`170`	`}`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,16 @@ public function testAndOrVariants(): void`
`129`	`129`	`$this->analyse([__DIR__ . '/data/query-builder-dql-and-or-variants.php'], []);`
`130`	`130`	`}`
`131`	`131`
	`132`	`+ public function testUpdateIssue(): void`
	`133`	`+ {`
	`134`	`+ $this->analyse([__DIR__ . '/data/query-builder-dql-update.php'], [`
	`135`	`+ [`
	`136`	`+ 'Could not analyse QueryBuilder with dynamic arguments.',`
	`137`	`+ 31,`
	`138`	`+ ],`
	`139`	`+ ]);`
	`140`	`+ }`
	`141`	`+`
`132`	`142`	`public function testBranchingPerformance(): void`
`133`	`143`	`{`
`134`	`144`	`$this->analyse([__DIR__ . '/data/query-builder-branches-performance.php'], [`

Lines changed: 40 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,40 @@`
	`1`	`+<?php declare(strict_types = 1);`
	`2`	`+`
	`3`	`+namespace PHPStan\Rules\Doctrine\ORM;`
	`4`	`+`
	`5`	`+use Doctrine\ORM\EntityManager;`
	`6`	`+`
	`7`	`+class TestUpdateQueryBuilder`
	`8`	`+{`
	`9`	`+`
	`10`	`+ /** @var EntityManager */`
	`11`	`+ private $entityManager;`
	`12`	`+`
	`13`	`+ public function __construct(EntityManager $entityManager)`
	`14`	`+ {`
	`15`	`+ $this->entityManager = $entityManager;`
	`16`	`+ }`
	`17`	`+`
	`18`	`+ public function nonDynamicSet(int $int, string $title): void`
	`19`	`+ {`
	`20`	`+ $this->entityManager->createQueryBuilder()`
	`21`	`+ ->update(MyEntity::class, 'e')`
	`22`	`+ ->set('e.title', $title)`
	`23`	`+ ->andWhere('e.id = :int')`
	`24`	`+ ->setParameter('int', $int)`
	`25`	`+ ->getQuery()`
	`26`	`+ ->execute();`
	`27`	`+ }`
	`28`	`+`
	`29`	`+ public function dynamicSet(int $int, string $field, string $title): void`
	`30`	`+ {`
	`31`	`+ $this->entityManager->createQueryBuilder()`
	`32`	`+ ->update(MyEntity::class, 'e')`
	`33`	`+ ->set('e.' . $field, $title)`
	`34`	`+ ->andWhere('e.id = :int')`
	`35`	`+ ->setParameter('int', $int)`
	`36`	`+ ->getQuery()`
	`37`	`+ ->execute();`
	`38`	`+ }`
	`39`	`+`
	`40`	`+}`

Comments

(0)