From f83401abd906d2c6d828ec5d9156e719e8538d17 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Wed, 11 Jul 2012 14:21:05 +0200
Subject: [PATCH] [Process] fixed setting the timeout to null

---
 src/Symfony/Component/Process/Process.php           |  4 +++-
 src/Symfony/Component/Process/ProcessBuilder.php    |  4 +++-
 .../Component/Process/Tests/ProcessBuilderTest.php  | 13 +++++++++++++
 src/Symfony/Component/Process/Tests/ProcessTest.php |  9 +++++++++
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
index 42b466dab3..60f265024c 100644
--- a/src/Symfony/Component/Process/Process.php
+++ b/src/Symfony/Component/Process/Process.php
@@ -595,7 +595,9 @@ class Process
     public function setTimeout($timeout)
     {
         if (null === $timeout) {
-            return null;
+            $this->timeout = null;
+
+            return;
         }
 
         $timeout = (integer) $timeout;
diff --git a/src/Symfony/Component/Process/ProcessBuilder.php b/src/Symfony/Component/Process/ProcessBuilder.php
index c3b3175025..b9862df653 100644
--- a/src/Symfony/Component/Process/ProcessBuilder.php
+++ b/src/Symfony/Component/Process/ProcessBuilder.php
@@ -91,7 +91,9 @@ class ProcessBuilder
     public function setTimeout($timeout)
     {
         if (null === $timeout) {
-            return null;
+            $this->timeout = null;
+
+            return;
         }
 
         $timeout = (integer) $timeout;
diff --git a/src/Symfony/Component/Process/Tests/ProcessBuilderTest.php b/src/Symfony/Component/Process/Tests/ProcessBuilderTest.php
index fd9d620730..9ca45a80a7 100644
--- a/src/Symfony/Component/Process/Tests/ProcessBuilderTest.php
+++ b/src/Symfony/Component/Process/Tests/ProcessBuilderTest.php
@@ -92,4 +92,17 @@ class ProcessBuilderTest extends \PHPUnit_Framework_TestCase
         $pb = new ProcessBuilder();
         $pb->setTimeout(-1);
     }
+
+    public function testNullTimeout()
+    {
+        $pb = new ProcessBuilder();
+        $pb->setTimeout(10);
+        $pb->setTimeout(null);
+
+        $r = new \ReflectionObject($pb);
+        $p = $r->getProperty('timeout');
+        $p->setAccessible(true);
+
+        $this->assertNull($p->getValue($pb));
+    }
 }
diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php
index 354b3aea8a..81f817145a 100644
--- a/src/Symfony/Component/Process/Tests/ProcessTest.php
+++ b/src/Symfony/Component/Process/Tests/ProcessTest.php
@@ -35,6 +35,15 @@ class ProcessTest extends \PHPUnit_Framework_TestCase
         $p->setTimeout(-1);
     }
 
+    public function testNullTimeout()
+    {
+        $p = new Process('');
+        $p->setTimeout(10);
+        $p->setTimeout(null);
+
+        $this->assertNull($p->getTimeout());
+    }
+
     /**
      * tests results from sub processes
      *