From f39ede439110c13688d51967b100db1ed2a63410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= Date: Wed, 14 Jun 2023 15:02:10 +0200 Subject: [PATCH] Make some classes final --- .../Bridge/Monolog/Formatter/ConsoleFormatter.php | 4 +--- .../Bridge/Monolog/Formatter/VarDumperFormatter.php | 4 +--- src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php | 4 +--- .../Monolog/Handler/ElasticsearchLogstashHandler.php | 4 +--- src/Symfony/Bridge/Monolog/Handler/MailerHandler.php | 4 +--- src/Symfony/Bridge/Monolog/Handler/NotifierHandler.php | 5 +---- .../Bridge/Monolog/Handler/ServerLogHandler.php | 10 ++-------- .../Monolog/Processor/ConsoleCommandProcessor.php | 4 +--- .../Monolog/Processor/SwitchUserTokenProcessor.php | 4 +--- .../Bridge/Monolog/Processor/TokenProcessor.php | 4 +--- .../ArgumentResolver/BackedEnumValueResolver.php | 4 +--- .../Component/Mailer/Transport/Smtp/SmtpTransport.php | 7 +------ .../Normalizer/ConstraintViolationListNormalizer.php | 4 +--- .../Serializer/Normalizer/CustomNormalizer.php | 4 +--- .../Serializer/Normalizer/DataUriNormalizer.php | 4 +--- .../Serializer/Normalizer/DateIntervalNormalizer.php | 4 +--- .../Serializer/Normalizer/DateTimeNormalizer.php | 4 +--- .../Serializer/Normalizer/DateTimeZoneNormalizer.php | 4 +--- .../Normalizer/JsonSerializableNormalizer.php | 4 +--- .../Serializer/Normalizer/ObjectNormalizer.php | 4 +--- .../Serializer/Tests/Encoder/XmlEncoderTest.php | 2 +- .../Component/Serializer/Tests/SerializerTest.php | 4 ++-- 22 files changed, 24 insertions(+), 72 deletions(-) diff --git a/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php b/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php index 36de344954c1c..430bfaffd00f0 100644 --- a/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php +++ b/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php @@ -25,10 +25,8 @@ * * @author Tobias Schultze * @author Grégoire Pineau - * - * @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 index 14b7da442b605..dd640db785415 100644 --- a/src/Symfony/Bridge/Monolog/Formatter/VarDumperFormatter.php +++ b/src/Symfony/Bridge/Monolog/Formatter/VarDumperFormatter.php @@ -17,10 +17,8 @@ /** * @author Grégoire Pineau - * - * @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 index 57a4c1c2b74d7..ecb7337f70cf5 100644 --- 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 - * - * @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 index e387c869608e9..3ecb506bacc22 100644 --- 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 - * - * @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 index 718be59c13088..bee2eb3864a8e 100644 --- a/src/Symfony/Bridge/Monolog/Handler/MailerHandler.php +++ b/src/Symfony/Bridge/Monolog/Handler/MailerHandler.php @@ -23,10 +23,8 @@ /** * @author Alexander Borisov - * - * @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 index 20d6c0eaee00b..37e98cfc6befc 100644 --- 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 - * - * @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 index 1b416d0809d24..bbe50eba9c748 100644 --- 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 index df2a7187201b4..ecb24a1948949 100644 --- 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 - * - * @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 index 22d86f0b3edb5..5cb75adba4198 100644 --- 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 - * - * @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 index 0e0085718e439..70eb4255f440d 100644 --- a/src/Symfony/Bridge/Monolog/Processor/TokenProcessor.php +++ b/src/Symfony/Bridge/Monolog/Processor/TokenProcessor.php @@ -18,10 +18,8 @@ * * @author Dany Maillard * @author Igor Timoshenko - * - * @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 index 4f0ca76d30226..95205dfd0af69 100644 --- 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 - * - * @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 index 0f228191e6c67..abc34b8679fcb 100644 --- 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]); } diff --git a/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php index d3afa41d7656b..1e042b21c03d6 100644 --- a/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php @@ -21,10 +21,8 @@ * * @author Grégoire Pineau * @author Kévin Dunglas - * - * @final since Symfony 6.3 */ -class ConstraintViolationListNormalizer implements NormalizerInterface +final class ConstraintViolationListNormalizer implements NormalizerInterface { public const INSTANCE = 'instance'; public const STATUS = 'status'; diff --git a/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php index 14ba85b51c9cd..fcfb6f1737049 100644 --- a/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php @@ -16,10 +16,8 @@ /** * @author Jordi Boggiano - * - * @final since Symfony 6.3 */ -class CustomNormalizer implements NormalizerInterface, DenormalizerInterface, SerializerAwareInterface +final class CustomNormalizer implements NormalizerInterface, DenormalizerInterface, SerializerAwareInterface { use ObjectToPopulateTrait; use SerializerAwareTrait; diff --git a/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php index 44e080b90ed5e..c1aa9695b2c2f 100644 --- a/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php @@ -22,10 +22,8 @@ * Denormalizes a data URI to a {@see \SplFileObject} object. * * @author Kévin Dunglas - * - * @final since Symfony 6.3 */ -class DataUriNormalizer implements NormalizerInterface, DenormalizerInterface +final class DataUriNormalizer implements NormalizerInterface, DenormalizerInterface { private const SUPPORTED_TYPES = [ \SplFileInfo::class => true, diff --git a/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php index c46737e8b2783..b94324607484c 100644 --- a/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php @@ -19,10 +19,8 @@ * Denormalizes an interval string to an instance of {@see \DateInterval}. * * @author Jérôme Parmentier - * - * @final since Symfony 6.3 */ -class DateIntervalNormalizer implements NormalizerInterface, DenormalizerInterface +final class DateIntervalNormalizer implements NormalizerInterface, DenormalizerInterface { public const FORMAT_KEY = 'dateinterval_format'; diff --git a/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php index c165317f56765..8bb007103f55f 100644 --- a/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php @@ -20,10 +20,8 @@ * Denormalizes a date string to an instance of {@see \DateTime} or {@see \DateTimeImmutable}. * * @author Kévin Dunglas - * - * @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'; diff --git a/src/Symfony/Component/Serializer/Normalizer/DateTimeZoneNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/DateTimeZoneNormalizer.php index 595847e87d6d1..f5a08e1f3322d 100644 --- a/src/Symfony/Component/Serializer/Normalizer/DateTimeZoneNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/DateTimeZoneNormalizer.php @@ -19,10 +19,8 @@ * Normalizes a {@see \DateTimeZone} object to a timezone string. * * @author Jérôme Desjardins - * - * @final since Symfony 6.3 */ -class DateTimeZoneNormalizer implements NormalizerInterface, DenormalizerInterface +final class DateTimeZoneNormalizer implements NormalizerInterface, DenormalizerInterface { public function getSupportedTypes(?string $format): array { diff --git a/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php index 60c10626266e2..324487c28d21a 100644 --- a/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php @@ -18,10 +18,8 @@ * A normalizer that uses an objects own JsonSerializable implementation. * * @author Fred Cox - * - * @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 { diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php index af530f8d3da5a..533c07e6dddba 100644 --- a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php @@ -25,10 +25,8 @@ * Converts between objects and arrays using the PropertyAccess component. * * @author Kévin Dunglas - * - * @final since Symfony 6.3 */ -class ObjectNormalizer extends AbstractObjectNormalizer +final class ObjectNormalizer extends AbstractObjectNormalizer { protected $propertyAccessor; diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php index 965256d3747fe..9758f2c2ae508 100644 --- a/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php +++ b/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php @@ -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()) diff --git a/src/Symfony/Component/Serializer/Tests/SerializerTest.php b/src/Symfony/Component/Serializer/Tests/SerializerTest.php index 669d545b7c320..9579b75b10d25 100644 --- a/src/Symfony/Component/Serializer/Tests/SerializerTest.php +++ b/src/Symfony/Component/Serializer/Tests/SerializerTest.php @@ -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'); }