beenull/karadav
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update dependencies

Browse source
This commit is contained in:
bohwaz 2023-10-15 12:19:20 +02:00
parent 461b6dd852
commit 4cde41e2f5
2 changed files with 41 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
lib/KD2/ErrorManager.php
View file

@ -131,8 +131,9 @@ class ErrorManager
static public function shutdownHandler() static public function shutdownHandler()
{ {
// Stop here if disabled or if the script ended with an exception // Stop here if disabled or if the script ended with an exception
if (!self::$enabled || self::$catching) if (!self::$enabled || self::$catching) {
return false; return false;
}
$error = error_get_last(); $error = error_get_last();
@ -755,32 +756,12 @@ class ErrorManager
return $out; return $out;
} }
/** static public function setEnvironment(int $environment): void
* Enable error manager
* @param integer $type Type of error management (ErrorManager::PRODUCTION or ErrorManager::DEVELOPMENT)
* You can also use ErrorManager::PRODUCTION | ErrorManager::CLI_DEVELOPMENT to get error messages in CLI but still hide errors
* on web front-end.
* @return void
*/
static public function enable($type = self::DEVELOPMENT)
{ {
if (self::$enabled) self::$enabled = $environment;
return true; error_reporting($environment & self::DEVELOPMENT ? -1 : E_ALL & ~E_DEPRECATED & ~E_STRICT);
self::$context['request_started'] = $_SERVER['REQUEST_TIME_FLOAT'] ?? microtime(true); if ($environment & self::DEVELOPMENT && PHP_SAPI != 'cli') {
self::$enabled = $type;
self::$term_color = function_exists('posix_isatty') && defined('\STDOUT') && @posix_isatty(\STDOUT);
ini_set('display_errors', false);
ini_set('log_errors', false);
ini_set('html_errors', false);
ini_set('zend.exception_ignore_args', false); // We want to get the args in exceptions (since PHP 7.4)
error_reporting($type & self::DEVELOPMENT ? -1 : E_ALL & ~E_DEPRECATED & ~E_STRICT);
if ($type & self::DEVELOPMENT && PHP_SAPI != 'cli')
{
self::setHtmlHeader('<!DOCTYPE html><meta charset="utf-8" /><style type="text/css"> self::setHtmlHeader('<!DOCTYPE html><meta charset="utf-8" /><style type="text/css">
body { font-family: sans-serif; } * { margin: 0; padding: 0; } body { font-family: sans-serif; } * { margin: 0; padding: 0; }
u, code b, i, h3 { font-style: normal; font-weight: normal; text-decoration: none; } u, code b, i, h3 { font-style: normal; font-weight: normal; text-decoration: none; }
@ -796,15 +777,37 @@ class ErrorManager
</style> </style>
<pre id="icn"> \__/<br /> (xx)<br />//||\\\\</pre>'); <pre id="icn"> \__/<br /> (xx)<br />//||\\\\</pre>');
} }
}
/**
* Enable error manager
* @param integer $environment Type of error management (ErrorManager::PRODUCTION or ErrorManager::DEVELOPMENT)
* You can also use ErrorManager::PRODUCTION | ErrorManager::CLI_DEVELOPMENT to get error messages in CLI but still hide errors
* on web front-end.
* @return void
*/
static public function enable(int $environment = self::DEVELOPMENT): void
{
if (self::$enabled) {
return;
}
self::$context['request_started'] = $_SERVER['REQUEST_TIME_FLOAT'] ?? microtime(true);
self::$term_color = function_exists('posix_isatty') && defined('\STDOUT') && @posix_isatty(\STDOUT);
ini_set('display_errors', false);
ini_set('log_errors', false);
ini_set('html_errors', false);
ini_set('zend.exception_ignore_args', false); // We want to get the args in exceptions (since PHP 7.4)
self::setEnvironment($environment);
register_shutdown_function([self::class, 'shutdownHandler']); register_shutdown_function([self::class, 'shutdownHandler']);
set_exception_handler([__CLASS__, 'exceptionHandler']); set_exception_handler([__CLASS__, 'exceptionHandler']);
set_error_handler([__CLASS__, 'errorHandler']); set_error_handler([__CLASS__, 'errorHandler']);
if ($type & self::DEVELOPMENT) if ($environment & self::DEVELOPMENT) {
{
self::startTimer('_global'); self::startTimer('_global');
} }
@ -818,10 +821,8 @@ class ErrorManager
'root_directory' => 'DOCUMENT_ROOT', 'root_directory' => 'DOCUMENT_ROOT',
]; ];
foreach ($defaults as $a => $b) foreach ($defaults as $a => $b) {
{ if (isset($_SERVER[$b]) && !isset(self::$context[$a])) {
if (isset($_SERVER[$b]) && !isset(self::$context[$a]))
{
self::$context[$a] = $_SERVER[$b]; self::$context[$a] = $_SERVER[$b];
} }
} }

2
lib/KD2/WebDAV/Server.php
View file

@ -118,7 +118,7 @@ class Server
public function setBaseURI(string $uri): void public function setBaseURI(string $uri): void
{ {
$this->base_uri = ltrim($uri, '/'); $this->base_uri = '/' . ltrim($uri, '/');
$this->base_uri = rtrim($this->base_uri, '/') . '/'; $this->base_uri = rtrim($this->base_uri, '/') . '/';
} }