minor symfony#53281 [Config] Use CPP (OskarStark)

nicolas-grekas · nicolas-grekas · commit 13b3f126cc60 · 2024-01-02T13:37:33.000+01:00
This PR was squashed before being merged into the 7.1 branch. Discussion ---------- [Config] Use CPP | Q | A | ------------- | --- | Branch? | 7.1 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | -- | License | MIT Commits ------- c41ea2d [Config] Use CPP
diff --git a/src/Symfony/Component/Config/Builder/ClassBuilder.php b/src/Symfony/Component/Config/Builder/ClassBuilder.php
@@ -20,7 +20,6 @@
  */
 class ClassBuilder
 {
-    private string $namespace;
     private string $name;
 
     /** @var Property[] */
@@ -33,9 +32,10 @@ class ClassBuilder
     private array $implements = [];
     private bool $allowExtraKeys = false;
 
-    public function __construct(string $namespace, string $name)
-    {
-        $this->namespace = $namespace;
+    public function __construct(
+        private string $namespace,
+        string $name,
+    ) {
         $this->name = ucfirst($this->camelCase($name)).'Config';
     }
 
diff --git a/src/Symfony/Component/Config/Builder/ConfigBuilderGenerator.php b/src/Symfony/Component/Config/Builder/ConfigBuilderGenerator.php
@@ -37,11 +37,10 @@ class ConfigBuilderGenerator implements ConfigBuilderGeneratorInterface
      * @var ClassBuilder[]
      */
     private array $classes = [];
-    private string $outputDir;
 
-    public function __construct(string $outputDir)
-    {
-        $this->outputDir = $outputDir;
+    public function __construct(
+        private string $outputDir,
+    ) {
     }
 
     /**
diff --git a/src/Symfony/Component/Config/Builder/Method.php b/src/Symfony/Component/Config/Builder/Method.php
@@ -20,11 +20,9 @@
  */
 class Method
 {
-    private string $content;
-
-    public function __construct(string $content)
-    {
-        $this->content = $content;
+    public function __construct(
+        private string $content,
+    ) {
     }
 
     public function getContent(): string
diff --git a/src/Symfony/Component/Config/Builder/Property.php b/src/Symfony/Component/Config/Builder/Property.php
@@ -20,17 +20,15 @@
  */
 class Property
 {
-    private string $name;
-    private string $originalName;
     private bool $array = false;
     private bool $scalarsAllowed = false;
     private ?string $type = null;
     private ?string $content = null;
 
-    public function __construct(string $originalName, string $name)
-    {
-        $this->name = $name;
-        $this->originalName = $originalName;
+    public function __construct(
+        private string $originalName,
+        private string $name,
+    ) {
     }
 
     public function getName(): string
diff --git a/src/Symfony/Component/Config/ConfigCache.php b/src/Symfony/Component/Config/ConfigCache.php
@@ -25,16 +25,14 @@
  */
 class ConfigCache extends ResourceCheckerConfigCache
 {
-    private bool $debug;
-
     /**
      * @param string $file  The absolute cache path
      * @param bool   $debug Whether debugging is enabled or not
      */
-    public function __construct(string $file, bool $debug)
-    {
-        $this->debug = $debug;
-
+    public function __construct(
+        string $file,
+        private bool $debug,
+    ) {
         $checkers = [];
         if (true === $this->debug) {
             $checkers = [new SelfCheckingResourceChecker()];
diff --git a/src/Symfony/Component/Config/ConfigCacheFactory.php b/src/Symfony/Component/Config/ConfigCacheFactory.php
@@ -22,14 +22,12 @@
  */
 class ConfigCacheFactory implements ConfigCacheFactoryInterface
 {
-    private bool $debug;
-
     /**
      * @param bool $debug The debug flag to pass to ConfigCache
      */
-    public function __construct(bool $debug)
-    {
-        $this->debug = $debug;
+    public function __construct(
+        private bool $debug,
+    ) {
     }
 
     public function cache(string $file, callable $callback): ConfigCacheInterface
diff --git a/src/Symfony/Component/Config/Definition/BaseNode.php b/src/Symfony/Component/Config/Definition/BaseNode.php
@@ -30,7 +30,6 @@ abstract class BaseNode implements NodeInterface
     private static array $placeholders = [];
 
     protected string $name;
-    protected ?NodeInterface $parent;
     protected array $normalizationClosures = [];
     protected array $normalizedTypes = [];
     protected array $finalValidationClosures = [];
@@ -39,22 +38,22 @@ abstract class BaseNode implements NodeInterface
     protected array $deprecation = [];
     protected array $equivalentValues = [];
     protected array $attributes = [];
-    protected string $pathSeparator;
 
     private mixed $handlingPlaceholder = null;
 
     /**
      * @throws \InvalidArgumentException if the name contains a period
      */
-    public function __construct(?string $name, NodeInterface $parent = null, string $pathSeparator = self::DEFAULT_PATH_SEPARATOR)
-    {
+    public function __construct(
+        ?string $name,
+        protected ?NodeInterface $parent = null,
+        protected string $pathSeparator = self::DEFAULT_PATH_SEPARATOR,
+    ) {
         if (str_contains($name = (string) $name, $pathSeparator)) {
             throw new \InvalidArgumentException('The name must not contain ".'.$pathSeparator.'".');
         }
 
         $this->name = $name;
-        $this->parent = $parent;
-        $this->pathSeparator = $pathSeparator;
     }
 
     /**
diff --git a/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php b/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php
@@ -30,11 +30,9 @@ class ExprBuilder
     public ?\Closure $ifPart = null;
     public ?\Closure $thenPart = null;
 
-    protected NodeDefinition $node;
-
-    public function __construct(NodeDefinition $node)
-    {
-        $this->node = $node;
+    public function __construct(
+        protected NodeDefinition $node,
+    ) {
     }
 
     /**
diff --git a/src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php
@@ -21,11 +21,9 @@ class MergeBuilder
     public bool $allowFalse = false;
     public bool $allowOverwrite = true;
 
-    protected NodeDefinition $node;
-
-    public function __construct(NodeDefinition $node)
-    {
-        $this->node = $node;
+    public function __construct(
+        protected NodeDefinition $node,
+    ) {
     }
 
     /**
diff --git a/src/Symfony/Component/Config/Definition/Builder/NormalizationBuilder.php b/src/Symfony/Component/Config/Definition/Builder/NormalizationBuilder.php
@@ -22,11 +22,9 @@ class NormalizationBuilder
     public array $declaredTypes = [];
     public array $remappings = [];
 
-    protected NodeDefinition $node;
-
-    public function __construct(NodeDefinition $node)
-    {
-        $this->node = $node;
+    public function __construct(
+        protected NodeDefinition $node,
+    ) {
     }
 
     /**
diff --git a/src/Symfony/Component/Config/Definition/Builder/ValidationBuilder.php b/src/Symfony/Component/Config/Definition/Builder/ValidationBuilder.php
@@ -20,11 +20,9 @@ class ValidationBuilder
 {
     public array $rules = [];
 
-    protected NodeDefinition $node;
-
-    public function __construct(NodeDefinition $node)
-    {
-        $this->node = $node;
+    public function __construct(
+        protected NodeDefinition $node,
+    ) {
     }
 
     /**
diff --git a/src/Symfony/Component/Config/Loader/Loader.php b/src/Symfony/Component/Config/Loader/Loader.php
@@ -21,11 +21,10 @@
 abstract class Loader implements LoaderInterface
 {
     protected LoaderResolverInterface $resolver;
-    protected ?string $env;
 
-    public function __construct(string $env = null)
-    {
-        $this->env = $env;
+    public function __construct(
+        protected ?string $env = null,
+    ) {
     }
 
     public function getResolver(): LoaderResolverInterface
diff --git a/src/Symfony/Component/Config/Loader/ParamConfigurator.php b/src/Symfony/Component/Config/Loader/ParamConfigurator.php
@@ -18,11 +18,9 @@
  */
 class ParamConfigurator
 {
-    private string $name;
-
-    public function __construct(string $name)
-    {
-        $this->name = $name;
+    public function __construct(
+        private string $name,
+    ) {
     }
 
     public function __toString(): string
diff --git a/src/Symfony/Component/Config/Resource/ClassExistenceResource.php b/src/Symfony/Component/Config/Resource/ClassExistenceResource.php
@@ -23,7 +23,6 @@
  */
 class ClassExistenceResource implements SelfCheckingResourceInterface
 {
-    private string $resource;
     private ?array $exists = null;
 
     private static int $autoloadLevel = 0;
@@ -34,9 +33,10 @@ class ClassExistenceResource implements SelfCheckingResourceInterface
      * @param string    $resource The fully-qualified class name
      * @param bool|null $exists   Boolean when the existence check has already been done
      */
-    public function __construct(string $resource, bool $exists = null)
-    {
-        $this->resource = $resource;
+    public function __construct(
+        private string $resource,
+        bool $exists = null,
+    ) {
         if (null !== $exists) {
             $this->exists = [$exists, null];
         }
diff --git a/src/Symfony/Component/Config/Resource/DirectoryResource.php b/src/Symfony/Component/Config/Resource/DirectoryResource.php
@@ -21,18 +21,18 @@
 class DirectoryResource implements SelfCheckingResourceInterface
 {
     private string $resource;
-    private ?string $pattern;
 
     /**
      * @param string      $resource The file path to the resource
      * @param string|null $pattern  A pattern to restrict monitored files
      *
      * @throws \InvalidArgumentException
      */
-    public function __construct(string $resource, string $pattern = null)
-    {
+    public function __construct(
+        string $resource,
+        private ?string $pattern = null,
+    ) {
         $resolvedResource = realpath($resource) ?: (file_exists($resource) ? $resource : false);
-        $this->pattern = $pattern;
 
         if (false === $resolvedResource || !is_dir($resolvedResource)) {
             throw new \InvalidArgumentException(sprintf('The directory "%s" does not exist.', $resource));
diff --git a/src/Symfony/Component/Config/Resource/FileExistenceResource.php b/src/Symfony/Component/Config/Resource/FileExistenceResource.php
@@ -23,16 +23,14 @@
  */
 class FileExistenceResource implements SelfCheckingResourceInterface
 {
-    private string $resource;
-
     private bool $exists;
 
     /**
      * @param string $resource The file path to the resource
      */
-    public function __construct(string $resource)
-    {
-        $this->resource = $resource;
+    public function __construct(
+        private string $resource,
+    ) {
         $this->exists = file_exists($resource);
     }
 
diff --git a/src/Symfony/Component/Config/Resource/GlobResource.php b/src/Symfony/Component/Config/Resource/GlobResource.php
@@ -28,10 +28,7 @@
 class GlobResource implements \IteratorAggregate, SelfCheckingResourceInterface
 {
     private string $prefix;
-    private string $pattern;
-    private bool $recursive;
     private string $hash;
-    private bool $forExclusion;
     private array $excludedPrefixes;
     private int $globBrace;
 
@@ -42,13 +39,15 @@ class GlobResource implements \IteratorAggregate, SelfCheckingResourceInterface
      *
      * @throws \InvalidArgumentException
      */
-    public function __construct(string $prefix, string $pattern, bool $recursive, bool $forExclusion = false, array $excludedPrefixes = [])
-    {
+    public function __construct(
+        string $prefix,
+        private string $pattern,
+        private bool $recursive,
+        private bool $forExclusion = false,
+        array $excludedPrefixes = [],
+    ) {
         ksort($excludedPrefixes);
         $resolvedPrefix = realpath($prefix) ?: (file_exists($prefix) ? $prefix : false);
-        $this->pattern = $pattern;
-        $this->recursive = $recursive;
-        $this->forExclusion = $forExclusion;
         $this->excludedPrefixes = $excludedPrefixes;
         $this->globBrace = \defined('GLOB_BRACE') ? \GLOB_BRACE : 0;
 
diff --git a/src/Symfony/Component/Config/ResourceCheckerConfigCache.php b/src/Symfony/Component/Config/ResourceCheckerConfigCache.php
@@ -23,21 +23,14 @@
  */
 class ResourceCheckerConfigCache implements ConfigCacheInterface
 {
-    private string $file;
-
-    /**
-     * @var iterable<mixed, ResourceCheckerInterface>
-     */
-    private iterable $resourceCheckers;
-
     /**
      * @param string                                    $file             The absolute cache path
      * @param iterable<mixed, ResourceCheckerInterface> $resourceCheckers The ResourceCheckers to use for the freshness check
      */
-    public function __construct(string $file, iterable $resourceCheckers = [])
-    {
-        $this->file = $file;
-        $this->resourceCheckers = $resourceCheckers;
+    public function __construct(
+        private string $file,
+        private iterable $resourceCheckers = [],
+    ) {
     }
 
     public function getPath(): string
diff --git a/src/Symfony/Component/Config/ResourceCheckerConfigCacheFactory.php b/src/Symfony/Component/Config/ResourceCheckerConfigCacheFactory.php
@@ -19,14 +19,12 @@
  */
 class ResourceCheckerConfigCacheFactory implements ConfigCacheFactoryInterface
 {
-    private iterable $resourceCheckers = [];
-
     /**
      * @param iterable<int, ResourceCheckerInterface> $resourceCheckers
      */
-    public function __construct(iterable $resourceCheckers = [])
-    {
-        $this->resourceCheckers = $resourceCheckers;
+    public function __construct(
+        private iterable $resourceCheckers = [],
+    ) {
     }
 
     public function cache(string $file, callable $callable): ConfigCacheInterface

Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,9 @@`
`20`	`20`	`*/`
`21`	`21`	`class Method`
`22`	`22`	`{`
`23`		`- private string $content;`
`24`		`-`
`25`		`- public function __construct(string $content)`
`26`		`- {`
`27`		`- $this->content = $content;`
	`23`	`+ public function __construct(`
	`24`	`+ private string $content,`
	`25`	`+ ) {`
`28`	`26`	`}`
`29`	`27`
`30`	`28`	`public function getContent(): string`