Merge branch '2.3' into 2.7

nicolas-grekas · nicolas-grekas · commit 6acefcd24089 · 2016-04-02T09:48:01.000+02:00
* 2.3:
  [travis] Disable hirak/prestissimo for deps=low/high tests
  [HttpFoundation] fix phpdoc of UploadedFile
  [ci] Skip dns-sensitive tests when DnsMock is not found
  Optimize ReplaceAliasByActualDefinitionPass
  [Process] use __METHOD__ where applicable

Conflicts:
	.travis.yml
	src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
	src/Symfony/Component/Process/Process.php
	src/Symfony/Component/Process/ProcessBuilder.php
diff --git a/Tests/Constraints/EmailValidatorTest.php b/Tests/Constraints/EmailValidatorTest.php
@@ -110,6 +110,7 @@ public function testStrict()
 
     /**
      * @dataProvider getDnsChecks
+     * @requires function Symfony\Bridge\PhpUnit\DnsMock::withMockedHosts
      */
     public function testDnsChecks($type, $violation)
     {
@@ -144,6 +145,9 @@ public function getDnsChecks()
         );
     }
 
+    /**
+     * @requires function Symfony\Bridge\PhpUnit\DnsMock::withMockedHosts
+     */
     public function testHostnameIsProperlyParsed()
     {
         DnsMock::withMockedHosts(array('baz.com' => array(array('type' => 'MX'))));

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,7 @@ public function testStrict()`
`110`	`110`
`111`	`111`	`/**`
`112`	`112`	`* @dataProvider getDnsChecks`
	`113`	`+ * @requires function Symfony\Bridge\PhpUnit\DnsMock::withMockedHosts`
`113`	`114`	`*/`
`114`	`115`	`public function testDnsChecks($type, $violation)`
`115`	`116`	`{`
`@@ -144,6 +145,9 @@ public function getDnsChecks()`
`144`	`145`	`);`
`145`	`146`	`}`
`146`	`147`
	`148`	`+ /**`
	`149`	`+ * @requires function Symfony\Bridge\PhpUnit\DnsMock::withMockedHosts`
	`150`	`+ */`
`147`	`151`	`public function testHostnameIsProperlyParsed()`
`148`	`152`	`{`
`149`	`153`	`DnsMock::withMockedHosts(array('baz.com' => array(array('type' => 'MX'))));`