symfony · lyrixx · Jun 14, 2023
diff --git a/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php b/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php
@@ -25,10 +25,8 @@
  *
  * @author Tobias Schultze <http://tobion.de>
  * @author Grégoire Pineau <[email protected]>
- *
- * @final since Symfony 6.1
  */
-class ConsoleFormatter implements FormatterInterface
+final class ConsoleFormatter implements FormatterInterface
 {
     use CompatibilityFormatter;
 

diff --git a/src/Symfony/Bridge/Monolog/Formatter/VarDumperFormatter.php b/src/Symfony/Bridge/Monolog/Formatter/VarDumperFormatter.php
@@ -17,10 +17,8 @@
 
 /**
  * @author Grégoire Pineau <[email protected]>
- *
- * @final since Symfony 6.1
  */
-class VarDumperFormatter implements FormatterInterface
+final class VarDumperFormatter implements FormatterInterface
 {
     use CompatibilityFormatter;
 

diff --git a/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php b/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php
@@ -77,10 +77,8 @@ public function isHandling(array $record): bool
  * This mapping can be customized with the $verbosityLevelMap constructor parameter.
  *
  * @author Tobias Schultze <http://tobion.de>
- *
- * @final since Symfony 6.1
  */
-class ConsoleHandler extends AbstractProcessingHandler implements EventSubscriberInterface
+final class ConsoleHandler extends AbstractProcessingHandler implements EventSubscriberInterface
 {
     use CompatibilityHandler;
     use CompatibilityIsHandlingHandler;

diff --git a/src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php b/src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php
@@ -41,10 +41,8 @@
  * stack is recommended.
  *
  * @author Grégoire Pineau <[email protected]>
- *
- * @final since Symfony 6.1
  */
-class ElasticsearchLogstashHandler extends AbstractHandler
+final class ElasticsearchLogstashHandler extends AbstractHandler
 {
     use CompatibilityHandler;
 

diff --git a/src/Symfony/Bridge/Monolog/Handler/MailerHandler.php b/src/Symfony/Bridge/Monolog/Handler/MailerHandler.php
@@ -23,10 +23,8 @@
 
 /**
  * @author Alexander Borisov <[email protected]>
- *
- * @final since Symfony 6.1
  */
-class MailerHandler extends AbstractProcessingHandler
+final class MailerHandler extends AbstractProcessingHandler
 {
     use CompatibilityProcessingHandler;
 

diff --git a/src/Symfony/Bridge/Monolog/Handler/NotifierHandler.php b/src/Symfony/Bridge/Monolog/Handler/NotifierHandler.php
@@ -16,17 +16,14 @@
 use Monolog\Logger;
 use Monolog\LogRecord;
 use Symfony\Component\Notifier\Notification\Notification;
-use Symfony\Component\Notifier\Notifier;
 use Symfony\Component\Notifier\NotifierInterface;
 
 /**
  * Uses Notifier as a log handler.
  *
  * @author Fabien Potencier <[email protected]>
- *
- * @final since Symfony 6.1
  */
-class NotifierHandler extends AbstractHandler
+final class NotifierHandler extends AbstractHandler
 {
     use CompatibilityHandler;
 

diff --git a/src/Symfony/Bridge/Monolog/Handler/ServerLogHandler.php b/src/Symfony/Bridge/Monolog/Handler/ServerLogHandler.php
@@ -20,10 +20,7 @@
 use Symfony\Bridge\Monolog\Formatter\VarDumperFormatter;
 
 if (trait_exists(FormattableHandlerTrait::class)) {
-    /**
-     * @final since Symfony 6.1
-     */
-    class ServerLogHandler extends AbstractProcessingHandler
+    final class ServerLogHandler extends AbstractProcessingHandler
     {
         use CompatibilityHandler;
         use CompatibilityProcessingHandler;
@@ -35,10 +32,7 @@ protected function getDefaultFormatter(): FormatterInterface
         }
     }
 } else {
-    /**
-     * @final since Symfony 6.1
-     */
-    class ServerLogHandler extends AbstractProcessingHandler
+    final class ServerLogHandler extends AbstractProcessingHandler
     {
         use CompatibilityHandler;
         use CompatibilityProcessingHandler;

diff --git a/src/Symfony/Bridge/Monolog/Processor/ConsoleCommandProcessor.php b/src/Symfony/Bridge/Monolog/Processor/ConsoleCommandProcessor.php
@@ -21,10 +21,8 @@
  * Adds the current console command information to the log entry.
  *
  * @author Piotr Stankowski <[email protected]>
- *
- * @final since Symfony 6.1
  */
-class ConsoleCommandProcessor implements EventSubscriberInterface, ResetInterface
+final class ConsoleCommandProcessor implements EventSubscriberInterface, ResetInterface
 {
     use CompatibilityProcessor;
 

diff --git a/src/Symfony/Bridge/Monolog/Processor/SwitchUserTokenProcessor.php b/src/Symfony/Bridge/Monolog/Processor/SwitchUserTokenProcessor.php
@@ -18,10 +18,8 @@
  * Adds the original security token to the log entry.
  *
  * @author Igor Timoshenko <[email protected]>
- *
- * @final since Symfony 6.1
  */
-class SwitchUserTokenProcessor extends AbstractTokenProcessor
+final class SwitchUserTokenProcessor extends AbstractTokenProcessor
 {
     protected function getKey(): string
     {

diff --git a/src/Symfony/Bridge/Monolog/Processor/TokenProcessor.php b/src/Symfony/Bridge/Monolog/Processor/TokenProcessor.php
@@ -18,10 +18,8 @@
  *
  * @author Dany Maillard <[email protected]>
  * @author Igor Timoshenko <[email protected]>
- *
- * @final since Symfony 6.1
  */
-class TokenProcessor extends AbstractTokenProcessor
+final class TokenProcessor extends AbstractTokenProcessor
 {
     protected function getKey(): string
     {

diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/BackedEnumValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/BackedEnumValueResolver.php
@@ -22,10 +22,8 @@
  * leading to a 404 Not Found if the attribute value isn't a valid backing value for the enum type.
  *
  * @author Maxime Steinhausser <[email protected]>
- *
- * @final since Symfony 6.2
  */
-class BackedEnumValueResolver implements ArgumentValueResolverInterface, ValueResolverInterface
+final class BackedEnumValueResolver implements ArgumentValueResolverInterface, ValueResolverInterface
 {
     /**
      * @deprecated since Symfony 6.2, use resolve() instead

diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/SmtpTransport.php b/src/Symfony/Component/Mailer/Transport/Smtp/SmtpTransport.php
@@ -244,12 +244,7 @@ protected function doSend(SentMessage $message): void
         }
     }
 
-    /**
-     * @internal since version 6.1, to be made private in 7.0
-     *
-     * @final since version 6.1, to be made private in 7.0
-     */
-    protected function doHeloCommand(): void
+    private function doHeloCommand(): void
     {
         $this->executeCommand(sprintf("HELO %s\r\n", $this->domain), [250]);
     }

@@ -21,10 +21,8 @@
  *
  * @author Grégoire Pineau <[email protected]>
  * @author Kévin Dunglas <[email protected]>
- *
- * @final since Symfony 6.3
  */
-class ConstraintViolationListNormalizer implements NormalizerInterface
+final class ConstraintViolationListNormalizer implements NormalizerInterface
 {
     public const INSTANCE = 'instance';
     public const STATUS = 'status';

@@ -16,10 +16,8 @@
 
 /**
  * @author Jordi Boggiano <[email protected]>
- *
- * @final since Symfony 6.3
  */
-class CustomNormalizer implements NormalizerInterface, DenormalizerInterface, SerializerAwareInterface
+final class CustomNormalizer implements NormalizerInterface, DenormalizerInterface, SerializerAwareInterface
 {
     use ObjectToPopulateTrait;
     use SerializerAwareTrait;

@@ -22,10 +22,8 @@
  * Denormalizes a data URI to a {@see \SplFileObject} object.
  *
  * @author Kévin Dunglas <[email protected]>
- *
- * @final since Symfony 6.3
  */
-class DataUriNormalizer implements NormalizerInterface, DenormalizerInterface
+final class DataUriNormalizer implements NormalizerInterface, DenormalizerInterface
 {
     private const SUPPORTED_TYPES = [
         \SplFileInfo::class => true,

@@ -19,10 +19,8 @@
  * Denormalizes an interval string to an instance of {@see \DateInterval}.
  *
  * @author Jérôme Parmentier <[email protected]>
- *
- * @final since Symfony 6.3
  */
-class DateIntervalNormalizer implements NormalizerInterface, DenormalizerInterface
+final class DateIntervalNormalizer implements NormalizerInterface, DenormalizerInterface
 {
     public const FORMAT_KEY = 'dateinterval_format';
 

@@ -20,10 +20,8 @@
  * Denormalizes a date string to an instance of {@see \DateTime} or {@see \DateTimeImmutable}.
  *
  * @author Kévin Dunglas <[email protected]>
- *
- * @final since Symfony 6.3
  */
-class DateTimeNormalizer implements NormalizerInterface, DenormalizerInterface
+final class DateTimeNormalizer implements NormalizerInterface, DenormalizerInterface
 {
     public const FORMAT_KEY = 'datetime_format';
     public const TIMEZONE_KEY = 'datetime_timezone';

@@ -19,10 +19,8 @@
  * Normalizes a {@see \DateTimeZone} object to a timezone string.
  *
  * @author Jérôme Desjardins <[email protected]>
- *
- * @final since Symfony 6.3
  */
-class DateTimeZoneNormalizer implements NormalizerInterface, DenormalizerInterface
+final class DateTimeZoneNormalizer implements NormalizerInterface, DenormalizerInterface
 {
     public function getSupportedTypes(?string $format): array
     {

@@ -18,10 +18,8 @@
  * A normalizer that uses an objects own JsonSerializable implementation.
  *
  * @author Fred Cox <[email protected]>
- *
- * @final since Symfony 6.3
  */
-class JsonSerializableNormalizer extends AbstractNormalizer
+final class JsonSerializableNormalizer extends AbstractNormalizer
 {
     public function normalize(mixed $object, string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null
     {

@@ -25,10 +25,8 @@
  * Converts between objects and arrays using the PropertyAccess component.
  *
  * @author Kévin Dunglas <[email protected]>
- *
- * @final since Symfony 6.3
  */
-class ObjectNormalizer extends AbstractObjectNormalizer
+final class ObjectNormalizer extends AbstractObjectNormalizer
 {
     protected $propertyAccessor;
 

@@ -934,7 +934,7 @@ private function createXmlEncoderWithDateTimeNormalizer(): XmlEncoder
 
     private function createMockDateTimeNormalizer(): MockObject&NormalizerInterface
     {
-        $mock = $this->createMock(CustomNormalizer::class);
+        $mock = $this->createMock(NormalizerInterface::class);
 
         $mock
             ->expects($this->once())

@@ -89,7 +89,7 @@ public function testItThrowsExceptionOnInvalidEncoder()
     public function testNormalizeNoMatch()
     {
         $this->expectException(UnexpectedValueException::class);
-        $serializer = new Serializer([$this->createMock(CustomNormalizer::class)]);
+        $serializer = new Serializer([$this->createMock(NormalizerInterface::class)]);
         $serializer->normalize(new \stdClass(), 'xml');
     }
 
@@ -117,7 +117,7 @@ public function testNormalizeOnDenormalizer()
     public function testDenormalizeNoMatch()
     {
         $this->expectException(UnexpectedValueException::class);
-        $serializer = new Serializer([$this->createMock(CustomNormalizer::class)]);
+        $serializer = new Serializer([$this->createMock(NormalizerInterface::class)]);
         $serializer->denormalize('foo', 'stdClass');
     }