Commit 70ecacc

janedbalondrejmirtes

authored and

committed

AssertTypeSpecifyingExtensionHelper: rootExpr with unknown variable to avoid always-true false positives (#197)

1 parent 614acc1 commit 70ecaccCopy full SHA for 70ecacc

File tree

+19

-1

lines changed

+19

-1

lines changed

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`use ReflectionObject;`
`24`	`24`	`use function array_key_exists;`
`25`	`25`	`use function count;`
	`26`	`+use function in_array;`
`26`	`27`	`use function strlen;`
`27`	`28`	`use function strpos;`
`28`	`29`	`use function substr;`
`@@ -33,6 +34,12 @@ class AssertTypeSpecifyingExtensionHelper`
`33`	`34`	`/** @var Closure[] */`
`34`	`35`	`private static $resolvers;`
`35`	`36`
	`37`	`+ /**`
	`38`	`+ * Those can specify types correctly, but would produce always-true issue`
	`39`	`+ * @var string[]`
	`40`	`+ */`
	`41`	`+ private static $resolversCausingAlwaysTrue = ['ContainsOnlyInstancesOf', 'ContainsEquals', 'Contains'];`
	`42`	`+`
`36`	`43`	`/**`
`37`	`44`	`* @param Arg[] $args`
`38`	`45`	`*/`
`@@ -87,10 +94,14 @@ public static function specifyTypes(`
`87`	`94`	`if ($expression === null) {`
`88`	`95`	`return new SpecifiedTypes([], []);`
`89`	`96`	`}`
	`97`	`+`
	`98`	`+ $bypassAlwaysTrueIssue = in_array(self::trimName($name), self::$resolversCausingAlwaysTrue, true);`
	`99`	`+`
`90`	`100`	`return $typeSpecifier->specifyTypesInCondition(`
`91`	`101`	`$scope,`
`92`	`102`	`$expression,`
`93`		`- TypeSpecifierContext::createTruthy()`
	`103`	`+ TypeSpecifierContext::createTruthy(),`
	`104`	`+ $bypassAlwaysTrueIssue ? new Expr\BinaryOp\BooleanAnd($expression, new Expr\Variable('nonsense')) : null`
`94`	`105`	`);`
`95`	`106`	`}`
`96`	`107`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,13 @@ public function testOther()`
`65`	`65`	`$foo->assertSame();`
`66`	`66`	`}`
`67`	`67`
	`68`	`+ public function testAssertContains()`
	`69`	`+ {`
	`70`	`+ $this->assertContains('not in the list', new \ArrayObject([1]));`
	`71`	`+ $this->assertContainsEquals('not in the list', new \ArrayObject([1]));`
	`72`	`+ $this->assertNotContains('not in the list', new \ArrayObject([1]));`
	`73`	`+ }`
	`74`	`+`
`68`	`75`	`public function testStaticMethodReturnWithSameTypeIsNotReported()`
`69`	`76`	`{`
`70`	`77`	`$this->assertSame(self::createSomething('foo'), self::createSomething('foo'));`

Comments

(0)