Fix code

twigphp · Nov 6, 2024 · 5b580ec · 5b580ec
1 parent 94612e7
commit 5b580ec
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/Extension/CoreExtension.php b/src/Extension/CoreExtension.php
@@ -1571,7 +1571,7 @@ public static function getAttribute(Environment $env, Source $source, $object, $
         if (/* Template::METHOD_CALL */ 'method' !== $type) {
             $arrayItem = \is_bool($item) || \is_float($item) ? (int) $item : $item;
 
-            if ($sandboxed && $object instanceof \ArrayAccess && !\in_array($object::class, self::ARRAY_LIKE_CLASSES, true)) {
+            if ($sandboxed && $object instanceof \ArrayAccess && !\in_array(get_class($object), self::ARRAY_LIKE_CLASSES, true)) {
                 try {
                     $env->getExtension(SandboxExtension::class)->checkPropertyAllowed($object, $arrayItem, $lineno, $source);
                 } catch (SecurityNotAllowedPropertyError $propertyNotAllowedError) {

diff --git a/src/Node/Expression/GetAttrExpression.php b/src/Node/Expression/GetAttrExpression.php
@@ -67,7 +67,7 @@ public function compile(Compiler $compiler): void
                 ->raw(') || ')
                 ->raw($var)
                 ->raw(' instanceof ArrayAccess && in_array(')
-                ->raw($var.'::class')
+                ->raw('get_class('.$var.')')
                 ->raw(', CoreExtension::ARRAY_LIKE_CLASSES, true) ? (')
                 ->raw($var)
                 ->raw('[')

diff --git a/tests/Extension/CoreTest.php b/tests/Extension/CoreTest.php
@@ -325,7 +325,7 @@ public function testSandboxedInclude()
             'index' => '{{ include("included", sandboxed=true) }}',
             'included' => '{{ "included"|e }}',
         ]));
-        $policy = new SecurityPolicy(allowedFunctions: ['include']);
+        $policy = new SecurityPolicy([], [], [], [], ['include']);
         $sandbox = new SandboxExtension($policy, false);
         $twig->addExtension($sandbox);
 
@@ -340,7 +340,7 @@ public function testSandboxedIncludeWithPreloadedTemplate()
             'index' => '{{ include("included", sandboxed=true) }}',
             'included' => '{{ "included"|e }}',
         ]));
-        $policy = new SecurityPolicy(allowedFunctions: ['include']);
+        $policy = new SecurityPolicy([], [], [], [], ['include']);
         $sandbox = new SandboxExtension($policy, false);
         $twig->addExtension($sandbox);