Mercurial > hg > isophonics-drupal-site
comparison vendor/symfony/debug/ErrorHandler.php @ 18:af1871eacc83
Update to Drupal core 8.7.1
author | Chris Cannam |
---|---|
date | Thu, 09 May 2019 15:33:08 +0100 |
parents | 129ea1e6d783 |
children |
comparison
equal
deleted
inserted
replaced
17:129ea1e6d783 | 18:af1871eacc83 |
---|---|
220 if (!isset($prev[$type])) { | 220 if (!isset($prev[$type])) { |
221 throw new \InvalidArgumentException('Unknown error type: '.$type); | 221 throw new \InvalidArgumentException('Unknown error type: '.$type); |
222 } | 222 } |
223 if (!\is_array($log)) { | 223 if (!\is_array($log)) { |
224 $log = [$log]; | 224 $log = [$log]; |
225 } elseif (!array_key_exists(0, $log)) { | 225 } elseif (!\array_key_exists(0, $log)) { |
226 throw new \InvalidArgumentException('No logger provided'); | 226 throw new \InvalidArgumentException('No logger provided'); |
227 } | 227 } |
228 if (null === $log[0]) { | 228 if (null === $log[0]) { |
229 $this->loggedErrors &= ~$type; | 229 $this->loggedErrors &= ~$type; |
230 } elseif ($log[0] instanceof LoggerInterface) { | 230 } elseif ($log[0] instanceof LoggerInterface) { |
515 ($type & $level) ? $this->loggers[$type][1] : LogLevel::DEBUG, | 515 ($type & $level) ? $this->loggers[$type][1] : LogLevel::DEBUG, |
516 $logMessage, | 516 $logMessage, |
517 $errorAsException ? ['exception' => $errorAsException] : [], | 517 $errorAsException ? ['exception' => $errorAsException] : [], |
518 ]; | 518 ]; |
519 } else { | 519 } else { |
520 if (!\defined('HHVM_VERSION')) { | |
521 $currentErrorHandler = set_error_handler('var_dump'); | |
522 restore_error_handler(); | |
523 } | |
524 | |
520 try { | 525 try { |
521 $this->isRecursive = true; | 526 $this->isRecursive = true; |
522 $level = ($type & $level) ? $this->loggers[$type][1] : LogLevel::DEBUG; | 527 $level = ($type & $level) ? $this->loggers[$type][1] : LogLevel::DEBUG; |
523 $this->loggers[$type][0]->log($level, $logMessage, $errorAsException ? ['exception' => $errorAsException] : []); | 528 $this->loggers[$type][0]->log($level, $logMessage, $errorAsException ? ['exception' => $errorAsException] : []); |
524 } finally { | 529 } finally { |
525 $this->isRecursive = false; | 530 $this->isRecursive = false; |
526 | 531 |
527 if (!\defined('HHVM_VERSION')) { | 532 if (!\defined('HHVM_VERSION')) { |
528 set_error_handler([$this, __FUNCTION__]); | 533 set_error_handler($currentErrorHandler); |
529 } | 534 } |
530 } | 535 } |
531 } | 536 } |
532 | 537 |
533 return !$silenced && $type && $log; | 538 return !$silenced && $type && $log; |