Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/changelog.270.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Bug fixes:

Libraries and assets:
- update the bundled XMF library to 1.3.3: the proxy_env header is only honoured when the direct peer is listed in the new $xoopsConfig['proxy_trusted'] (addresses or CIDR ranges, documented in xoops_data/configs/xoopsconfig.dist.php) — sites that set proxy_env must add proxy_trusted, until then the peer address is used; Forwarded headers are parsed per RFC 7239; Xmf\Mail\SendmailRunner has a delivery timeout; Xmf\Database\Tables keeps CURRENT_TIMESTAMP defaults and refuses tables with functional index parts; Xmf\Security\Serializer accepts every legacy payload; Xmf\Jwt\TokenReader accepts Bearer tokens on custom headers again (xoops_lib/composer.dist.json, xoops_lib/vendor/xoops/xmf)
- HTML Purifier 4.19.1, firebase/php-jwt 7.2.1, Monolog 3.12.1, Punic 3.8.2, Smarty 4.5.8, symfony/polyfill-mbstring 1.43.0, symfony/var-dumper 7.4.18, symfony/yaml 7.4.20, TCPDF 6.11.4, webmozart/assert 2.5.0 (xoops_lib/composer.dist.lock, xoops_lib/vendor) (#265)
- HTML Purifier 4.19.1, firebase/php-jwt 7.2.1, Monolog 3.12.1, Punic 3.8.2, Smarty 4.5.8, symfony/polyfill-mbstring 1.43.0, symfony/var-dumper 7.4.21, symfony/yaml 7.4.21, TCPDF 6.11.4, webmozart/assert 2.5.0 (xoops_lib/composer.dist.lock, xoops_lib/vendor) (#265)

Tooling and CI:
- Qodana (jetbrains/qodana-php 2026.2, qodana.recommended profile) scans pull requests and master again, as it does on XoopsCore26; the scan installs xoops_lib/composer.dist.lock inside the linter container and skips the vendor trees, the installer, xoops_data, extras and tests; it runs only when the QODANA_TOKEN repository secret is set (qodana.yaml, .github/workflows/qodana.yml) (mamba)
Expand Down
24 changes: 12 additions & 12 deletions htdocs/xoops_lib/composer.dist.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1312,16 +1312,16 @@
},
{
"name": "symfony/var-dumper",
"version": "v7.4.18",
"version": "v7.4.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
"reference": "e088da50b813f32473a76871616cbb8fa54653a8"
"reference": "55d06b02f49eca9bff61828548988e6f8763e8a6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/e088da50b813f32473a76871616cbb8fa54653a8",
"reference": "e088da50b813f32473a76871616cbb8fa54653a8",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/55d06b02f49eca9bff61828548988e6f8763e8a6",
"reference": "55d06b02f49eca9bff61828548988e6f8763e8a6",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -1375,7 +1375,7 @@
"dump"
],
"support": {
"source": "https://github.com/symfony/var-dumper/tree/v7.4.18"
"source": "https://github.com/symfony/var-dumper/tree/v7.4.21"
},
"funding": [
{
Expand All @@ -1395,20 +1395,20 @@
"type": "tidelift"
}
],
"time": "2026-08-30T20:10:52+00:00"
"time": "2026-10-13T05:48:33+00:00"
},
{
"name": "symfony/yaml",
"version": "v7.4.20",
"version": "v7.4.21",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "0222bf4dfaa1e3ceb8fff579635d655f2950d5a7"
"reference": "044907929c7999814378be22da34722c7a86bad4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/0222bf4dfaa1e3ceb8fff579635d655f2950d5a7",
"reference": "0222bf4dfaa1e3ceb8fff579635d655f2950d5a7",
"url": "https://api.github.com/repos/symfony/yaml/zipball/044907929c7999814378be22da34722c7a86bad4",
"reference": "044907929c7999814378be22da34722c7a86bad4",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -1451,7 +1451,7 @@
"description": "Loads and dumps YAML files",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/yaml/tree/v7.4.20"
"source": "https://github.com/symfony/yaml/tree/v7.4.21"
},
"funding": [
{
Expand All @@ -1471,7 +1471,7 @@
"type": "tidelift"
}
],
"time": "2026-09-26T06:31:10+00:00"
"time": "2026-10-12T12:34:30+00:00"
},
{
"name": "tecnickcom/tcpdf",
Expand Down
28 changes: 14 additions & 14 deletions htdocs/xoops_lib/vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -1360,17 +1360,17 @@
},
{
"name": "symfony/var-dumper",
"version": "v7.4.18",
"version_normalized": "7.4.18.0",
"version": "v7.4.21",
"version_normalized": "7.4.21.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
"reference": "e088da50b813f32473a76871616cbb8fa54653a8"
"reference": "55d06b02f49eca9bff61828548988e6f8763e8a6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/e088da50b813f32473a76871616cbb8fa54653a8",
"reference": "e088da50b813f32473a76871616cbb8fa54653a8",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/55d06b02f49eca9bff61828548988e6f8763e8a6",
"reference": "55d06b02f49eca9bff61828548988e6f8763e8a6",
"shasum": ""
},
"require": {
Expand All @@ -1388,7 +1388,7 @@
"symfony/uid": "^6.4|^7.0|^8.0",
"twig/twig": "^3.12|^4.0"
},
"time": "2026-08-30T20:10:52+00:00",
"time": "2026-10-13T05:48:33+00:00",
"bin": [
"Resources/bin/var-dump-server"
],
Expand Down Expand Up @@ -1426,7 +1426,7 @@
"dump"
],
"support": {
"source": "https://github.com/symfony/var-dumper/tree/v7.4.18"
"source": "https://github.com/symfony/var-dumper/tree/v7.4.21"
},
"funding": [
{
Expand All @@ -1450,17 +1450,17 @@
},
{
"name": "symfony/yaml",
"version": "v7.4.20",
"version_normalized": "7.4.20.0",
"version": "v7.4.21",
"version_normalized": "7.4.21.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "0222bf4dfaa1e3ceb8fff579635d655f2950d5a7"
"reference": "044907929c7999814378be22da34722c7a86bad4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/0222bf4dfaa1e3ceb8fff579635d655f2950d5a7",
"reference": "0222bf4dfaa1e3ceb8fff579635d655f2950d5a7",
"url": "https://api.github.com/repos/symfony/yaml/zipball/044907929c7999814378be22da34722c7a86bad4",
"reference": "044907929c7999814378be22da34722c7a86bad4",
"shasum": ""
},
"require": {
Expand All @@ -1474,7 +1474,7 @@
"require-dev": {
"symfony/console": "^6.4|^7.0|^8.0"
},
"time": "2026-09-26T06:31:10+00:00",
"time": "2026-10-12T12:34:30+00:00",
"bin": [
"Resources/bin/yaml-lint"
],
Expand Down Expand Up @@ -1505,7 +1505,7 @@
"description": "Loads and dumps YAML files",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/yaml/tree/v7.4.20"
"source": "https://github.com/symfony/yaml/tree/v7.4.21"
},
"funding": [
{
Expand Down
16 changes: 8 additions & 8 deletions htdocs/xoops_lib/vendor/composer/installed.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
'name' => 'xoopscore27/libraries',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => '3b9bf84a8f6fe8b170148626b32942afc9088d0b',
'reference' => 'cfbac97abb8e5bb981a588b3ca6918bd99209fe4',
'type' => 'metapackage',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
Expand Down Expand Up @@ -197,18 +197,18 @@
'dev_requirement' => false,
),
'symfony/var-dumper' => array(
'pretty_version' => 'v7.4.18',
'version' => '7.4.18.0',
'reference' => 'e088da50b813f32473a76871616cbb8fa54653a8',
'pretty_version' => 'v7.4.21',
'version' => '7.4.21.0',
'reference' => '55d06b02f49eca9bff61828548988e6f8763e8a6',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/var-dumper',
'aliases' => array(),
'dev_requirement' => false,
),
'symfony/yaml' => array(
'pretty_version' => 'v7.4.20',
'version' => '7.4.20.0',
'reference' => '0222bf4dfaa1e3ceb8fff579635d655f2950d5a7',
'pretty_version' => 'v7.4.21',
'version' => '7.4.21.0',
'reference' => '044907929c7999814378be22da34722c7a86bad4',
'type' => 'library',
'install_path' => __DIR__ . '/../symfony/yaml',
'aliases' => array(),
Expand Down Expand Up @@ -271,7 +271,7 @@
'xoopscore27/libraries' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => '3b9bf84a8f6fe8b170148626b32942afc9088d0b',
'reference' => 'cfbac97abb8e5bb981a588b3ca6918bd99209fe4',
'type' => 'metapackage',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,10 +196,7 @@ public static function castFrameStub(FrameStub $frame, array $a, Stub $stub, boo
$prefix = Caster::PREFIX_VIRTUAL;

if (isset($f['file'], $f['line'])) {
$cacheKey = $f;
unset($cacheKey['object'], $cacheKey['args']);
$cacheKey[] = self::$srcContext;
$cacheKey = implode('-', $cacheKey);
$cacheKey = "{$f['file']}-{$f['line']}-".($f['class'] ?? '').'-'.($f['type'] ?? '').'-'.($f['function'] ?? '').'-'.self::$srcContext;

if (isset(self::$framesCache[$cacheKey])) {
$a[$prefix.'src'] = self::$framesCache[$cacheKey];
Expand Down
75 changes: 39 additions & 36 deletions htdocs/xoops_lib/vendor/symfony/yaml/Dumper.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,39 +77,18 @@ private function doDump(mixed $input, int $inline = 0, int $indent = 0, int $fla
}

if (Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && \is_string($value) && str_contains($value, "\n") && !str_contains($value, "\r")) {
$blockIndentationIndicator = $this->getBlockIndentationIndicator($value);

if (isset($value[-2]) && "\n" === $value[-2] && "\n" === $value[-1]) {
$blockChompingIndicator = '+';
} elseif ("\n" === $value[-1]) {
$blockChompingIndicator = '';
} else {
$blockChompingIndicator = '-';
}

$output .= \sprintf('%s%s%s |%s%s', $prefix, $dumpAsMap ? Inline::dump($key, $flags).':' : '-', '', $blockIndentationIndicator, $blockChompingIndicator);

foreach (explode("\n", $value) as $row) {
if ('' === $row) {
$output .= "\n";
} else {
$output .= \sprintf("\n%s%s%s", $prefix, str_repeat(' ', $this->indentation), $row);
}
}
$output .= \sprintf('%s%s%s |%s%s', $prefix, $dumpAsMap ? Inline::dump($key, $flags).':' : '-', '', $this->getBlockIndentationIndicator($value), $this->getBlockChompingIndicator($value));
$output .= $this->dumpBlockScalarLines($value, $prefix);

continue;
}

if ($value instanceof TaggedValue) {
$output .= \sprintf('%s%s !%s', $prefix, $dumpAsMap ? Inline::dump($key, $flags).':' : '-', $value->getTag());

if (Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && \is_string($value->getValue()) && str_contains($value->getValue(), "\n") && !str_contains($value->getValue(), "\r\n")) {
$blockIndentationIndicator = $this->getBlockIndentationIndicator($value->getValue());
$output .= \sprintf(' |%s', $blockIndentationIndicator);

foreach (explode("\n", $value->getValue()) as $row) {
$output .= \sprintf("\n%s%s%s", $prefix, str_repeat(' ', $this->indentation), $row);
}
if (Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && \is_string($value->getValue()) && str_contains($value->getValue(), "\n") && !str_contains($value->getValue(), "\r")) {
$output .= \sprintf(' |%s%s', $this->getBlockIndentationIndicator($value->getValue()), $this->getBlockChompingIndicator($value->getValue()));
$output .= $this->dumpBlockScalarLines($value->getValue(), $prefix);

continue;
}
Expand Down Expand Up @@ -148,13 +127,9 @@ private function dumpTaggedValue(TaggedValue $value, int $inline, int $indent, i
{
$output = \sprintf('%s!%s', $prefix ? $prefix.' ' : '', $value->getTag());

if (Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && \is_string($value->getValue()) && str_contains($value->getValue(), "\n") && !str_contains($value->getValue(), "\r\n")) {
$blockIndentationIndicator = $this->getBlockIndentationIndicator($value->getValue());
$output .= \sprintf(' |%s', $blockIndentationIndicator);

foreach (explode("\n", $value->getValue()) as $row) {
$output .= \sprintf("\n%s%s%s", $prefix, str_repeat(' ', $this->indentation), $row);
}
if (Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK & $flags && \is_string($value->getValue()) && str_contains($value->getValue(), "\n") && !str_contains($value->getValue(), "\r")) {
$output .= \sprintf(' |%s%s', $this->getBlockIndentationIndicator($value->getValue()), $this->getBlockChompingIndicator($value->getValue()));
$output .= $this->dumpBlockScalarLines($value->getValue(), $prefix);

return $output;
}
Expand All @@ -166,15 +141,43 @@ private function dumpTaggedValue(TaggedValue $value, int $inline, int $indent, i
return $output."\n".$this->doDump($value->getValue(), $inline - 1, $indent, $flags, $nestingLevel + 1);
}

private function getBlockChompingIndicator(string $value): string
{
// a block made of line breaks only has no content, so only the keep indicator preserves them
if ("\n" === $value || isset($value[-2]) && "\n" === $value[-2] && "\n" === $value[-1]) {
return '+';
}

if ("\n" === $value[-1]) {
return '';
}

return '-';
}

private function dumpBlockScalarLines(string $value, string $prefix): string
{
$output = '';

foreach (explode("\n", $value) as $row) {
if ('' === $row) {
$output .= "\n";
} else {
$output .= \sprintf("\n%s%s%s", $prefix, str_repeat(' ', $this->indentation), $row);
}
}

return $output;
}

private function getBlockIndentationIndicator(string $value): string
{
$lines = explode("\n", $value);

// If the first line (that is neither empty nor contains only spaces)
// starts with a space character, the spec requires a block indentation indicator
// The spec requires a block indentation indicator when the first line that is not empty starts with a space, even if that line holds only spaces
// http://www.yaml.org/spec/1.2/spec.html#id2793979
foreach ($lines as $line) {
if ('' !== trim($line, ' ')) {
if ('' !== $line) {
return str_starts_with($line, ' ') ? (string) $this->indentation : '';
}
}
Expand Down
2 changes: 1 addition & 1 deletion htdocs/xoops_lib/vendor/symfony/yaml/Escaper.php
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public static function requiresSingleQuoting(string $value): bool
{
// Determines if a PHP value is entirely composed of a value that would
// require single quoting in YAML.
if (\in_array(strtolower($value), ['null', '~', 'true', 'false', 'y', 'n', 'yes', 'no', 'on', 'off'], true)) {
if (\in_array(strtolower($value), ['null', '~', 'true', 'false', 'y', 'n', 'yes', 'no', 'on', 'off', '.inf', '.nan', '...'], true)) {
return true;
}

Expand Down
Loading