geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-17 21:07:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad merge

Browse Source
This commit is contained in:
Fabien Potencier
2023-12-20 20:34:40 +01:00
parent e6a98a000f
commit bc22e38ce6
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Extension/SandboxExtension.php
+1 -5
View File
@@ -82,11 +82,7 @@ final class SandboxExtension extends AbstractExtension
return $this->policy; return $this->policy;
} }
<<<<<<< HEAD public function checkSecurity($tags, $filters, $functions, Source $source = null): void
public function checkSecurity($tags, $filters, $functions): void
=======
public function checkSecurity($tags, $filters, $functions, Source $source = null)
>>>>>>> 2.x
{ {
if ($this->isSandboxed($source)) { if ($this->isSandboxed($source)) {
$this->policy->checkSecurity($tags, $filters, $functions); $this->policy->checkSecurity($tags, $filters, $functions);