Skip to content

Commit 29a5f21

Browse files
minor symfony#53615 fix method signatures (xabbuh)
This PR was merged into the 6.3 branch. Discussion ---------- fix method signatures | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | no | New feature? | no | Deprecations? | no | Issues | | License | MIT Commits ------- 5c7aa68 fix method signatures
2 parents f89bbc1 + 5c7aa68 commit 29a5f21

File tree

11 files changed

+220
-220
lines changed

11 files changed

+220
-220
lines changed

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

Lines changed: 210 additions & 210 deletions
Large diffs are not rendered by default.

src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/AutowiringTypes/AutowiredServices.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class AutowiredServices
2121
private $dispatcher;
2222
private $cachePool;
2323

24-
public function __construct(?Reader $annotationReader = null, EventDispatcherInterface $dispatcher, CacheItemPoolInterface $cachePool)
24+
public function __construct(?Reader $annotationReader, EventDispatcherInterface $dispatcher, CacheItemPoolInterface $cachePool)
2525
{
2626
$this->annotationReader = $annotationReader;
2727
$this->dispatcher = $dispatcher;

src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class ProfilerController
4040
private $cspHandler;
4141
private $baseDir;
4242

43-
public function __construct(UrlGeneratorInterface $generator, ?Profiler $profiler = null, Environment $twig, array $templates, ?ContentSecurityPolicyHandler $cspHandler = null, ?string $baseDir = null)
43+
public function __construct(UrlGeneratorInterface $generator, ?Profiler $profiler, Environment $twig, array $templates, ?ContentSecurityPolicyHandler $cspHandler = null, ?string $baseDir = null)
4444
{
4545
$this->generator = $generator;
4646
$this->profiler = $profiler;

src/Symfony/Component/Console/Tests/CI/GithubActionReporterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function testIsGithubActionEnvironment()
3434
/**
3535
* @dataProvider annotationsFormatProvider
3636
*/
37-
public function testAnnotationsFormat(string $type, string $message, ?string $file = null, ?int $line = null, ?int $col = null, string $expected)
37+
public function testAnnotationsFormat(string $type, string $message, ?string $file, ?int $line, ?int $col, string $expected)
3838
{
3939
$reporter = new GithubActionReporter($buffer = new BufferedOutput());
4040

src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ private function &recursiveBuildPreliminaryFormTree(FormInterface $form, array &
259259
return $output;
260260
}
261261

262-
private function &recursiveBuildFinalFormTree(?FormInterface $form = null, FormView $view, array &$outputByHash)
262+
private function &recursiveBuildFinalFormTree(?FormInterface $form, FormView $view, array &$outputByHash)
263263
{
264264
$viewHash = spl_object_hash($view);
265265
$formHash = null;

src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ abstract class AbstractSurrogateFragmentRenderer extends RoutableFragmentRendere
3434
*
3535
* @param FragmentRendererInterface $inlineStrategy The inline strategy to use when the surrogate is not supported
3636
*/
37-
public function __construct(?SurrogateInterface $surrogate = null, FragmentRendererInterface $inlineStrategy, ?UriSigner $signer = null)
37+
public function __construct(?SurrogateInterface $surrogate, FragmentRendererInterface $inlineStrategy, ?UriSigner $signer = null)
3838
{
3939
$this->surrogate = $surrogate;
4040
$this->inlineStrategy = $inlineStrategy;

src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,7 @@ public function fooAction(?NonExistentClass $nonExistent = null)
583583
{
584584
}
585585

586-
public function barAction(?NonExistentClass $nonExistent = null, $bar)
586+
public function barAction(?NonExistentClass $nonExistent, $bar)
587587
{
588588
}
589589
}

src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public static function typesProvider()
134134
/**
135135
* @dataProvider provideCollectionTypes
136136
*/
137-
public function testExtractCollection($property, ?array $type = null, $shortDescription, $longDescription)
137+
public function testExtractCollection($property, ?array $type, $shortDescription, $longDescription)
138138
{
139139
$this->testExtract($property, $type, $shortDescription, $longDescription);
140140
}

src/Symfony/Component/Validator/Context/ExecutionContext.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public function __construct(ValidatorInterface $validator, mixed $root, Translat
121121
$this->cachedObjectsRefs = new \SplObjectStorage();
122122
}
123123

124-
public function setNode(mixed $value, ?object $object, ?MetadataInterface $metadata = null, string $propertyPath): void
124+
public function setNode(mixed $value, ?object $object, ?MetadataInterface $metadata, string $propertyPath): void
125125
{
126126
$this->value = $value;
127127
$this->object = $object;

src/Symfony/Component/Validator/Context/ExecutionContextInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public function getObject(): ?object;
126126
*
127127
* @return void
128128
*/
129-
public function setNode(mixed $value, ?object $object, ?MetadataInterface $metadata = null, string $propertyPath);
129+
public function setNode(mixed $value, ?object $object, ?MetadataInterface $metadata, string $propertyPath);
130130

131131
/**
132132
* Warning: Should not be called by user code, to be used by the validator engine only.

0 commit comments

Comments
 (0)