Use CPP where possible

Author: alexandre-daubois

src/Symfony/Bundle/FrameworkBundle/CacheWarmer/CachePoolClearerCacheWarmer.php

@@ -25,16 +25,13 @@
  */
 final class CachePoolClearerCacheWarmer implements CacheWarmerInterface
 {
-    private Psr6CacheClearer $poolClearer;
-    private array $pools;
-
     /**
      * @param string[] $pools
      */
-    public function __construct(Psr6CacheClearer $poolClearer, array $pools = [])
-    {
-        $this->poolClearer = $poolClearer;
-        $this->pools = $pools;
+    public function __construct(
+        private Psr6CacheClearer $poolClearer,
+        private array $pools = [],
+    ) {
     }
 
     public function warmUp(string $cacheDir, ?string $buildDir = null): array

src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ConfigBuilderCacheWarmer.php

@@ -34,13 +34,10 @@
  */
 class ConfigBuilderCacheWarmer implements CacheWarmerInterface
 {
-    private KernelInterface $kernel;
-    private ?LoggerInterface $logger;
-
-    public function __construct(KernelInterface $kernel, ?LoggerInterface $logger = null)
-    {
-        $this->kernel = $kernel;
-        $this->logger = $logger;
+    public function __construct(
+        private KernelInterface $kernel,
+        private ?LoggerInterface $logger = null,
+    ) {
     }
 
     public function warmUp(string $cacheDir, ?string $buildDir = null): array

src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php

@@ -26,12 +26,12 @@
  */
 class RouterCacheWarmer implements CacheWarmerInterface, ServiceSubscriberInterface
 {
-    private ContainerInterface $container;
-
-    public function __construct(ContainerInterface $container)
-    {
-        // As this cache warmer is optional, dependencies should be lazy-loaded, that's why a container should be injected.
-        $this->container = $container;
+    /**
+     * As this cache warmer is optional, dependencies should be lazy-loaded, that's why a container should be injected.
+     */
+    public function __construct(
+        private ContainerInterface $container,
+    ) {
     }
 
     public function warmUp(string $cacheDir, ?string $buildDir = null): array

src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TranslationsCacheWarmer.php

@@ -26,13 +26,14 @@
  */
 class TranslationsCacheWarmer implements CacheWarmerInterface, ServiceSubscriberInterface
 {
-    private ContainerInterface $container;
     private TranslatorInterface $translator;
 
-    public function __construct(ContainerInterface $container)
-    {
-        // As this cache warmer is optional, dependencies should be lazy-loaded, that's why a container should be injected.
-        $this->container = $container;
+    /**
+     * As this cache warmer is optional, dependencies should be lazy-loaded, that's why a container should be injected.
+     */
+    public function __construct(
+        private ContainerInterface $container,
+    ) {
     }
 
     public function warmUp(string $cacheDir, ?string $buildDir = null): array

src/Symfony/Bundle/FrameworkBundle/Routing/Router.php

@@ -35,16 +35,21 @@
  */
 class Router extends BaseRouter implements WarmableInterface, ServiceSubscriberInterface
 {
-    private ContainerInterface $container;
     private array $collectedParameters = [];
     private \Closure $paramFetcher;
 
     /**
      * @param mixed $resource The main resource to load
      */
-    public function __construct(ContainerInterface $container, mixed $resource, array $options = [], ?RequestContext $context = null, ?ContainerInterface $parameters = null, ?LoggerInterface $logger = null, ?string $defaultLocale = null)
-    {
-        $this->container = $container;
+    public function __construct(
+        private ContainerInterface $container,
+        mixed $resource,
+        array $options = [],
+        ?RequestContext $context = null,
+        ?ContainerInterface $parameters = null,
+        ?LoggerInterface $logger = null,
+        ?string $defaultLocale = null,
+    ) {
         $this->resource = $resource;
         $this->context = $context ?? new RequestContext();
         $this->logger = $logger;

src/Symfony/Bundle/FrameworkBundle/Secrets/SodiumVault.php

@@ -26,18 +26,19 @@ class SodiumVault extends AbstractVault implements EnvVarLoaderInterface
     private string|\Stringable|null $decryptionKey = null;
     private string $pathPrefix;
     private ?string $secretsDir;
-    private ?string $derivedSecretEnvVar;
 
     /**
      * @param $decryptionKey A string or a stringable object that defines the private key to use to decrypt the vault
      *                       or null to store generated keys in the provided $secretsDir
      */
-    public function __construct(string $secretsDir, #[\SensitiveParameter] string|\Stringable|null $decryptionKey = null, ?string $derivedSecretEnvVar = null)
-    {
+    public function __construct(
+        string $secretsDir,
+        #[\SensitiveParameter] string|\Stringable|null $decryptionKey = null,
+        private ?string $derivedSecretEnvVar = null,
+    ) {
         $this->pathPrefix = rtrim(strtr($secretsDir, '/', \DIRECTORY_SEPARATOR), \DIRECTORY_SEPARATOR).\DIRECTORY_SEPARATOR.basename($secretsDir).'.';
         $this->decryptionKey = $decryptionKey;
         $this->secretsDir = $secretsDir;
-        $this->derivedSecretEnvVar = $derivedSecretEnvVar;
     }
 
     public function generateKeys(bool $override = false): bool

src/Symfony/Component/Asset/Exception/AssetNotFoundException.php

@@ -16,19 +16,19 @@
  */
 class AssetNotFoundException extends RuntimeException
 {
-    private array $alternatives;
-
     /**
      * @param string     $message      Exception message to throw
      * @param array      $alternatives List of similar defined names
      * @param int        $code         Exception code
      * @param \Throwable $previous     Previous exception used for the exception chaining
      */
-    public function __construct(string $message, array $alternatives = [], int $code = 0, ?\Throwable $previous = null)
-    {
+    public function __construct(
+        string $message,
+        private array $alternatives = [],
+        int $code = 0,
+        ?\Throwable $previous = null,
+    ) {
         parent::__construct($message, $code, $previous);
-
-        $this->alternatives = $alternatives;
     }
 
     public function getAlternatives(): array

src/Symfony/Component/BrowserKit/Test/Constraint/BrowserCookieValueSame.php

@@ -16,19 +16,13 @@
 
 final class BrowserCookieValueSame extends Constraint
 {
-    private string $name;
-    private string $value;
-    private bool $raw;
-    private string $path;
-    private ?string $domain;
-
-    public function __construct(string $name, string $value, bool $raw = false, string $path = '/', ?string $domain = null)
-    {
-        $this->name = $name;
-        $this->path = $path;
-        $this->domain = $domain;
-        $this->value = $value;
-        $this->raw = $raw;
+    public function __construct(
+        private string $name,
+        private string $value,
+        private bool $raw = false,
+        private string $path = '/',
+        private ?string $domain = null,
+    ) {
     }
 
     public function toString(): string

src/Symfony/Component/BrowserKit/Test/Constraint/BrowserHasCookie.php

@@ -16,15 +16,11 @@
 
 final class BrowserHasCookie extends Constraint
 {
-    private string $name;
-    private string $path;
-    private ?string $domain;
-
-    public function __construct(string $name, string $path = '/', ?string $domain = null)
-    {
-        $this->name = $name;
-        $this->path = $path;
-        $this->domain = $domain;
+    public function __construct(
+        private string $name,
+        private string $path = '/',
+        private ?string $domain = null,
+    ) {
     }
 
     public function toString(): string

src/Symfony/Component/Cache/Adapter/PhpFilesAdapter.php

@@ -305,10 +305,8 @@ private function getFileKey(string $file): string
  */
 class LazyValue
 {
-    public string $file;
-
-    public function __construct(string $file)
-    {
-        $this->file = $file;
+    public function __construct(
+        public string $file,
+    ) {
     }
 }