git subrepo commit mailcow/src/mailcow-dockerized
subrepo: subdir: "mailcow/src/mailcow-dockerized"
merged: "308860af"
upstream: origin: "https://github.com/mailcow/mailcow-dockerized.git"
branch: "master"
commit: "3f1a5af8"
git-subrepo: version: "0.4.5"
origin: "???"
commit: "???"
Change-Id: I5d51c14b45db54fe706be40a591ddbfcea50d4b0
diff --git a/mailcow/src/mailcow-dockerized/data/web/inc/lib/vendor/symfony/var-dumper/Dumper/CliDumper.php b/mailcow/src/mailcow-dockerized/data/web/inc/lib/vendor/symfony/var-dumper/Dumper/CliDumper.php
index c1539ee..f6e290c 100644
--- a/mailcow/src/mailcow-dockerized/data/web/inc/lib/vendor/symfony/var-dumper/Dumper/CliDumper.php
+++ b/mailcow/src/mailcow-dockerized/data/web/inc/lib/vendor/symfony/var-dumper/Dumper/CliDumper.php
@@ -55,11 +55,11 @@
protected $collapseNextHash = false;
protected $expandNextHash = false;
- private $displayOptions = [
+ private array $displayOptions = [
'fileLinkFormat' => null,
];
- private $handlesHrefGracefully;
+ private bool $handlesHrefGracefully;
/**
* {@inheritdoc}
@@ -125,7 +125,7 @@
/**
* {@inheritdoc}
*/
- public function dumpScalar(Cursor $cursor, string $type, $value)
+ public function dumpScalar(Cursor $cursor, string $type, string|int|float|bool|null $value)
{
$this->dumpKey($cursor);
@@ -139,11 +139,20 @@
case 'integer':
$style = 'num';
+
+ if (isset($this->styles['integer'])) {
+ $style = 'integer';
+ }
+
break;
case 'double':
$style = 'num';
+ if (isset($this->styles['float'])) {
+ $style = 'float';
+ }
+
switch (true) {
case \INF === $value: $value = 'INF'; break;
case -\INF === $value: $value = '-INF'; break;
@@ -267,7 +276,7 @@
/**
* {@inheritdoc}
*/
- public function enterHash(Cursor $cursor, int $type, $class, bool $hasChild)
+ public function enterHash(Cursor $cursor, int $type, string|int|null $class, bool $hasChild)
{
if (null === $this->colors) {
$this->colors = $this->supportsColors();
@@ -308,7 +317,7 @@
/**
* {@inheritdoc}
*/
- public function leaveHash(Cursor $cursor, int $type, $class, bool $hasChild, int $cut)
+ public function leaveHash(Cursor $cursor, int $type, string|int|null $class, bool $hasChild, int $cut)
{
if (empty($cursor->attr['cut_hash'])) {
$this->dumpEllipsis($cursor, $hasChild, $cut);
@@ -425,19 +434,15 @@
* @param string $style The type of style being applied
* @param string $value The value being styled
* @param array $attr Optional context information
- *
- * @return string The value with style decoration
*/
- protected function style(string $style, string $value, array $attr = [])
+ protected function style(string $style, string $value, array $attr = []): string
{
if (null === $this->colors) {
$this->colors = $this->supportsColors();
}
- if (null === $this->handlesHrefGracefully) {
- $this->handlesHrefGracefully = 'JetBrains-JediTerm' !== getenv('TERMINAL_EMULATOR')
- && (!getenv('KONSOLE_VERSION') || (int) getenv('KONSOLE_VERSION') > 201100);
- }
+ $this->handlesHrefGracefully ??= 'JetBrains-JediTerm' !== getenv('TERMINAL_EMULATOR')
+ && (!getenv('KONSOLE_VERSION') || (int) getenv('KONSOLE_VERSION') > 201100);
if (isset($attr['ellipsis'], $attr['ellipsis-type'])) {
$prefix = substr($value, 0, -$attr['ellipsis']);
@@ -501,10 +506,7 @@
return $value;
}
- /**
- * @return bool Tells if the current output stream supports ANSI colors or not
- */
- protected function supportsColors()
+ protected function supportsColors(): bool
{
if ($this->outputStream !== static::$defaultOutput) {
return $this->hasColorSupport($this->outputStream);
@@ -576,10 +578,8 @@
*
* Reference: Composer\XdebugHandler\Process::supportsColor
* https://github.com/composer/xdebug-handler
- *
- * @param mixed $stream A CLI output stream
*/
- private function hasColorSupport($stream): bool
+ private function hasColorSupport(mixed $stream): bool
{
if (!\is_resource($stream) || 'stream' !== get_resource_type($stream)) {
return false;