minor #25637 Remove dead code (chalasr)

fabpot · fabpot · commit de3d060fc7b5 · 2017-12-31T04:31:47.000+01:00
This PR was merged into the 4.0 branch. Discussion ---------- Remove dead code | Q | A | ------------- | --- | Branch? | 4.0 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a Commits ------- b8006b1 Remove dead code
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/CoverageListenerTest.php b/src/Symfony/Bridge/PhpUnit/Tests/CoverageListenerTest.php
@@ -12,10 +12,6 @@ public function test()
             $this->markTestSkipped('This test cannot be run on Windows.');
         }
 
-        if (defined('HHVM_VERSION')) {
-            $this->markTestSkipped('This test cannot be run on HHVM.');
-        }
-
         if (\PHP_VERSION_ID >= 70000) {
             $php = 'phpdbg -qrr';
         } else {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
@@ -448,9 +448,6 @@ public function testExtensionInPhar()
         if (extension_loaded('suhosin') && false === strpos(ini_get('suhosin.executor.include.whitelist'), 'phar')) {
             $this->markTestSkipped('To run this test, add "phar" to the "suhosin.executor.include.whitelist" settings in your php.ini file.');
         }
-        if (defined('HHVM_VERSION')) {
-            $this->markTestSkipped('HHVM makes this test conflict with those run in separate processes.');
-        }
 
         require_once self::$fixturesPath.'/includes/ProjectWithXsdExtensionInPhar.phar';
 
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -288,13 +288,10 @@ public function start(callable $callback = null, array $env = array())
             // @see : https://bugs.php.net/69442
             $ptsWorkaround = fopen(__FILE__, 'r');
         }
-        if (defined('HHVM_VERSION')) {
-            $envPairs = $env;
-        } else {
-            $envPairs = array();
-            foreach ($env as $k => $v) {
-                $envPairs[] = $k.'='.$v;
-            }
+
+        $envPairs = array();
+        foreach ($env as $k => $v) {
+            $envPairs[] = $k.'='.$v;
         }
 
         if (!is_dir($this->cwd)) {

Original file line number	Diff line number	Diff line change
`@@ -448,9 +448,6 @@ public function testExtensionInPhar()`
`448`	`448`	`if (extension_loaded('suhosin') && false === strpos(ini_get('suhosin.executor.include.whitelist'), 'phar')) {`
`449`	`449`	`$this->markTestSkipped('To run this test, add "phar" to the "suhosin.executor.include.whitelist" settings in your php.ini file.');`
`450`	`450`	`}`
`451`		`- if (defined('HHVM_VERSION')) {`
`452`		`- $this->markTestSkipped('HHVM makes this test conflict with those run in separate processes.');`
`453`		`- }`
`454`	`451`
`455`	`452`	`require_once self::$fixturesPath.'/includes/ProjectWithXsdExtensionInPhar.phar';`
`456`	`453`