D21498.id51168.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D21498.id51168.diff
View Options

	diff --git a/src/error/PhutilErrorHandler.php b/src/error/PhutilErrorHandler.php
	--- a/src/error/PhutilErrorHandler.php
	+++ b/src/error/PhutilErrorHandler.php
	@@ -180,10 +180,10 @@
	* @return void
	* @task internal
	*/
	- public static function handleError($num, $str, $file, $line, $ctx) {
	+ public static function handleError($num, $str, $file, $line, $ctx = null) {

	foreach (self::$traps as $trap) {
	- $trap->addError($num, $str, $file, $line, $ctx);
	+ $trap->addError($num, $str, $file, $line);
	}

	if ((error_reporting() & $num) == 0) {
	@@ -214,7 +214,6 @@
	array(
	'file' => $file,
	'line' => $line,
	- 'context' => $ctx,
	'error_code' => $num,
	'trace' => $trace,
	));
	diff --git a/src/error/PhutilErrorTrap.php b/src/error/PhutilErrorTrap.php
	--- a/src/error/PhutilErrorTrap.php
	+++ b/src/error/PhutilErrorTrap.php
	@@ -41,13 +41,12 @@
	private $destroyed;
	private $errors = array();

	- public function addError($num, $str, $file, $line, $ctx) {
	+ public function addError($num, $str, $file, $line) {
	$this->errors[] = array(
	'num' => $num,
	'str' => $str,
	'file' => $file,
	'line' => $line,
	- 'ctx' => $ctx,
	);
	return $this;
	}