symfony · nicolas-grekas · Feb 10, 2022 · Feb 8, 2022 · Feb 9, 2022
diff --git a/UPGRADE-6.1.md b/UPGRADE-6.1.md
@@ -1,10 +1,16 @@
 UPGRADE FROM 6.0 to 6.1
 =======================
 
+All components
+--------------
+
+ * Public and protected properties are now considered final;
+   instead of overriding a property, consider setting its value in the constructor
+
 Console
 -------
 
- * Deprecate `Command::$defaultName` and `Command::$defaultDescription`, use the `AsCommand` attribute instead.
+ * Deprecate `Command::$defaultName` and `Command::$defaultDescription`, use the `AsCommand` attribute instead
 
 Serializer
 ----------

diff --git a/src/Symfony/Component/Cache/Tests/Adapter/MaxIdLengthAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/MaxIdLengthAdapterTest.php
@@ -79,10 +79,10 @@ public function testTooLongNamespace()
 
 abstract class MaxIdLengthAdapter extends AbstractAdapter
 {
-    protected $maxIdLength = 50;
-
     public function __construct(string $ns)
     {
+        $this->maxIdLength = 50;
+
         parent::__construct($ns);
     }
 }
@@ -5,7 +5,7 @@ CHANGELOG
 ---
 
  * Add method `__toString()` to `InputInterface`
- * Deprecate `Command::$defaultName` and `Command::$defaultDescription`, use the `AsCommand` attribute instead.
+ * Deprecate `Command::$defaultName` and `Command::$defaultDescription`, use the `AsCommand` attribute instead
 
 6.0
 ---

@@ -503,13 +503,27 @@ class Php8Command2 extends Command
 
 class MyCommand extends Command
 {
+    /**
+     * @deprecated since Symfony 6.1
+     */
     protected static $defaultName = 'my:command';
+
+    /**
+     * @deprecated since Symfony 6.1
+     */
     protected static $defaultDescription = 'This is a command I wrote all by myself';
 }
 
 #[AsCommand(name: 'my:command', description: 'This is a command I wrote all by myself')]
 class MyAnnotatedCommand extends Command
 {
+    /**
+     * @deprecated since Symfony 6.1
+     */
     protected static $defaultName = 'i-shall-be-ignored';
+
+    /**
+     * @deprecated since Symfony 6.1
+     */
     protected static $defaultDescription = 'This description should be ignored.';
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
@@ -413,16 +413,6 @@ class ProjectServiceContainer extends Container
     public $__foo_bar;
     public $__foo_baz;
     public $__internal;
-    protected $privates;
-    protected $methodMap = [
-        'bar' => 'getBarService',
-        'foo_bar' => 'getFooBarService',
-        'foo.baz' => 'getFoo_BazService',
-        'circular' => 'getCircularService',
-        'throw_exception' => 'getThrowExceptionService',
-        'throws_exception_on_service_configuration' => 'getThrowsExceptionOnServiceConfigurationService',
-        'internal_dependency' => 'getInternalDependencyService',
-    ];
 
     public function __construct()
     {
@@ -434,6 +424,15 @@ public function __construct()
         $this->__internal = new \stdClass();
         $this->privates = [];
         $this->aliases = ['alias' => 'bar'];
+        $this->methodMap = [
+            'bar' => 'getBarService',
+            'foo_bar' => 'getFooBarService',
+            'foo.baz' => 'getFoo_BazService',
+            'circular' => 'getCircularService',
+            'throw_exception' => 'getThrowExceptionService',
+            'throws_exception_on_service_configuration' => 'getThrowsExceptionOnServiceConfigurationService',
+            'internal_dependency' => 'getInternalDependencyService',
+        ];
     }
 
     protected function getInternalService()

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php
@@ -89,7 +89,7 @@ public function testRegisterClasses()
         $container = new ContainerBuilder();
         $container->setParameter('sub_dir', 'Sub');
         $loader = new TestFileLoader($container, new FileLocator(self::$fixturesPath.'/Fixtures'));
-        $loader->autoRegisterAliasesForSinglyImplementedInterfaces = false;
+        $loader->noAutoRegisterAliasesForSinglyImplementedInterfaces();
 
         $loader->registerClasses(new Definition(), 'Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\\', 'Prototype/%sub_dir%/*');
         $loader->registerClasses(new Definition(), 'Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\\', 'Prototype/%sub_dir%/*'); // loading twice should not be an issue
@@ -270,7 +270,10 @@ public function testRegisterClassesWithWhenEnv(?string $env, bool $expected)
 
 class TestFileLoader extends FileLoader
 {
-    public $autoRegisterAliasesForSinglyImplementedInterfaces = true;
+    public function noAutoRegisterAliasesForSinglyImplementedInterfaces()
+    {
+        $this->autoRegisterAliasesForSinglyImplementedInterfaces = false;
+    }
 
     public function load(mixed $resource, string $type = null): mixed
     {

@@ -4,7 +4,7 @@ CHANGELOG
 6.1
 ---
 
- * Report overridden `@final` constants
+ * Report overridden `@final` constants and properties
 
 5.4
 ---

@@ -112,6 +112,7 @@ class DebugClassLoader
     private static array $checkedClasses = [];
     private static array $final = [];
     private static array $finalMethods = [];
+    private static array $finalProperties = [];
     private static array $finalConstants = [];
     private static array $deprecated = [];
     private static array $internal = [];
@@ -469,9 +470,10 @@ public function checkAnnotations(\ReflectionClass $refl, string $class): array
         self::$finalMethods[$class] = [];
         self::$internalMethods[$class] = [];
         self::$annotatedParameters[$class] = [];
+        self::$finalProperties[$class] = [];
         self::$finalConstants[$class] = [];
         foreach ($parentAndOwnInterfaces as $use) {
-            foreach (['finalMethods', 'internalMethods', 'annotatedParameters', 'returnTypes', 'finalConstants'] as $property) {
+            foreach (['finalMethods', 'internalMethods', 'annotatedParameters', 'returnTypes', 'finalProperties', 'finalConstants'] as $property) {
                 if (isset(self::${$property}[$use])) {
                     self::${$property}[$class] = self::${$property}[$class] ? self::${$property}[$use] + self::${$property}[$class] : self::${$property}[$use];
                 }
@@ -626,22 +628,29 @@ public function checkAnnotations(\ReflectionClass $refl, string $class): array
             }
         }
 
-        foreach ($refl->getReflectionConstants(\ReflectionClassConstant::IS_PUBLIC | \ReflectionClassConstant::IS_PROTECTED) as $constant) {
-            if ($constant->class !== $class) {
-                continue;
-            }
+        $finals = isset(self::$final[$class]) || $refl->isFinal() ? [] : [
+            'finalConstants' => $refl->getReflectionConstants(\ReflectionClassConstant::IS_PUBLIC | \ReflectionClassConstant::IS_PROTECTED),
+            'finalProperties' => $refl->getProperties(\ReflectionProperty::IS_PUBLIC | \ReflectionProperty::IS_PROTECTED),
+        ];
+        foreach ($finals as $type => $reflectors) {
+            foreach ($reflectors as $r) {
+                if ($r->class !== $class) {
+                    continue;
+                }
+
+                $doc = $this->parsePhpDoc($r);
 
-            foreach ($parentAndOwnInterfaces as $use) {
-                if (isset(self::$finalConstants[$use][$constant->name])) {
-                    $deprecations[] = sprintf('The "%s::%s" constant is considered final. You should not override it in "%s".', self::$finalConstants[$use][$constant->name], $constant->name, $class);
+                foreach ($parentAndOwnInterfaces as $use) {
+                    if (isset(self::${$type}[$use][$r->name]) && !isset($doc['deprecated']) && ('finalConstants' === $type || substr($use, 0, strrpos($use, '\\')) !== substr($use, 0, strrpos($class, '\\')))) {
+                        $msg = 'finalConstants' === $type ? '%s" constant' : '$%s" property';
+                        $deprecations[] = sprintf('The "%s::'.$msg.' is considered final. You should not override it in "%s".', self::${$type}[$use][$r->name], $r->name, $class);
+                    }
                 }
-            }
 
-            if (!($doc = $this->parsePhpDoc($constant)) || !isset($doc['final'])) {
-                continue;
+                if (isset($doc['final']) || ('finalProperties' === $type && str_starts_with($class, 'Symfony\\') && !$r->hasType())) {
+                    self::${$type}[$class][$r->name] = $class;
+                }
             }
-
-            self::$finalConstants[$class][$constant->name] = $class;
         }
 
         return $deprecations;

@@ -401,13 +401,34 @@ class_exists('Test\\'.ReturnType::class, true);
         ], $deprecations);
     }
 
+    public function testOverrideFinalProperty()
+    {
+        $deprecations = [];
+        set_error_handler(function ($type, $msg) use (&$deprecations) { $deprecations[] = $msg; });
+        $e = error_reporting(E_USER_DEPRECATED);
+
+        class_exists(Fixtures\OverrideFinalProperty::class, true);
+        class_exists(Fixtures\FinalProperty\OverrideFinalPropertySameNamespace::class, true);
+        class_exists('Test\\'.OverrideOutsideFinalProperty::class, true);
+
+        error_reporting($e);
+        restore_error_handler();
+
+        $this->assertSame([
+            'The "Symfony\Component\ErrorHandler\Tests\Fixtures\FinalProperty\FinalProperty::$pub" property is considered final. You should not override it in "Symfony\Component\ErrorHandler\Tests\Fixtures\OverrideFinalProperty".',
+            'The "Symfony\Component\ErrorHandler\Tests\Fixtures\FinalProperty\FinalProperty::$prot" property is considered final. You should not override it in "Symfony\Component\ErrorHandler\Tests\Fixtures\OverrideFinalProperty".',
+            'The "Symfony\Component\ErrorHandler\Tests\Fixtures\FinalProperty\FinalProperty::$implicitlyFinal" property is considered final. You should not override it in "Symfony\Component\ErrorHandler\Tests\Fixtures\OverrideFinalProperty".',
+            'The "Test\Symfony\Component\ErrorHandler\Tests\FinalProperty\OutsideFinalProperty::$final" property is considered final. You should not override it in "Test\Symfony\Component\ErrorHandler\Tests\OverrideOutsideFinalProperty".'
+        ], $deprecations);
+    }
+
     public function testOverrideFinalConstant()
     {
         $deprecations = [];
         set_error_handler(function ($type, $msg) use (&$deprecations) { $deprecations[] = $msg; });
         $e = error_reporting(E_USER_DEPRECATED);
 
-        class_exists( Fixtures\FinalConstant\OverrideFinalConstant::class, true);
+        class_exists(Fixtures\FinalConstant\OverrideFinalConstant::class, true);
 
         error_reporting($e);
         restore_error_handler();
@@ -523,6 +544,10 @@ public function ownAbstractBaseMethod() { }
             return $fixtureDir.\DIRECTORY_SEPARATOR.'ReturnType.php';
         } elseif ('Test\\'.Fixtures\OutsideInterface::class === $class) {
             return $fixtureDir.\DIRECTORY_SEPARATOR.'OutsideInterface.php';
+        } elseif ('Test\\'.OverrideOutsideFinalProperty::class === $class) {
+            return $fixtureDir.'OverrideOutsideFinalProperty.php';
+        } elseif ('Test\\Symfony\\Component\\ErrorHandler\\Tests\\FinalProperty\\OutsideFinalProperty' === $class) {
+            return $fixtureDir.'FinalProperty'.\DIRECTORY_SEPARATOR.'OutsideFinalProperty.php';
         }
     }
 }
@@ -0,0 +1,32 @@
+<?php
+
+namespace Symfony\Component\ErrorHandler\Tests\Fixtures\FinalProperty;
+
+class FinalProperty
+{
+    /**
+     * @final
+     */
+    public $pub;
+
+    /**
+     * @final
+     */
+    protected $prot;
+
+    /**
+     * @final
+     */
+    private $priv;
+
+    /**
+     * @final
+     */
+    public $notOverriden;
+
+    protected $implicitlyFinal;
+
+    protected string $typedSoNotFinal;
+
+    protected $deprecated;
+}
@@ -0,0 +1,23 @@
+<?php
+
+namespace Test\Symfony\Component\ErrorHandler\Tests\FinalProperty;
+
+class OutsideFinalProperty
+{
+    /**
+     * @final
+     */
+    public $final;
+
+    protected $notImplicitlyFinalBecauseNotInSymfony;
+
+    /**
+     * @final
+     */
+    public $notOverriden;
+
+    /**
+     * @final
+     */
+    protected $deprecated;
+}
@@ -0,0 +1,8 @@
+<?php
+
+namespace Symfony\Component\ErrorHandler\Tests\Fixtures\FinalProperty;
+
+class OverrideFinalPropertySameNamespace extends FinalProperty
+{
+    public $pub;
+}
@@ -0,0 +1,18 @@
+<?php
+
+namespace Symfony\Component\ErrorHandler\Tests\Fixtures;
+
+use Symfony\Component\ErrorHandler\Tests\Fixtures\FinalProperty\FinalProperty;
+
+class OverrideFinalProperty extends FinalProperty
+{
+    public $pub;
+    protected $prot;
+    private $priv;
+    protected $implicitlyFinal;
+    protected string $typedSoNotFinal;
+    /**
+     * @deprecated
+     */
+    protected $deprecated;
+}
@@ -0,0 +1,15 @@
+<?php
+
+namespace Test\Symfony\Component\ErrorHandler\Tests;
+
+use Test\Symfony\Component\ErrorHandler\Tests\FinalProperty\OutsideFinalProperty;
+
+class OverrideOutsideFinalProperty extends OutsideFinalProperty
+{
+    public $final;
+    protected $notImplicitlyFinalBecauseNotInSymfony;
+    /**
+     * @deprecated
+     */
+    protected $deprecated;
+}
@@ -13,7 +13,7 @@
 
 trait VersionAwareTest
 {
-    protected static $supportedFeatureSetVersion = 404;
+    protected static int $supportedFeatureSetVersion = 404;
 
     protected function requiresFeatureSet(int $requiredFeatureSetVersion)
     {

diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Query.php
@@ -26,9 +26,6 @@ class Query extends AbstractQuery
 {
     public const PAGINATION_OID = \LDAP_CONTROL_PAGEDRESULTS;
 
-    /** @var Connection */
-    protected $connection;
-
     /** @var resource[]|Result[] */
     private array $results;
 

diff --git a/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php b/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
@@ -39,6 +39,8 @@
  * A test case to ease testing Constraint Validators.
  *
  * @author Bernhard Schussek <bschussek@gmail.com>
+ *
+ * @template T of ConstraintValidatorInterface
  */
 abstract class ConstraintValidatorTestCase extends TestCase
 {
@@ -48,7 +50,7 @@ abstract class ConstraintValidatorTestCase extends TestCase
     protected $context;
 
     /**
-     * @var ConstraintValidatorInterface
+     * @var T
      */
     protected $validator;
 

diff --git a/src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php
@@ -18,16 +18,11 @@
 
 /**
  * @requires extension fileinfo
+ *
+ * @extends ConstraintValidatorTestCase<ImageValidator>
  */
 class ImageValidatorTest extends ConstraintValidatorTestCase
 {
-    protected $context;
-
-    /**
-     * @var ImageValidator
-     */
-    protected $validator;
-
     protected $path;
     protected $image;
     protected $imageLandscape;
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ CHANGELOG @@
     ---
      * Add method `__toString()` to `InputInterface`
-     * Deprecate `Command::$defaultName` and `Command::$defaultDescription`, use the `AsCommand` attribute instead.
+     * Deprecate `Command::$defaultName` and `Command::$defaultDescription`, use the `AsCommand` attribute instead
 .0
     ---
@@ Expand Down @@