upgraded dependencies
This commit is contained in:
@@ -11,8 +11,6 @@
|
||||
|
||||
namespace Symfony\Component\ErrorHandler\Exception;
|
||||
|
||||
use Symfony\Component\Debug\Exception\FatalThrowableError;
|
||||
use Symfony\Component\Debug\Exception\FlattenException as LegacyFlattenException;
|
||||
use Symfony\Component\HttpFoundation\Exception\RequestExceptionInterface;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
|
||||
@@ -24,7 +22,7 @@ use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
|
||||
*
|
||||
* @author Fabien Potencier <fabien@symfony.com>
|
||||
*/
|
||||
class FlattenException extends LegacyFlattenException
|
||||
class FlattenException
|
||||
{
|
||||
/** @var string */
|
||||
private $message;
|
||||
@@ -65,7 +63,7 @@ class FlattenException extends LegacyFlattenException
|
||||
/**
|
||||
* @return static
|
||||
*/
|
||||
public static function create(\Exception $exception, $statusCode = null, array $headers = []): self
|
||||
public static function create(\Exception $exception, int $statusCode = null, array $headers = []): self
|
||||
{
|
||||
return static::createFromThrowable($exception, $statusCode, $headers);
|
||||
}
|
||||
@@ -100,7 +98,7 @@ class FlattenException extends LegacyFlattenException
|
||||
$e->setStatusCode($statusCode);
|
||||
$e->setHeaders($headers);
|
||||
$e->setTraceFromThrowable($exception);
|
||||
$e->setClass($exception instanceof FatalThrowableError ? $exception->getOriginalClassName() : \get_class($exception));
|
||||
$e->setClass(\get_class($exception));
|
||||
$e->setFile($exception->getFile());
|
||||
$e->setLine($exception->getLine());
|
||||
|
||||
@@ -133,11 +131,9 @@ class FlattenException extends LegacyFlattenException
|
||||
}
|
||||
|
||||
/**
|
||||
* @param int $code
|
||||
*
|
||||
* @return $this
|
||||
*/
|
||||
public function setStatusCode($code): self
|
||||
public function setStatusCode(int $code): self
|
||||
{
|
||||
$this->statusCode = $code;
|
||||
|
||||
@@ -165,11 +161,9 @@ class FlattenException extends LegacyFlattenException
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $class
|
||||
*
|
||||
* @return $this
|
||||
*/
|
||||
public function setClass($class): self
|
||||
public function setClass(string $class): self
|
||||
{
|
||||
$this->class = false !== strpos($class, "@anonymous\0") ? (get_parent_class($class) ?: key(class_implements($class)) ?: 'class').'@anonymous' : $class;
|
||||
|
||||
@@ -182,11 +176,9 @@ class FlattenException extends LegacyFlattenException
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $file
|
||||
*
|
||||
* @return $this
|
||||
*/
|
||||
public function setFile($file): self
|
||||
public function setFile(string $file): self
|
||||
{
|
||||
$this->file = $file;
|
||||
|
||||
@@ -199,11 +191,9 @@ class FlattenException extends LegacyFlattenException
|
||||
}
|
||||
|
||||
/**
|
||||
* @param int $line
|
||||
*
|
||||
* @return $this
|
||||
*/
|
||||
public function setLine($line): self
|
||||
public function setLine(int $line): self
|
||||
{
|
||||
$this->line = $line;
|
||||
|
||||
@@ -215,6 +205,9 @@ class FlattenException extends LegacyFlattenException
|
||||
return $this->statusText;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return $this
|
||||
*/
|
||||
public function setStatusText(string $statusText): self
|
||||
{
|
||||
$this->statusText = $statusText;
|
||||
@@ -228,11 +221,9 @@ class FlattenException extends LegacyFlattenException
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $message
|
||||
*
|
||||
* @return $this
|
||||
*/
|
||||
public function setMessage($message): self
|
||||
public function setMessage(string $message): self
|
||||
{
|
||||
if (false !== strpos($message, "@anonymous\0")) {
|
||||
$message = preg_replace_callback('/[a-zA-Z_\x7f-\xff][\\\\a-zA-Z0-9_\x7f-\xff]*+@anonymous\x00.*?\.php(?:0x?|:[0-9]++\$)[0-9a-fA-F]++/', function ($m) {
|
||||
@@ -265,10 +256,7 @@ class FlattenException extends LegacyFlattenException
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return self|null
|
||||
*/
|
||||
public function getPrevious()
|
||||
public function getPrevious(): ?self
|
||||
{
|
||||
return $this->previous;
|
||||
}
|
||||
@@ -276,7 +264,7 @@ class FlattenException extends LegacyFlattenException
|
||||
/**
|
||||
* @return $this
|
||||
*/
|
||||
final public function setPrevious(?LegacyFlattenException $previous): self
|
||||
public function setPrevious(?self $previous): self
|
||||
{
|
||||
$this->previous = $previous;
|
||||
|
||||
@@ -302,16 +290,6 @@ class FlattenException extends LegacyFlattenException
|
||||
return $this->trace;
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated since 4.1, use {@see setTraceFromThrowable()} instead.
|
||||
*/
|
||||
public function setTraceFromException(\Exception $exception)
|
||||
{
|
||||
@trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1, use "setTraceFromThrowable()" instead.', __METHOD__), \E_USER_DEPRECATED);
|
||||
|
||||
$this->setTraceFromThrowable($exception);
|
||||
}
|
||||
|
||||
/**
|
||||
* @return $this
|
||||
*/
|
||||
@@ -323,13 +301,9 @@ class FlattenException extends LegacyFlattenException
|
||||
}
|
||||
|
||||
/**
|
||||
* @param array $trace
|
||||
* @param string|null $file
|
||||
* @param int|null $line
|
||||
*
|
||||
* @return $this
|
||||
*/
|
||||
public function setTrace($trace, $file, $line): self
|
||||
public function setTrace(array $trace, ?string $file, ?int $line): self
|
||||
{
|
||||
$this->trace = [];
|
||||
$this->trace[] = [
|
||||
@@ -374,7 +348,6 @@ class FlattenException extends LegacyFlattenException
|
||||
return ['array', '*SKIPPED over 10000 entries*'];
|
||||
}
|
||||
if ($value instanceof \__PHP_Incomplete_Class) {
|
||||
// is_object() returns false on PHP<=7.1
|
||||
$result[$key] = ['incomplete-object', $this->getClassNameFromIncomplete($value)];
|
||||
} elseif (\is_object($value)) {
|
||||
$result[$key] = ['object', \get_class($value)];
|
||||
|
Reference in New Issue
Block a user