revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-22 06:42:41 +01:00
Code Issues Releases Wiki Activity

Fix error handler on PHP 8

Browse source 
Summary:
PHP 7.2.0 deprecated the 5th parameter and PHP 8 removed it, so stop
using it and provide a default value to avoid erroring with:

```
Too few arguments to function PhutilErrorHandler::handleError(), 4 passed and exactly 5 expected
```

Test Plan: Used to create this revision with PHP 8 on macOS

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: Korvin

Maniphest Tasks: T13588

Differential Revision: https://secure.phabricator.com/D21498
This commit is contained in:
Jessica Clarke 2021-01-11 02:02:16 +00:00 committed by jrtc27
parent 930f7e117d
commit 446dcf1ccd
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/error/PhutilErrorHandler.php
View file

@ -180,10 +180,10 @@ final class PhutilErrorHandler extends Phobject {
* @return void * @return void
* @task internal * @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) { foreach (self::$traps as $trap) {
$trap->addError($num, $str, $file, $line, $ctx); $trap->addError($num, $str, $file, $line);
} }
if ((error_reporting() & $num) == 0) { if ((error_reporting() & $num) == 0) {
@ -214,7 +214,6 @@ final class PhutilErrorHandler extends Phobject {
array( array(
'file' => $file, 'file' => $file,
'line' => $line, 'line' => $line,
'context' => $ctx,
'error_code' => $num, 'error_code' => $num,
'trace' => $trace, 'trace' => $trace,
)); ));

3
src/error/PhutilErrorTrap.php
View file

@ -41,13 +41,12 @@ final class PhutilErrorTrap extends Phobject {
private $destroyed; private $destroyed;
private $errors = array(); private $errors = array();
public function addError($num, $str, $file, $line, $ctx) { public function addError($num, $str, $file, $line) {
$this->errors[] = array( $this->errors[] = array(
'num' => $num, 'num' => $num,
'str' => $str, 'str' => $str,
'file' => $file, 'file' => $file,
'line' => $line, 'line' => $line,
'ctx' => $ctx,
); );
return $this; return $this;
} }