[Process] Always call proc_close

nicolas-grekas · nicolas-grekas · commit ccb67d7bd228 · 2015-12-08T18:02:07.000+01:00
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -157,16 +157,7 @@ public function __construct($commandline, $cwd = null, array $env = null, $stdin
 
     public function __destruct()
     {
-        if ($this->isRunning()) {
-            $this->doSignal(15, false);
-            usleep(10000);
-        }
-        if ($this->isRunning()) {
-            usleep(100000);
-            $this->doSignal(9, false);
-        }
-
-        // Don't call ->stop() nor ->close() since we don't want to wait for the subprocess here
+        $this->stop(0);
     }
 
     public function __clone()
diff --git a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php
@@ -709,26 +709,23 @@ public function testCheckTimeoutOnTerminatedProcess()
      */
     public function testCheckTimeoutOnStartedProcess()
     {
-        $timeout = 0.5;
-        $precision = 100000;
         $process = $this->getProcess(self::$phpBin.' -r "sleep(3);"');
-        $process->setTimeout($timeout);
-        $start = microtime(true);
+        $process->setTimeout(0.5);
 
         $process->start();
+        $start = microtime(true);
 
         try {
             while ($process->isRunning()) {
                 $process->checkTimeout();
-                usleep($precision);
+                usleep(100000);
             }
             $this->fail('A RuntimeException should have been raised');
         } catch (RuntimeException $e) {
         }
         $duration = microtime(true) - $start;
 
-        $this->assertLessThan($timeout + $precision, $duration);
-        $this->assertFalse($process->isSuccessful());
+        $this->assertLessThan(1, $duration);
 
         throw $e;
     }
diff --git a/src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php b/src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php
@@ -85,13 +85,9 @@ public function testProcessWithoutTermSignal()
         parent::testProcessWithoutTermSignal();
     }
 
-    /**
-     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
-     * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.
-     */
     public function testCheckTimeoutOnStartedProcess()
     {
-        parent::testCheckTimeoutOnStartedProcess();
+        $this->markTestSkipped('Stopping with signal is not supported in sigchild environment');
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -85,13 +85,9 @@ public function testProcessWithoutTermSignal()`
`85`	`85`	`parent::testProcessWithoutTermSignal();`
`86`	`86`	`}`
`87`	`87`
`88`		`- /**`
`89`		`- * @expectedException \Symfony\Component\Process\Exception\RuntimeException`
`90`		`- * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.`
`91`		`- */`
`92`	`88`	`public function testCheckTimeoutOnStartedProcess()`
`93`	`89`	`{`
`94`		`- parent::testCheckTimeoutOnStartedProcess();`
	`90`	`+ $this->markTestSkipped('Stopping with signal is not supported in sigchild environment');`
`95`	`91`	`}`
`96`	`92`
`97`	`93`	`/**`