Skip to content

Commit 3258a9e

Browse files
alexandre-dauboisalexandre-daubois
committed
Remove useless code
1 parent a58cfb3 commit 3258a9e

File tree

52 files changed

+78
-215
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+78
-215
lines changed

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ private function createFirewalls(array $config, ContainerBuilder $container): vo
307307

308308
$configId = 'security.firewall.map.config.'.$name;
309309

310-
[$matcher, $listeners, $exceptionListener, $logoutListener, $firewallAuthenticators] = $this->createFirewall($container, $name, $firewall, $authenticationProviders, $providerIds, $configId);
310+
[$matcher, $listeners, $exceptionListener, $logoutListener, $firewallAuthenticators] = $this->createFirewall($container, $name, $firewall, $providerIds, $configId);
311311

312312
if (!$firewallAuthenticators) {
313313
$authenticators[$name] = null;
@@ -348,7 +348,7 @@ private function createFirewalls(array $config, ContainerBuilder $container): vo
348348
}
349349
}
350350

351-
private function createFirewall(ContainerBuilder $container, string $id, array $firewall, array &$authenticationProviders, array $providerIds, string $configId): array
351+
private function createFirewall(ContainerBuilder $container, string $id, array $firewall, array $providerIds, string $configId): array
352352
{
353353
$config = $container->setDefinition($configId, new ChildDefinition('security.firewall.config'));
354354
$config->replaceArgument(0, $id);

‎src/Symfony/Component/BrowserKit/Test/Constraint/BrowserCookieValueSame.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@ public function toString(): string
3434
if ($this->domain) {
3535
$str .= \sprintf(' for domain "%s"', $this->domain);
3636
}
37-
$str .= \sprintf(' with %svalue "%s"', $this->raw ? 'raw ' : '', $this->value);
3837

39-
return $str;
38+
return $str.\sprintf(' with %svalue "%s"', $this->raw ? 'raw ' : '', $this->value);
4039
}
4140

4241
/**

‎src/Symfony/Component/Dotenv/Dotenv.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ private function resolveVariables(string $value, array $loadedVars): string
485485
(?P<closing_brace>\})? # optional closing brace
486486
/x';
487487

488-
$value = preg_replace_callback($regex, function ($matches) use ($loadedVars) {
488+
return preg_replace_callback($regex, function ($matches) use ($loadedVars) {
489489
// odd number of backslashes means the $ character is escaped
490490
if (1 === \strlen($matches['backslashes']) % 2) {
491491
return substr($matches[0], 1);
@@ -532,8 +532,6 @@ private function resolveVariables(string $value, array $loadedVars): string
532532

533533
return $matches['backslashes'].$value;
534534
}, $value);
535-
536-
return $value;
537535
}
538536

539537
private function moveCursor(string $text): void

‎src/Symfony/Component/Form/Extension/Core/DataTransformer/DateIntervalToArrayTransformer.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,8 @@ public function transform(mixed $dateInterval): array
9393
}
9494
}
9595
$result['invert'] = '-' === $result['invert'];
96-
$result = array_intersect_key($result, array_flip($this->fields));
9796

98-
return $result;
97+
return array_intersect_key($result, array_flip($this->fields));
9998
}
10099

101100
/**

‎src/Symfony/Component/Form/Extension/Core/DataTransformer/PercentToLocalizedStringTransformer.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,6 @@ private function round(int|float $number): int|float
210210
\NumberFormatter::ROUND_HALFDOWN => round($number, 0, \PHP_ROUND_HALF_DOWN),
211211
};
212212

213-
$number = 1 === $roundingCoef ? (int) $number : $number / $roundingCoef;
214-
215-
return $number;
213+
return 1 === $roundingCoef ? (int) $number : $number / $roundingCoef;
216214
}
217215
}

‎src/Symfony/Component/Form/Extension/Core/Type/TimeType.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
6060

6161
if ('single_text' === $options['widget']) {
6262
$builder->addEventListener(FormEvents::PRE_SUBMIT, static function (FormEvent $e) use ($options) {
63-
/** @var PreSubmitEvent $event */
6463
$data = $e->getData();
6564
if ($data && preg_match('/^(?P<hours>\d{2}):(?P<minutes>\d{2})(?::(?P<seconds>\d{2})(?:\.\d+)?)?$/', $data, $matches)) {
6665
if ($options['with_seconds']) {

‎src/Symfony/Component/Intl/Data/Generator/LanguageDataGenerator.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,11 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, str
130130
$localizedNames[$language] = $name;
131131
}
132132
}
133-
$data = [
133+
134+
return [
134135
'Names' => $names,
135136
'LocalizedNames' => $localizedNames,
136137
];
137-
138-
return $data;
139138
}
140139

141140
return null;

‎src/Symfony/Component/Intl/Data/Generator/TimezoneDataGenerator.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,20 +121,16 @@ protected function generateDataForRoot(BundleEntryReaderInterface $reader, strin
121121

122122
protected function generateDataForMeta(BundleEntryReaderInterface $reader, string $tempDir): ?array
123123
{
124-
$rootBundle = $reader->read($tempDir, 'root');
125-
126124
$this->zoneIds = array_unique($this->zoneIds);
127125

128126
sort($this->zoneIds);
129127
ksort($this->zoneToCountryMapping);
130128

131-
$data = [
129+
return [
132130
'Zones' => $this->zoneIds,
133131
'ZoneToCountry' => $this->zoneToCountryMapping,
134132
'CountryToZone' => self::generateCountryToZoneMapping($this->zoneToCountryMapping),
135133
];
136-
137-
return $data;
138134
}
139135

140136
private function generateZones(BundleEntryReaderInterface $reader, string $tempDir, string $locale): array

‎src/Symfony/Component/Lock/Store/PostgreSqlStore.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public function exists(Key $key): bool
169169
$stmt = $this->getConnection()->prepare($sql);
170170

171171
$stmt->bindValue(':key', $this->getHashedKey($key));
172-
$result = $stmt->execute();
172+
$stmt->execute();
173173

174174
if ($stmt->fetchColumn() > 0) {
175175
// connection is locked, check for lock in internal store

‎src/Symfony/Component/Mailer/Bridge/Azure/Transport/AzureApiTransport.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $e
6565

6666
$response = $this->client->request('POST', 'https://'.$endpoint, [
6767
'body' => json_encode($payload),
68-
'headers' => $this->getSignedHeaders($payload, $email),
68+
'headers' => $this->getSignedHeaders($payload),
6969
]);
7070

7171
try {
@@ -189,7 +189,7 @@ private function generateAuthenticationSignature(string $content): string
189189
/**
190190
* Get authenticated headers for signed request,.
191191
*/
192-
private function getSignedHeaders(array $payload, Email $message): array
192+
private function getSignedHeaders(array $payload): array
193193
{
194194
// HTTP Method verb (uppercase)
195195
$verb = 'POST';

‎src/Symfony/Component/Mailer/Bridge/Mailgun/Tests/Transport/MailgunApiTransportTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,6 @@ public function testCustomHeader()
103103
*/
104104
public function testPrefixHeaderWithH()
105105
{
106-
$json = json_encode(['foo' => 'bar']);
107-
$deliveryTime = (new \DateTimeImmutable('2020-03-20 13:01:00'))->format(\DateTimeInterface::RFC2822);
108-
109106
$email = new Email();
110107
$email->getHeaders()->addTextHeader('h:bar', 'bar-value');
111108

‎src/Symfony/Component/Messenger/Bridge/AmazonSqs/Tests/Transport/AmazonSqsReceiverTest.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,8 @@ private function createSqsEnvelope()
6767

6868
private function createSerializer(): Serializer
6969
{
70-
$serializer = new Serializer(
70+
return new Serializer(
7171
new SerializerComponent\Serializer([new ObjectNormalizer()], ['json' => new JsonEncoder()])
7272
);
73-
74-
return $serializer;
7573
}
7674
}

‎src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/Connection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public static function fromDsn(#[\SensitiveParameter] string $dsn, array $option
157157
}
158158

159159
$parsedPath = explode('/', ltrim($params['path'] ?? '/', '/'));
160-
if (\count($parsedPath) > 0 && ($queueName = end($parsedPath))) {
160+
if ($queueName = end($parsedPath)) {
161161
$configuration['queue_name'] = $queueName;
162162
}
163163
$configuration['account'] = 2 === \count($parsedPath) ? $parsedPath[0] : $options['account'] ?? self::DEFAULT_OPTIONS['account'];

‎src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ public function countMessagesInQueues(): int
318318
private function publishWithDelay(string $body, array $headers, int $delay, ?AmqpStamp $amqpStamp = null): void
319319
{
320320
$routingKey = $this->getRoutingKeyForMessage($amqpStamp);
321-
$isRetryAttempt = $amqpStamp ? $amqpStamp->isRetryAttempt() : false;
321+
$isRetryAttempt = $amqpStamp && $amqpStamp->isRetryAttempt();
322322

323323
$this->setupDelay($delay, $routingKey, $isRetryAttempt);
324324

‎src/Symfony/Component/Messenger/Bridge/Beanstalkd/Tests/Transport/BeanstalkdReceiverTest.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,8 @@ private function createBeanstalkdEnvelope(): array
9191

9292
private function createSerializer(): Serializer
9393
{
94-
$serializer = new Serializer(
94+
return new Serializer(
9595
new SerializerComponent\Serializer([new ObjectNormalizer()], ['json' => new JsonEncoder()])
9696
);
97-
98-
return $serializer;
9997
}
10098
}

‎src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineReceiverTest.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -314,10 +314,8 @@ private function createDoctrineEnvelope(): array
314314

315315
private function createSerializer(): Serializer
316316
{
317-
$serializer = new Serializer(
317+
return new Serializer(
318318
new SerializerComponent\Serializer([new ObjectNormalizer()], ['json' => new JsonEncoder()])
319319
);
320-
321-
return $serializer;
322320
}
323321
}

‎src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public function get(): ?array
193193
if (method_exists(QueryBuilder::class, 'forUpdate')) {
194194
$sql = $this->addLockMode($query, $sql);
195195
} else {
196-
if (preg_match('/FROM (.+) WHERE/', (string) $sql, $matches)) {
196+
if (preg_match('/FROM (.+) WHERE/', $sql, $matches)) {
197197
$fromClause = $matches[1];
198198
$sql = str_replace(
199199
\sprintf('FROM %s WHERE', $fromClause),

‎src/Symfony/Component/Messenger/Transport/Serialization/Normalizer/FlattenExceptionNormalizer.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ final class FlattenExceptionNormalizer implements DenormalizerInterface, Normali
2828

2929
public function normalize(mixed $object, ?string $format = null, array $context = []): array
3030
{
31-
$normalized = [
31+
return [
3232
'message' => $object->getMessage(),
3333
'code' => $object->getCode(),
3434
'headers' => $object->getHeaders(),
@@ -41,8 +41,6 @@ public function normalize(mixed $object, ?string $format = null, array $context
4141
'trace' => $object->getTrace(),
4242
'trace_as_string' => $object->getTraceAsString(),
4343
];
44-
45-
return $normalized;
4644
}
4745

4846
public function getSupportedTypes(?string $format): array

‎src/Symfony/Component/Mime/Part/AbstractMultipartPart.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,8 @@ public function bodyToString(): string
5858
foreach ($parts as $part) {
5959
$string .= '--'.$this->getBoundary()."\r\n".$part->toString()."\r\n";
6060
}
61-
$string .= '--'.$this->getBoundary()."--\r\n";
6261

63-
return $string;
62+
return $string.'--'.$this->getBoundary()."--\r\n";
6463
}
6564

6665
public function bodyToIterable(): iterable

‎src/Symfony/Component/Mime/Test/Constraint/EmailAttachmentCount.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ final class EmailAttachmentCount extends Constraint
1919
{
2020
public function __construct(
2121
private int $expectedValue,
22-
private ?string $transport = null,
2322
) {
2423
}
2524

‎src/Symfony/Component/Notifier/Bridge/FakeSms/Tests/FakeSmsLoggerTransportTest.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ final class FakeSmsLoggerTransportTest extends TransportTestCase
2525
{
2626
public static function createTransport(?HttpClientInterface $client = null, ?LoggerInterface $logger = null): FakeSmsLoggerTransport
2727
{
28-
$transport = (new FakeSmsLoggerTransport($logger ?? new NullLogger(), $client ?? new MockHttpClient()));
29-
30-
return $transport;
28+
return new FakeSmsLoggerTransport($logger ?? new NullLogger(), $client ?? new MockHttpClient());
3129
}
3230

3331
public static function toStringProvider(): iterable

‎src/Symfony/Component/Notifier/Bridge/PagerDuty/PagerDutyOptions.php

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111

1212
namespace Symfony\Component\Notifier\Bridge\PagerDuty;
1313

14-
use Symfony\Component\Clock\Clock;
15-
use Symfony\Component\Clock\ClockInterface;
1614
use Symfony\Component\Notifier\Exception\InvalidArgumentException;
1715
use Symfony\Component\Notifier\Message\MessageOptionsInterface;
1816

@@ -21,9 +19,7 @@
2119
*/
2220
final class PagerDutyOptions implements MessageOptionsInterface
2321
{
24-
private ClockInterface $clock;
25-
26-
public function __construct(string $routingKey, string $eventAction, string $severity, private array $options = [], ?ClockInterface $clock = null)
22+
public function __construct(string $routingKey, string $eventAction, string $severity, private array $options = [])
2723
{
2824
if (!\in_array($eventAction, ['trigger', 'acknowledge', 'resolve'], true)) {
2925
throw new InvalidArgumentException('Invalid "event_action" option given.');
@@ -56,8 +52,6 @@ public function __construct(string $routingKey, string $eventAction, string $sev
5652
if (null === $dedupKey && \in_array($eventAction, ['acknowledge', 'resolve'], true)) {
5753
throw new InvalidArgumentException('Option "dedup_key" must be set for event actions: "acknowledge" & "resolve".');
5854
}
59-
60-
$this->clock = $clock ?? Clock::get();
6155
}
6256

6357
public function toArray(): array

‎src/Symfony/Component/Notifier/Bridge/PagerDuty/composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
],
1818
"require": {
1919
"php": ">=8.2",
20-
"symfony/clock": "^6.4|^7.0",
2120
"symfony/http-client": "^6.4|^7.0",
2221
"symfony/notifier": "^6.4|^7.0"
2322
},

‎src/Symfony/Component/Notifier/Bridge/Sipgate/SipgateTransport.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,7 @@ protected function doSend(MessageInterface $message): SentMessage
7777
}
7878

7979
if (204 === $statusCode) {
80-
$sentMessage = new SentMessage($message, (string) $this);
81-
82-
return $sentMessage;
80+
return new SentMessage($message, (string) $this);
8381
} elseif (401 === $statusCode) {
8482
throw new TransportException(sprintf('Unable to send SMS with Sipgate: Error code %d - tokenId or token is wrong.', $statusCode), $response);
8583
} elseif (402 === $statusCode) {

‎src/Symfony/Component/Routing/RouteCompiler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ private static function compilePattern(Route $route, string $pattern, bool $isHo
154154

155155
$regexp = $route->getRequirement($varName);
156156
if (null === $regexp) {
157-
$followingPattern = (string) substr($pattern, $pos);
157+
$followingPattern = substr($pattern, $pos);
158158
// Find the next static character after the variable that functions as a separator. By default, this separator and '/'
159159
// are disallowed for the variable. This default requirement makes sure that optional variables can be matched at all
160160
// and that the generating-matching-combination of URLs unambiguous, i.e. the params used for generating the URL are

‎src/Symfony/Component/Security/Core/User/InMemoryUser.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ public function isEqualTo(UserInterface $user): bool
8888
return false;
8989
}
9090

91-
$currentRoles = array_map('strval', (array) $this->getRoles());
92-
$newRoles = array_map('strval', (array) $user->getRoles());
91+
$currentRoles = array_map('strval', $this->getRoles());
92+
$newRoles = array_map('strval', $user->getRoles());
9393
$rolesChanged = \count($currentRoles) !== \count($newRoles) || \count($currentRoles) !== \count(array_intersect($currentRoles, $newRoles));
9494
if ($rolesChanged) {
9595
return false;

‎src/Symfony/Component/Security/Http/Firewall/ContextListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ private static function hasUserChanged(UserInterface $originalUser, TokenInterfa
298298
}
299299
}
300300

301-
$userRoles = array_map('strval', (array) $refreshedUser->getRoles());
301+
$userRoles = array_map('strval', $refreshedUser->getRoles());
302302

303303
if (
304304
\count($userRoles) !== \count($refreshedToken->getRoleNames())

‎src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -198,12 +198,6 @@ private function startAuthentication(Request $request, AuthenticationException $
198198
$this->throwUnauthorizedException($authException);
199199
}
200200

201-
if (!$response instanceof Response) {
202-
$given = get_debug_type($response);
203-
204-
throw new \LogicException(\sprintf('The "%s::start()" method must return a Response object ("%s" returned).', get_debug_type($this->authenticationEntryPoint), $given));
205-
}
206-
207201
return $response;
208202
}
209203

‎src/Symfony/Component/Security/Http/Impersonate/ImpersonateUrlGenerator.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ private function buildPath(?string $targetUri = null, string $identifier = Switc
8181

8282
$targetUri ??= $request->getRequestUri();
8383

84-
$targetUri .= (parse_url($targetUri, \PHP_URL_QUERY) ? '&' : '?').http_build_query([$switchUserConfig['parameter'] => $identifier], '', '&');
85-
86-
return $targetUri;
84+
return $targetUri.(parse_url($targetUri, \PHP_URL_QUERY) ? '&' : '?').http_build_query([$switchUserConfig['parameter'] => $identifier], '', '&');
8785
}
8886
}

‎src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeHandler.php

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,7 @@ abstract protected function processRememberMe(RememberMeDetails $rememberMeDetai
5757

5858
public function consumeRememberMeCookie(RememberMeDetails $rememberMeDetails): UserInterface
5959
{
60-
try {
61-
$user = $this->userProvider->loadUserByIdentifier($rememberMeDetails->getUserIdentifier());
62-
} catch (AuthenticationException $e) {
63-
throw $e;
64-
}
65-
66-
if (!$user instanceof UserInterface) {
67-
throw new \LogicException(\sprintf('The UserProviderInterface implementation must return an instance of UserInterface, but returned "%s".', get_debug_type($user)));
68-
}
69-
60+
$user = $this->userProvider->loadUserByIdentifier($rememberMeDetails->getUserIdentifier());
7061
$this->processRememberMe($rememberMeDetails, $user);
7162

7263
$this->logger?->info('Remember-me cookie accepted.');

‎src/Symfony/Component/Security/Http/Tests/EventListener/UserCheckerListenerTest.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,4 @@ private function createCheckPassportEvent($passport = null)
7272

7373
return new CheckPassportEvent($this->createMock(AuthenticatorInterface::class), $passport);
7474
}
75-
76-
private function createAuthenticationSuccessEvent()
77-
{
78-
return new AuthenticationSuccessEvent(new PostAuthenticationToken($this->user, 'main', []));
79-
}
8075
}

0 commit comments

Comments
 (0)