Commit eb6e8eb

committed

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

2 parents ffb83c1 + 68fc764 commit eb6e8ebCopy full SHA for eb6e8eb

File tree

+53

-1

lines changed

+53

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`use PHPStan\Type\DynamicMethodReturnTypeExtension;`
`12`	`12`	`use PHPStan\Type\Type;`
`13`	`13`	`use function get_class;`
	`14`	`+use function in_array;`
`14`	`15`	`use function is_object;`
`15`	`16`	`use function method_exists;`
`16`	`17`
`@@ -34,7 +35,7 @@ public function getClass(): string`
`34`	`35`
`35`	`36`	`public function isMethodSupported(MethodReflection $methodReflection): bool`
`36`	`37`	`{`
`37`		`- return true;`
	`38`	`+ return in_array($methodReflection->getName(), ['add', 'addMultiple'], true);`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type`

Lines changed: 35 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,35 @@`
	`1`	`+<?php declare(strict_types = 1);`
	`2`	`+`
	`3`	`+namespace PHPStan\Type\Doctrine\QueryBuilder\Expr;`
	`4`	`+`
	`5`	`+use PHPStan\Testing\TypeInferenceTestCase;`
	`6`	`+`
	`7`	`+class BaseExpressionDynamicReturnTypeExtensionTest extends TypeInferenceTestCase`
	`8`	`+{`
	`9`	`+`
	`10`	`+ /** @return iterable<mixed> */`
	`11`	`+ public function dataFileAsserts(): iterable`
	`12`	`+ {`
	`13`	`+ yield from $this->gatherAssertTypes(__DIR__ . '/../../data/QueryResult/baseExpressionAndOr.php');`
	`14`	`+ }`
	`15`	`+`
	`16`	`+ /**`
	`17`	`+ * @dataProvider dataFileAsserts`
	`18`	`+ * @param mixed ...$args`
	`19`	`+ */`
	`20`	`+ public function testFileAsserts(`
	`21`	`+ string $assertType,`
	`22`	`+ string $file,`
	`23`	`+ ...$args`
	`24`	`+ ): void`
	`25`	`+ {`
	`26`	`+ $this->assertFileAsserts($assertType, $file, ...$args);`
	`27`	`+ }`
	`28`	`+`
	`29`	`+ /** @return string[] */`
	`30`	`+ public static function getAdditionalConfigFiles(): array`
	`31`	`+ {`
	`32`	`+ return [__DIR__ . '/../../data/QueryResult/config.neon'];`
	`33`	`+ }`
	`34`	`+`
	`35`	`+}`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,16 @@`
	`1`	`+<?php declare(strict_types = 1);`
	`2`	`+`
	`3`	`+namespace QueryResult\CreateQuery;`
	`4`	`+`
	`5`	`+use Doctrine\ORM\Query\Expr\Andx;`
	`6`	`+use function PHPStan\Testing\assertType;`
	`7`	`+`
	`8`	`+$and = new Andx();`
	`9`	`+$count1 = $and->count();`
	`10`	`+assertType("int<0, max>", $count1);`
	`11`	`+`
	`12`	`+$modifiedAnd = $and->add('a = b');`
	`13`	`+assertType("Doctrine\ORM\Query\Expr\Andx", $modifiedAnd);`
	`14`	`+`
	`15`	`+$string = $and->__toString();`
	`16`	`+assertType("string", $string);`

Comments

(0)