Store information about the timeout in PHP_Invoker_TimeoutException.

Author: sebastianbergmann

ChangeLog.markdown

@@ -1,9 +1,9 @@
-PHP_Invoker 1.0
+PHP_Invoker 1.1
 ===============
 
-This is the list of changes for the PHP_Invoker 1.0 release series.
+This is the list of changes for the PHP_Invoker 1.1 release series.
 
-PHP_Invoker 1.0.0
+PHP_Invoker 1.1.0
 -----------------
 
-* Initial release.
+* `PHP_Invoker_TimeoutException` now holds information on the timeout.

PHP/Invoker.php

@@ -59,6 +59,11 @@
  */
 class PHP_Invoker
 {
+    /**
+     * @var integer
+     */
+    protected $timeout;
+
     /**
      * Invokes a callable and raises an exception when the execution does not
      * finish before the specified timeout.
@@ -82,6 +87,8 @@ public function invoke($callable, array $arguments, $timeout)
         pcntl_signal(SIGALRM, array($this, 'callback'), TRUE);
         pcntl_alarm($timeout);
 
+        $this->timeout = $timeout;
+
         try {
             $result = call_user_func_array($callable, $arguments);
         }
@@ -101,6 +108,11 @@ public function invoke($callable, array $arguments, $timeout)
      */
     public function callback()
     {
-        throw new PHP_Invoker_TimeoutException;
+        throw new PHP_Invoker_TimeoutException(
+          sprintf(
+            'Execution aborted after %s',
+            PHP_Timer::secondsToTimeString($this->timeout)
+          )
+        );
     }
 }

package.xml

@@ -17,10 +17,10 @@
   <email>[email protected]</email>
   <active>yes</active>
  </lead>
- <date>2011-11-22</date>
+ <date>2012-01-23</date>
  <version>
-  <release>1.0.1</release>
-  <api>1.0.0</api>
+  <release>1.1.0</release>
+  <api>1.1.0</api>
  </version>
  <stability>
   <release>stable</release>
@@ -56,6 +56,11 @@
    <pearinstaller>
     <min>1.9.4</min>
    </pearinstaller>
+   <package>
+    <name>PHP_Timer</name>
+    <channel>pear.phpunit.de</channel>
+    <min>1.0.1</min>
+   </package>
    <extension>
     <name>pcntl</name>
    </extension>