From 4d5c643d1dc50dba7fe2772d8da830cfae11e651 Mon Sep 17 00:00:00 2001 From: Denny Septian Panggabean Date: Fri, 20 Nov 2026 00:05:11 +0700 Subject: [PATCH] chore: bump dependencies kint-php/kint to v6.1.1 as minimum required --- admin/framework/composer.json | 2 +- composer.json | 2 +- system/ThirdParty/Kint/CallFinder.php | 10 +-- system/ThirdParty/Kint/Kint.php | 18 ++--- .../Kint/Parser/BlacklistPlugin.php | 2 +- .../Kint/Parser/ClassStaticsPlugin.php | 4 +- system/ThirdParty/Kint/Parser/DomPlugin.php | 12 ++-- .../ThirdParty/Kint/Parser/FsPathPlugin.php | 5 +- system/ThirdParty/Kint/Parser/Parser.php | 39 +++++++++-- .../ThirdParty/Kint/Parser/ProfilePlugin.php | 4 +- system/ThirdParty/Kint/Parser/XmlPlugin.php | 2 +- .../Kint/Renderer/AssetRendererTrait.php | 2 +- .../ThirdParty/Kint/Renderer/RichRenderer.php | 5 +- system/ThirdParty/Kint/Value/ClosureValue.php | 2 +- .../Value/Context/ClassDeclaredContext.php | 6 +- .../ThirdParty/Kint/Value/DateTimeValue.php | 2 +- .../Kint/Value/DomNodeListValue.php | 2 +- system/ThirdParty/Kint/Value/DomNodeValue.php | 2 +- system/ThirdParty/Kint/Value/EnumValue.php | 2 +- .../Kint/Value/LazyInstanceValue.php | 36 ++++++++++ .../Kint/Value/ProxyInstanceValue.php | 70 +++++++++++++++++++ .../Kint/Value/SimpleXMLElementValue.php | 2 +- .../Kint/Value/SplFileInfoValue.php | 2 +- .../ThirdParty/Kint/Value/ThrowableValue.php | 2 +- system/ThirdParty/Kint/init.php | 1 + 25 files changed, 181 insertions(+), 55 deletions(-) create mode 100644 system/ThirdParty/Kint/Value/LazyInstanceValue.php create mode 100644 system/ThirdParty/Kint/Value/ProxyInstanceValue.php diff --git a/admin/framework/composer.json b/admin/framework/composer.json index 2cb3ffa82498..713f670a70de 100644 --- a/admin/framework/composer.json +++ b/admin/framework/composer.json @@ -20,7 +20,7 @@ "codeigniter/coding-standard": "^1.7", "fakerphp/faker": "^1.24", "friendsofphp/php-cs-fixer": "^3.47.1", - "kint-php/kint": "^6.1", + "kint-php/kint": "^6.1.1", "mikey179/vfsstream": "^1.6.12", "nexusphp/cs-config": "^3.6", "phpunit/phpunit": "^10.5.16 || ^11.2", diff --git a/composer.json b/composer.json index 38a356b5089a..e49acc999dc3 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "boundwize/structarmed": "^0.21", "codeigniter/phpstan-codeigniter": "^2.3", "fakerphp/faker": "^1.24", - "kint-php/kint": "^6.1", + "kint-php/kint": "^6.1.1", "mikey179/vfsstream": "^1.6.12", "nexusphp/tachycardia": "^2.0", "phpstan/extension-installer": "^1.4", diff --git a/system/ThirdParty/Kint/CallFinder.php b/system/ThirdParty/Kint/CallFinder.php index cc34123a72c8..71688e20a656 100644 --- a/system/ThirdParty/Kint/CallFinder.php +++ b/system/ThirdParty/Kint/CallFinder.php @@ -208,7 +208,7 @@ public static function getFunctionCalls(string $source, int $line, $function): a $function_calls = []; // Performance optimization preventing backwards loops - /** @psalm-var array */ + /** @psalm-var array */ $prev_tokens = [null, null, null]; if (\is_array($function)) { @@ -522,11 +522,11 @@ public static function getFunctionCalls(string $source, int $line, $function): a 'literal' => $literal, 'new_without_parens' => $new_without_parens, ]; - } - // Skip first-class callables - if (KINT_PHP81 && 1 === \count($formatted_parameters) && '...' === \reset($formatted_parameters)['path']) { - continue; + // Skip callable assignment + if ('...' === $path || '?' === $path) { + continue 2; + } } // Get the modifiers diff --git a/system/ThirdParty/Kint/Kint.php b/system/ThirdParty/Kint/Kint.php index 4348aab090b3..2e06257b0c89 100644 --- a/system/ThirdParty/Kint/Kint.php +++ b/system/ThirdParty/Kint/Kint.php @@ -50,8 +50,8 @@ * @psalm-type KintCallInfo = array{ * params: ?list, * modifiers: array, - * callee: ?callable, - * caller: ?callable, + * callee: ?TraceFrame, + * caller: ?TraceFrame, * trace: TraceFrame[], * } * @@ -126,7 +126,7 @@ class Kint implements FacadeInterface ]; /** - * @psalm-var array> + * @psalm-var array|RendererInterface> * * Array of modes to renderer class names */ @@ -138,7 +138,7 @@ class Kint implements FacadeInterface ]; /** - * @psalm-var array> + * @psalm-var array|PluginInterface> */ public static array $plugins = [ \Kint\Parser\ArrayLimitPlugin::class, @@ -433,16 +433,10 @@ public static function getCallInfo(array $aliases, array $trace, array $args): a } foreach ($miniTrace as $index => $frame) { - if ((0 === $index && $callee === $frame) || isset($frame['file'], $frame['line'])) { - unset($frame['object'], $frame['args']); - $miniTrace[$index] = $frame; - } else { - unset($miniTrace[$index]); - } + unset($frame['object'], $frame['args']); + $miniTrace[$index] = $frame; } - $miniTrace = \array_values($miniTrace); - $call = static::getSingleCall($callee ?: [], $args); $ret = [ diff --git a/system/ThirdParty/Kint/Parser/BlacklistPlugin.php b/system/ThirdParty/Kint/Parser/BlacklistPlugin.php index 2fa4fed56137..ff07d7907799 100644 --- a/system/ThirdParty/Kint/Parser/BlacklistPlugin.php +++ b/system/ThirdParty/Kint/Parser/BlacklistPlugin.php @@ -88,7 +88,7 @@ public function parseBegin(&$var, ContextInterface $c): ?AbstractValue */ protected function blacklistValue(&$var, ContextInterface $c): InstanceValue { - $object = new InstanceValue($c, \get_class($var), \spl_object_hash($var), \spl_object_id($var)); + $object = new InstanceValue($c, \get_class($var), @\spl_object_hash($var), \spl_object_id($var)); $object->flags |= AbstractValue::FLAG_BLACKLIST; return $object; diff --git a/system/ThirdParty/Kint/Parser/ClassStaticsPlugin.php b/system/ThirdParty/Kint/Parser/ClassStaticsPlugin.php index 0b5e616fc716..e06a7d634d32 100644 --- a/system/ThirdParty/Kint/Parser/ClassStaticsPlugin.php +++ b/system/ThirdParty/Kint/Parser/ClassStaticsPlugin.php @@ -41,7 +41,7 @@ class ClassStaticsPlugin extends AbstractPlugin implements PluginCompleteInterface { - /** @psalm-var array>> */ + /** @psalm-var array>> */ private array $cache = []; public function getTypes(): array @@ -137,7 +137,7 @@ private function buildStaticValue(ReflectionProperty $pr, int $depth): AbstractV } if (KINT_PHP81 === false) { - $pr->setAccessible(true); + $pr->setAccessible(true); // @codeCoverageIgnore } /** diff --git a/system/ThirdParty/Kint/Parser/DomPlugin.php b/system/ThirdParty/Kint/Parser/DomPlugin.php index 7de5eb8db301..5ad43e8c32c9 100644 --- a/system/ThirdParty/Kint/Parser/DomPlugin.php +++ b/system/ThirdParty/Kint/Parser/DomPlugin.php @@ -274,7 +274,7 @@ private function parseProperty(object $var, string $prop, ContextInterface $c): } if (isset(self::$blacklist[$prop])) { - $b = new InstanceValue($c, \get_class($value), \spl_object_hash($value), \spl_object_id($value)); + $b = new InstanceValue($c, \get_class($value), @\spl_object_hash($value), \spl_object_id($value)); $b->flags |= AbstractValue::FLAG_GENERATED | AbstractValue::FLAG_BLACKLIST; return $b; @@ -311,7 +311,7 @@ private function parseList(object $var, ContextInterface $c): InstanceValue if ($var instanceof NodeList || $var instanceof DOMNodeList) { $v = new DomNodeListValue($c, $var); } else { - $v = new InstanceValue($c, \get_class($var), \spl_object_hash($var), \spl_object_id($var)); + $v = new InstanceValue($c, \get_class($var), @\spl_object_hash($var), \spl_object_id($var)); } $parser = $this->getParser(); @@ -461,10 +461,6 @@ public static function getKnownProperties(object $var): array self::$property_cache[$classname] = []; foreach ($r->getProperties() as $prop) { - if ($prop->isStatic()) { - continue; - } - $declaring = $prop->getDeclaringClass()->getName(); $name = $prop->name; @@ -490,6 +486,7 @@ public static function getKnownProperties(object $var): array $known_properties = self::$property_cache[$classname]; } else { + // @codeCoverageIgnoreStart $known_properties = self::DOMNODE_PROPS; if ($var instanceof DOMElement) { $known_properties += self::DOMELEMENT_PROPS; @@ -497,9 +494,10 @@ public static function getKnownProperties(object $var): array foreach (self::DOM_VERSIONS as $key => $val) { if (false === $val) { - unset($known_properties[$key]); // @codeCoverageIgnore + unset($known_properties[$key]); } } + // @codeCoverageIgnoreEnd } /** @psalm-var non-empty-array $known_properties */ diff --git a/system/ThirdParty/Kint/Parser/FsPathPlugin.php b/system/ThirdParty/Kint/Parser/FsPathPlugin.php index 3b17d0e91142..2e9b127825ee 100644 --- a/system/ThirdParty/Kint/Parser/FsPathPlugin.php +++ b/system/ThirdParty/Kint/Parser/FsPathPlugin.php @@ -31,6 +31,7 @@ use Kint\Value\Representation\SplFileInfoRepresentation; use SplFileInfo; use TypeError; +use ValueError; class FsPathPlugin extends AbstractPlugin implements PluginCompleteInterface { @@ -64,8 +65,8 @@ public function parseComplete(&$var, AbstractValue $v, int $trigger): AbstractVa if (!@\file_exists($var)) { return $v; } - } catch (TypeError $e) {// @codeCoverageIgnore - // Only possible in PHP 7 + } catch (TypeError|ValueError $e) {// @codeCoverageIgnore + // TypeError only possible in PHP 7, ValueError from 8.6+ return $v; // @codeCoverageIgnore } diff --git a/system/ThirdParty/Kint/Parser/Parser.php b/system/ThirdParty/Kint/Parser/Parser.php index 5b28157ab29e..f17049139b66 100644 --- a/system/ThirdParty/Kint/Parser/Parser.php +++ b/system/ThirdParty/Kint/Parser/Parser.php @@ -34,12 +34,15 @@ use Kint\Value\ArrayValue; use Kint\Value\ClosedResourceValue; use Kint\Value\Context\ArrayContext; +use Kint\Value\Context\BaseContext; use Kint\Value\Context\ClassDeclaredContext; use Kint\Value\Context\ClassOwnedContext; use Kint\Value\Context\ContextInterface; use Kint\Value\Context\PropertyContext; use Kint\Value\FixedWidthValue; use Kint\Value\InstanceValue; +use Kint\Value\LazyInstanceValue; +use Kint\Value\ProxyInstanceValue; use Kint\Value\Representation\ContainerRepresentation; use Kint\Value\Representation\StringRepresentation; use Kint\Value\ResourceValue; @@ -77,6 +80,7 @@ class Parser public const TRIGGER_SUCCESS = 1 << 1; public const TRIGGER_RECURSION = 1 << 2; public const TRIGGER_DEPTH_LIMIT = 1 << 3; + public const TRIGGER_LAZY = 1 << 4; public const TRIGGER_COMPLETE = self::TRIGGER_SUCCESS | self::TRIGGER_RECURSION | self::TRIGGER_DEPTH_LIMIT; /** @psalm-var ?class-string */ @@ -368,7 +372,7 @@ private function getPropsOrderedOld(ReflectionClass $r): array private function parseObject(object &$var, ContextInterface $c): AbstractValue { - $hash = \spl_object_hash($var); + $hash = @\spl_object_hash($var); $classname = \get_class($var); if (isset($this->object_hashes[$hash])) { @@ -383,18 +387,36 @@ private function parseObject(object &$var, ContextInterface $c): AbstractValue $cdepth = $c->getDepth(); $ap = $c->getAccessPath(); + $robj = new ReflectionObject($var); + + if (KINT_PHP84 && $robj->isUninitializedLazyObject($var)) { + // Since getProperties on ReflectionObject also gets dynamic + // properties we have to use a ReflectionClass so as not to + // accidentally initialize lazy objects + $robj = new ReflectionClass($var); + $object = new LazyInstanceValue($c, $classname, $hash, \spl_object_id($var)); + } elseif (KINT_PHP84 && ($innerVar = $robj->initializeLazyObject($var)) !== $var) { + $innerContext = new BaseContext('instance'); + $innerContext->access_path = $ap; + $innerContext->depth = $cdepth + 1; + $inner = $this->parse($innerVar, $innerContext); + $innerContext->access_path = null; + + return new ProxyInstanceValue($c, $inner, $classname, $hash, \spl_object_id($var)); + } else { + $object = new InstanceValue($c, $classname, $hash, \spl_object_id($var)); + } if ($this->depth_limit && $cdepth >= $this->depth_limit) { - $object = new InstanceValue($c, $classname, $hash, \spl_object_id($var)); $object->flags |= AbstractValue::FLAG_DEPTH_LIMIT; return $this->applyPluginsComplete($var, $object, self::TRIGGER_DEPTH_LIMIT); } if (KINT_PHP81) { - $props = $this->getPropsOrdered(new ReflectionObject($var)); + $props = $this->getPropsOrdered($robj); } else { - $props = $this->getPropsOrderedOld(new ReflectionObject($var)); // @codeCoverageIgnore + $props = $this->getPropsOrderedOld($robj); // @codeCoverageIgnore } $values = (array) $var; @@ -402,7 +424,7 @@ private function parseObject(object &$var, ContextInterface $c): AbstractValue foreach ($props as $rprop) { if (KINT_PHP81 === false) { - $rprop->setAccessible(true); + $rprop->setAccessible(true); // @codeCoverageIgnore } $name = $rprop->getName(); @@ -503,7 +525,6 @@ private function parseObject(object &$var, ContextInterface $c): AbstractValue } } - $object = new InstanceValue($c, $classname, $hash, \spl_object_id($var)); if ($props) { $object->setChildren($properties); } @@ -512,7 +533,11 @@ private function parseObject(object &$var, ContextInterface $c): AbstractValue $object->addRepresentation(new ContainerRepresentation('Properties', $properties)); } - return $this->applyPluginsComplete($var, $object, self::TRIGGER_SUCCESS); + return $this->applyPluginsComplete( + $var, + $object, + $object instanceof LazyInstanceValue ? self::TRIGGER_LAZY : self::TRIGGER_SUCCESS, + ); } finally { unset($this->object_hashes[$hash]); } diff --git a/system/ThirdParty/Kint/Parser/ProfilePlugin.php b/system/ThirdParty/Kint/Parser/ProfilePlugin.php index 836357b24eda..a83451e39b2c 100644 --- a/system/ThirdParty/Kint/Parser/ProfilePlugin.php +++ b/system/ThirdParty/Kint/Parser/ProfilePlugin.php @@ -51,7 +51,7 @@ public function getTypes(): array public function getTriggers(): int { - return Parser::TRIGGER_BEGIN | Parser::TRIGGER_COMPLETE; + return Parser::TRIGGER_BEGIN | Parser::TRIGGER_COMPLETE | Parser::TRIGGER_LAZY; } public function parseBegin(&$var, ContextInterface $c): ?AbstractValue @@ -65,7 +65,7 @@ public function parseBegin(&$var, ContextInterface $c): ?AbstractValue } if (\is_object($var)) { - $hash = \spl_object_hash($var); + $hash = @\spl_object_hash($var); $this->instance_counts[$hash] ??= 0; $this->instance_complexity[$hash] ??= 0; $this->instance_count_stack[$hash] ??= 0; diff --git a/system/ThirdParty/Kint/Parser/XmlPlugin.php b/system/ThirdParty/Kint/Parser/XmlPlugin.php index 64275a2e9740..585b0d9c2500 100644 --- a/system/ThirdParty/Kint/Parser/XmlPlugin.php +++ b/system/ThirdParty/Kint/Parser/XmlPlugin.php @@ -48,7 +48,7 @@ class XmlPlugin extends AbstractPlugin implements PluginCompleteInterface * however it's memory usage is very high and it takes longer to parse and * render. Plus it's a pain to work with. So SimpleXML is the default. * - * @psalm-var 'SimpleXML'|'DOMDocument'|'XMLDocument' + * @psalm-var 'DOMDocument'|'SimpleXML'|'XMLDocument' */ public static string $parse_method = 'SimpleXML'; diff --git a/system/ThirdParty/Kint/Renderer/AssetRendererTrait.php b/system/ThirdParty/Kint/Renderer/AssetRendererTrait.php index fb66f2db1b7b..84f3998de0dd 100644 --- a/system/ThirdParty/Kint/Renderer/AssetRendererTrait.php +++ b/system/ThirdParty/Kint/Renderer/AssetRendererTrait.php @@ -31,7 +31,7 @@ trait AssetRendererTrait { public static ?string $theme = null; - /** @psalm-var array{js?:string, css?:array} */ + /** @psalm-var array{js?:string, css?:array} */ private static array $assetCache = []; /** @psalm-api */ diff --git a/system/ThirdParty/Kint/Renderer/RichRenderer.php b/system/ThirdParty/Kint/Renderer/RichRenderer.php index a494938d5d68..a8756c6df1ef 100644 --- a/system/ThirdParty/Kint/Renderer/RichRenderer.php +++ b/system/ThirdParty/Kint/Renderer/RichRenderer.php @@ -437,7 +437,10 @@ public function postRender(): string continue; } - $output .= '
  • '.$this->ideLink($step['file'], $step['line']); // closing tag not required + $output .= '
  • '; // closing tag not required + if (isset($step['file'])) { + $output .= $this->ideLink($step['file'], $step['line']); + } if (isset($step['function']) && !\in_array($step['function'], ['include', 'include_once', 'require', 'require_once'], true) ) { diff --git a/system/ThirdParty/Kint/Value/ClosureValue.php b/system/ThirdParty/Kint/Value/ClosureValue.php index 7bad29abb859..b5ef8b6bb8cf 100644 --- a/system/ThirdParty/Kint/Value/ClosureValue.php +++ b/system/ThirdParty/Kint/Value/ClosureValue.php @@ -44,7 +44,7 @@ class ClosureValue extends InstanceValue public function __construct(ContextInterface $context, Closure $cl) { - parent::__construct($context, \get_class($cl), \spl_object_hash($cl), \spl_object_id($cl)); + parent::__construct($context, \get_class($cl), @\spl_object_hash($cl), \spl_object_id($cl)); /** * @psalm-suppress UnnecessaryVarAnnotation diff --git a/system/ThirdParty/Kint/Value/Context/ClassDeclaredContext.php b/system/ThirdParty/Kint/Value/Context/ClassDeclaredContext.php index 9243833aff6e..1bc2591f74dc 100644 --- a/system/ThirdParty/Kint/Value/Context/ClassDeclaredContext.php +++ b/system/ThirdParty/Kint/Value/Context/ClassDeclaredContext.php @@ -76,11 +76,8 @@ public function isAccessible(?string $scope): bool if (\is_a($scope, $this->proto_class, true)) { return true; } - - if (\is_a($this->proto_class, $scope, true)) { - return true; - } } else { + // @codeCoverageIgnoreStart if (\is_a($scope, $this->owner_class, true)) { return true; } @@ -88,6 +85,7 @@ public function isAccessible(?string $scope): bool if (\is_a($this->owner_class, $scope, true)) { return true; } + // @codeCoverageIgnoreEnd } return false; diff --git a/system/ThirdParty/Kint/Value/DateTimeValue.php b/system/ThirdParty/Kint/Value/DateTimeValue.php index 1892b24e1eba..83fcb62c82d0 100644 --- a/system/ThirdParty/Kint/Value/DateTimeValue.php +++ b/system/ThirdParty/Kint/Value/DateTimeValue.php @@ -37,7 +37,7 @@ class DateTimeValue extends InstanceValue public function __construct(ContextInterface $context, DateTimeInterface $dt) { - parent::__construct($context, \get_class($dt), \spl_object_hash($dt), \spl_object_id($dt)); + parent::__construct($context, \get_class($dt), @\spl_object_hash($dt), \spl_object_id($dt)); $this->dt = clone $dt; } diff --git a/system/ThirdParty/Kint/Value/DomNodeListValue.php b/system/ThirdParty/Kint/Value/DomNodeListValue.php index 7f8f378ab6e1..fe6b6e762d15 100644 --- a/system/ThirdParty/Kint/Value/DomNodeListValue.php +++ b/system/ThirdParty/Kint/Value/DomNodeListValue.php @@ -40,7 +40,7 @@ class DomNodeListValue extends InstanceValue */ public function __construct(ContextInterface $context, object $node) { - parent::__construct($context, \get_class($node), \spl_object_hash($node), \spl_object_id($node)); + parent::__construct($context, \get_class($node), @\spl_object_hash($node), \spl_object_id($node)); $this->length = $node->length; } diff --git a/system/ThirdParty/Kint/Value/DomNodeValue.php b/system/ThirdParty/Kint/Value/DomNodeValue.php index 5f3650f29e60..e251ff315b8e 100644 --- a/system/ThirdParty/Kint/Value/DomNodeValue.php +++ b/system/ThirdParty/Kint/Value/DomNodeValue.php @@ -38,7 +38,7 @@ class DomNodeValue extends InstanceValue */ public function __construct(ContextInterface $context, object $node) { - parent::__construct($context, \get_class($node), \spl_object_hash($node), \spl_object_id($node)); + parent::__construct($context, \get_class($node), @\spl_object_hash($node), \spl_object_id($node)); } public function getDisplaySize(): ?string diff --git a/system/ThirdParty/Kint/Value/EnumValue.php b/system/ThirdParty/Kint/Value/EnumValue.php index 0017e3d49087..ef61efa4caaf 100644 --- a/system/ThirdParty/Kint/Value/EnumValue.php +++ b/system/ThirdParty/Kint/Value/EnumValue.php @@ -38,7 +38,7 @@ class EnumValue extends InstanceValue public function __construct(ContextInterface $context, UnitEnum $enumval) { - parent::__construct($context, \get_class($enumval), \spl_object_hash($enumval), \spl_object_id($enumval)); + parent::__construct($context, \get_class($enumval), @\spl_object_hash($enumval), \spl_object_id($enumval)); $this->enumval = $enumval; } diff --git a/system/ThirdParty/Kint/Value/LazyInstanceValue.php b/system/ThirdParty/Kint/Value/LazyInstanceValue.php new file mode 100644 index 000000000000..25e924c9d31b --- /dev/null +++ b/system/ThirdParty/Kint/Value/LazyInstanceValue.php @@ -0,0 +1,36 @@ +classname; + } +} diff --git a/system/ThirdParty/Kint/Value/ProxyInstanceValue.php b/system/ThirdParty/Kint/Value/ProxyInstanceValue.php new file mode 100644 index 000000000000..c1eb1fcea079 --- /dev/null +++ b/system/ThirdParty/Kint/Value/ProxyInstanceValue.php @@ -0,0 +1,70 @@ +instance = $instance; + $this->setChildren([$instance]); + $this->addRepresentation(new ValueRepresentation('Instance', $instance, null, true)); + } + + /** + * @psalm-api + */ + public function getInstance(): AbstractValue + { + return $this->instance; + } + + public function getDisplayType(): string + { + return 'Proxy '.$this->instance->getDisplayType(); + } + + public function getDisplaySize(): ?string + { + return $this->instance->getDisplaySize(); + } +} diff --git a/system/ThirdParty/Kint/Value/SimpleXMLElementValue.php b/system/ThirdParty/Kint/Value/SimpleXMLElementValue.php index 0ea6eccd4398..5b3c113a54af 100644 --- a/system/ThirdParty/Kint/Value/SimpleXMLElementValue.php +++ b/system/ThirdParty/Kint/Value/SimpleXMLElementValue.php @@ -42,7 +42,7 @@ public function __construct( array $children, ?string $text_content ) { - parent::__construct($context, \get_class($element), \spl_object_hash($element), \spl_object_id($element)); + parent::__construct($context, \get_class($element), @\spl_object_hash($element), \spl_object_id($element)); $this->children = $children; $this->text_content = $text_content; diff --git a/system/ThirdParty/Kint/Value/SplFileInfoValue.php b/system/ThirdParty/Kint/Value/SplFileInfoValue.php index 826762c9ab14..988e65572218 100644 --- a/system/ThirdParty/Kint/Value/SplFileInfoValue.php +++ b/system/ThirdParty/Kint/Value/SplFileInfoValue.php @@ -41,7 +41,7 @@ class SplFileInfoValue extends InstanceValue public function __construct(ContextInterface $context, SplFileInfo $info) { - parent::__construct($context, \get_class($info), \spl_object_hash($info), \spl_object_id($info)); + parent::__construct($context, \get_class($info), @\spl_object_hash($info), \spl_object_id($info)); $this->path = $info->getPathname(); diff --git a/system/ThirdParty/Kint/Value/ThrowableValue.php b/system/ThirdParty/Kint/Value/ThrowableValue.php index 79999ffe3d44..7b0dfcceeb77 100644 --- a/system/ThirdParty/Kint/Value/ThrowableValue.php +++ b/system/ThirdParty/Kint/Value/ThrowableValue.php @@ -37,7 +37,7 @@ class ThrowableValue extends InstanceValue public function __construct(ContextInterface $context, Throwable $throw) { - parent::__construct($context, \get_class($throw), \spl_object_hash($throw), \spl_object_id($throw)); + parent::__construct($context, \get_class($throw), @\spl_object_hash($throw), \spl_object_id($throw)); $this->message = $throw->getMessage(); } diff --git a/system/ThirdParty/Kint/init.php b/system/ThirdParty/Kint/init.php index 9787a159004b..430f842c45a0 100644 --- a/system/ThirdParty/Kint/init.php +++ b/system/ThirdParty/Kint/init.php @@ -46,6 +46,7 @@ \define('KINT_PHP84', \version_compare(PHP_VERSION, '8.4') >= 0); \define('KINT_PHP8412', \version_compare(PHP_VERSION, '8.4.12') >= 0); \define('KINT_PHP85', \version_compare(PHP_VERSION, '8.5') >= 0); +\define('KINT_PHP86', \version_compare(PHP_VERSION, '8.6') >= 0); // Dynamic default settings if (\strlen((string) \ini_get('xdebug.file_link_format')) > 0) {