8000 minor #52103 [ErrorHandler] Fix expected missing return types (alexan… · symfony/symfony@364cdce · GitHub
[go: up one dir, main page]
Skip to content

Commit 364cdce

Browse files
nicolas-grekasnicolas-grekas
committed
minor #52103 [ErrorHandler] Fix expected missing return types (alexandre-daubois)
This PR was merged into the 6.4 branch. Discussion ---------- [ErrorHandler] Fix expected missing return types | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT Follow up of #50734 Commits ------- 842e6ab [ErrorHandler] Fix expected missing return types
2 parents aa5ba21 + 842e6ab commit 364cdce

File tree

1 file changed

+43
-43
lines changed

1 file changed

+43
-43
lines changed

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

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ diff --git a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
6969
diff --git a/src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php b/src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php
7070
--- a/src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php
7171
+++ b/src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php
72-
@@ -40,5 +40,5 @@ class ContainerAwareLoader extends Loader
72+
@@ -38,5 +38,5 @@ class ContainerAwareLoader extends Loader
7373
* @return void
7474
*/
7575
- public function addFixture(FixtureInterface $fixture)
@@ -124,7 +124,7 @@ diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExt
124124
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php
125125
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php
126126
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php
127-
@@ -32,5 +32,5 @@ class DoctrineValidationPass implements CompilerPassInterface
127+
@@ -30,5 +30,5 @@ class DoctrineValidationPass implements CompilerPassInterface
128128
* @return void
129129
*/
130130
- public function process(ContainerBuilder $container)
@@ -134,7 +134,7 @@ diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/Doctri
134134
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
135135
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
136136
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php
137-
@@ -57,5 +57,5 @@ class RegisterEventListenersAndSubscribersPass implements CompilerPassInterface
137+
@@ -53,5 +53,5 @@ class RegisterEventListenersAndSubscribersPass implements CompilerPassInterface
138138
* @return void
139139
*/
140140
- public function process(ContainerBuilder $container)
@@ -144,7 +144,7 @@ diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/Regist
144144
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php
145145
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php
146146
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php
147-
@@ -134,5 +134,5 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
147+
@@ -123,5 +123,5 @@ abstract class RegisterMappingsPass implements CompilerPassInterface
148148
* @return void
149149
*/
150150
- public function process(ContainerBuilder $container)
@@ -154,21 +154,21 @@ diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/Regist
154154
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php
155155
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php
156156
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/Security/UserProvider/EntityFactory.php
157-
@@ -37,5 +37,5 @@ class EntityFactory implements UserProviderFactoryInterface
157+
@@ -34,5 +34,5 @@ class EntityFactory implements UserProviderFactoryInterface
158158
* @return void
159159
*/
160160
- public function create(ContainerBuilder $container, string $id, array $config)
161161
+ public function create(ContainerBuilder $container, string $id, array $config): void
162162
{
163163
$container
164-
@@ -50,5 +50,5 @@ class EntityFactory implements UserProviderFactoryInterface
164+
@@ -47,5 +47,5 @@ class EntityFactory implements UserProviderFactoryInterface
165165
* @return string
166166
*/
167167
- public function getKey()
168168
+ public function getKey(): string
169169
{
170170
return $this->key;
171-
@@ -58,5 +58,5 @@ class EntityFactory implements UserProviderFactoryInterface
171+
@@ -55,5 +55,5 @@ class EntityFactory implements UserProviderFactoryInterface
172172
* @return void
173173
*/
174174
- public function addConfiguration(NodeDefinition $node)
@@ -242,14 +242,14 @@ diff --git a/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php b/src/Symfony/Bri
242242
diff --git a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineClearEntityManagerWorkerSubscriber.php b/src/Symfony/Bridge/Doctrine/Messenger/DoctrineClearEntityManagerWorkerSubscriber.php
243243
--- a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineClearEntityManagerWorkerSubscriber.php
244244
+++ b/src/Symfony/Bridge/Doctrine/Messenger/DoctrineClearEntityManagerWorkerSubscriber.php
245-
@@ -34,5 +34,5 @@ class DoctrineClearEntityManagerWorkerSubscriber implements EventSubscriberInter
245+
@@ -32,5 +32,5 @@ class DoctrineClearEntityManagerWorkerSubscriber implements EventSubscriberInter
246246
* @return void
247247
*/
248248
- public function onWorkerMessageHandled()
249249
+ public function onWorkerMessageHandled(): void
250250
{
251251
$this->clearEntityManagers();
252-
@@ -42,5 +42,5 @@ class DoctrineClearEntityManagerWorkerSubscriber implements EventSubscriberInter
252+
@@ -40,5 +40,5 @@ class DoctrineClearEntityManagerWorkerSubscriber implements EventSubscriberInter
253253
* @return void
254254
*/
255255
- public function onWorkerMessageFailed()
@@ -259,21 +259,21 @@ diff --git a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineClearEntityManagerWor
259259
diff --git a/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php b/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
260260
--- a/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
261261
+++ b/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php
262-
@@ -72,5 +72,5 @@ class DoctrineTokenProvider implements TokenProviderInterface, TokenVerifierInte
262+
@@ -70,5 +70,5 @@ class DoctrineTokenProvider implements TokenProviderInterface, TokenVerifierInte
263263
* @return void
264264
*/
265265
- public function deleteTokenBySeries(string $series)
266266
+ public function deleteTokenBySeries(string $series): void
267267
{
268268
$sql = 'DELETE FROM rememberme_token WHERE series=:series';
269-
@@ -85,5 +85,5 @@ class DoctrineTokenProvider implements TokenProviderInterface, TokenVerifierInte
269+
@@ -83,5 +83,5 @@ class DoctrineTokenProvider implements TokenProviderInterface, TokenVerifierInte
270270
* @return void
271271
*/
272272
- public function updateToken(string $series, #[\SensitiveParameter] string $tokenValue, \DateTime $lastUsed)
273273
+ public function updateToken(string $series, #[\SensitiveParameter] string $tokenValue, \DateTime $lastUsed): void
274274
{
275275
$sql = 'UPDATE rememberme_token SET value=:value, lastUsed=:lastUsed WHERE series=:series';
276-
@@ -107,5 +107,5 @@ class DoctrineTokenProvider implements TokenProviderInterface, TokenVerifierInte
276+
@@ -105,5 +105,5 @@ class DoctrineTokenProvider implements TokenProviderInterface, TokenVerifierInte
277277
* @return void
278278
*/
279279
- public function createNewToken(PersistentTokenInterface $token)
@@ -300,7 +300,7 @@ diff --git a/src/Symfony/Bridge/Doctrine/Tests/Fixtures/LegacyQueryMock.php b/sr
300300
diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
301301
--- a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
302302
+++ b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
303-
@@ -43,5 +43,5 @@ class UniqueEntityValidator extends ConstraintValidator
303+
@@ -41,5 +41,5 @@ class UniqueEntityValidator extends ConstraintValidator
304304
* @throws ConstraintDefinitionException
305305
*/
306306
- public function validate(mixed $entity, Constraint $constraint)
@@ -704,14 +704,14 @@ diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/Wor
704704
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
705705
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
706706
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
707-
@@ -211,5 +211,5 @@ class FrameworkExtension extends Extension
707+
@@ -210,5 +210,5 @@ class FrameworkExtension extends Extension
708708
* @throws LogicException
709709
*/
710710
- public function load(array $configs, ContainerBuilder $container)
711711
+ public function load(array $configs, ContainerBuilder $container): void
712712
{
713713
$loader = new PhpFileLoader($container, new FileLocator(\dirname(__DIR__).'/Resources/config'));
714-
@@ -2954,5 +2954,5 @@ class FrameworkExtension extends Extension
714+
@@ -2953,5 +2953,5 @@ class FrameworkExtension extends Extension
715715
* @return void
716716
*/
717717
- public static function registerRateLimiter(ContainerBuilder $container, string $name, array $limiterConfig)
@@ -999,14 +999,14 @@ diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/User
999999
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
10001000
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
10011001
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
1002-
@@ -82,5 +82,5 @@ class SecurityExtension extends Extension implements PrependExtensionInterface
1002+
@@ -83,5 +83,5 @@ class SecurityExtension extends Extension implements PrependExtensionInterface
10031003
* @return void
10041004
*/
10051005
- public function prepend(ContainerBuilder $container)
10061006
+ public function prepend(ContainerBuilder $container): void
10071007
{
10081008
foreach ($this->getSortedFactories() as $factory) {
1009-
@@ -94,5 +94,5 @@ class SecurityExtension extends Extension implements PrependExtensionInterface
1009+
@@ -95,5 +95,5 @@ class SecurityExtension extends Extension implements PrependExtensionInterface
10101010
* @return void
10111011
*/
10121012
- public function load(array $configs, ContainerBuilder $container)
@@ -4822,6 +4822,16 @@ diff --git a/src/Symfony/Component/ErrorHandler/BufferingLogger.php b/src/Symfon
48224822
+ public function __wakeup(): void
48234823
{
48244824
throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
4825+
diff --git a/src/Symfony/Component/ErrorHandler/ErrorRenderer/FileLinkFormatter.php b/src/Symfony/Component/ErrorHandler/ErrorRenderer/FileLinkFormatter.php
4826+
--- a/src/Symfony/Component/ErrorHandler/ErrorRenderer/FileLinkFormatter.php
4827+
+++ b/src/Symfony/Component/ErrorHandler/ErrorRenderer/FileLinkFormatter.php
4828+
@@ -52,5 +52,5 @@ class FileLinkFormatter
4829+
* @return string|false
4830+
*/
4831+
- public function format(string $file, int $line): string|bool
4832+
+ public function format(string $file, int $line): string|false
4833+
{
4834+
if ($fmt = $this->getFileLinkFormat()) {
48254835
diff --git a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
48264836
--- a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
48274837
+++ b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
@@ -5654,7 +5664,7 @@ diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorat
56545664
diff --git a/src/Symfony/Component/Form/Command/DebugCommand.php b/src/Symfony/Component/Form/Command/DebugCommand.php
56555665
--- a/src/Symfony/Component/Form/Command/DebugCommand.php
56565666
+++ b/src/Symfony/Component/Form/Command/DebugCommand.php
5657-
@@ -58,5 +58,5 @@ class DebugCommand extends Command
5667+
@@ -59,5 +59,5 @@ class DebugCommand extends Command
56585668
* @return void
56595669
*/
56605670
- protected function configure()
@@ -7285,98 +7295,98 @@ diff --git a/src/Symfony/Component/HttpFoundation/ParameterBag.php b/src/Symfony
72857295
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
72867296
--- a/src/Symfony/Component/HttpFoundation/Request.php
72877297
+++ b/src/Symfony/Component/HttpFoundation/Request.php
7288-
@@ -272,5 +272,5 @@ class Request
7298+
@@ -274,5 +274,5 @@ class Request
72897299
* @return void
72907300
*/
72917301
- public function initialize(array $query = [], array $request = [], array $attributes = [], array $cookies = [], array $files = [], array $server = [], $content = null)
72927302
+ public function initialize(array $query = [], array $request = [], array $attributes = [], array $cookies = [], array $files = [], array $server = [], $content = null): void
72937303
{
72947304
$this->request = new InputBag($request);
7295-
@@ -432,5 +432,5 @@ class Request
7305+
@@ -434,5 +434,5 @@ class Request
72967306
* @return void
72977307
*/
72987308
- public static function setFactory(?callable $callable)
72997309
+ public static function setFactory(?callable $callable): void
73007310
{
73017311
self::$requestFactory = $callable;
7302-
@@ -538,5 +538,5 @@ class Request
7312+
@@ -540,5 +540,5 @@ class Request
73037313
* @return void
73047314
*/
73057315
- public function overrideGlobals()
73067316
+ public function overrideGlobals(): void
73077317
{
73087318
$this->server->set('QUERY_STRING', static::normalizeQueryString(http_build_query($this->query->all(), '', '&')));
7309-
@@ -580,5 +580,5 @@ class Request
7319+
@@ -582,5 +582,5 @@ class Request
73107320
* @return void
73117321
*/
73127322
- public static function setTrustedProxies(array $proxies, int $trustedHeaderSet)
73137323
+ public static function setTrustedProxies(array $proxies, int $trustedHeaderSet): void
73147324
{
73157325
self::$trustedProxies = array_reduce($proxies, function ($proxies, $proxy) {
7316-
@@ -623,5 +623,5 @@ class Request
7326+
@@ -625,5 +625,5 @@ class Request
73177327
* @return void
73187328
*/
73197329
- public static function setTrustedHosts(array $hostPatterns)
73207330
+ public static function setTrustedHosts(array $hostPatterns): void
73217331
{
73227332
self::$trustedHostPatterns = array_map(fn ($hostPattern) => sprintf('{%s}i', $hostPattern), $hostPatterns);
7323-
@@ -671,5 +671,5 @@ class Request
7333+
@@ -673,5 +673,5 @@ class Request
73247334
* @return void
73257335
*/
73267336
- public static function enableHttpMethodParameterOverride()
73277337
+ public static function enableHttpMethodParameterOverride(): void
73287338
{
73297339
self::$httpMethodParameterOverride = true;
7330-
@@ -758,5 +758,5 @@ class Request
7340+
@@ -760,5 +760,5 @@ class Request
73317341
* @return void
73327342
*/
73337343
- public function setSession(SessionInterface $session)
73347344
+ public function setSession(SessionInterface $session): void
73357345
{
73367346
$this->session = $session;
7337-
@@ -1181,5 +1181,5 @@ class Request
7347+
@@ -1183,5 +1183,5 @@ class Request
73387348
* @return void
73397349
*/
73407350
- public function setMethod(string $method)
73417351
+ public function setMethod(string $method): void
73427352
{
73437353
$this->method = null;
7344-
@@ -1304,5 +1304,5 @@ class Request
7354+
@@ -1306,5 +1306,5 @@ class Request
73457355
* @return void
73467356
*/
73477357
- public function setFormat(?string $format, string|array $mimeTypes)
73487358
+ public function setFormat(?string $format, string|array $mimeTypes): void
73497359
{
73507360
if (null === static::$formats) {
7351-
@@ -1336,5 +1336,5 @@ class Request
7361+
@@ -1338,5 +1338,5 @@ class Request
73527362
* @return void
73537363
*/
73547364
- public function setRequestFormat(?string $format)
73557365
+ public function setRequestFormat(?string $format): void
73567366
{
73577367
$this->format = $format;
7358-
@@ -1368,5 +1368,5 @@ class Request
7368+
@@ -1370,5 +1370,5 @@ class Request
73597369
* @return void
73607370
*/
73617371
- public function setDefaultLocale(string $locale)
73627372
+ public function setDefaultLocale(string $locale): void
73637373
{
73647374
$this->defaultLocale = $locale;
7365-
@@ -1390,5 +1390,5 @@ class Request
7375+
@@ -1392,5 +1392,5 @@ class Request
73667376
* @return void
73677377
*/
73687378
- public function setLocale(string $locale)
73697379
+ public function setLocale(string $locale): void
73707380
{
73717381
$this->setPhpDefaultLocale($this->locale = $locale);
7372-
@@ -1747,5 +1747,5 @@ class Request
7382+
@@ -1749,5 +1749,5 @@ class Request
73737383
* @return string
73747384
*/
73757385
- protected function prepareRequestUri()
73767386
+ protected function prepareRequestUri(): string
73777387
{
73787388
$requestUri = '';
7379-
@@ -1917,5 +1917,5 @@ class Request
7389+
@@ -1919,5 +1919,5 @@ class Request
73807390
* @return void
73817391
*/
73827392
- protected static function initializeFormats()
@@ -8275,16 +8285,6 @@ diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RouterDataCollector.
82758285
+ public function onKernelController(ControllerEvent $event): void
82768286
{
82778287
$this->controllers[$event->getRequest()] = $event->getController();
8278-
diff --git a/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php b/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php
8279-
--- a/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php
8280-
+++ b/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php
8281-
@@ -53,5 +53,5 @@ class FileLinkFormatter
8282-
* @return string|false
8283-
*/
8284-
- public function format(string $file, int $line): string|bool
8285-
+ public function format(string $file, int $line): string|false
8286-
{
8287-
if ($fmt = $this->getFileLinkFormat()) {
82888288
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php
82898289
--- a/src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php
82908290
+++ b/src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php
@@ -10001,7 +10001,7 @@ diff --git a/src/Symfony/Component/Mime/Part/TextPart.php b/src/Symfony/Componen
1000110001
diff --git a/src/Symfony/Component/Mime/RawMessage.php b/src/Symfony/Component/Mime/RawMessage.php
1000210002
--- a/src/Symfony/Component/Mime/RawMessage.php
1000310003
+++ b/src/Symfony/Component/Mime/RawMessage.php
10004-
@@ -58,5 +58,5 @@ class RawMessage
10004+
@@ -76,5 +76,5 @@ class RawMessage
1000510005
* @throws LogicException if the message is not valid
1000610006
*/
1000710007
- public function ensureValidity()

0 commit comments

Comments
 (0)
0