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

Author: janedbal

src/Type/PHPUnit/Assert/AssertTypeSpecifyingExtensionHelper.php

@@ -23,6 +23,7 @@
 useReflectionObject;
 usefunctionarray_key_exists;
 usefunctioncount;
+usefunctionin_array;
 usefunctionstrlen;
 usefunctionstrpos;
 usefunctionsubstr;
@@ -33,6 +34,12 @@ class AssertTypeSpecifyingExtensionHelper
 /** @var Closure[] */
 privatestatic$resolvers;
 
+/**
+ * Those can specify types correctly, but would produce always-true issue
+ * @var string[]
+ */
+privatestatic$resolversCausingAlwaysTrue = ['ContainsOnlyInstancesOf', 'ContainsEquals', 'Contains'];
+
 /**
  * @param Arg[] $args
  */
@@ -87,10 +94,14 @@ public static function specifyTypes(
 if ($expression === null) {
 returnnewSpecifiedTypes([], []);
  }
+
+$bypassAlwaysTrueIssue = in_array(self::trimName($name), self::$resolversCausingAlwaysTrue, true);
+
 return$typeSpecifier->specifyTypesInCondition(
 $scope,
 $expression,
- TypeSpecifierContext::createTruthy()
+ TypeSpecifierContext::createTruthy(),
+$bypassAlwaysTrueIssue ? newExpr\BinaryOp\BooleanAnd($expression, newExpr\Variable('nonsense')) : null
  );
 	}
 

tests/Rules/PHPUnit/data/assert-same.php

@@ -65,6 +65,13 @@ public function testOther()
 $foo->assertSame();
 	}
 
+publicfunctiontestAssertContains()
+	{
+$this->assertContains('not in the list', new \ArrayObject([1]));
+$this->assertContainsEquals('not in the list', new \ArrayObject([1]));
+$this->assertNotContains('not in the list', new \ArrayObject([1]));
+	}
+
 publicfunctiontestStaticMethodReturnWithSameTypeIsNotReported()
 	{
 $this->assertSame(self::createSomething('foo'), self::createSomething('foo'));