Merge pull request #118 from async-interop/return_old_error_handler

trowski · web-flow · commit db1661be6a00 · 2016-12-22T11:38:10.000-06:00
Loop::setErrorHandler should return the last error handler
diff --git a/src/Loop.php b/src/Loop.php
@@ -388,12 +388,12 @@ public static function getState($key)
      * @param callable(\Throwable|\Exception $error)|null $callback The callback to execute. `null` will clear the
      *     current handler.
      *
-     * @return void
+     * @return callable(\Throwable|\Exception $error)|null The previous handler, `null` if there was none.
      */
     public static function setErrorHandler(callable $callback = null)
     {
         $driver = self::$driver ?: self::get();
-        $driver->setErrorHandler($callback);
+        return $driver->setErrorHandler($callback);
     }
 
     /**
diff --git a/src/Loop/Driver.php b/src/Loop/Driver.php
@@ -246,7 +246,7 @@ final public function getState($key)
      * @param callable(\Throwable|\Exception $error)|null $callback The callback to execute. `null` will clear the
      *     current handler.
      *
-     * @return void
+     * @return callable(\Throwable|\Exception $error)|null The previous handler, `null` if there was none.
      */
     abstract public function setErrorHandler(callable $callback = null);
 

Original file line number	Diff line number	Diff line change
`@@ -388,12 +388,12 @@ public static function getState($key)`
`388`	`388`	* @param callable(\Throwable\|\Exception $error)\|null $callback The callback to execute. `null` will clear the
`389`	`389`	`* current handler.`
`390`	`390`	`*`
`391`		`- * @return void`
	`391`	+ * @return callable(\Throwable\|\Exception $error)\|null The previous handler, `null` if there was none.
`392`	`392`	`*/`
`393`	`393`	`public static function setErrorHandler(callable $callback = null)`
`394`	`394`	`{`
`395`	`395`	`$driver = self::$driver ?: self::get();`
`396`		`- $driver->setErrorHandler($callback);`
	`396`	`+ return $driver->setErrorHandler($callback);`
`397`	`397`	`}`
`398`	`398`
`399`	`399`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ final public function getState($key)`
`246`	`246`	* @param callable(\Throwable\|\Exception $error)\|null $callback The callback to execute. `null` will clear the
`247`	`247`	`* current handler.`
`248`	`248`	`*`
`249`		`- * @return void`
	`249`	+ * @return callable(\Throwable\|\Exception $error)\|null The previous handler, `null` if there was none.
`250`	`250`	`*/`
`251`	`251`	`abstract public function setErrorHandler(callable $callback = null);`
`252`	`252`