Merge branch '1.3.x' into 1.4.x

Author: ondrejmirtes

src/Type/PHPUnit/Assert/AssertTypeSpecifyingExtensionHelper.php

@@ -23,6 +23,7 @@
 use ReflectionObject;
 use function array_key_exists;
 use function count;
+use function in_array;
 use function strlen;
 use function strpos;
 use function substr;
@@ -33,6 +34,12 @@ class AssertTypeSpecifyingExtensionHelper
 /** @var Closure[] */
 private static $resolvers;
 
+/**
+ * Those can specify types correctly, but would produce always-true issue
+ * @var string[]
+ */
+private static $resolversCausingAlwaysTrue = ['ContainsOnlyInstancesOf', 'ContainsEquals', 'Contains'];
+
 /**
  * @param Arg[] $args
  */
@@ -87,10 +94,14 @@ public static function specifyTypes(
 if ($expression === null) {
 return new SpecifiedTypes([], []);
 }
+
+$bypassAlwaysTrueIssue = in_array(self::trimName($name), self::$resolversCausingAlwaysTrue, true);
+
 return $typeSpecifier->specifyTypesInCondition(
 $scope,
 $expression,
-TypeSpecifierContext::createTruthy()
+TypeSpecifierContext::createTruthy(),
+$bypassAlwaysTrueIssue ? new Expr\BinaryOp\BooleanAnd($expression, new Expr\Variable('nonsense')) : null
 );
 }
 

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

@@ -65,6 +65,13 @@ public function testOther()
 $foo->assertSame();
 }
 
+public function testAssertContains()
+{
+$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]));
+}
+
 public function testStaticMethodReturnWithSameTypeIsNotReported()
 {
 $this->assertSame(self::createSomething('foo'), self::createSomething('foo'));