Use CPP in full code base

andreybolonin · fabpot · commit 28923f4269ba · 2024-08-29T19:29:39.000+02:00
diff --git a/src/Cache/ChainCache.php b/src/Cache/ChainCache.php
@@ -21,14 +21,12 @@
  */
 final class ChainCache implements CacheInterface
 {
-    private $caches;
-
     /**
      * @param iterable<CacheInterface> $caches The ordered list of caches used to store and fetch cached items
      */
-    public function __construct(iterable $caches)
-    {
-        $this->caches = $caches;
+    public function __construct(
+        private iterable $caches,
+    ) {
     }
 
     public function generateKey(string $name, string $className): string
diff --git a/src/Compiler.php b/src/Compiler.php
@@ -22,17 +22,16 @@ class Compiler
     private $lastLine;
     private $source;
     private $indentation;
-    private $env;
     private $debugInfo = [];
     private $sourceOffset;
     private $sourceLine;
     private $varNameSalt = 0;
     private $didUseEcho = false;
     private $didUseEchoStack = [];
 
-    public function __construct(Environment $env)
-    {
-        $this->env = $env;
+    public function __construct(
+        private Environment $env,
+    ) {
     }
 
     public function getEnvironment(): Environment
diff --git a/src/Environment.php b/src/Environment.php
@@ -107,7 +107,7 @@ class Environment
      *               false (default): allows templates to use a mix of "yield" and "echo" calls to allow for a progressive migration
      *               Switch to "true" when possible as this will be the only supported mode in Twig 4.0
      */
-    public function __construct(LoaderInterface $loader, $options = [])
+    public function __construct(LoaderInterface $loader, array $options = [])
     {
         $this->setLoader($loader);
 
diff --git a/src/ExpressionParser.php b/src/ExpressionParser.php
@@ -47,18 +47,16 @@ class ExpressionParser
     public const OPERATOR_LEFT = 1;
     public const OPERATOR_RIGHT = 2;
 
-    private $parser;
-    private $env;
     /** @var array<string, array{precedence: int, class: class-string<AbstractUnary>}> */
     private $unaryOperators;
     /** @var array<string, array{precedence: int, class: class-string<AbstractBinary>, associativity: self::OPERATOR_*}> */
     private $binaryOperators;
     private $readyNodes = [];
 
-    public function __construct(Parser $parser, Environment $env)
-    {
-        $this->parser = $parser;
-        $this->env = $env;
+    public function __construct(
+        private Parser $parser,
+        private Environment $env,
+    ) {
         $this->unaryOperators = $env->getUnaryOperators();
         $this->binaryOperators = $env->getBinaryOperators();
     }
diff --git a/src/Extension/OptimizerExtension.php b/src/Extension/OptimizerExtension.php
@@ -15,11 +15,9 @@
 
 final class OptimizerExtension extends AbstractExtension
 {
-    private $optimizers;
-
-    public function __construct(int $optimizers = -1)
-    {
-        $this->optimizers = $optimizers;
+    public function __construct(
+        private int $optimizers = -1,
+    ) {
     }
 
     public function getNodeVisitors(): array
diff --git a/src/Extension/YieldNotReadyExtension.php b/src/Extension/YieldNotReadyExtension.php
@@ -18,11 +18,9 @@
  */
 final class YieldNotReadyExtension extends AbstractExtension
 {
-    private $useYield;
-
-    public function __construct(bool $useYield)
-    {
-        $this->useYield = $useYield;
+    public function __construct(
+        private bool $useYield,
+    ) {
     }
 
     public function getNodeVisitors(): array
diff --git a/src/Loader/ArrayLoader.php b/src/Loader/ArrayLoader.php
@@ -28,14 +28,12 @@
  */
 final class ArrayLoader implements LoaderInterface
 {
-    private $templates = [];
-
     /**
      * @param array $templates An array of templates (keys are the names, and values are the source code)
      */
-    public function __construct(array $templates = [])
-    {
-        $this->templates = $templates;
+    public function __construct(
+        private array $templates = [],
+    ) {
     }
 
     public function setTemplate(string $name, string $template): void
diff --git a/src/Loader/ChainLoader.php b/src/Loader/ChainLoader.php
@@ -21,11 +21,6 @@
  */
 final class ChainLoader implements LoaderInterface
 {
-    /**
-     * @var \Traversable<LoaderInterface>|LoaderInterface[]
-     */
-    private $loaders;
-
     /**
      * @var array<string, bool>
      */
@@ -34,9 +29,9 @@ final class ChainLoader implements LoaderInterface
     /**
      * @param iterable<LoaderInterface> $loaders
      */
-    public function __construct(iterable $loaders = [])
-    {
-        $this->loaders = $loaders;
+    public function __construct(
+        private iterable $loaders = [],
+    ) {
     }
 
     public function addLoader(LoaderInterface $loader): void
diff --git a/src/Markup.php b/src/Markup.php
@@ -19,7 +19,7 @@
 class Markup implements \Countable, \JsonSerializable
 {
     private $content;
-    private $charset;
+    private ?string $charset;
 
     public function __construct($content, $charset)
     {
diff --git a/src/NodeVisitor/OptimizerNodeVisitor.php b/src/NodeVisitor/OptimizerNodeVisitor.php
@@ -47,13 +47,13 @@ final class OptimizerNodeVisitor implements NodeVisitorInterface
 
     private $loops = [];
     private $loopsTargets = [];
-    private $optimizers;
 
     /**
      * @param int $optimizers The optimizer mode
      */
-    public function __construct(int $optimizers = -1)
-    {
+    public function __construct(
+        private int $optimizers = -1,
+    ) {
         if ($optimizers > (self::OPTIMIZE_FOR | self::OPTIMIZE_RAW_FILTER | self::OPTIMIZE_TEXT_NODES)) {
             throw new \InvalidArgumentException(\sprintf('Optimizer mode "%s" is not valid.', $optimizers));
         }
@@ -65,8 +65,6 @@ public function __construct(int $optimizers = -1)
         if (-1 !== $optimizers && self::OPTIMIZE_TEXT_NODES === (self::OPTIMIZE_TEXT_NODES & $optimizers)) {
             trigger_deprecation('twig/twig', '3.12', 'The "Twig\NodeVisitor\OptimizerNodeVisitor::OPTIMIZE_TEXT_NODES" option is deprecated and does nothing.');
         }
-
-        $this->optimizers = $optimizers;
     }
 
     public function enterNode(Node $node, Environment $env): Node
diff --git a/src/NodeVisitor/YieldNotReadyNodeVisitor.php b/src/NodeVisitor/YieldNotReadyNodeVisitor.php
@@ -21,12 +21,11 @@
  */
 final class YieldNotReadyNodeVisitor implements NodeVisitorInterface
 {
-    private $useYield;
     private $yieldReadyNodes = [];
 
-    public function __construct(bool $useYield)
-    {
-        $this->useYield = $useYield;
+    public function __construct(
+        private bool $useYield,
+    ) {
     }
 
     public function enterNode(Node $node, Environment $env): Node
diff --git a/src/Parser.php b/src/Parser.php
@@ -40,15 +40,14 @@ class Parser
     private $blocks;
     private $blockStack;
     private $macros;
-    private $env;
     private $importedSymbols;
     private $traits;
     private $embeddedTemplates = [];
     private $varNameSalt = 0;
 
-    public function __construct(Environment $env)
-    {
-        $this->env = $env;
+    public function __construct(
+        private Environment $env,
+    ) {
     }
 
     public function getVarName(): string
diff --git a/src/Profiler/NodeVisitor/ProfilerNodeVisitor.php b/src/Profiler/NodeVisitor/ProfilerNodeVisitor.php
@@ -27,12 +27,11 @@
  */
 final class ProfilerNodeVisitor implements NodeVisitorInterface
 {
-    private $extensionName;
     private $varName;
 
-    public function __construct(string $extensionName)
-    {
-        $this->extensionName = $extensionName;
+    public function __construct(
+        private string $extensionName,
+    ) {
         $this->varName = \sprintf('__internal_%s', hash(\PHP_VERSION_ID < 80100 ? 'sha256' : 'xxh128', $extensionName));
     }
 
diff --git a/src/Profiler/Profile.php b/src/Profiler/Profile.php
@@ -20,18 +20,15 @@ final class Profile implements \IteratorAggregate, \Serializable
     public const BLOCK = 'block';
     public const TEMPLATE = 'template';
     public const MACRO = 'macro';
-
-    private $template;
-    private $name;
-    private $type;
     private $starts = [];
     private $ends = [];
     private $profiles = [];
 
-    public function __construct(string $template = 'main', string $type = self::ROOT, string $name = 'main')
-    {
-        $this->template = $template;
-        $this->type = $type;
+    public function __construct(
+        private string $template = 'main',
+        private string $type = self::ROOT,
+        private string $name = 'main',
+    ) {
         $this->name = str_starts_with($name, '__internal_') ? 'INTERNAL' : $name;
         $this->enter();
     }
diff --git a/src/Runtime/EscaperRuntime.php b/src/Runtime/EscaperRuntime.php
@@ -26,11 +26,9 @@ final class EscaperRuntime implements RuntimeExtensionInterface
     /** @internal */
     public $safeLookup = [];
 
-    private $charset;
-
-    public function __construct($charset = 'UTF-8')
-    {
-        $this->charset = $charset;
+    public function __construct(
+        private $charset = 'UTF-8',
+    ) {
     }
 
     /**
diff --git a/src/RuntimeLoader/ContainerRuntimeLoader.php b/src/RuntimeLoader/ContainerRuntimeLoader.php
@@ -23,11 +23,9 @@
  */
 class ContainerRuntimeLoader implements RuntimeLoaderInterface
 {
-    private $container;
-
-    public function __construct(ContainerInterface $container)
-    {
-        $this->container = $container;
+    public function __construct(
+        private ContainerInterface $container,
+    ) {
     }
 
     public function load(string $class)
diff --git a/src/RuntimeLoader/FactoryRuntimeLoader.php b/src/RuntimeLoader/FactoryRuntimeLoader.php
@@ -18,14 +18,12 @@
  */
 class FactoryRuntimeLoader implements RuntimeLoaderInterface
 {
-    private $map;
-
     /**
      * @param array $map An array where keys are class names and values factory callables
      */
-    public function __construct(array $map = [])
-    {
-        $this->map = $map;
+    public function __construct(
+        private array $map = [],
+    ) {
     }
 
     public function load(string $class)
diff --git a/src/Source.php b/src/Source.php
@@ -18,20 +18,16 @@
  */
 final class Source
 {
-    private $code;
-    private $name;
-    private $path;
-
     /**
      * @param string $code The template source code
      * @param string $name The template logical name
      * @param string $path The filesystem path of the template if any
      */
-    public function __construct(string $code, string $name, string $path = '')
-    {
-        $this->code = $code;
-        $this->name = $name;
-        $this->path = $path;
+    public function __construct(
+        private string $code,
+        private string $name,
+        private string $path = '',
+    ) {
     }
 
     public function getCode(): string
diff --git a/src/Template.php b/src/Template.php
@@ -35,17 +35,16 @@ abstract class Template
 
     protected $parent;
     protected $parents = [];
-    protected $env;
     protected $blocks = [];
     protected $traits = [];
     protected $extensions = [];
     protected $sandbox;
 
     private $useYield;
 
-    public function __construct(Environment $env)
-    {
-        $this->env = $env;
+    public function __construct(
+        protected Environment $env,
+    ) {
         $this->useYield = $env->useYield();
         $this->extensions = $env->getExtensions();
     }
diff --git a/src/TemplateWrapper.php b/src/TemplateWrapper.php
@@ -18,19 +18,16 @@
  */
 final class TemplateWrapper
 {
-    private $env;
-    private $template;
-
     /**
      * This method is for internal use only and should never be called
      * directly (use Twig\Environment::load() instead).
      *
      * @internal
      */
-    public function __construct(Environment $env, Template $template)
-    {
-        $this->env = $env;
-        $this->template = $template;
+    public function __construct(
+        private Environment $env,
+        private Template $template,
+    ) {
     }
 
     public function render(array $context = []): string
diff --git a/src/Token.php b/src/Token.php
diff --git a/src/TokenStream.php b/src/TokenStream.php
diff --git a/src/Util/DeprecationCollector.php b/src/Util/DeprecationCollector.php

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ class Environment`
`107`	`107`	`* false (default): allows templates to use a mix of "yield" and "echo" calls to allow for a progressive migration`
`108`	`108`	`* Switch to "true" when possible as this will be the only supported mode in Twig 4.0`
`109`	`109`	`*/`
`110`		`- public function __construct(LoaderInterface $loader, $options = [])`
	`110`	`+ public function __construct(LoaderInterface $loader, array $options = [])`
`111`	`111`	`{`
`112`	`112`	`$this->setLoader($loader);`
`113`	`113`
Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,9 @@`
`15`	`15`
`16`	`16`	`final class OptimizerExtension extends AbstractExtension`
`17`	`17`	`{`
`18`		`- private $optimizers;`
`19`		`-`
`20`		`- public function __construct(int $optimizers = -1)`
`21`		`- {`
`22`		`- $this->optimizers = $optimizers;`
	`18`	`+ public function __construct(`
	`19`	`+ private int $optimizers = -1,`
	`20`	`+ ) {`
`23`	`21`	`}`
`24`	`22`
`25`	`23`	`public function getNodeVisitors(): array`
Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,9 @@`
`18`	`18`	`*/`
`19`	`19`	`final class YieldNotReadyExtension extends AbstractExtension`
`20`	`20`	`{`
`21`		`- private $useYield;`
`22`		`-`
`23`		`- public function __construct(bool $useYield)`
`24`		`- {`
`25`		`- $this->useYield = $useYield;`
	`21`	`+ public function __construct(`
	`22`	`+ private bool $useYield,`
	`23`	`+ ) {`
`26`	`24`	`}`
`27`	`25`
`28`	`26`	`public function getNodeVisitors(): array`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`class Markup implements \Countable, \JsonSerializable`
`20`	`20`	`{`
`21`	`21`	`private $content;`
`22`		`- private $charset;`
	`22`	`+ private ?string $charset;`
`23`	`23`
`24`	`24`	`public function __construct($content, $charset)`
`25`	`25`	`{`