geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-15 11:56:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.x' into 4.x

Browse Source 
* 3.x:
  Rely on reflection to access null properties
This commit is contained in:
Fabien Potencier
2024-11-07 13:40:55 +01:00
parent ee6b4ebb6d 0232d389ca
commit 22eefc2a76
1 changed files with 45 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Extension/CoreExtension.php
+45 -6
View File
@@ -1576,7 +1576,7 @@ final class CoreExtension extends AbstractExtension
// array
if (Template::METHOD_CALL !== $type) {
$arrayItem = \is_bool($item) || \is_float($item) ? (int) $item : $item;
$arrayItem = \is_bool($item) || \is_float($item) ? (int) $item : $item = (string) $item;
if ($sandboxed && $object instanceof \ArrayAccess && !\in_array($object::class, self::ARRAY_LIKE_CLASSES, true)) {
try {
@@ -1586,9 +1586,11 @@ final class CoreExtension extends AbstractExtension
}
}
if (((\is_array($object) || $object instanceof \ArrayObject) && (isset($object[$arrayItem]) || \array_key_exists($arrayItem, (array) $object)))
|| ($object instanceof \ArrayAccess && isset($object[$arrayItem]))
) {
if (match (true) {
\is_array($object) => \array_key_exists($arrayItem, $object),
$object instanceof \ArrayAccess => $object->offsetExists($arrayItem),
default => false,
}) {
if ($isDefinedTest) {
return true;
}
@@ -1631,6 +1633,8 @@ final class CoreExtension extends AbstractExtension
}
}
$item = (string) $item;
if (!\is_object($object)) {
if ($isDefinedTest) {
return false;
@@ -1665,12 +1669,24 @@ final class CoreExtension extends AbstractExtension
}
}
if (isset($object->$item) || \array_key_exists((string) $item, (array) $object)) {
static $propertyCheckers = [];
if (isset($object->$item)
|| ($propertyCheckers[$object::class][$item] ??= self::getPropertyChecker($object::class, $item))($object, $item)
) {
if ($isDefinedTest) {
return true;
}
return isset($object->$item) ? $object->$item : ((array) $object)[(string) $item];
return $object->$item;
}
if ($object instanceof \DateTimeInterface && \in_array($item, ['date', 'timezone', 'timezone_type'], true)) {
if ($isDefinedTest) {
return true;
}
return ((array) $object)[$item];
}
if (\defined($object::class.'::'.$item)) {
@@ -1987,4 +2003,27 @@ final class CoreExtension extends AbstractExtension
return $expr;
}
private static function getPropertyChecker(string $class, string $property): \Closure
{
static $classReflectors = [];
$class = $classReflectors[$class] ??= new \ReflectionClass($class);
if (!$class->hasProperty($property)) {
static $propertyExists;
return $propertyExists ??= \Closure::fromCallable('property_exists');
}
$property = $class->getProperty($property);
if (!$property->isPublic()) {
static $false;
return $false ??= static fn () => false;
}
return static fn ($object) => $property->isInitialized($object);
}
}