Skip to content

Commit d0bc10e

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '6.4' into 7.2
* 6.4: - CS fixes
2 parents 09d4348 + fb11d06 commit d0bc10e

File tree

93 files changed

+259
-233
lines changed

Some content is hidden

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

93 files changed

+259
-233
lines changed

‎.git-blame-ignore-revs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ f4118e110a46de3ffb799e7d79bf15128d1646ea
44
ae0a783425b80b78376488619bf9106e69193fa4
55
9c1e36257c4df0929179462d6b2bdd00453ac8aa
66
6ae74d38e3d20d0ffcc66c7c3d28767fab76bdfb
7-
# Prefix all sprintf() calls
87
6ce530c5e90397d88e3a76a56db266c74d651584
8+
77bd236b8da064c90b19b84a35becfb3e43348db

‎.github/expected-missing-return-types.diff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ diff --git a/src/Symfony/Component/Translation/Extractor/ExtractorInterface.php
578578
diff --git a/src/Symfony/Component/TypeInfo/Tests/Fixtures/DummyWithPhpDoc.php b/src/Symfony/Component/TypeInfo/Tests/Fixtures/DummyWithPhpDoc.php
579579
--- a/src/Symfony/Component/TypeInfo/Tests/Fixtures/DummyWithPhpDoc.php
580580
+++ b/src/Symfony/Component/TypeInfo/Tests/Fixtures/DummyWithPhpDoc.php
581-
@@ -15,5 +15,5 @@ final class DummyWithPhpDoc
581+
@@ -32,5 +32,5 @@ final class DummyWithPhpDoc
582582
* @return Dummy
583583
*/
584584
- public function getNextDummy(mixed $dummy): mixed
@@ -613,14 +613,14 @@ diff --git a/src/Symfony/Component/VarDumper/Dumper/DataDumperInterface.php b/sr
613613
diff --git a/src/Symfony/Component/VarExporter/Tests/ProxyHelperTest.php b/src/Symfony/Component/VarExporter/Tests/ProxyHelperTest.php
614614
--- a/src/Symfony/Component/VarExporter/Tests/ProxyHelperTest.php
615615
+++ b/src/Symfony/Component/VarExporter/Tests/ProxyHelperTest.php
616-
@@ -172,5 +172,5 @@ class ProxyHelperTest extends TestCase
616+
@@ -173,5 +173,5 @@ class ProxyHelperTest extends TestCase
617617
{
618618
yield 'not type hinted __unserialize method' => [new class {
619619
- public function __unserialize($array)
620620
+ public function __unserialize($array): void
621621
{
622622
}
623-
@@ -192,5 +192,5 @@ class ProxyHelperTest extends TestCase
623+
@@ -193,5 +193,5 @@ class ProxyHelperTest extends TestCase
624624

625625
yield 'type hinted __unserialize method' => [new class {
626626
- public function __unserialize(array $array)

‎src/Symfony/Bridge/Doctrine/Middleware/Debug/Driver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function connect(array $params): ConnectionInterface
3636
{
3737
$connection = parent::connect($params);
3838

39-
if ('void' !== (string) (new \ReflectionMethod(DriverInterface\Connection::class, 'commit'))->getReturnType()) {
39+
if ('void' !== (string) (new \ReflectionMethod(ConnectionInterface::class, 'commit'))->getReturnType()) {
4040
return new DBAL3\Connection(
4141
$connection,
4242
$this->debugDataHolder,

‎src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ public function loadTokenBySeries(string $series): PersistentTokenInterface
6060
$row = $stmt->fetchNumeric() ?: throw new TokenNotFoundException('No token found.');
6161

6262
[$class, $username, $value, $last_used] = $row;
63+
6364
return new PersistentToken($class, $username, $series, $value, new \DateTimeImmutable($last_used));
6465
}
6566

‎src/Symfony/Bridge/Doctrine/Tests/Form/DataTransformer/CollectionToArrayTransformerTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ public function testTransformReadableCollection()
7474
3 => 'bar',
7575
];
7676

77-
$collection = new class($array) implements ReadableCollection
78-
{
77+
$collection = new class($array) implements ReadableCollection {
7978
public function __construct(private readonly array $array)
8079
{
8180
}
@@ -172,7 +171,7 @@ public function getIterator(): \Traversable
172171

173172
public function count(): int
174173
{
175-
return count($this->array);
174+
return \count($this->array);
176175
}
177176
};
178177

‎src/Symfony/Bridge/Doctrine/Tests/Security/RememberMe/DoctrineTokenProviderPostgresTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
<?php
22

3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <fabien@symfony.com>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
312
namespace Symfony\Bridge\Doctrine\Tests\Security\RememberMe;
413

514
use Doctrine\DBAL\Configuration;

‎src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
8484
['Architecture', (\PHP_INT_SIZE * 8).' bits'],
8585
['Intl locale', class_exists(\Locale::class, false) && \Locale::getDefault() ? \Locale::getDefault() : 'n/a'],
8686
['Timezone', date_default_timezone_get().' (<comment>'.(new \DateTimeImmutable())->format(\DateTimeInterface::W3C).'</>)'],
87-
['OPcache', \extension_loaded('Zend OPcache') ? (filter_var(\ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN) ? 'Enabled' : 'Not enabled') : 'Not installed'],
88-
['APCu', \extension_loaded('apcu') ? (filter_var(\ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? 'Enabled' : 'Not enabled') : 'Not installed'],
89-
['Xdebug', \extension_loaded('xdebug') ? ($xdebugMode && 'off' !== $xdebugMode ? 'Enabled (' . $xdebugMode . ')' : 'Not enabled') : 'Not installed'],
87+
['OPcache', \extension_loaded('Zend OPcache') ? (filter_var(\ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN) ? 'Enabled' : 'Not enabled') : 'Not installed'],
88+
['APCu', \extension_loaded('apcu') ? (filter_var(\ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN) ? 'Enabled' : 'Not enabled') : 'Not installed'],
89+
['Xdebug', \extension_loaded('xdebug') ? ($xdebugMode && 'off' !== $xdebugMode ? 'Enabled ('.$xdebugMode.')' : 'Not enabled') : 'Not installed'],
9090
];
9191

9292
$io->table([], $rows);

‎src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function __construct(
6464
parent::__construct();
6565

6666
if (!method_exists($writer, 'getFormats')) {
67-
throw new \InvalidArgumentException(sprintf('The writer class "%s" does not implement the "getFormats()" method.', $writer::class));
67+
throw new \InvalidArgumentException(\sprintf('The writer class "%s" does not implement the "getFormats()" method.', $writer::class));
6868
}
6969
}
7070

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -276,10 +276,10 @@ public function testValidatorEmailValidationMode(string $mode)
276276

277277
$this->createContainerFromClosure(function (ContainerBuilder $container) use ($mode) {
278278
$container->loadFromExtension('framework', [
279-
'annotations' => false,
280-
'http_method_override' => false,
281-
'handle_all_throwables' => true,
282-
'php_errors' => ['log' => true],
279+
'annotations' => false,
280+
'http_method_override' => false,
281+
'handle_all_throwables' => true,
282+
'php_errors' => ['log' => true],
283283
'validation' => [
284284
'email_validation_mode' => $mode,
285285
],

‎src/Symfony/Bundle/SecurityBundle/Tests/SecurityTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public function testLogin()
154154
->method('getProvidedServices')
155155
->willReturn([
156156
'security.authenticator.custom.dev' => $authenticator,
157-
'security.authenticator.remember_me.main' => $authenticator
157+
'security.authenticator.remember_me.main' => $authenticator,
158158
])
159159
;
160160
$firewallAuthenticatorLocator
@@ -287,7 +287,7 @@ public function testLoginFailsWhenTooManyAuthenticatorsFound()
287287
->method('getProvidedServices')
288288
->willReturn([
289289
'security.authenticator.custom.main' => $authenticator,
290-
'security.authenticator.other.main' => $authenticator
290+
'security.authenticator.other.main' => $authenticator,
291291
])
292292
;
293293

0 commit comments

Comments
 (0)