feat: update twig to v3

box.json

@@ -5,7 +5,6 @@
   "directories-bin": [
     "config",
     "home",
-    "vendor/twig/twig/lib",
     "vendor/twig/twig/src"
   ],
   "files-bin": [

composer.json

@@ -12,7 +12,7 @@
         "symfony/expression-language": "^6.1",
         "symfony/finder": "^6.1",
         "symfony/yaml": "^6.1",
-        "twig/twig": "^2.16.1",
+        "twig/twig": "^3.22",
         "composer/semver": "^3.4"
     },
     "require-dev": {
@@ -59,9 +59,6 @@
     "config": {
         "allow-plugins": {
             "bamarni/composer-bin-plugin": true
-        },
-        "audit": {
-            "block-insecure": false
         }
     }
 }

src/Twig/EnvironmentBuilder.php

@@ -4,13 +4,15 @@
 
 use my127\Workspace\Path\Path;
 use my127\Workspace\Twig\Loader\Filesystem;
+use Twig\Environment;
+use Twig\TwigFunction;
 
 class EnvironmentBuilder
 {
     /** @var Path */
     private $path;
 
-    /** @var \Twig_Function[] */
+    /** @var TwigFunction[] */
     private $functions = [];
 
     /** @var mixed[] */
@@ -23,20 +25,20 @@ public function __construct(Path $path)
 
     public function addFunction(string $name, callable $function): void
     {
-        $this->functions[$name] = new \Twig_Function($name, $function);
+        $this->functions[$name] = new TwigFunction($name, $function);
     }
 
     public function addGlobal(string $name, $value)
     {
         $this->globals[$name] = $value;
     }
 
-    public function create(string $path): \Twig_Environment
+    public function create(string $path): Environment
     {
         $directory = $this->path->getRealPath($path);
 
         $loader = new Filesystem([$directory], $directory);
-        $environment = new \Twig_Environment($loader, [
+        $environment = new Environment($loader, [
             'autoescape' => false,
         ]);
 

src/Twig/Loader/Filesystem.php

@@ -2,7 +2,10 @@
 
 namespace my127\Workspace\Twig\Loader;
 
-class Filesystem extends \Twig_Loader_Filesystem
+use Twig\Loader\FilesystemLoader;
+use Twig\Source;
+
+class Filesystem extends FilesystemLoader
 {
     private $path;
 
@@ -13,15 +16,15 @@ public function __construct($paths = [], ?string $rootPath = null)
         $this->path = $rootPath;
     }
 
-    public function getSourceContext($name)
+    public function getSourceContext($name): Source
     {
         $path = $this->findTemplate($name);
         $content = file_get_contents($path);
 
         $content = str_replace("@('", "attr('", $content);
         $content = str_replace('@("', 'attr("', $content);
 
-        return new \Twig_Source($content, $name, $path);
+        return new Source($content, $name, $path);
     }
 
     public function getRootPath(): string

src/Types/Confd/Confd.php

@@ -5,6 +5,7 @@
 use my127\Workspace\Expression\Expression;
 use my127\Workspace\Path\Path;
 use my127\Workspace\Twig\Loader\Filesystem;
+use Twig\Environment;
 
 class Confd
 {
@@ -14,7 +15,7 @@ class Confd
     private $definition;
 
     /**
-     * @var \Twig_Environment
+     * @var Environment
      */
     private $twig;
 
@@ -33,7 +34,7 @@ class Confd
      */
     private $rootPath;
 
-    public function __construct(Path $path, Definition $definition, \Twig_Environment $twig, Expression $expression)
+    public function __construct(Path $path, Definition $definition, Environment $twig, Expression $expression)
     {
         $this->definition = $definition;
         $this->twig = $twig;