Delegate checking for null Source to SandboxExtension instead of Sour…

…cePolicy
twigphp · Oct 27, 2023 · cbbf38b · cbbf38b
1 parent 6783091
commit cbbf38b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/Extension/SandboxExtension.php b/src/Extension/SandboxExtension.php
@@ -65,7 +65,10 @@ public function isSandboxedGlobally()
 
     private function isSourceSandboxed(?Source $source) : bool
     {
-        return $this->sourcePolicy && $this->sourcePolicy->enableSandbox($source);
+        if ($source === null || $this->sourcePolicy === null) {
+            return false;
+        }
+        return $this->sourcePolicy->enableSandbox($source);
     }
 
     public function setSecurityPolicy(SecurityPolicyInterface $policy)

diff --git a/src/Sandbox/SourcePolicyInterface.php b/src/Sandbox/SourcePolicyInterface.php
@@ -20,5 +20,5 @@
  */
 interface SourcePolicyInterface
 {
-    public function enableSandbox(?Source $source): bool;
+    public function enableSandbox(Source $source): bool;
 }
diff --git a/tests/Extension/SandboxTest.php b/tests/Extension/SandboxTest.php
@@ -463,9 +463,9 @@ protected function getEnvironment($sandboxed, $options, $templates, $tags = [],
     public function testSandboxSourcePolicyEnableReturningFalse()
     {
         $twig = $this->getEnvironment(false, [], self::$templates, [], [], [], [], [], new class() implements \Twig\Sandbox\SourcePolicyInterface {
-            public function enableSandbox(Source $source = null): bool
+            public function enableSandbox(Source $source): bool
             {
-                return $source && '1_basic' != $source->getName();
+                return '1_basic' != $source->getName();
             }
         });
         $this->assertEquals('FOO', $twig->load('1_basic')->render(self::$params));
@@ -474,9 +474,9 @@ public function enableSandbox(Source $source = null): bool
     public function testSandboxSourcePolicyEnableReturningTrue()
     {
         $twig = $this->getEnvironment(false, [], self::$templates, [], [], [], [], [], new class() implements \Twig\Sandbox\SourcePolicyInterface {
-            public function enableSandbox(Source $source = null): bool
+            public function enableSandbox(Source $source): bool
             {
-                return $source && '1_basic' === $source->getName();
+                return '1_basic' === $source->getName();
             }
         });
         $this->expectException(SecurityError::class);
@@ -486,7 +486,7 @@ public function enableSandbox(Source $source = null): bool
     public function testSandboxSourcePolicyFalseDoesntOverrideOtherEnables()
     {
         $twig = $this->getEnvironment(true, [], self::$templates, [], [], [], [], [], new class() implements \Twig\Sandbox\SourcePolicyInterface {
-            public function enableSandbox(Source $source = null): bool
+            public function enableSandbox(Source $source): bool
             {
                 return false;
             }