Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit b8d504c7767c · 2019-08-07T14:00:28.000+02:00
* 4.3:
  Fix inconsistent return points.
  pass translation parameters to the trans filter
  [Mime] fixed wrong mimetype
  [ProxyManagerBridge] Polyfill for unmaintained version
  [HttpClient] Declare `$active` first to prevent weird issue
  Remove deprecated assertContains
  [HttpClient] fix tests
  SCA: dropped unused mocks, duplicate import and a function alias usage
  Added correct plural for box -&gt; boxes
  [Config] fix test
  Fix remaining tests
  Improve fa (persian) translation
diff --git a/Tests/DeprecationErrorHandler/DeprecationTest.php b/Tests/DeprecationErrorHandler/DeprecationTest.php
@@ -46,8 +46,8 @@ public function testLegacyTestMethodIsDetectedAsSuch()
     public function testItCanBeConvertedToAString()
     {
         $deprecation = new Deprecation('💩', $this->debugBacktrace(), __FILE__);
-        $this->assertContains('💩', $deprecation->toString());
-        $this->assertContains(__FUNCTION__, $deprecation->toString());
+        $this->assertStringContainsString('💩', $deprecation->toString());
+        $this->assertStringContainsString(__FUNCTION__, $deprecation->toString());
     }
 
     public function testItRulesOutFilesOutsideVendorsAsIndirect()

Original file line number	Diff line number	Diff line change
`@@ -46,8 +46,8 @@ public function testLegacyTestMethodIsDetectedAsSuch()`
`46`	`46`	`public function testItCanBeConvertedToAString()`
`47`	`47`	`{`
`48`	`48`	`$deprecation = new Deprecation('💩', $this->debugBacktrace(), __FILE__);`
`49`		`- $this->assertContains('💩', $deprecation->toString());`
`50`		`- $this->assertContains(__FUNCTION__, $deprecation->toString());`
	`49`	`+ $this->assertStringContainsString('💩', $deprecation->toString());`
	`50`	`+ $this->assertStringContainsString(__FUNCTION__, $deprecation->toString());`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`public function testItRulesOutFilesOutsideVendorsAsIndirect()`