interkollektives/lichterei-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to rc5

Browse Source
This commit is contained in:
Bastian Allgeier
2020-12-10 11:24:42 +01:00
parent 3fec0d7c93
commit c378376bc9
257 changed files with 13009 additions and 1846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kirby/vendor/filp/whoops/src/Whoops/Exception/Formatter.php vendored
View File

@@ -21,6 +21,7 @@ class Formatter
$response = [
'type' => get_class($exception),
'message' => $exception->getMessage(),
'code' => $exception->getCode(),
'file' => $exception->getFile(),
'line' => $exception->getLine(),
];

2
kirby/vendor/filp/whoops/src/Whoops/Exception/Inspector.php vendored
View File

@@ -251,7 +251,7 @@ class Inspector
return $traces;
}
if (!extension_loaded('xdebug') || !xdebug_is_enabled()) {
if (!extension_loaded('xdebug') || !function_exists('xdebug_is_enabled') || !xdebug_is_enabled()) {
return $traces;
}

33
kirby/vendor/filp/whoops/src/Whoops/Handler/PrettyPageHandler.php vendored
View File

@@ -47,14 +47,14 @@ class PrettyPageHandler extends Handler
/**
* The name of the custom css file.
*
* @var string
* @var string|null
*/
private $customCss = null;
/**
* The name of the custom js file.
*
* @var string
* @var string|null
*/
private $customJs = null;
@@ -518,8 +518,8 @@ class PrettyPageHandler extends Handler
/**
* Determine if the editor link should act as an Ajax request.
*
* @param string $filePath
* @param int $line
* @param string $filePath
* @param int $line
*
* @throws UnexpectedValueException If editor resolver does not return a boolean
*
@@ -611,7 +611,7 @@ class PrettyPageHandler extends Handler
/**
* Adds a path to the list of paths to be searched for resources.
*
* @param string $path
* @param string $path
*
* @throws InvalidArgumentException If $path is not a valid directory
*
@@ -631,7 +631,7 @@ class PrettyPageHandler extends Handler
/**
* Adds a custom css file to be loaded.
*
* @param string $name
* @param string|null $name
*
* @return void
*/
@@ -643,7 +643,8 @@ class PrettyPageHandler extends Handler
/**
* Adds a custom js file to be loaded.
*
* @param string $name
* @param string|null $name
*
* @return void
*/
public function addCustomJs($name)
@@ -666,7 +667,7 @@ class PrettyPageHandler extends Handler
* way back to the first, enabling a cascading-type system of overrides for
* all resources.
*
* @param string $resource
* @param string $resource
*
* @throws RuntimeException If resource cannot be found in any of the available paths
*
@@ -760,9 +761,11 @@ class PrettyPageHandler extends Handler
/**
* blacklist a sensitive value within one of the superglobal arrays.
* Alias for the hideSuperglobalKey method.
*
* @param string $superGlobalName The name of the superglobal array, e.g. '_GET'
* @param string $key The key within the superglobal
* @see hideSuperglobalKey
*
* @return void
*/
@@ -771,6 +774,18 @@ class PrettyPageHandler extends Handler
$this->blacklist[$superGlobalName][] = $key;
}
/**
* Hide a sensitive value within one of the superglobal arrays.
*
* @param string $superGlobalName The name of the superglobal array, e.g. '_GET'
* @param string $key The key within the superglobal
* @return void
*/
public function hideSuperglobalKey($superGlobalName, $key)
{
return $this->blacklist($superGlobalName, $key);
}
/**
* Checks all values within the given superGlobal array.
*
@@ -778,7 +793,7 @@ class PrettyPageHandler extends Handler
* only '*' characters. We intentionally dont rely on $GLOBALS as it
* depends on the 'auto_globals_jit' php.ini setting.
*
* @param array $superGlobal One of the superglobal arrays
* @param array $superGlobal One of the superglobal arrays
* @param string $superGlobalName The name of the superglobal array, e.g. '_GET'
*
* @return array $values without sensitive data

167
kirby/vendor/filp/whoops/src/Whoops/Run.php vendored
View File

@@ -7,6 +7,7 @@
namespace Whoops;
use InvalidArgumentException;
use Throwable;
use Whoops\Exception\ErrorException;
use Whoops\Exception\Inspector;
use Whoops\Handler\CallbackHandler;
@@ -17,8 +18,19 @@ use Whoops\Util\SystemFacade;
final class Run implements RunInterface
{
/**
* @var bool
*/
private $isRegistered;
/**
* @var bool
*/
private $allowQuit = true;
/**
* @var bool
*/
private $sendOutput = true;
/**
@@ -31,17 +43,35 @@ final class Run implements RunInterface
*/
private $handlerStack = [];
/**
* @var array
* @psalm-var list<array{patterns: string, levels: int}>
*/
private $silencedPatterns = [];
/**
* @var SystemFacade
*/
private $system;
/**
* In certain scenarios, like in shutdown handler, we can not throw exceptions.
*
* @var bool
*/
private $canThrowExceptions = true;
public function __construct(SystemFacade $system = null)
{
$this->system = $system ?: new SystemFacade;
}
/**
* Explicitly request your handler runs as the last of all currently registered handlers
* Explicitly request your handler runs as the last of all currently registered handlers.
*
* @param HandlerInterface $handler
*
* @return Run
*/
public function appendHandler($handler)
{
@@ -50,7 +80,11 @@ final class Run implements RunInterface
}
/**
* Explicitly request your handler runs as the first of all currently registered handlers
* Explicitly request your handler runs as the first of all currently registered handlers.
*
* @param HandlerInterface $handler
*
* @return Run
*/
public function prependHandler($handler)
{
@@ -58,12 +92,14 @@ final class Run implements RunInterface
}
/**
* Register your handler as the last of all currently registered handlers.
* Register your handler as the last of all currently registered handlers (to be executed first).
* Prefer using appendHandler and prependHandler for clarity.
*
* @throws InvalidArgumentException If argument is not callable or instance of HandlerInterface
* @param Callable|HandlerInterface $handler
* @param Callable|HandlerInterface $handler
*
* @return Run
*
* @throws InvalidArgumentException If argument is not callable or instance of HandlerInterface.
*/
public function pushHandler($handler)
{
@@ -72,17 +108,21 @@ final class Run implements RunInterface
}
/**
* See removeFirstHandler and removeLastHandler
* @return null|HandlerInterface
* Removes and returns the last handler pushed to the handler stack.
*
* @see Run::removeFirstHandler(), Run::removeLastHandler()
*
* @return HandlerInterface|null
*/
public function popHandler()
{
return array_pop($this->handlerStack);
}
/**
* Removes the first handler
* Removes the first handler.
*
* @return void
*/
public function removeFirstHandler()
{
@@ -90,7 +130,9 @@ final class Run implements RunInterface
}
/**
* Removes the last handler
* Removes the last handler.
*
* @return void
*/
public function removeLastHandler()
{
@@ -98,8 +140,8 @@ final class Run implements RunInterface
}
/**
* Returns an array with all handlers, in the
* order they were added to the stack.
* Returns an array with all handlers, in the order they were added to the stack.
*
* @return array
*/
public function getHandlers()
@@ -108,8 +150,8 @@ final class Run implements RunInterface
}
/**
* Clears all handlers in the handlerStack, including
* the default PrettyPage handler.
* Clears all handlers in the handlerStack, including the default PrettyPage handler.
*
* @return Run
*/
public function clearHandlers()
@@ -118,17 +160,9 @@ final class Run implements RunInterface
return $this;
}
/**
* @param \Throwable $exception
* @return Inspector
*/
private function getInspector($exception)
{
return new Inspector($exception);
}
/**
* Registers this instance as an error handler.
*
* @return Run
*/
public function register()
@@ -152,7 +186,8 @@ final class Run implements RunInterface
}
/**
* Unregisters all handlers registered by this Whoops\Run instance
* Unregisters all handlers registered by this Whoops\Run instance.
*
* @return Run
*/
public function unregister()
@@ -169,7 +204,9 @@ final class Run implements RunInterface
/**
* Should Whoops allow Handlers to force the script to quit?
* @param bool|int $exit
*
* @param bool|int $exit
*
* @return bool
*/
public function allowQuit($exit = null)
@@ -182,10 +219,12 @@ final class Run implements RunInterface
}
/**
* Silence particular errors in particular files
* @param array|string $patterns List or a single regex pattern to match
* @param int $levels Defaults to E_STRICT | E_DEPRECATED
* @return \Whoops\Run
* Silence particular errors in particular files.
*
* @param array|string $patterns List or a single regex pattern to match.
* @param int $levels Defaults to E_STRICT | E_DEPRECATED.
*
* @return Run
*/
public function silenceErrorsInPaths($patterns, $levels = 10240)
{
@@ -201,12 +240,12 @@ final class Run implements RunInterface
(array) $patterns
)
);
return $this;
}
/**
* Returns an array with silent errors in path configuration
* Returns an array with silent errors in path configuration.
*
* @return array
*/
@@ -215,13 +254,16 @@ final class Run implements RunInterface
return $this->silencedPatterns;
}
/*
/**
* Should Whoops send HTTP error code to the browser if possible?
* Whoops will by default send HTTP code 500, but you may wish to
* use 502, 503, or another 5xx family code.
*
* @param bool|int $code
*
* @return int|false
*
* @throws InvalidArgumentException
*/
public function sendHttpCode($code = null)
{
@@ -239,7 +281,7 @@ final class Run implements RunInterface
if ($code < 400 || 600 <= $code) {
throw new InvalidArgumentException(
"Invalid status code '$code', must be 4xx or 5xx"
"Invalid status code '$code', must be 4xx or 5xx"
);
}
@@ -248,8 +290,10 @@ final class Run implements RunInterface
/**
* Should Whoops push output directly to the client?
* If this is false, output will be returned by handleException
* @param bool|int $send
* If this is false, output will be returned by handleException.
*
* @param bool|int $send
*
* @return bool
*/
public function writeToOutput($send = null)
@@ -262,11 +306,11 @@ final class Run implements RunInterface
}
/**
* Handles an exception, ultimately generating a Whoops error
* page.
* Handles an exception, ultimately generating a Whoops error page.
*
* @param \Throwable $exception
* @return string Output generated by handlers
* @param Throwable $exception
*
* @return string Output generated by handlers.
*/
public function handleException($exception)
{
@@ -343,17 +387,17 @@ final class Run implements RunInterface
}
/**
* Converts generic PHP errors to \ErrorException
* instances, before passing them off to be handled.
* Converts generic PHP errors to \ErrorException instances, before passing them off to be handled.
*
* This method MUST be compatible with set_error_handler.
*
* @param int $level
* @param string $message
* @param string $file
* @param int $line
* @param int $level
* @param string $message
* @param string|null $file
* @param int|null $line
*
* @return bool
*
* @throws ErrorException
*/
public function handleError($level, $message, $file = null, $line = null)
@@ -388,6 +432,8 @@ final class Run implements RunInterface
/**
* Special case to deal with Fatal errors and the like.
*
* @return void
*/
public function handleShutdown()
{
@@ -411,11 +457,24 @@ final class Run implements RunInterface
}
/**
* In certain scenarios, like in shutdown handler, we can not throw exceptions
* @var bool
* @param Throwable $exception
*
* @return Inspector
*/
private $canThrowExceptions = true;
private function getInspector($exception)
{
return new Inspector($exception);
}
/**
* Resolves the giving handler.
*
* @param HandlerInterface $handler
*
* @return HandlerInterface
*
* @throws InvalidArgumentException
*/
private function resolveHandler($handler)
{
if (is_callable($handler)) {
@@ -424,7 +483,7 @@ final class Run implements RunInterface
if (!$handler instanceof HandlerInterface) {
throw new InvalidArgumentException(
"Handler must be a callable, or instance of "
"Handler must be a callable, or instance of "
. "Whoops\\Handler\\HandlerInterface"
);
}
@@ -433,13 +492,15 @@ final class Run implements RunInterface
}
/**
* Echo something to the browser
* @param string $output
* @return $this
* Echo something to the browser.
*
* @param string $output
*
* @return Run
*/
private function writeToOutputNow($output)
{
if ($this->sendHttpCode() && \Whoops\Util\Misc::canSendHeaders()) {
if ($this->sendHttpCode() && Misc::canSendHeaders()) {
$this->system->setHttpResponseCode(
$this->sendHttpCode()
);