*/
private static array $enumProperties = [];
- private Describer $describer;
- private Renderer $renderer;
+ private readonly Describer $describer;
+ private readonly Renderer $renderer;
/**
diff --git a/core/vendor/tracy/tracy/src/Tracy/Dumper/Exposer.php b/core/vendor/tracy/tracy/src/Tracy/Dumper/Exposer.php
index 87106d7f35..abc5f5a1ff 100644
--- a/core/vendor/tracy/tracy/src/Tracy/Dumper/Exposer.php
+++ b/core/vendor/tracy/tracy/src/Tracy/Dumper/Exposer.php
@@ -10,7 +10,7 @@
use Dom;
use Ds;
use Uri;
-use function array_diff_key, array_key_exists, count, end, explode, get_debug_type, get_mangled_object_vars, implode, iterator_to_array, sort;
+use function array_key_exists, count;
use const PHP_VERSION_ID;
diff --git a/core/vendor/tracy/tracy/src/Tracy/Dumper/Renderer.php b/core/vendor/tracy/tracy/src/Tracy/Dumper/Renderer.php
index e849c6f79f..d713159949 100644
--- a/core/vendor/tracy/tracy/src/Tracy/Dumper/Renderer.php
+++ b/core/vendor/tracy/tracy/src/Tracy/Dumper/Renderer.php
@@ -8,7 +8,7 @@
namespace Tracy\Dumper;
use Tracy\Helpers;
-use function count, htmlspecialchars, is_array, is_bool, is_float, is_int, is_object, is_string, str_repeat, str_replace, strlen, strrpos, substr, substr_count;
+use function count, is_array, is_bool, is_float, is_int, is_object, is_string, strlen;
/**
@@ -53,7 +53,7 @@ public function renderAsHtml(\stdClass $model): string
$html = $this->renderVar($value);
$json = $snapshot = null;
- } elseif ($this->lazy && (is_array($value) && $value || is_object($value))) { // full lazy-loading
+ } elseif ($this->lazy && ((is_array($value) && $value) || is_object($value))) { // full lazy-loading
$html = '';
$snapshot = $this->collectingMode ? null : $this->snapshot;
$json = $value;
@@ -82,10 +82,10 @@ public function renderAsHtml(\stdClass $model): string
}
return ' 100 ? "\n" : '')
+ . ($json && $this->collapseTop === true ? ' tracy-collapsed' : '') . '"'
+ . ($snapshot !== null ? " data-tracy-snapshot='" . Helpers::jsonEncode($snapshot) . "'" : '')
+ . ($json ? " data-tracy-dump='" . Helpers::jsonEncode($json) . "'" : '')
+ . ($location || strlen($html) > 100 ? "\n" : '')
. '>'
. $location
. $html
@@ -231,7 +231,11 @@ private function renderArray(array|Value $array, int $depth): string
if ($this->lazy !== false) {
$ref = new Value(Value::TypeRef, $array->id);
$this->copySnapshot($ref);
- return '" . $out . ' ';
+ return '"
+ . $out
+ . ' ';
} elseif ($this->hash) {
return $out . (isset($this->above[$array->id]) ? ' see above ' : ' see below ');
@@ -314,7 +318,11 @@ private function renderObject(Value $object, int $depth): string
if ($this->lazy !== false) {
$ref = new Value(Value::TypeRef, $object->id);
$this->copySnapshot($ref);
- return '" . $out . ' ';
+ return '"
+ . $out
+ . ' ';
} elseif ($this->hash) {
return $out . (isset($this->above[$object->id]) ? ' see above ' : ' see below ');
@@ -368,7 +376,11 @@ private function renderResource(Value $resource, int $depth): string
if ($this->lazy !== false) {
$ref = new Value(Value::TypeRef, $resource->id);
$this->copySnapshot($ref);
- return '" . $out . ' ';
+ return '"
+ . $out
+ . ' ';
}
return $out . ' see above ';
diff --git a/core/vendor/tracy/tracy/src/Tracy/Helpers.php b/core/vendor/tracy/tracy/src/Tracy/Helpers.php
index 96258dd709..5c7a8da1b3 100644
--- a/core/vendor/tracy/tracy/src/Tracy/Helpers.php
+++ b/core/vendor/tracy/tracy/src/Tracy/Helpers.php
@@ -7,8 +7,8 @@
namespace Tracy;
-use function array_filter, array_map, array_merge, array_pop, array_slice, array_unique, basename, bin2hex, class_exists, constant, count, dechex, defined, dirname, end, escapeshellarg, explode, extension_loaded, func_get_args, function_exists, get_class_methods, get_declared_classes, get_defined_functions, getenv, getmypid, headers_list, htmlspecialchars, htmlspecialchars_decode, iconv_strlen, implode, in_array, ini_set, is_a, is_array, is_callable, is_file, is_object, is_string, json_encode, levenshtein, ltrim, mb_strlen, mb_substr, method_exists, ob_end_clean, ob_get_clean, ob_start, ord, preg_match, preg_replace, preg_replace_callback, random_bytes, rawurlencode, rtrim, sapi_windows_vt100_support, spl_object_id, str_contains, str_pad, str_replace, strcasecmp, stream_isatty, strip_tags, strlen, strtoupper, strtr, substr, trait_exists, utf8_decode;
-use const DIRECTORY_SEPARATOR, ENT_HTML5, ENT_QUOTES, ENT_SUBSTITUTE, JSON_HEX_AMP, JSON_HEX_APOS, JSON_HEX_TAG, JSON_INVALID_UTF8_SUBSTITUTE, JSON_UNESCAPED_SLASHES, JSON_UNESCAPED_UNICODE, PHP_EOL, PHP_SAPI, STDOUT, STR_PAD_LEFT;
+use function count, defined, extension_loaded, func_get_args, function_exists, is_array, is_object, is_string, strlen;
+use const ENT_HTML5, ENT_QUOTES, ENT_SUBSTITUTE, PHP_SAPI;
/**
@@ -40,6 +40,7 @@ public static function editorLink(string $file, ?int $line = null): string
basename($file),
$line ? ":$line" : '',
);
+
} else {
return self::formatHtml('% ', $file . ($line ? ":$line" : ''));
}
@@ -141,7 +142,10 @@ public static function countTransparentFrames(array $trace, ?array $paths = null
$next = $trace[$key + 1] ?? null;
$nextReflection = match (true) {
$next === null => null,
- isset($next['class'], $next['function']) && method_exists($next['class'], $next['function']) => new \ReflectionMethod($next['class'], $next['function']),
+ isset($next['class'], $next['function']) && method_exists($next['class'], $next['function']) => new \ReflectionMethod(
+ $next['class'],
+ $next['function'],
+ ),
isset($next['function']) && function_exists($next['function']) => new \ReflectionFunction($next['function']),
default => null,
};
@@ -256,15 +260,19 @@ public static function improveException(\Throwable $e): void
} elseif (is_array($arg) && !method_exists($arg[0], $arg[1])) {
$hint = self::getSuggestion(get_class_methods($arg[0]) ?: [], $arg[1]);
$class = is_object($arg[0]) ? $arg[0]::class : $arg[0];
- $message = str_replace($m[2], "but method $class::$arg[1]() does not exist" . ($hint ? " (did you mean $hint?)" : ''), $message);
+ $message = str_replace(
+ $m[2],
+ "but method $class::$arg[1]() does not exist" . ($hint ? " (did you mean $hint?)" : ''),
+ $message,
+ );
} elseif (is_string($arg) && !function_exists($arg)) {
- $funcs = array_merge(get_defined_functions()['internal'], get_defined_functions()['user']);
+ $funcs = [...get_defined_functions()['internal'], ...get_defined_functions()['user']];
$hint = self::getSuggestion($funcs, $arg);
$message = str_replace($m[2], "but function '$arg' does not exist" . ($hint ? " (did you mean $hint?)" : ''), $message);
}
} elseif (preg_match('#^Call to undefined function (\S+\\\)?(\w+)\(#', $message, $m)) {
- $funcs = array_merge(get_defined_functions()['internal'], get_defined_functions()['user']);
+ $funcs = [...get_defined_functions()['internal'], ...get_defined_functions()['user']];
if ($hint = self::getSuggestion($funcs, $m[1] . $m[2]) ?: self::getSuggestion($funcs, $m[2])) {
$message = "Call to undefined function $m[2](), did you mean $hint()?";
$replace = ["$m[2](", "$hint("];
@@ -303,7 +311,7 @@ public static function improveException(\Throwable $e): void
if (isset($replace)) {
$loc = Debugger::mapSource($e->getFile(), $e->getLine()) ?? ['file' => $e->getFile(), 'line' => $e->getLine()];
- @$e->tracyAction = [ // dynamic properties are deprecated since PHP 8.2
+ @$e->tracyAction = [ // @ dynamic properties are deprecated
'link' => self::editorUri($loc['file'], $loc['line'], 'fix', $replace[0], $replace[1]),
'label' => 'fix it',
];
@@ -341,7 +349,7 @@ public static function guessClassFile(string $class): ?string
if ($i > $max && $i < count($segments) && ($file = (new \ReflectionClass($class))->getFileName())) {
$max = $i;
- $res = array_merge(array_slice(explode(DIRECTORY_SEPARATOR, $file), 0, $i - count($parts)), array_slice($segments, $i));
+ $res = [...array_slice(explode(DIRECTORY_SEPARATOR, $file), 0, $i - count($parts)), ...array_slice($segments, $i)];
$res = implode(DIRECTORY_SEPARATOR, $res) . '.php';
}
}
@@ -359,7 +367,10 @@ public static function getSuggestion(array $items, string $value): ?string
{
$best = null;
$min = (strlen($value) / 4 + 1) * 10 + .1;
- $items = array_map(fn($item) => $item instanceof \ReflectionMethod || $item instanceof \ReflectionProperty ? $item->getName() : (string) $item, $items);
+ $items = array_map(
+ fn($item) => $item instanceof \ReflectionMethod || $item instanceof \ReflectionProperty ? $item->getName() : (string) $item,
+ $items,
+ );
foreach (array_unique($items) as $item) {
if (($len = levenshtein($item, $value, 10, 11, 10)) > 0 && $len < $min) {
$min = $len;
@@ -421,7 +432,11 @@ public static function isCli(): bool
/** @internal */
public static function getNonce(bool $attr = false): ?string
{
- return preg_match('#^Content-Security-Policy(?:-Report-Only)?:.*\sscript-src(?:-elem)?\s+(?:[^;]+\s)?\'nonce-([\w+/]+=*)\'#mi', implode("\n", headers_list()), $m)
+ return preg_match(
+ '#^Content-Security-Policy(?:-Report-Only)?:.*\sscript-src(?:-elem)?\s+(?:[^;]+\s)?\'nonce-([\w+/]+=*)\'#mi',
+ implode("\n", headers_list()),
+ $m,
+ )
? ($attr ? ' nonce="' . self::escapeHtml($m[1]) . '"' : $m[1])
: null;
}
@@ -496,8 +511,8 @@ private static function doEncodeString(string $s, bool $utf8, bool $showWhitespa
$s = preg_replace_callback(
$utf8 ? '#[\p{C}<&]#u' : '#[\x00-\x1F\x7F-\xFF<&]#',
fn($m) => $special[$m[0]] ?? (strlen($m[0]) === 1
- ? '\x' . str_pad(strtoupper(dechex(ord($m[0]))), 2, '0', STR_PAD_LEFT) . ' '
- : '\u{' . strtoupper(ltrim(dechex(self::utf8Ord($m[0])), '0')) . '} '),
+ ? '\x' . str_pad(strtoupper(dechex(ord($m[0]))), 2, '0', STR_PAD_LEFT) . ' '
+ : '\u{' . strtoupper(ltrim(dechex(self::utf8Ord($m[0])), '0')) . '} '),
$s,
);
$s = str_replace('', '', $s);
@@ -527,7 +542,7 @@ public static function utf8Length(string $s): int
return match (true) {
extension_loaded('mbstring') => mb_strlen($s, 'UTF-8'),
extension_loaded('iconv') => iconv_strlen($s, 'UTF-8') ?: strlen($s),
- default => strlen(@utf8_decode($s)), // deprecated
+ default => strlen(@utf8_decode($s)), // @ utf8_decode() is deprecated
};
}
@@ -682,7 +697,7 @@ public static function detectColors(): bool
public static function getExceptionChain(\Throwable $ex): array
{
$res = [$ex];
- while (($ex = $ex->getPrevious()) && !in_array($ex, $res, strict: true)) {
+ while (($ex = $ex->getPrevious()) && !in_array($ex, $res, true)) {
$res[] = $ex;
}
@@ -759,7 +774,15 @@ public static function jsonEncode(mixed $value, bool $inScript = false): string
{
$old = @ini_set('serialize_precision', '-1'); // @ may be disabled
try {
- return json_encode($value, ($inScript ? JSON_HEX_TAG : 0) | JSON_HEX_APOS | JSON_HEX_AMP | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_INVALID_UTF8_SUBSTITUTE);
+ return json_encode(
+ $value,
+ ($inScript ? JSON_HEX_TAG : 0)
+ | JSON_HEX_APOS
+ | JSON_HEX_AMP
+ | JSON_UNESCAPED_UNICODE
+ | JSON_UNESCAPED_SLASHES
+ | JSON_INVALID_UTF8_SUBSTITUTE,
+ );
} finally {
if ($old !== false) {
ini_set('serialize_precision', $old);
diff --git a/core/vendor/tracy/tracy/src/Tracy/Logger/Logger.php b/core/vendor/tracy/tracy/src/Tracy/Logger/Logger.php
index 39b5d458cb..c77d9f7039 100644
--- a/core/vendor/tracy/tracy/src/Tracy/Logger/Logger.php
+++ b/core/vendor/tracy/tracy/src/Tracy/Logger/Logger.php
@@ -7,8 +7,8 @@
namespace Tracy;
-use function in_array, is_string;
-use const DIRECTORY_SEPARATOR, FILE_APPEND, LOCK_EX, LOCK_UN, PHP_EOL;
+use function is_string;
+use const DIRECTORY_SEPARATOR, FILE_APPEND, LOCK_EX;
/**
@@ -74,7 +74,7 @@ public function log(mixed $message, string $level = self::INFO)
$this->logException($message, $exceptionFile);
}
- if (in_array($level, [self::ERROR, self::EXCEPTION, self::CRITICAL], strict: true)) {
+ if (in_array($level, [self::ERROR, self::EXCEPTION, self::CRITICAL], true)) {
$this->sendEmail($message);
}
@@ -92,7 +92,10 @@ public static function formatMessage($message): string
foreach (Helpers::getExceptionChain($message) as $exception) {
$tmp[] = ($exception instanceof \ErrorException
? Helpers::errorTypeToString($exception->getSeverity()) . ': ' . $exception->getMessage()
- : get_debug_type($exception) . ': ' . $exception->getMessage() . ($exception->getCode() ? ' #' . $exception->getCode() : '')
+ : get_debug_type($exception)
+ . ': '
+ . $exception->getMessage()
+ . ($exception->getCode() ? ' #' . $exception->getCode() : '')
) . ' in ' . $exception->getFile() . ':' . $exception->getLine();
}
diff --git a/core/vendor/tracy/tracy/src/Tracy/OutputDebugger/OutputDebugger.php b/core/vendor/tracy/tracy/src/Tracy/OutputDebugger/OutputDebugger.php
index 87b21605e3..a4841ac46d 100644
--- a/core/vendor/tracy/tracy/src/Tracy/OutputDebugger/OutputDebugger.php
+++ b/core/vendor/tracy/tracy/src/Tracy/OutputDebugger/OutputDebugger.php
@@ -7,8 +7,7 @@
namespace Tracy;
-use function array_slice, count;
-use const PHP_OUTPUT_HANDLER_FINAL;
+use function count;
/**
diff --git a/core/vendor/tracy/tracy/src/Tracy/Session/FileSession.php b/core/vendor/tracy/tracy/src/Tracy/Session/FileSession.php
index 2c13182f48..f778f6df2a 100644
--- a/core/vendor/tracy/tracy/src/Tracy/Session/FileSession.php
+++ b/core/vendor/tracy/tracy/src/Tracy/Session/FileSession.php
@@ -8,7 +8,6 @@
namespace Tracy;
use function is_string;
-use const LOCK_EX, LOCK_UN;
/**
@@ -53,7 +52,7 @@ private function open(): void
if (
!is_string($id)
|| !preg_match('#^\w{10}\z#i', $id)
- || !($file = @fopen($path = $this->dir . '/' . self::FilePrefix . $id, 'r+')) // intentionally @
+ || !($file = @fopen($path = $this->dir . '/' . self::FilePrefix . $id, 'r+')) // @ file may not exist
) {
$id = Helpers::createId();
setcookie($this->cookieName, $id, [
@@ -64,7 +63,7 @@ private function open(): void
'samesite' => 'Lax',
]);
- $file = @fopen($path = $this->dir . '/' . self::FilePrefix . $id, 'c+'); // intentionally @
+ $file = @fopen($path = $this->dir . '/' . self::FilePrefix . $id, 'c+'); // @ is escalated to exception
if ($file === false) {
throw new \RuntimeException("Unable to create file '$path'. " . (error_get_last()['message'] ?? ''));
}
@@ -72,7 +71,7 @@ private function open(): void
@chmod($path, 0o600); // @ - may not be supported by the filesystem
}
- if (!@flock($file, LOCK_EX)) { // intentionally @
+ if (!@flock($file, LOCK_EX)) { // @ is escalated to exception
throw new \RuntimeException("Unable to acquire exclusive lock on '$path'. " . (error_get_last()['message'] ?? ''));
}
diff --git a/core/vendor/tracy/tracy/src/Tracy/Session/NativeSession.php b/core/vendor/tracy/tracy/src/Tracy/Session/NativeSession.php
index b662ed2e82..9020ae2c24 100644
--- a/core/vendor/tracy/tracy/src/Tracy/Session/NativeSession.php
+++ b/core/vendor/tracy/tracy/src/Tracy/Session/NativeSession.php
@@ -7,8 +7,6 @@
namespace Tracy;
-use const PHP_SESSION_ACTIVE;
-
/**
* Session storage backed by native PHP session ($_SESSION).
diff --git a/core/vendor/tracy/tracy/tools/create-phar/create-phar.php b/core/vendor/tracy/tracy/tools/create-phar/create-phar.php
index 8905778ccf..e08e291436 100644
--- a/core/vendor/tracy/tracy/tools/create-phar/create-phar.php
+++ b/core/vendor/tracy/tracy/tools/create-phar/create-phar.php
@@ -16,7 +16,10 @@
");
$phar->startBuffering();
-foreach ($iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(__DIR__ . '/../../src', RecursiveDirectoryIterator::SKIP_DOTS)) as $file) {
+foreach ($iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator(
+ __DIR__ . '/../../src',
+ RecursiveDirectoryIterator::SKIP_DOTS,
+)) as $file) {
if (!in_array($file->getExtension(), ['php', 'phtml', 'js', 'css'], true)) {
continue;
}
diff --git a/core/vendor/vlucas/phpdotenv/composer.json b/core/vendor/vlucas/phpdotenv/composer.json
index 60aa7a58fd..db6e40b9e8 100644
--- a/core/vendor/vlucas/phpdotenv/composer.json
+++ b/core/vendor/vlucas/phpdotenv/composer.json
@@ -54,7 +54,7 @@
"forward-command": false
},
"branch-alias": {
- "dev-master": "5.6-dev"
+ "dev-master": "5.8-dev"
}
}
}
diff --git a/core/vendor/vlucas/phpdotenv/src/Parser/Lines.php b/core/vendor/vlucas/phpdotenv/src/Parser/Lines.php
index de290c5a4b..e2a212892e 100644
--- a/core/vendor/vlucas/phpdotenv/src/Parser/Lines.php
+++ b/core/vendor/vlucas/phpdotenv/src/Parser/Lines.php
@@ -43,6 +43,11 @@ public static function process(array $lines)
}
}
+ // Emit an unterminated multiline value so the parser reports the missing quote.
+ if ($multiline) {
+ $output[] = \implode("\n", $multilineBuffer);
+ }
+
return $output;
}
@@ -111,11 +116,7 @@ private static function looksLikeMultilineStart(string $line)
*/
private static function looksLikeMultilineStop(string $line, bool $started)
{
- if ($line === '"') {
- return true;
- }
-
- return Regex::occurrences('/(?=([^\\\\]"))/', \str_replace('\\\\', '', $line))->map(static function (int $count) use ($started) {
+ return Regex::occurrences('/(?map(static function (int $count) use ($started) {
return $started ? $count > 1 : $count >= 1;
})->success()->getOrElse(false);
}
diff --git a/manager/actions/files.dynamic.php b/manager/actions/files.dynamic.php
index 537a330915..e9b2614711 100755
--- a/manager/actions/files.dynamic.php
+++ b/manager/actions/files.dynamic.php
@@ -7,6 +7,7 @@
}
$token_check = checkToken();
$newToken = makeToken();
+$tokenRefusedMessage = '' . e(\EvolutionCMS\Support\CsrfMessage::text()) . ' ' . $_lang['files_zip_deleted'] . ' Invalid token Invalid token ' . $_lang['files_zip_unavailable'] . ' Invalid token Invalid token Invalid token Invalid token Invalid token Invalid token Invalid token Invalid token Invalid token Invalid token ' . $_lang['files_link_deleted'] . ' Invalid token Invalid token Invalid token KCFinder: /
<?php echo $this->session['dir'] ?>
[+site_name_text+] (Evolution CMS Manager Login)
[+site_name_text+] (Evolution CMS Content Manager)