8000 Merge branch '6.4' into 7.0 · symfony/symfony@d24a7e5 · GitHub
[go: up one dir, main page]
Skip to content

Commit d24a7e5

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '6.4' into 7.0
* 6.4: Fix merge Sync .github/expected-missing-return-types.diff
2 parents 87d1c9a + c984e22 commit d24a7e5

File tree

2 files changed

+46
-26
lines changed

2 files changed

+46
-26
lines changed

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

+43-26
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ diff --git a/src/Symfony/Component/BrowserKit/AbstractBrowser.php b/src/Symfony/
2222
*/
2323
- abstract protected function doRequest(object $request);
2424
+ abstract protected function doRequest(object $request): object;
25-
25+
2626
/**
2727
@@ -451,5 +451,5 @@ abstract class AbstractBrowser
2828
* @throws LogicException When this abstract class is not implemented
@@ -146,21 +146,21 @@ diff --git a/src/Symfony/Component/DependencyInjection/Extension/ExtensionInterf
146146
*/
147147
- public function load(array $configs, ContainerBuilder $container);
148148
+ public function load(array $configs, ContainerBuilder $container): void;
149-
149+
150150
/**
151151
@@ -37,5 +37,5 @@ interface ExtensionInterface
152152
* @return string
153153
*/
154154
- public function getNamespace();
155155
+ public function getNamespace(): string;
156-
156+
157157
/**
158158
@@ -44,5 +44,5 @@ interface ExtensionInterface
159159
* @return string|false
160160
*/
161161
- public function getXsdValidationBasePath();
162162
+ public function getXsdValidationBasePath(): string|false;
163-
163+
164164
/**
165165
@@ -53,4 +53,4 @@ interface ExtensionInterface
166166
* @return string
@@ -249,35 +249,35 @@ diff --git a/src/Symfony/Component/Form/FormTypeInterface.php b/src/Symfony/Comp
249249
*/
250250
- public function getParent();
251251
+ public function getParent(): ?string;
252-
252+
253253
/**
254254
@@ -34,5 +34,5 @@ interface FormTypeInterface
255255
* @return void
256256
*/
257257
- public function configureOptions(OptionsResolver $resolver);
258258
+ public function configureOptions(OptionsResolver $resolver): void;
259-
259+
260260
/**
261261
@@ -48,5 +48,5 @@ interface FormTypeInterface
262262
* @see FormTypeExtensionInterface::buildForm()
263263
*/
264264
- public function buildForm(FormBuilderInterface $builder, array $options);
265265
+ public function buildForm(FormBuilderInterface $builder, array $options): void;
266-
266+
267267
/**
268268
@@ -66,5 +66,5 @@ interface FormTypeInterface
269269
* @see FormTypeExtensionInterface::buildView()
270270
*/
271271
- public function buildView(FormView $view, FormInterface $form, array $options);
272272
+ public function buildView(FormView $view, FormInterface $form, array $options): void;
273-
273+
274274
/**
275275
@@ -85,5 +85,5 @@ interface FormTypeInterface
276276
* @see FormTypeExtensionInterface::finishView()
277277
*/
278278
- public function finishView(FormView $view, FormInterface $form, array $options);
279279
+ public function finishView(FormView $view, FormInterface $form, array $options): void;
280-
280+
281281
/**
282282
@@ -95,4 +95,4 @@ interface FormTypeInterface
283283
* @return string
@@ -324,26 +324,26 @@ diff --git a/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php b/src/S
324324
*/
325325
- public function boot();
326326
+ public function boot(): void;
327-
327+
328328
/**
329329
@@ -35,5 +35,5 @@ interface BundleInterface
330330
* @return void
331331
*/
332332
- public function shutdown();
333333
+ public function shutdown(): void;
334-
334+
335335
/**
336336
@@ -44,5 +44,5 @@ interface BundleInterface
337337
* @return void
338338
*/
339339
- public function build(ContainerBuilder $container);
340340
+ public function build(ContainerBuilder $container): void;
341-
341+
342342
/**
343343
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
344344
--- a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
345345
+++ b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
346-
@@ -101,5 +101,5 @@ abstract class DataCollector implements DataCollectorInterface
346+
@@ -113,5 +113,5 @@ abstract class DataCollector implements DataCollectorInterface
347347
* @return void
348348
*/
349349
- public function reset()
@@ -358,7 +358,7 @@ diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DataCollectorInterfa
358358
*/
359359
- public function collect(Request $request, Response $response, ?\Throwable $exception = null);
360360
+ public function collect(Request $request, Response $response, ?\Throwable $exception = null): void;
361-
361+
362362
/**
363363
@@ -35,4 +35,4 @@ interface DataCollectorInterface extends ResetInterface
364364
* @return string
@@ -383,38 +383,38 @@ diff --git a/src/Symfony/Component/HttpKernel/KernelInterface.php b/src/Symfony/
383383
*/
384384
- public function registerContainerConfiguration(LoaderInterface $loader);
385385
+ public function registerContainerConfiguration(LoaderInterface $loader): void;
386-
386+
387387
/**
388388
@@ -44,5 +44,5 @@ interface KernelInterface extends HttpKernelInterface
389389
* @return void
390390
*/
391391
- public function boot();
392392
+ public function boot(): void;
393-
393+
394394
/**
395395
@@ -53,5 +53,5 @@ interface KernelInterface extends HttpKernelInterface
396396
* @return void
397397
*/
398398
- public function shutdown();
399399
+ public function shutdown(): void;
400-
400+
401401
/**
402402
diff --git a/src/Symfony/Component/Routing/Loader/AttributeClassLoader.php b/src/Symfony/Component/Routing/Loader/AttributeClassLoader.php
403403
--- a/src/Symfony/Component/Routing/Loader/AttributeClassLoader.php
404404
+++ b/src/Symfony/Component/Routing/Loader/AttributeClassLoader.php
405-
@@ -234,5 +234,5 @@ abstract class AttributeClassLoader implements LoaderInterface
405+
@@ -236,5 +236,5 @@ abstract class AttributeClassLoader implements LoaderInterface
406406
* @return string
407407
*/
408408
- protected function getDefaultRouteName(\ReflectionClass $class, \ReflectionMethod $method)
409409
+ protected function getDefaultRouteName(\ReflectionClass $class, \ReflectionMethod $method): string
410410
{
411411
$name = str_replace('\\', '_', $class->name).'_'.$method->name;
412-
@@ -333,5 +333,5 @@ abstract class AttributeClassLoader implements LoaderInterface
412+
@@ -335,5 +335,5 @@ abstract class AttributeClassLoader implements LoaderInterface
413413
* @return void
414414
*/
415415
- abstract protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot);
416416
+ abstract protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot): void;
417-
417+
418418
/**
419419
diff --git a/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php b/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php
420420
--- a/src/Symfony/Component/Security/Core/Authentication/RememberMe/TokenProviderInterface.php
@@ -424,21 +424,21 @@ diff --git a/src/Symfony/Component/Security/Core/Authentication/RememberMe/Token
424424
*/
425425
- public function loadTokenBySeries(string $series);
426426
+ public function loadTokenBySeries(string $series): PersistentTokenInterface;
427-
427+
428428
/**
429429
@@ -35,5 +35,5 @@ interface TokenProviderInterface
430430
* @return void
431431
*/
432432
- public function deleteTokenBySeries(string $series);
433433
+ public function deleteTokenBySeries(string $series): void;
434-
434+
435435
/**
436436
@@ -44,5 +44,5 @@ interface TokenProviderInterface
437437
* @throws TokenNotFoundException if the token is not found
438438
*/
439439
- public function updateToken(string $series, #[\SensitiveParameter] string $tokenValue, \DateTimeInterface $lastUsed);
440440
+ public function updateToken(string $series, #[\SensitiveParameter] string $tokenValue, \DateTimeInterface $lastUsed): void;
441-
441+
442442
/**
443443
@@ -51,4 +51,4 @@ interface TokenProviderInterface
444444
* @return void
@@ -485,7 +485,7 @@ diff --git a/src/Symfony/Component/Translation/Extractor/ExtractorInterface.php
485485
*/
486486
- public function extract(string|iterable $resource, MessageCatalogue $catalogue);
487487
+ public function extract(string|iterable $resource, MessageCatalogue $catalogue): void;
488-
488+
489489
/**
490490
@@ -36,4 +36,4 @@ interface ExtractorInterface
491491
* @return void
@@ -501,7 +501,7 @@ diff --git a/src/Symfony/Component/Validator/ConstraintValidatorInterface.php b/
501501
*/
502502
- public function initialize(ExecutionContextInterface $context);
503503
+ public function initialize(ExecutionContextInterface $context): void;
504-
504+
505505
/**
506506
@@ -31,4 +31,4 @@ interface ConstraintValidatorInterface
507507
* @return void
@@ -518,6 +518,23 @@ diff --git a/src/Symfony/Component/VarDumper/Dumper/DataDumperInterface.php b/sr
518518
- public function dump(Data $data);
519519
+ public function dump(Data $data): ?string;
520520
}
521+
diff --git a/src/Symfony/Component/VarExporter/Tests/ProxyHelperTest.php b/src/Symfony/Component/VarExporter/Tests/ProxyHelperTest.php
522+
--- a/src/Symfony/Component/VarExporter/Tests/ProxyHelperTest.php
523+
+++ b/src/Symfony/Component/VarExporter/Tests/ProxyHelperTest.php
524+
@@ -172,5 +172,5 @@ class ProxyHelperTest extends TestCase
525+
{
526+
yield 'not type hinted __unserialize method' => [new class() {
527+
- public function __unserialize($array)
528+
+ public function __unserialize($array): void
529+
{
530+
}
531+
@@ -192,5 +192,5 @@ class ProxyHelperTest extends TestCase
532+
533+
yield 'type hinted __unserialize method' => [new class() {
534+
- public function __unserialize(array $array)
535+
+ public function __unserialize(array $array): void
536+
{
537+
}
521538
diff --git a/src/Symfony/Contracts/Translation/LocaleAwareInterface.php b/src/Symfony/Contracts/Translation/LocaleAwareInterface.php
522539
--- a/src/Symfony/Contracts/Translation/LocaleAwareInterface.php
523540
+++ b/src/Symfony/Contracts/Translation/LocaleAwareInterface.php
@@ -526,7 +543,7 @@ diff --git a/src/Symfony/Contracts/Translation/LocaleAwareInterface.php b/src/Sy
526543
*/
527544
- public function setLocale(string $locale);
528545
+ public function setLocale(string $locale): void;
529-
546+
530547
/**
531548
diff --git a/src/Symfony/Contracts/Translation/TranslatorTrait.php b/src/Symfony/Contracts/Translation/TranslatorTrait.php
532549
--- a/src/Symfony/Contracts/Translation/TranslatorTrait.php

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

+3
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,7 @@ public function testSerializerJsonDetailedErrorMessagesEnabledWhenDefaultContext
572572
$processor = new Processor();
573573
$config = $processor->processConfiguration(new Configuration(true), [
574574
[
575+
'http_method_override' => false,
575576
'serializer' => [
576577
'default_context' => [
577578
'foo' => 'bar',
@@ -588,6 +589,7 @@ public function testSerializerJsonDetailedErrorMessagesInDefaultContextCanBeDisa
588589
$processor = new Processor();
589590
$config = $processor->processConfiguration(new Configuration(true), [
590591
[
592+
'http_method_override' => false,
591593
'serializer' => [
592594
'default_context' => [
593595
'foo' => 'bar',
@@ -605,6 +607,7 @@ public function testSerializerJsonDetailedErrorMessagesInDefaultContextCanBeDisa
605607
$processor = new Processor();
606608
$config = $processor->processConfiguration(new Configuration(true), [
607609
[
610+
'http_method_override' => false,
608611
'serializer' => [
609612
'default_context' => [
610613
'foo' => 'bar',

0 commit comments

Comments
 (0)
0