symfony · nicolas-grekas · Dec 30, 2023 · Dec 20, 2023
diff --git a/UPGRADE-7.1.md b/UPGRADE-7.1.md
@@ -6,11 +6,31 @@ Cache
 
  * Deprecate `CouchbaseBucketAdapter`, use `CouchbaseCollectionAdapter` instead
 
+FrameworkBundle
+---------------
+
+ * Mark classes `ConfigBuilderCacheWarmer`, `Router`, `SerializerCacheWarmer`, `TranslationsCacheWarmer`, `Translator` and `ValidatorCacheWarmer` as `final`
+
 Messenger
 ---------
 
  * Make `#[AsMessageHandler]` final
 
+SecurityBundle
+--------------
+
+ * Mark class `ExpressionCacheWarmer` as `final`
+
+Translation
+-----------
+
+ * Mark class `DataCollectorTranslator` as `final`
+
+TwigBundle
+----------
+
+ * Mark class `TemplateCacheWarmer` as `final`
+
 Workflow
 --------
 

diff --git a/src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php b/src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php
@@ -21,6 +21,8 @@
  * since this information is necessary to build the proxies in the first place.
  *
  * @author Benjamin Eberlei <[email protected]>
+ *
+ * @final since Symfony 7.1
  */
 class ProxyCacheWarmer implements CacheWarmerInterface
 {

diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -4,6 +4,7 @@ CHANGELOG
 7.1
 ---
 
+ * Mark classes `ConfigBuilderCacheWarmer`, `Router`, `SerializerCacheWarmer`, `TranslationsCacheWarmer`, `Translator` and `ValidatorCacheWarmer` as `final`
  * Move the Router `cache_dir` to `kernel.build_dir`
  * Deprecate the `router.cache_dir` config option
  * Add `rate_limiter` tags to rate limiter services

diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ConfigBuilderCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ConfigBuilderCacheWarmer.php
@@ -25,6 +25,8 @@
  * Generate all config builders.
  *
  * @author Tobias Nyholm <[email protected]>
+ *
+ * @final since Symfony 7.1
  */
 class ConfigBuilderCacheWarmer implements CacheWarmerInterface
 {

diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php
@@ -23,6 +23,8 @@
  * Warms up XML and YAML serializer metadata.
  *
  * @author Titouan Galopin <[email protected]>
+ *
+ * @final since Symfony 7.1
  */
 class SerializerCacheWarmer extends AbstractPhpFileCacheWarmer
 {

diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TranslationsCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TranslationsCacheWarmer.php
@@ -21,6 +21,8 @@
  * Generates the catalogues for translations.
  *
  * @author Xavier Leune <[email protected]>
+ *
+ * @final since Symfony 7.1
  */
 class TranslationsCacheWarmer implements CacheWarmerInterface, ServiceSubscriberInterface
 {

diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php
@@ -24,6 +24,8 @@
  * Warms up XML and YAML validator metadata.
  *
  * @author Titouan Galopin <[email protected]>
+ *
+ * @final since Symfony 7.1
  */
 class ValidatorCacheWarmer extends AbstractPhpFileCacheWarmer
 {

diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
@@ -30,6 +30,8 @@
  * This Router creates the Loader only when the cache is empty.
  *
  * @author Fabien Potencier <[email protected]>
+ *
+ * @final since Symfony 7.1
  */
 class Router extends BaseRouter implements WarmableInterface, ServiceSubscriberInterface
 {

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
@@ -100,16 +100,6 @@ public function testTransWithCaching()
         $this->assertEquals('foobarbax (sr@latin)', $translator->trans('foobarbax'));
     }
 
-    public function testTransWithCachingWithInvalidLocale()
-    {
-        $this->expectException(\InvalidArgumentException::class);
-        $this->expectExceptionMessage('Invalid "invalid locale" locale.');
-        $loader = $this->createMock(LoaderInterface::class);
-        $translator = $this->getTranslator($loader, ['cache_dir' => $this->tmpDir], 'loader', TranslatorWithInvalidLocale::class);
-
-        $translator->trans('foo');
-    }
-
     public function testLoadResourcesWithoutCaching()
     {
         $loader = new YamlFileLoader();
@@ -418,11 +408,3 @@ private function createTranslator($loader, $options, $translatorClass = Translat
         );
     }
 }
-
-class TranslatorWithInvalidLocale extends Translator
-{
-    public function getLocale(): string
-    {
-        return 'invalid locale';
-    }
-}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
@@ -21,6 +21,8 @@
 
 /**
  * @author Fabien Potencier <[email protected]>
+ *
+ * @final since Symfony 7.1
  */
 class Translator extends BaseTranslator implements WarmableInterface
 {

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+7.1
+---
+
+ * Mark class `ExpressionCacheWarmer` as `final`
+
 7.0
 ---
 

@@ -15,6 +15,9 @@
 use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
 use Symfony\Component\Security\Core\Authorization\ExpressionLanguage;
 
+/**
+ * @final since Symfony 7.1
+ */
 class ExpressionCacheWarmer implements CacheWarmerInterface
 {
     private iterable $expressions;

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+7.1
+---
+
+ * Mark class `TemplateCacheWarmer` as `final`
+
 7.0
 ---
 

@@ -21,6 +21,8 @@
  * Generates the Twig cache for all templates.
  *
  * @author Fabien Potencier <[email protected]>
+ *
+ * @final since Symfony 7.1
  */
 class TemplateCacheWarmer implements CacheWarmerInterface, ServiceSubscriberInterface
 {

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+7.1
+---
+
+ * Mark class `DataCollectorTranslator` as `final`
+
 7.0
 ---
 

@@ -18,6 +18,8 @@
 
 /**
  * @author Abdellatif Ait boudad <[email protected]>
+ *
+ * @final since Symfony 7.1
  */
 class DataCollectorTranslator implements TranslatorInterface, TranslatorBagInterface, LocaleAwareInterface, WarmableInterface
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,8 @@ @@
     /**
      * @author Fabien Potencier <[email protected]>
+     *
+     * @final since Symfony 7.1
      */
     class Translator extends BaseTranslator implements WarmableInterface
     {
@@ Expand Down @@