8000 Fix merge · symfony/symfony@d6ecabf · GitHub
[go: up one dir, main page]
Skip to content

Commit d6ecabf

Browse files
nicolas-grekasnicolas-grekas
committed
Fix merge
1 parent 33d49e3 commit d6ecabf

File tree

2 files changed

+29
-22
lines changed

2 files changed

+29
-22
lines changed

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

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ git checkout composer.json src/
1010
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractLayoutTestCase.php b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractLayoutTestCase.php
1111
--- a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractLayoutTestCase.php
1212
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/AbstractLayoutTestCase.php
13-
@@ -52,5 +52,5 @@ abstract class AbstractLayoutTestCase extends FormLayoutTestCase
13+
@@ -49,5 +49,5 @@ abstract class AbstractLayoutTestCase extends FormLayoutTestCase
1414
* @return FormExtensionInterface[]
1515
*/
1616
- protected function getExtensions()
@@ -20,35 +20,21 @@ diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/AbstractLayoutTestCase.php
2020
diff --git a/src/Symfony/Component/BrowserKit/AbstractBrowser.php b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
2121
--- a/src/Symfony/Component/BrowserKit/AbstractBrowser.php
2222
+++ b/src/Symfony/Component/BrowserKit/AbstractBrowser.php
23-
@@ -407,5 +407,5 @@ abstract class AbstractBrowser
24-
* @throws \RuntimeException When processing returns exit code
25-
*/
26-
- protected function doRequestInProcess(object $request)
27-
+ protected function doRequestInProcess(object $request): object
28-
{
29-
$deprecationsFile = tempnam(sys_get_temp_dir(), 'deprec');
30-
@@ -440,5 +440,5 @@ abstract class AbstractBrowser
31-
* @return object
32-
*/
33-
- abstract protected function doRequest(object $request);
34-
+ abstract protected function doRequest(object $request): object;
35-
36-
/**
37-
@@ -451,5 +451,5 @@ abstract class AbstractBrowser
23+
@@ -466,5 +466,5 @@ abstract class AbstractBrowser
3824
* @throws LogicException When this abstract class is not implemented
3925
*/
4026
- protected function getScript(object $request)
4127
+ protected function getScript(object $request): string
4228
{
4329
throw new LogicException('To insulate requests, you need to override the getScript() method.');
44-
@@ -461,5 +461,5 @@ abstract class AbstractBrowser
45-
* @return object
30+
@@ -478,5 +478,5 @@ abstract class AbstractBrowser
31+
* @psalm-return TRequest
4632
*/
4733
- protected function filterRequest(Request $request)
4834
+ protected function filterRequest(Request $request): object
4935
{
5036
return $request;
51-
@@ -471,5 +471,5 @@ abstract class AbstractBrowser
37+
@@ -490,5 +490,5 @@ abstract class AbstractBrowser
5238
* @return Response
5339
*/
5440
- protected function filterResponse(object 10000 $response)
@@ -408,7 +394,7 @@ diff --git a/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php b/src/S
408394
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
409395
--- a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
410396
+++ b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
411-
@@ -113,5 +113,5 @@ abstract class DataCollector implements DataCollectorInterface
397+
@@ -111,5 +111,5 @@ abstract class DataCollector implements DataCollectorInterface
412398
* @return void
413399
*/
414400
- public function reset()
@@ -542,6 +528,16 @@ diff --git a/src/Symfony/Component/Security/Http/Firewall.php b/src/Symfony/Comp
542528
+ protected function callListeners(RequestEvent $event, iterable $listeners): void
543529
{
544530
foreach ($listeners as $listener) {
531+
diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
532+
--- a/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
533+
+++ b/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
534+
@@ -820,5 +820,5 @@ XML;
535+
* @return Dummy
536+
*/
537+
- protected static function getObject(): object
538+
+ protected static function getObject(): Dummy
539+
{
540+
$obj = new Dummy();
545541
diff --git a/src/Symfony/Component/Translation/Extractor/ExtractorInterface.php b/src/Symfony/Component/Translation/Extractor/ExtractorInterface.php
546542
--- a/src/Symfony/Component/Translation/Extractor/ExtractorInterface.php
547543
+++ b/src/Symfony/Component/Translation/Extractor/ExtractorInterface.php
@@ -558,6 +554,16 @@ diff --git a/src/Symfony/Component/Translation/Extractor/ExtractorInterface.php
558554
- public function setPrefix(string $prefix);
559555
+ public function setPrefix(string $prefix): void;
560556
}
557+
diff --git a/src/Symfony/Component/TypeInfo/Tests/Fixtures/DummyWithPhpDoc.php b/src/Symfony/Component/TypeInfo/Tests/Fixtures/DummyWithPhpDoc.php
558+
--- a/src/Symfony/Component/TypeInfo/Tests/Fixtures/DummyWithPhpDoc.php
559+
+++ b/src/Symfony/Component/TypeInfo/Tests/Fixtures/DummyWithPhpDoc.php
560+
@@ -15,5 +15,5 @@ final class DummyWithPhpDoc
561+
* @return Dummy
562+
*/
563+
- public function getNextDummy(mixed $dummy): mixed
564+
+ public function getNextDummy(mixed $dummy): Dummy
565+
{
566+
throw new \BadMethodCallException(sprintf('"%s" is not implemented.', __METHOD__));
561567
diff --git a/src/Symfony/Component/Validator/ConstraintValidatorInterface.php b/src/Symfony/Component/Validator/ConstraintValidatorInterface.php
562568
--- a/src/Symfony/Component/Validator/ConstraintValidatorInterface.php
563569
+++ b/src/Symfony/Component/Validator/ConstraintValidatorInterface.php
@@ -588,14 +594,14 @@ diff --git a/src/Symfony/Component/VarExporter/Tests/ProxyHelperTest.php b/src/S
588594
+++ b/src/Symfony/Component/VarExporter/Tests/ProxyHelperTest.php
589595
@@ -172,5 +172,5 @@ class ProxyHelperTest extends TestCase
590596
{
591-
yield 'not type hinted __unserialize method' => [new class() {
597+
yield 'not type hinted __unserialize method' => [new class {
592598
- public function __unserialize($array)
593599
+ public function __unserialize($array): void
594600
{
595601
}
596602
@@ -192,5 +192,5 @@ class ProxyHelperTest extends TestCase
597603

598-
yield 'type hinted __unserialize method' => [new class() {
604+
yield 'type hinted __unserialize method' => [new class {
599605
- public function __unserialize(array $array)
600606
+ public function __unserialize(array $array): void
601607
{

‎.github/patch-types.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
case false !== strpos($file, '/src/Symfony/Component/VarDumper/Tests/Fixtures/NotLoadableClass.php'):
6060
case false !== strpos($file, '/src/Symfony/Component/VarDumper/Tests/Fixtures/ReflectionIntersectionTypeFixture.php'):
6161
case false !== strpos($file, '/src/Symfony/Component/VarDumper/Tests/Fixtures/ReflectionUnionTypeWithIntersectionFixture.php'):
62+
case false !== strpos($file, '/src/Symfony/Component/VarDumper/Tests/Fixtures/VirtualProperty.php'):
6263
case false !== strpos($file, '/src/Symfony/Component/VarExporter/Internal'):
6364
case false !== strpos($file, '/src/Symfony/Component/VarExporter/Tests/Fixtures/'):
6465
case false !== strpos($file, '/src/Symfony/Component/Cache/Traits/RelayProxy.php'):

0 commit comments

Comments
 (0)
0