Commit ade3496

committed

Merge branch 'empty-hotfix2' into 1.1.x

2 parents 7267329 + 6b93db7 commit ade3496Copy full SHA for ade3496

File tree

-1

lines changed

-1

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`use PhpParser\Node\Expr\FuncCall;`
`14`	`14`	`use PhpParser\Node\Expr\Instanceof_;`
`15`	`15`	`use PhpParser\Node\Name;`
	`16`	`+use PhpParser\Node\Scalar\LNumber;`
`16`	`17`	`use PHPStan\Analyser\Scope;`
`17`	`18`	`use PHPStan\Analyser\SpecifiedTypes;`
`18`	`19`	`use PHPStan\Analyser\TypeSpecifier;`
`@@ -162,7 +163,10 @@ private static function getExpressionResolvers(): array`
`162`	`163`	`return new Expr\BinaryOp\BooleanOr(`
`163`	`164`	`new Instanceof_($actual->value, new Name(EmptyIterator::class)),`
`164`	`165`	`new Expr\BinaryOp\BooleanOr(`
`165`		`- new Instanceof_($actual->value, new Name(Countable::class)),`
	`166`	`+ new Expr\BinaryOp\BooleanAnd(`
	`167`	`+ new Instanceof_($actual->value, new Name(Countable::class)),`
	`168`	`+ new Identical(new FuncCall(new Name('count'), [new Arg($actual->value)]), new LNumber(0))`
	`169`	`+ ),`
`166`	`170`	`new Expr\Empty_($actual->value)`
`167`	`171`	`)`
`168`	`172`	`);`

Comments

(0)