Commit 774d086

committed

simplify

1 parent 3933f4b commit 774d086Copy full SHA for 774d086

File tree

1 file changed

+18

-20

lines changed

src/Analyser
- TypeSpecifier.php

1 file changed

+18

-20

lines changed

`‎src/Analyser/TypeSpecifier.php‎`

Lines changed: 18 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -2260,28 +2260,26 @@ public function resolveIdentical(Expr\BinaryOp\Identical $expr, Scope $scope, Ty`
`2260`	`2260`	`&& in_array($unwrappedRightExpr->name->toLowerString(), ['count', 'sizeof'], true)`
`2261`	`2261`	`&& count($unwrappedRightExpr->getArgs()) >= 1`
`2262`	`2262`	`) {`
`2263`		`- $leftArrayType = $scope->getType($unwrappedLeftExpr->getArgs()[0]->value);`
`2264`		`- $rightArrayType = $scope->getType($unwrappedRightExpr->getArgs()[0]->value);`
	`2263`	`+ $argType = $scope->getType($unwrappedRightExpr->getArgs()[0]->value);`
	`2264`	`+ $sizeType = $scope->getType($leftExpr);`
`2265`	`2265`
`2266`		`- if ($leftArrayType->isArray()->yes() && $rightArrayType->isArray()->yes()) {`
`2267`		`- $argType = $scope->getType($unwrappedRightExpr->getArgs()[0]->value);`
`2268`		`- $sizeType = $scope->getType($leftExpr);`
`2269`		`-`
`2270`		`- if ($sizeType instanceof IntegerRangeType \|\| $sizeType->isConstantScalarValue()->yes()) {`
`2271`		`- $specifiedTypes = $this->specifyTypesForCountFuncCall($unwrappedRightExpr, $argType, $sizeType, $context, $scope, $expr);`
`2272`		`- if ($specifiedTypes !== null) {`
`2273`		`- return $specifiedTypes;`
`2274`		`- }`
`2275`		`- }`
	`2266`	`+ $specifiedTypes = $this->specifyTypesForCountFuncCall($unwrappedRightExpr, $argType, $sizeType, $context, $scope, $expr);`
	`2267`	`+ if ($specifiedTypes !== null) {`
	`2268`	`+ return $specifiedTypes;`
	`2269`	`+ }`
`2276`	`2270`
`2277`		`- if (!$rightType->isConstantScalarValue()->yes()) {`
`2278`		`- if ($leftArrayType->isIterableAtLeastOnce()->yes() \|\| $rightArrayType->isIterableAtLeastOnce()->yes()) {`
`2279`		`- $arrayTypes = $this->create($unwrappedLeftExpr->getArgs()[0]->value, new NonEmptyArrayType(), $context, $scope)->setRootExpr($expr);`
`2280`		`- return $arrayTypes->unionWith(`
`2281`		`- $this->create($unwrappedRightExpr->getArgs()[0]->value, new NonEmptyArrayType(), $context, $scope)->setRootExpr($expr),`
`2282`		`- );`
`2283`		`- }`
`2284`		`- }`
	`2271`	`+ $leftArrayType = $scope->getType($unwrappedLeftExpr->getArgs()[0]->value);`
	`2272`	`+ $rightArrayType = $scope->getType($unwrappedRightExpr->getArgs()[0]->value);`
	`2273`	`+ if (`
	`2274`	`+ $leftArrayType->isArray()->yes()`
	`2275`	`+ && $rightArrayType->isArray()->yes()`
	`2276`	`+ && !$rightType->isConstantScalarValue()->yes()`
	`2277`	`+ && ($leftArrayType->isIterableAtLeastOnce()->yes() \|\| $rightArrayType->isIterableAtLeastOnce()->yes())`
	`2278`	`+ ) {`
	`2279`	`+ $arrayTypes = $this->create($unwrappedLeftExpr->getArgs()[0]->value, new NonEmptyArrayType(), $context, $scope)->setRootExpr($expr);`
	`2280`	`+ return $arrayTypes->unionWith(`
	`2281`	`+ $this->create($unwrappedRightExpr->getArgs()[0]->value, new NonEmptyArrayType(), $context, $scope)->setRootExpr($expr),`
	`2282`	`+ );`
`2285`	`2283`	`}`
`2286`	`2284`	`}`
`2287`	`2285`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 774d086

File tree

1 file changed

1 file changed

`‎src/Analyser/TypeSpecifier.php‎`

0 commit comments