Compare commits

...

7 Commits

Author SHA1 Message Date
Nicolas Grekas
2f9160e92e [ErrorHandler][Debug] Do not use the php80 polyfill 2021-07-22 09:21:39 +02:00
Alexander M. Turek
0239626388 Leverage str_contains/str_starts_with
Signed-off-by: Alexander M. Turek <me@derrabus.de>
2021-07-21 14:19:41 +02:00
Tobias Schultze
d2bbd5ffb4 Leverage str_ends_with
added the php80 polyfill to requirements when necessary
2021-07-21 13:57:04 +02:00
Alexander M. Turek
26c72fcb6d Indicate compatibility with psr/log 2 and 3
Signed-off-by: Alexander M. Turek <me@derrabus.de>
2021-07-18 16:08:08 +02:00
Nicolas Grekas
a8d2d5c944 Fix CS in README files 2021-05-26 19:39:37 +02:00
Alessandro Lai
45b2136377 Avoid warning with Xdebug 3 with develop mode disabled 2021-04-02 09:50:12 +02:00
Jérôme Deuchnord
157bbec4fd [ErrorHandler] Fix strpos error when trying to call a method without a name 2021-01-28 17:54:48 +01:00
8 changed files with 19 additions and 12 deletions

View File

@@ -35,8 +35,7 @@ class FatalErrorException extends \ErrorException
$this->setTrace($trace);
} elseif (null !== $traceOffset) {
if (\function_exists('xdebug_get_function_stack')) {
$trace = xdebug_get_function_stack();
if (\function_exists('xdebug_get_function_stack') && $trace = @xdebug_get_function_stack()) {
if (0 < $traceOffset) {
array_splice($trace, -$traceOffset);
}

View File

@@ -26,7 +26,7 @@ class FatalThrowableError extends FatalErrorException
public function __construct(\Throwable $e)
{
$this->originalClassName = get_debug_type($e);
$this->originalClassName = \get_class($e);
if ($e instanceof \ParseError) {
$severity = \E_PARSE;

View File

@@ -67,7 +67,7 @@ class FlattenException
$e->setStatusCode($statusCode);
$e->setHeaders($headers);
$e->setTraceFromThrowable($exception);
$e->setClass($exception instanceof FatalThrowableError ? $exception->getOriginalClassName() : get_debug_type($exception));
$e->setClass($exception instanceof FatalThrowableError ? $exception->getOriginalClassName() : \get_class($exception));
$e->setFile($exception->getFile());
$e->setLine($exception->getLine());

View File

@@ -40,7 +40,7 @@ class UndefinedMethodFatalErrorHandler implements FatalErrorHandlerInterface
$message = sprintf('Attempted to call an undefined method named "%s" of class "%s".', $methodName, $className);
if (!class_exists($className) || null === $methods = get_class_methods($className)) {
if ('' === $methodName || !class_exists($className) || null === $methods = get_class_methods($className)) {
// failed to get the class or its methods on which an unknown method was called (for example on an anonymous class)
return new UndefinedMethodException($message, $exception);
}

View File

@@ -24,7 +24,7 @@ Debug::enable();
Resources
---------
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
* [Report issues](https://github.com/symfony/symfony/issues) and
[send Pull Requests](https://github.com/symfony/symfony/pulls)
in the [main Symfony repository](https://github.com/symfony/symfony)
* [Contributing](https://symfony.com/doc/current/contributing/index.html)
* [Report issues](https://github.com/symfony/symfony/issues) and
[send Pull Requests](https://github.com/symfony/symfony/pulls)
in the [main Symfony repository](https://github.com/symfony/symfony)

View File

@@ -48,6 +48,15 @@ class UndefinedMethodFatalErrorHandlerTest extends TestCase
],
'Attempted to call an undefined method named "what" of class "SplObjectStorage".',
],
[
[
'type' => 1,
'line' => 12,
'file' => 'foo.php',
'message' => 'Call to undefined method SplObjectStorage::()',
],
'Attempted to call an undefined method named "" of class "SplObjectStorage".',
],
[
[
'type' => 1,

View File

@@ -14,7 +14,7 @@ require $vendor.'/vendor/autoload.php';
if (true) {
class TestLogger extends \Psr\Log\AbstractLogger
{
public function log($level, $message, array $context = [])
public function log($level, $message, array $context = []): void
{
echo $message, "\n";
}

View File

@@ -17,8 +17,7 @@
],
"require": {
"php": ">=7.1.3",
"psr/log": "~1.0",
"symfony/polyfill-php80": "^1.15"
"psr/log": "^1|^2|^3"
},
"conflict": {
"symfony/http-kernel": "<3.4"