8000 minor #50660 Make some classes final (lyrixx) · symfony/symfony@f9c9ec7 · GitHub
[go: up one dir, main page]
Skip to content

Commit f9c9ec7

Browse files
nicolas-grekasnicolas-grekas
committed
minor #50660 Make some classes final (lyrixx)
This PR was merged into the 7.0 branch. Discussion ---------- Make some classes final | Q | A | ------------- | --- | Branch? | 7.0 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | Commits ------- f39ede4 Make some classes final
2 parents b7fc8c2 + f39ede4 commit f9c9ec7

22 files changed

+24
-72
lines changed

‎src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@
2525
*
2626
* @author Tobias Schultze <http://tobion.de>
2727
* @author Grégoire Pineau <lyrixx@lyrixx.info>
28-
*
29-
* @final since Symfony 6.1
3028
*/
31-
class ConsoleFormatter implements FormatterInterface
29+
final class ConsoleFormatter implements FormatterInterface
3230
{
3331
use CompatibilityFormatter;
3432

‎src/Symfony/Bridge/Monolog/Formatter/VarDumperFormatter.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@
1717

1818
/**
1919
* @author Grégoire Pineau <lyrixx@lyrixx.info>
20-
*
21-
* @final since Symfony 6.1
2220
*/
23-
class VarDumperFormatter implements FormatterInterface
21+
final class VarDumperFormatter implements FormatterInterface
2422
{
2523
use CompatibilityFormatter;
2624

‎src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,8 @@ public function isHandling(array $record): bool
7777
* This mapping can be customized with the $verbosityLevelMap constructor parameter.
7878
*
7979
* @author Tobias Schultze <http://tobion.de>
80-
*
81-
* @final since Symfony 6.1
8280
*/
83-
class ConsoleHandler extends AbstractProcessingHandler implements EventSubscriberInterface
81+
final class ConsoleHandler extends AbstractProcessingHandler implements EventSubscriberInterface
8482
{
8583
use CompatibilityHandler;
8684
use CompatibilityIsHandlingHandler;

‎src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,8 @@
4141
* stack is recommended.
4242
*
4343
* @author Grégoire Pineau <lyrixx@lyrixx.info>
44-
*
45-
* @final since Symfony 6.1
4644
*/
47-
class ElasticsearchLogstashHandler extends AbstractHandler
45+
final class ElasticsearchLogstashHandler extends AbstractHandler
4846
{
4947
use CompatibilityHandler;
5048

‎src/Symfony/Bridge/Monolog/Handler/MailerHandler.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,8 @@
2323

2424
/**
2525
* @author Alexander Borisov <boshurik@gmail.com>
26-
*
27-
* @final since Symfony 6.1
2826
*/
29-
class MailerHandler extends AbstractProcessingHandler
27+
final class MailerHandler extends AbstractProcessingHandler
3028
{
3129
use CompatibilityProcessingHandler;
3230

‎src/Symfony/Bridge/Monolog/Handler/NotifierHandler.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,14 @@
1616
use Monolog\Logger;
1717
use Monolog\LogRecord;
1818
use Symfony\Component\Notifier\Notification\Notification;
19-
use Symfony\Component\Notifier\Notifier;
2019
use Symfony\Component\Notifier\NotifierInterface;
2120

2221
/**
2322
* Uses Notifier as a log handler.
2423
*
2524
* @author Fabien Potencier <fabien@symfony.com>
26-
*
27-
* @final since Symfony 6.1
2825
*/
29-
class NotifierHandler extends AbstractHandler
26+
final class NotifierHandler extends AbstractHandler
3027
{
3128
use CompatibilityHandler;
3229

‎src/Symfony/Bridge/Monolog/Handler/ServerLogHandler.php

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@
2020
use Symfony\Bridge\Monolog\Formatter\VarDumperFormatter;
2121

2222
if (trait_exists(FormattableHandlerTrait::class)) {
23-
/**
24-
* @final since Symfony 6.1
25-
*/
26-
class ServerLogHandler 10000 extends AbstractProcessingHandler
23+
final class ServerLogHandler extends AbstractProcessingHandler
2724
{
2825
use CompatibilityHandler;
2926
use CompatibilityProcessingHandler;
@@ -35,10 +32,7 @@ protected function getDefaultFormatter(): FormatterInterface
3532
}
3633
}
3734
} else {
38-
/**
39-
* @final since Symfony 6.1
40-
*/
41-
class ServerLogHandler extends AbstractProcessingHandler
35+
final class ServerLogHandler extends AbstractProcessingHandler
4236
{
4337
use CompatibilityHandler;
4438
use CompatibilityProcessingHandler;

‎src/Symfony/Bridge/Monolog/Processor/ConsoleCommandProcessor.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,8 @@
2121
* Adds the current console command information to the log entry.
2222
*
2323
* @author Piotr Stankowski <git@trakos.pl>
24-
*
25-
* @final since Symfony 6.1
2624
*/
27-
class ConsoleCommandProcessor implements EventSubscriberInterface, ResetInterface
25+
final class ConsoleCommandProcessor implements EventSubscriberInterface, ResetInterface
2826
{
2927
use CompatibilityProcessor;
3028

‎src/Symfony/Bridge/Monolog/Processor/SwitchUserTokenProcessor.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@
1818
* Adds the original security token to the log entry.
1919
*
2020
* @author Igor Timoshenko <igor.timoshenko@i.ua>
21-
*
22-
* @final since Symfony 6.1
2321
*/
24-
class SwitchUserTokenProcessor extends AbstractTokenProcessor
22+
final class SwitchUserTokenProcessor extends AbstractTokenProcessor
2523
{
2624
protected function getKey(): string
2725
{

‎src/Symfony/Bridge/Monolog/Processor/TokenProcessor.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@
1818
*
1919
* @author Dany Maillard <danymaillard93b@gmail.com>
2020
* @author Igor Timoshenko <igor.timoshenko@i.ua>
21-
*
22-
* @final since Symfony 6.1
2321
*/
24-
class TokenProcessor extends AbstractTokenProcessor
22+
final class TokenProcessor extends AbstractTokenProcessor
2523
{
2624
protected function getKey(): string
2725
{

‎src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/BackedEnumValueResolver.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,8 @@
2222
* leading to a 404 Not Found if the attribute value isn't a valid backing value for the enum type.
2323
*
2424
* @author Maxime Steinhausser <maxime.steinhausser@gmail.com>
25-
*
26-
* @final since Symfony 6.2
2725
*/
28-
class BackedEnumValueResolver implements ArgumentValueResolverInterface, ValueResolverInterface
26+
final class BackedEnumValueResolver implements ArgumentValueResolverInterface, ValueResolverInterface
2927
{
3028
/**
3129
* @deprecated since Symfony 6.2, use resolve() instead

‎src/Symfony/Component/Mailer/Transport/Smtp/SmtpTransport.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -244,12 +244,7 @@ protected function doSend(SentMessage $message): void
244244
}
245245
}
246246

247-
/**
248-
* @internal since version 6.1, to be made private in 7.0
249-
*
250-
* @final since version 6.1, to be made private in 7.0
251-
*/
252-
protected function doHeloCommand(): void
247+
private function doHeloCommand(): void
253248
{
254249
$this->executeCommand(sprintf("HELO %s\r\n", $this->domain), [250]);
255250
}

‎src/Symfony/Component/Serializer/Normalizer/ConstraintViolationListNormalizer.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,8 @@
2121
*
2222
* @author Grégoire Pineau <lyrixx@lyrixx.info>
2323
* @author Kévin Dunglas <dunglas@gmail.com>
24-
*
25-
* @final since Symfony 6.3
2624
*/
27-
class ConstraintViolationListNormalizer implements NormalizerInterface
25+
final class ConstraintViolationListNormalizer implements NormalizerInterface
2826
{
2927
public const INSTANCE = 'instance';
3028
public const STATUS = 'status';

‎src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@
1616

1717
/**
1818
* @author Jordi Boggiano <j.boggiano@seld.be>
19-
*
20-
* @final since Symfony 6.3
2119
*/
22-
class CustomNormalizer implements NormalizerInterface, DenormalizerInterface, SerializerAwareInterface
20+
final class CustomNormalizer implements NormalizerInterface, DenormalizerInterface, SerializerAwareInterface
2321
{
2422
use ObjectToPopulateTrait;
2523
use SerializerAwareTrait;

‎src/Symfony/Component/Serializer/Normalizer/DataUriNormalizer.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,8 @@
2222
* Denormalizes a data URI to a {@see \SplFileObject} object.
2323
*
2424
* @author Kévin Dunglas <dunglas@gmail.com>
25-
*
26-
* @final since Symfony 6.3
2725
*/
28-
class DataUriNormalizer implements NormalizerInterface, DenormalizerInterface
26+
final class DataUriNormalizer implements NormalizerInterface, DenormalizerInterface
2927
{
3028
private const SUPPORTED_TYPES = [
3129
\SplFileInfo::class => true,

‎src/Symfony/Component/Serializer/Normalizer/DateIntervalNormalizer.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@
1919
* Denormalizes an interval string to an instance of {@see \DateInterval}.
2020
*
2121
* @author Jérôme Parmentier <jerome@prmntr.me>
22-
*
23-
* @final since Symfony 6.3
2422
*/
25-
class DateIntervalNormalizer implements NormalizerInterface, DenormalizerInterface
23+
final class DateIntervalNormalizer implements NormalizerInterface, DenormalizerInterface
2624
{
2725
public const FORMAT_KEY = 'dateinterval_format';
2826

‎src/Symfony/Component/Serializer/Normalizer/DateTimeNormalizer.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@
2020
* Denormalizes a date string to an instance of {@see \DateTime} or {@see \DateTimeImmutable}.
2121
*
2222
* @author Kévin Dunglas <dunglas@gmail.com>
23-
*
24-
* @final since Symfony 6.3
2523
*/
26-
class DateTimeNormalizer implements NormalizerInterface, DenormalizerInterface
24+
final class DateTimeNormalizer implements NormalizerInterface, DenormalizerInterface
2725
{
2826
public const FORMAT_KEY = 'datetime_format';
2927
public const TIMEZONE_KEY = 'datetime_timezone';

‎src/Symfony/Component/Serializer/Normalizer/DateTimeZoneNormalizer.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@
1919
* Normalizes a {@see \DateTimeZone} object to a timezone string.
2020
*
2121
* @author Jérôme Desjardins <jewome62@gmail.com>
22-
*
23-
* @final since Symfony 6.3
2422
*/
25-
class DateTimeZoneNormalizer implements NormalizerInterface, DenormalizerInterface
23+
final class DateTimeZoneNormalizer implements NormalizerInterface, DenormalizerInterface
2624
{
2725
public function getSupportedTypes(?string $format): array
2826
{

‎src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@
1818
* A normalizer that uses an objects own JsonSerializable implementation.
1919
*
2020
* @author Fred Cox <mcfedr@gmail.com>
21-
*
22-
* @final since Symfony 6.3
2321
*/
24-
class JsonSerializableNormalizer extends AbstractNormalizer
22+
final class JsonSerializableNormalizer extends AbstractNormalizer
2523
{
2624
public function normalize(mixed $object, string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null
2725
{

‎src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@
2525
* Converts between objects and arrays using the PropertyAccess component.
2626
*
2727
* @author Kévin Dunglas <dunglas@gmail.com>
28-
*
29-
* @final since Symfony 6.3
3028
*/
31-
class ObjectNormalizer extends AbstractObjectNormalizer
29+
final class ObjectNormalizer extends AbstractObjectNormalizer
3230
{
3331
protected $propertyAccessor;
3432

‎src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,7 @@ private function createXmlEncoderWithDateTimeNormalizer(): XmlEncoder
934934

935935
private function createMockDateTimeNormalizer(): MockObject&NormalizerInterface
936936
{
937-
$mock = $this->createMock(CustomNormalizer::class);
937+
$mock = $this->createMock(NormalizerInterface::class);
938938

939939
$mock
940940
->expects($this->once())

‎src/Symfony/Component/Serializer/Tests/SerializerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public function testItThrowsExceptionOnInvalidEncoder()
8989
public function testNormalizeNoMatch()
9090
{
9191
$this->expectException(UnexpectedValueException::class);
92-
$serializer = new Serializer([$this->createMock(CustomNormalizer::class)]);
92+
$serializer = new Serializer([$this->createMock(NormalizerInterface::class)]);
9393
$serializer->normalize(new \stdClass(), 'xml');
9494
}
9595

@@ -117,7 +117,7 @@ public function testNormalizeOnDenormalizer()
117117
public function testDenormalizeNoMatch()
118118
{
119119
$this->expectException(UnexpectedValueException::class);
120-
$serializer = new Serializer([$this->createMock(CustomNormalizer::class)]);
120+
$serializer = new Serializer([$this->createMock(NormalizerInterface::class)]);
121121
$serializer->denormalize('foo', 'stdClass');
122122
}
123123

0 commit comments

Comments
 (0)
0