bug #25447 [Process] remove false-positive BC breaking exception on Windows (nicolas-grekas)

fabpot · fabpot · commit f07430f9a97e · 2017-12-11T12:30:22.000-08:00
This PR was merged into the 3.4 branch. Discussion ---------- [Process] remove false-positive BC breaking exception on Windows | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #25446 | License | MIT | Doc PR | - Commits ------- fe41155 [Process] remove false-positive BC breaking exception on Windows
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -331,10 +331,6 @@ public function start(callable $callback = null/*, array $env = array()*/)
         }
 
         if (!is_dir($this->cwd)) {
-            if ('\\' === DIRECTORY_SEPARATOR) {
-                throw new RuntimeException('The provided cwd does not exist.');
-            }
-
             @trigger_error('The provided cwd does not exist. Command is currently ran against getcwd(). This behavior is deprecated since version 3.4 and will be removed in 4.0.', E_USER_DEPRECATED);
         }
 
diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php
@@ -54,10 +54,6 @@ protected function tearDown()
      */
     public function testInvalidCwd()
     {
-        if ('\\' === DIRECTORY_SEPARATOR) {
-            $this->markTestSkipped('Windows handles this automatically.');
-        }
-
         // Check that it works fine if the CWD exists
         $cmd = new Process('echo test', __DIR__);
         $cmd->run();
@@ -66,28 +62,6 @@ public function testInvalidCwd()
         $cmd->run();
     }
 
-    /**
-     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
-     * @expectedExceptionMessage The provided cwd does not exist.
-     */
-    public function testInvalidCwdOnWindows()
-    {
-        if ('\\' !== DIRECTORY_SEPARATOR) {
-            $this->markTestSkipped('Unix handles this automatically.');
-        }
-
-        try {
-            // Check that it works fine if the CWD exists
-            $cmd = new Process('echo test', __DIR__);
-            $cmd->run();
-        } catch (\Exception $e) {
-            $this->fail($e);
-        }
-
-        $cmd = new Process('echo test', __DIR__.'/notfound/');
-        $cmd->run();
-    }
-
     public function testThatProcessDoesNotThrowWarningDuringRun()
     {
         if ('\\' === DIRECTORY_SEPARATOR) {

Original file line number	Diff line number	Diff line change
`@@ -331,10 +331,6 @@ public function start(callable $callback = null/, array $env = array()/)`
`331`	`331`	`}`
`332`	`332`
`333`	`333`	`if (!is_dir($this->cwd)) {`
`334`		`- if ('\\' === DIRECTORY_SEPARATOR) {`
`335`		`- throw new RuntimeException('The provided cwd does not exist.');`
`336`		`- }`
`337`		`-`
`338`	`334`	`@trigger_error('The provided cwd does not exist. Command is currently ran against getcwd(). This behavior is deprecated since version 3.4 and will be removed in 4.0.', E_USER_DEPRECATED);`
`339`	`335`	`}`
`340`	`336`