Merge branch '4.4'

* 4.4:
  bump phpunit-bridge cache-id
  removed unneeded phpdocs
  Use assertStringContainsString when needed
  Use assert assertContainsEquals when needed
  Use assertEqualsWithDelta when required

Author: nicolas-grekas

Tests/CoverageListenerTest.php

@@ -29,14 +29,14 @@ public function test()
 
         exec("$php $phpunit -c $dir/phpunit-without-listener.xml.dist $dir/tests/ --coverage-text 2> /dev/null", $output);
         $output = implode("\n", $output);
-        $this->assertContains('FooCov', $output);
+        $this->assertStringContainsString('FooCov', $output);
 
         exec("$php $phpunit -c $dir/phpunit-with-listener.xml.dist $dir/tests/ --coverage-text 2> /dev/null", $output);
         $output = implode("\n", $output);
-        $this->assertNotContains('FooCov', $output);
-        $this->assertContains("SutNotFoundTest::test\nCould not find the tested class.", $output);
-        $this->assertNotContains("CoversTest::test\nCould not find the tested class.", $output);
-        $this->assertNotContains("CoversDefaultClassTest::test\nCould not find the tested class.", $output);
-        $this->assertNotContains("CoversNothingTest::test\nCould not find the tested class.", $output);
+        $this->assertStringNotContainsString('FooCov', $output);
+        $this->assertStringContainsString("SutNotFoundTest::test\nCould not find the tested class.", $output);
+        $this->assertStringNotContainsString("CoversTest::test\nCould not find the tested class.", $output);
+        $this->assertStringNotContainsString("CoversDefaultClassTest::test\nCould not find the tested class.", $output);
+        $this->assertStringNotContainsString("CoversNothingTest::test\nCould not find the tested class.", $output);
     }
 }