8000 Merge branch '5.4' into 6.0 · symfony/symfony@b9a02ad · GitHub
[go: up one dir, main page]
Skip to content

Commit b9a02ad

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.4' into 6.0
* 5.4: Add missing return types to tests/internal/final methods Add type to fix 6.0 build
2 parents 4a77ea3 + 682b76f commit b9a02ad

File tree

6 files changed

+8
-12
lines changed

6 files changed

+8
-12
lines changed

‎.github/patch-types.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,9 @@
3131
case false !== strpos($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Prototype/BadClasses/MissingParent.php'):
3232
case false !== strpos($file, '/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/'):
3333
case false !== strpos($file, '/src/Symfony/Component/ErrorHandler/Tests/Fixtures/'):
34-
case false !== strpos($file, '/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php'):
35-
case false !== strpos($file, '/src/Symfony/Component/PropertyInfo/Tests/Fixtures/ParentDummy.php'):
36-
case false !== strpos($file, '/src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/DummyUsingTrait.php'):
34+
case false !== strpos($file, '/src/Symfony/Component/PropertyInfo/Tests/Fixtures/'):
3735
case false !== strpos($file, '/src/Symfony/Component/Runtime/Internal/ComposerPlugin.php'):
36+
case false !== strpos($file, '/src/Symfony/Component/Serializer/Tests/Fixtures/'):
3837
case false !== strpos($file, '/src/Symfony/Component/Serializer/Tests/Normalizer/Features/ObjectOuter.php'):
3938
case false !== strpos($file, '/src/Symfony/Component/VarDumper/Tests/Fixtures/NotLoadableClass.php'):
4039
case false !== strpos($file, '/src/Symfony/Component/VarDumper/Tests/Fixtures/ReflectionIntersectionTypeFixture.php'):

‎src/Symfony/Component/DependencyInjection/Tests/ServiceLocatorTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\DependencyInjection\Tests;
1313

14+
use Psr\Container\ContainerInterface;
1415
use Psr\Container\NotFoundExceptionInterface;
1516
use Symfony\Component\DependencyInjection\Container;
1617
use Symfony\Component\DependencyInjection\Exception\ServiceCircularReferenceException;
@@ -21,7 +22,7 @@
2122

2223
class ServiceLocatorTest extends BaseServiceLocatorTest
2324
{
24-
public function getServiceLocator(array $factories): ServiceLocator
25+
public function getServiceLocator(array $factories): ContainerInterface
2526
{
2627
return new ServiceLocator($factories);
2728
}

‎src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationTrustResolverTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public function getCredentials(): mixed
176176
{
177177
}
178178

179-
public function getUser(): string|\Stringable|UserInterface
179+
public function getUser(): UserInterface
180180
{
181181
}
182182

‎src/Symfony/Component/Security/Core/Tests/Authentication/Provider/DaoAuthenticationProviderTest.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -354,8 +354,3 @@ public function upgradePassword(PasswordAuthenticatedUserInterface $user, string
354354

355355
public function loadUserByIdentifier(string $identifier): UserInterface;
356356
}
357-
358-
interface DaoAuthenticationProviderTest_UserProvider extends UserProviderInterface
359-
{
360-
public function loadUserByUsername($username): UserInterface;
361-
}

‎src/Symfony/Component/Translation/Tests/IdentityTranslatorTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use Symfony\Component\Translation\IdentityTranslator;
1515
use Symfony\Contracts\Translation\Test\TranslatorTest;
16+
use Symfony\Contracts\Translation\TranslatorInterface;
1617

1718
class IdentityTranslatorTest extends TranslatorTest
1819
{
@@ -33,7 +34,7 @@ protected function tearDown(): void
3334
\Locale::setDefault($this->defaultLocale);
3435
}
3536

36-
public function getTranslator(): IdentityTranslator
37+
public function getTranslator(): TranslatorInterface
3738
{
3839
return new IdentityTranslator();
3940
}

‎src/Symfony/Contracts/Tests/Service/ServiceSubscriberTraitTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function aParentService(): Service1
4242
{
4343
}
4444

45-
public function setContainer(ContainerInterface $container): ?ContainerInterface
45+
public function setContainer(ContainerInterface $container)
4646
{
4747
return $container;
4848
}

0 commit comments

Comments
 (0)
0