Merge branch '3.4' into 4.3

* 3.4:
  bump phpunit-bridge cache-id
  Use assertStringContainsString when needed
  Use assert assertContainsEquals when needed
  Use assertEqualsWithDelta when required

Author: nicolas-grekas

Tests/Compiler/MergeExtensionConfigurationPassTest.php

@@ -85,7 +85,7 @@ public function testExtensionConfigurationIsTrackedByDefault()
         $pass = new MergeExtensionConfigurationPass();
         $pass->process($container);
 
-        $this->assertContains(new FileResource(__FILE__), $container->getResources(), '', false, false);
+        $this->assertContainsEquals(new FileResource(__FILE__), $container->getResources());
     }
 
     public function testOverriddenEnvsAreMerged()

Tests/Loader/XmlFileLoaderTest.php

@@ -462,7 +462,7 @@ public function testExtensions()
 
             $e = $e->getPrevious();
             $this->assertInstanceOf('InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
-            $this->assertContains('The attribute \'bar\' is not allowed', $e->getMessage(), '->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
+            $this->assertStringContainsString('The attribute \'bar\' is not allowed', $e->getMessage(), '->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
         }
 
         // non-registered extension
@@ -499,7 +499,7 @@ public function testExtensionInPhar()
 
             $e = $e->getPrevious();
             $this->assertInstanceOf('InvalidArgumentException', $e, '->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
-            $this->assertContains('The attribute \'bar\' is not allowed', $e->getMessage(), '->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
+            $this->assertStringContainsString('The attribute \'bar\' is not allowed', $e->getMessage(), '->load() throws an InvalidArgumentException if the configuration does not validate the XSD');
         }
     }
 

Tests/ParameterBag/EnvPlaceholderParameterBagTest.php

@@ -41,7 +41,7 @@ public function testMergeWillNotDuplicateIdenticalParameters()
 
         $this->assertCount(1, $placeholderForVariable);
         $this->assertIsString($placeholder);
-        $this->assertContains($envVariableName, $placeholder);
+        $this->assertStringContainsString($envVariableName, $placeholder);
     }
 
     public function testMergeWhereFirstBagIsEmptyWillWork()
@@ -64,7 +64,7 @@ public function testMergeWhereFirstBagIsEmptyWillWork()
 
         $this->assertCount(1, $placeholderForVariable);
         $this->assertIsString($placeholder);
-        $this->assertContains($envVariableName, $placeholder);
+        $this->assertStringContainsString($envVariableName, $placeholder);
     }
 
     public function testMergeWherePlaceholderOnlyExistsInSecond()