From ddd540debf57ccf3f67f87a53eec5e52ec304e54 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 29 Nov 2021 17:56:46 +0100 Subject: [PATCH 01/52] Update CHANGELOG for 5.4.0 --- CHANGELOG-5.4.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG-5.4.md b/CHANGELOG-5.4.md index 98ea5ab9c9e74..5ba6dab3b6129 100644 --- a/CHANGELOG-5.4.md +++ b/CHANGELOG-5.4.md @@ -7,6 +7,20 @@ in 5.4 minor versions. To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v5.4.0...v5.4.1 +* 5.4.0 (2021-11-29) + + * bug #44309 [Messenger] Leverage DBAL's getNativeConnection() method (derrabus) + * bug #44300 [FrameworkBundle] Fix property-info phpstan extractor discovery (1ed) + * feature #44271 [Notifier] add Vonage bridge to replace the Nexmo one (nicolas-grekas) + * bug #44187 [Translation] [Loco] Fix idempotency of LocoProvider write method (welcoMattic) + * bug #43992 [Security] Do not overwrite already stored tokens for REMOTE_USER authentication (stlrnz) + * bug #43876 [Validator] Fix validation for single level domains (HypeMC) + * bug #44327 [Debug][ErrorHandler] Increased the reserved memory from 10k to 32k (sakalys) + * bug #44261 [Process] intersect with getenv() in case-insensitive manner to get default envs (stable-staple) + * bug #44295 [Serializer] fix support for lazy/unset properties (nicolas-grekas) + * bug #44277 [Notifier] Fix AllMySms bridge body content (afiocre) + * bug #44269 [DoctrineBridge] Revert " add support for the JSON type" (dunglas) + * 5.4.0-RC1 (2021-11-24) * security #cve-2021-41268 [SecurityBundle] Default signature_properties to the previous behavior (wouterj) From 64fe9e76e667c0b1932b215cdd35237751fd6040 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 29 Nov 2021 17:56:53 +0100 Subject: [PATCH 02/52] Update VERSION for 5.4.0 --- src/Symfony/Component/HttpKernel/Kernel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 1f8a2c37b5d8d..656324a4df7e8 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -78,12 +78,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl */ private static $freshCache = []; - public const VERSION = '5.4.0-DEV'; + public const VERSION = '5.4.0'; public const VERSION_ID = 50400; public const MAJOR_VERSION = 5; public const MINOR_VERSION = 4; public const RELEASE_VERSION = 0; - public const EXTRA_VERSION = 'DEV'; + public const EXTRA_VERSION = ''; public const END_OF_MAINTENANCE = '11/2024'; public const END_OF_LIFE = '11/2025'; From a12336a7cd5df9c2723eee62073bb9dd795a14d1 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 29 Nov 2021 18:00:40 +0100 Subject: [PATCH 03/52] Bump Symfony version to 5.4.1 --- src/Symfony/Component/HttpKernel/Kernel.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 656324a4df7e8..6a5546de95007 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -78,12 +78,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl */ private static $freshCache = []; - public const VERSION = '5.4.0'; - public const VERSION_ID = 50400; + public const VERSION = '5.4.1-DEV'; + public const VERSION_ID = 50401; public const MAJOR_VERSION = 5; public const MINOR_VERSION = 4; - public const RELEASE_VERSION = 0; - public const EXTRA_VERSION = ''; + public const RELEASE_VERSION = 1; + public const EXTRA_VERSION = 'DEV'; public const END_OF_MAINTENANCE = '11/2024'; public const END_OF_LIFE = '11/2025'; From e9d5b7b321f904bf9d4698b477d174eb5cc9a99b Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 29 Nov 2021 18:08:23 +0100 Subject: [PATCH 04/52] Bump Symfony version to 6.0.1 --- src/Symfony/Component/HttpKernel/Kernel.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 6c2d9b33e0d7a..4b12ac3ff5b36 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -78,12 +78,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl */ private static array $freshCache = []; - public const VERSION = '6.0.0'; - public const VERSION_ID = 60000; + public const VERSION = '6.0.1-DEV'; + public const VERSION_ID = 60001; public const MAJOR_VERSION = 6; public const MINOR_VERSION = 0; - public const RELEASE_VERSION = 0; - public const EXTRA_VERSION = ''; + public const RELEASE_VERSION = 1; + public const EXTRA_VERSION = 'DEV'; public const END_OF_MAINTENANCE = '07/2022'; public const END_OF_LIFE = '07/2022'; From 6466a181482ac9e1a742215989c2575d6fa17cd1 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Mon, 29 Nov 2021 18:54:34 +0100 Subject: [PATCH 05/52] Don't mention psr/container v3, it doesn't exist --- src/Symfony/Component/DependencyInjection/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json index 192efbdb5adee..e819daa14f650 100644 --- a/src/Symfony/Component/DependencyInjection/composer.json +++ b/src/Symfony/Component/DependencyInjection/composer.json @@ -42,7 +42,7 @@ "symfony/yaml": "<5.4" }, "provide": { - "psr/container-implementation": "1.1|2.0|3.0", + "psr/container-implementation": "1.1|2.0", "symfony/service-implementation": "1.1|2.0|3.0" }, "autoload": { From c55bc0f9a326cca5b1930a6fe65d1cb90f789d5f Mon Sep 17 00:00:00 2001 From: Robin Chalas Date: Tue, 30 Nov 2021 16:02:12 +0100 Subject: [PATCH 06/52] =?UTF-8?q?[SecurityBundle]=C2=A0Fix=20invalid=20ref?= =?UTF-8?q?erence=20with=20`always=5Fauthenticate=5Fbefore=5Fgranting`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SecurityBundle/DependencyInjection/SecurityExtension.php | 2 +- .../Tests/DependencyInjection/SecurityExtensionTest.php | 2 +- .../Tests/Functional/app/StandardFormLogin/legacy_config.yml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php index 6fe970f366f3f..d937a54c43dfc 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php @@ -122,7 +122,7 @@ public function load(array $configs, ContainerBuilder $container) if ($config['always_authenticate_before_granting']) { $authorizationChecker = $container->getDefinition('security.authorization_checker'); $authorizationCheckerArgs = $authorizationChecker->getArguments(); - array_splice($authorizationCheckerArgs, 1, 0, [new Reference('security.authentication_manager')]); + array_splice($authorizationCheckerArgs, 1, 0, [new Reference('security.authentication.manager')]); $authorizationChecker->setArguments($authorizationCheckerArgs); } diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php index 8747273b9e9a6..5037bf2b93549 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php @@ -834,7 +834,7 @@ public function testLegacyAuthorizationManagerSignature() $args = $container->getDefinition('security.authorization_checker')->getArguments(); $this->assertEquals('security.token_storage', (string) $args[0]); - $this->assertEquals('security.authentication_manager', (string) $args[1]); + $this->assertEquals('security.authentication.manager', (string) $args[1]); $this->assertEquals('security.access.decision_manager', (string) $args[2]); $this->assertEquals('%security.access.always_authenticate_before_granting%', (string) $args[3]); } diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/StandardFormLogin/legacy_config.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/StandardFormLogin/legacy_config.yml index e393772ae4b21..265e1d1c83d32 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/StandardFormLogin/legacy_config.yml +++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/StandardFormLogin/legacy_config.yml @@ -2,6 +2,7 @@ imports: - { resource: ./legacy_base_config.yml } security: + always_authenticate_before_granting: true firewalls: default: anonymous: ~ From 369d9d7c8db282b39aab95c73ce44940602605ff Mon Sep 17 00:00:00 2001 From: Thomas Calvet Date: Tue, 30 Nov 2021 12:58:03 +0100 Subject: [PATCH 07/52] [HttpClient] Fix handling error info in MockResponse --- .../HttpClient/Response/MockResponse.php | 4 +++ .../HttpClient/Tests/MockHttpClientTest.php | 31 +++---------------- .../Tests/Response/MockResponseTest.php | 11 +++++++ 3 files changed, 19 insertions(+), 27 deletions(-) diff --git a/src/Symfony/Component/HttpClient/Response/MockResponse.php b/src/Symfony/Component/HttpClient/Response/MockResponse.php index 8f5803202c1bf..c38a0a4f0cd6b 100644 --- a/src/Symfony/Component/HttpClient/Response/MockResponse.php +++ b/src/Symfony/Component/HttpClient/Response/MockResponse.php @@ -260,6 +260,10 @@ private static function readResponse(self $response, array $options, ResponseInt 'http_code' => $response->info['http_code'], ] + $info + $response->info; + if (null !== $response->info['error']) { + throw new TransportException($response->info['error']); + } + if (!isset($response->info['total_time'])) { $response->info['total_time'] = microtime(true) - $response->info['start_time']; } diff --git a/src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php index 75bf16d3e6c86..f97b0cbb363ff 100644 --- a/src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php +++ b/src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php @@ -18,7 +18,6 @@ use Symfony\Component\HttpClient\Response\ResponseStream; use Symfony\Contracts\HttpClient\ChunkInterface; use Symfony\Contracts\HttpClient\HttpClientInterface; -use Symfony\Contracts\HttpClient\ResponseInterface; class MockHttpClientTest extends HttpClientTestCase { @@ -141,16 +140,8 @@ protected function getHttpClient(string $testCase): HttpClientInterface break; case 'testDnsError': - $mock = $this->createMock(ResponseInterface::class); - $mock->expects($this->any()) - ->method('getStatusCode') - ->willThrowException(new TransportException('DSN error')); - $mock->expects($this->any()) - ->method('getInfo') - ->willReturn([]); - - $responses[] = $mock; - $responses[] = $mock; + $responses[] = $mockResponse = new MockResponse('', ['error' => 'DNS error']); + $responses[] = $mockResponse; break; case 'testToStream': @@ -164,12 +155,7 @@ protected function getHttpClient(string $testCase): HttpClientInterface break; case 'testTimeoutOnAccess': - $mock = $this->createMock(ResponseInterface::class); - $mock->expects($this->any()) - ->method('getHeaders') - ->willThrowException(new TransportException('Timeout')); - - $responses[] = $mock; + $responses[] = new MockResponse('', ['error' => 'Timeout']); break; case 'testAcceptHeader': @@ -231,16 +217,7 @@ protected function getHttpClient(string $testCase): HttpClientInterface break; case 'testMaxDuration': - $mock = $this->createMock(ResponseInterface::class); - $mock->expects($this->any()) - ->method('getContent') - ->willReturnCallback(static function (): void { - usleep(100000); - - throw new TransportException('Max duration was reached.'); - }); - - $responses[] = $mock; + $responses[] = new MockResponse('', ['error' => 'Max duration was reached.']); break; } diff --git a/src/Symfony/Component/HttpClient/Tests/Response/MockResponseTest.php b/src/Symfony/Component/HttpClient/Tests/Response/MockResponseTest.php index 2f389bcc80c79..c87c020ecac2c 100644 --- a/src/Symfony/Component/HttpClient/Tests/Response/MockResponseTest.php +++ b/src/Symfony/Component/HttpClient/Tests/Response/MockResponseTest.php @@ -4,6 +4,7 @@ use PHPUnit\Framework\TestCase; use Symfony\Component\HttpClient\Exception\JsonException; +use Symfony\Component\HttpClient\Exception\TransportException; use Symfony\Component\HttpClient\Response\MockResponse; /** @@ -83,4 +84,14 @@ public function toArrayErrors() 'message' => 'JSON content was expected to decode to an array, "integer" returned for "https://example.com/file.json".', ]; } + + public function testErrorIsTakenIntoAccountInInitialization() + { + $this->expectException(TransportException::class); + $this->expectExceptionMessage('ccc error'); + + MockResponse::fromRequest('GET', 'https://symfony.com', [], new MockResponse('', [ + 'error' => 'ccc error', + ]))->getStatusCode(); + } } From a6a3bced5dd48bec23ffb8b739f92b3e8c72831d Mon Sep 17 00:00:00 2001 From: Martins Sipenko Date: Tue, 30 Nov 2021 18:22:59 +0200 Subject: [PATCH 08/52] [Lock] create lock table if it does not exist --- src/Symfony/Component/Lock/Store/DoctrineDbalStore.php | 4 ++++ .../Component/Lock/Tests/Store/DoctrineDbalStoreTest.php | 1 - src/Symfony/Component/Lock/Tests/Store/PdoStoreTest.php | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php b/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php index ead96843fbb78..1a94f3fc64711 100644 --- a/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php +++ b/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php @@ -14,6 +14,7 @@ use Doctrine\DBAL\Connection; use Doctrine\DBAL\DriverManager; use Doctrine\DBAL\Exception as DBALException; +use Doctrine\DBAL\Exception\TableNotFoundException; use Doctrine\DBAL\ParameterType; use Doctrine\DBAL\Schema\Schema; use Symfony\Component\Lock\Exception\InvalidArgumentException; @@ -90,6 +91,9 @@ public function save(Key $key) ParameterType::STRING, ParameterType::STRING, ]); + } catch (TableNotFoundException $e) { + $this->createTable(); + $this->save($key); } catch (DBALException $e) { // the lock is already acquired. It could be us. Let's try to put off. $this->putOffExpiration($key, $this->initialTtl); diff --git a/src/Symfony/Component/Lock/Tests/Store/DoctrineDbalStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/DoctrineDbalStoreTest.php index c20e2d3088111..6a89e49399b0c 100644 --- a/src/Symfony/Component/Lock/Tests/Store/DoctrineDbalStoreTest.php +++ b/src/Symfony/Component/Lock/Tests/Store/DoctrineDbalStoreTest.php @@ -70,7 +70,6 @@ public function testDsn(string $dsn, string $file = null) try { $store = new DoctrineDbalStore($dsn); - $store->createTable(); $store->save($key); $this->assertTrue($store->exists($key)); diff --git a/src/Symfony/Component/Lock/Tests/Store/PdoStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/PdoStoreTest.php index 69968a2f11b80..dd15f0f1614b9 100644 --- a/src/Symfony/Component/Lock/Tests/Store/PdoStoreTest.php +++ b/src/Symfony/Component/Lock/Tests/Store/PdoStoreTest.php @@ -84,7 +84,6 @@ public function testDsn(string $dsn, string $file = null) try { $store = new PdoStore($dsn); - $store->createTable(); $store->save($key); $this->assertTrue($store->exists($key)); From 60742265b8aa90af8cbb55bac63ee1cfba592118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20H=C3=A9lias?= Date: Wed, 1 Dec 2021 10:14:13 +0100 Subject: [PATCH 09/52] ResponseListener needs only 2 parameters --- src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php index 00b8d8aafbd5a..53613d3b5020c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/web.php @@ -70,7 +70,6 @@ ->args([ param('kernel.charset'), abstract_arg('The "set_content_language_from_locale" config value'), - param('kernel.enabled_locales'), ]) ->tag('kernel.event_subscriber') From 731712b29fad177649b78859c5522b99f99febb4 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Mon, 29 Nov 2021 19:16:58 +0100 Subject: [PATCH 10/52] Update PR template --- .github/PULL_REQUEST_TEMPLATE.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 62662f876fd3a..5e7092d385910 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,6 +1,6 @@ | Q | A | ------------- | --- -| Branch? | 5.4 for features / 4.4 or 5.3 for bug fixes +| Branch? | 6.1 for features / 4.4, 5.3, 5.4 or 6.0 for bug fixes | Bug fix? | yes/no | New feature? | yes/no | Deprecations? | yes/no @@ -8,14 +8,14 @@ | License | MIT | Doc PR | symfony/symfony-docs#... From e5419730919bcab10ff9cf586a8db9585f0dca71 Mon Sep 17 00:00:00 2001 From: PierreRebeilleau Date: Tue, 23 Nov 2021 17:32:25 +0100 Subject: [PATCH 11/52] [Serializer] Remove some type hints for API Platform compatibility --- .github/expected-missing-return-types.diff | 142 ++++++++++++++++++ .../Normalizer/AbstractNormalizer.php | 10 +- .../Normalizer/AbstractObjectNormalizer.php | 16 +- .../Normalizer/DenormalizerInterface.php | 8 +- .../Normalizer/NormalizerInterface.php | 6 +- 5 files changed, 168 insertions(+), 14 deletions(-) diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff index 9652b1f590945..91fab2152b6c4 100644 --- a/.github/expected-missing-return-types.diff +++ b/.github/expected-missing-return-types.diff @@ -875,3 +875,145 @@ index 024da1884e..943790e875 100644 + public function getOption(string $name): mixed; /** +diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php +index b0a1f32..893fe59 100644 +--- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php ++++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php +@@ -222,7 +222,7 @@ abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerIn + * + * @return string[]|AttributeMetadataInterface[]|bool + */ +- protected function getAllowedAttributes(string|object $classOrObject, array $context, bool $attributesAsString = false) ++ protected function getAllowedAttributes(string|object $classOrObject, array $context, bool $attributesAsString = false): array|bool + { + $allowExtraAttributes = $context[self::ALLOW_EXTRA_ATTRIBUTES] ?? $this->defaultContext[self::ALLOW_EXTRA_ATTRIBUTES]; + if (!$this->classMetadataFactory) { +@@ -272,7 +272,7 @@ abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerIn + * + * @return bool + */ +- protected function isAllowedAttribute(object|string $classOrObject, string $attribute, string $format = null, array $context = []) ++ protected function isAllowedAttribute(object|string $classOrObject, string $attribute, string $format = null, array $context = []): bool + { + $ignoredAttributes = $context[self::IGNORED_ATTRIBUTES] ?? $this->defaultContext[self::IGNORED_ATTRIBUTES]; + if (\in_array($attribute, $ignoredAttributes)) { +@@ -323,7 +323,7 @@ abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerIn + * @throws RuntimeException + * @throws MissingConstructorArgumentsException + */ +- protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, string $format = null) ++ protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, string $format = null): object + { + if (null !== $object = $this->extractObjectToPopulate($class, $context, self::OBJECT_TO_POPULATE)) { + unset($context[self::OBJECT_TO_POPULATE]); +diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php +index a241215..c6bcc63 100644 +--- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php ++++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php +@@ -143,7 +143,7 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer + /** + * {@inheritdoc} + */ +- public function normalize(mixed $object, string $format = null, array $context = []) ++ public function normalize(mixed $object, string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null + { + if (!isset($context['cache_key'])) { + $context['cache_key'] = $this->getCacheKey($format, $context); +@@ -276,7 +276,7 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer + /** + * {@inheritdoc} + */ +- protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, string $format = null) ++ protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, string $format = null): object + { + if ($this->classDiscriminatorResolver && $mapping = $this->classDiscriminatorResolver->getMappingForClass($class)) { + if (!isset($data[$mapping->getTypeProperty()])) { +@@ -338,19 +338,19 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer + * + * @return string[] + */ +- abstract protected function extractAttributes(object $object, string $format = null, array $context = []); ++ abstract protected function extractAttributes(object $object, string $format = null, array $context = []): array; + + /** + * Gets the attribute value. + * + * @return mixed + */ +- abstract protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []); ++ abstract protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []): mixed; + + /** + * {@inheritdoc} + */ +- public function supportsDenormalization(mixed $data, string $type, string $format = null) ++ public function supportsDenormalization(mixed $data, string $type, string $format = null): bool + { + return class_exists($type) || (interface_exists($type, false) && $this->classDiscriminatorResolver && null !== $this->classDiscriminatorResolver->getMappingForClass($type)); + } +@@ -358,7 +358,7 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer + /** + * {@inheritdoc} + */ +- public function denormalize(mixed $data, string $type, string $format = null, array $context = []) ++ public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed + { + if (!isset($context['cache_key'])) { + $context['cache_key'] = $this->getCacheKey($format, $context); +diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php +index 5e94400..726d89c 100644 +--- a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php ++++ b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php +@@ -44,7 +44,7 @@ interface DenormalizerInterface + * @throws RuntimeException Occurs if the class cannot be instantiated + * @throws ExceptionInterface Occurs for all the other cases of errors + */ +- public function denormalize(mixed $data, string $type, string $format = null, array $context = []); ++ public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed; + + /** + * Checks whether the given class is supported for denormalization by this normalizer. +@@ -55,5 +55,5 @@ interface DenormalizerInterface + * + * @return bool + */ +- public function supportsDenormalization(mixed $data, string $type, string $format = null); ++ public function supportsDenormalization(mixed $data, string $type, string $format = null): bool; + } +diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php +index fb4bee4..00e8ad0 100644 +--- a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php ++++ b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php +@@ -36,7 +36,7 @@ interface NormalizerInterface + * @throws LogicException Occurs when the normalizer is not called in an expected context + * @throws ExceptionInterface Occurs for all the other cases of errors + */ +- public function normalize(mixed $object, string $format = null, array $context = []); ++ public function normalize(mixed $object, string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null; + + /** + * Checks whether the given class is supported for normalization by this normalizer. +diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php +index c6bcc63..2ed1af7 100644 +--- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php ++++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php +@@ -135,7 +135,7 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer + /** + * {@inheritdoc} + */ +- public function supportsNormalization(mixed $data, string $format = null) ++ public function supportsNormalization(mixed $data, string $format = null): bool + { + return \is_object($data) && !$data instanceof \Traversable; + } +diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php +index d9f8df9..a7a60ad 100644 +--- a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php ++++ b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php +@@ -46,5 +46,5 @@ interface NormalizerInterface + * + * @return bool + */ +- public function supportsNormalization(mixed $data, string $format = null); ++ public function supportsNormalization(mixed $data, string $format = null): bool; + } diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php index a118639dfc8c5..b0a1f3218b830 100644 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php @@ -222,7 +222,7 @@ protected function handleCircularReference(object $object, string $format = null * * @return string[]|AttributeMetadataInterface[]|bool */ - protected function getAllowedAttributes(string|object $classOrObject, array $context, bool $attributesAsString = false): array|bool + protected function getAllowedAttributes(string|object $classOrObject, array $context, bool $attributesAsString = false) { $allowExtraAttributes = $context[self::ALLOW_EXTRA_ATTRIBUTES] ?? $this->defaultContext[self::ALLOW_EXTRA_ATTRIBUTES]; if (!$this->classMetadataFactory) { @@ -269,8 +269,10 @@ protected function getGroups(array $context): array /** * Is this attribute allowed? + * + * @return bool */ - protected function isAllowedAttribute(object|string $classOrObject, string $attribute, string $format = null, array $context = []): bool + protected function isAllowedAttribute(object|string $classOrObject, string $attribute, string $format = null, array $context = []) { $ignoredAttributes = $context[self::IGNORED_ATTRIBUTES] ?? $this->defaultContext[self::IGNORED_ATTRIBUTES]; if (\in_array($attribute, $ignoredAttributes)) { @@ -316,10 +318,12 @@ protected function getConstructor(array &$data, string $class, array &$context, * is removed from the context before being returned to avoid side effects * when recursively normalizing an object graph. * + * @return object + * * @throws RuntimeException * @throws MissingConstructorArgumentsException */ - protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, string $format = null): object + protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, string $format = null) { if (null !== $object = $this->extractObjectToPopulate($class, $context, self::OBJECT_TO_POPULATE)) { unset($context[self::OBJECT_TO_POPULATE]); diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php index 13a34ef451fa6..a241215133532 100644 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php @@ -135,7 +135,7 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory /** * {@inheritdoc} */ - public function supportsNormalization(mixed $data, string $format = null): bool + public function supportsNormalization(mixed $data, string $format = null) { return \is_object($data) && !$data instanceof \Traversable; } @@ -143,7 +143,7 @@ public function supportsNormalization(mixed $data, string $format = null): bool /** * {@inheritdoc} */ - public function normalize(mixed $object, string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null + public function normalize(mixed $object, string $format = null, array $context = []) { if (!isset($context['cache_key'])) { $context['cache_key'] = $this->getCacheKey($format, $context); @@ -276,7 +276,7 @@ private function getAttributeMetadata(object|string $objectOrClass, string $attr /** * {@inheritdoc} */ - protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, string $format = null): object + protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, string $format = null) { if ($this->classDiscriminatorResolver && $mapping = $this->classDiscriminatorResolver->getMappingForClass($class)) { if (!isset($data[$mapping->getTypeProperty()])) { @@ -338,17 +338,19 @@ protected function getAttributes(object $object, ?string $format, array $context * * @return string[] */ - abstract protected function extractAttributes(object $object, string $format = null, array $context = []): array; + abstract protected function extractAttributes(object $object, string $format = null, array $context = []); /** * Gets the attribute value. + * + * @return mixed */ - abstract protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []): mixed; + abstract protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []); /** * {@inheritdoc} */ - public function supportsDenormalization(mixed $data, string $type, string $format = null): bool + public function supportsDenormalization(mixed $data, string $type, string $format = null) { return class_exists($type) || (interface_exists($type, false) && $this->classDiscriminatorResolver && null !== $this->classDiscriminatorResolver->getMappingForClass($type)); } @@ -356,7 +358,7 @@ public function supportsDenormalization(mixed $data, string $type, string $forma /** * {@inheritdoc} */ - public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed + public function denormalize(mixed $data, string $type, string $format = null, array $context = []) { if (!isset($context['cache_key'])) { $context['cache_key'] = $this->getCacheKey($format, $context); diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php index 95131b84d4a15..5e94400b80006 100644 --- a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php +++ b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php @@ -34,6 +34,8 @@ interface DenormalizerInterface * @param string $format Format the given data was extracted from * @param array $context Options available to the denormalizer * + * @return mixed + * * @throws BadMethodCallException Occurs when the normalizer is not called in an expected context * @throws InvalidArgumentException Occurs when the arguments are not coherent or not supported * @throws UnexpectedValueException Occurs when the item cannot be hydrated with the given data @@ -42,7 +44,7 @@ interface DenormalizerInterface * @throws RuntimeException Occurs if the class cannot be instantiated * @throws ExceptionInterface Occurs for all the other cases of errors */ - public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed; + public function denormalize(mixed $data, string $type, string $format = null, array $context = []); /** * Checks whether the given class is supported for denormalization by this normalizer. @@ -50,6 +52,8 @@ public function denormalize(mixed $data, string $type, string $format = null, ar * @param mixed $data Data to denormalize from * @param string $type The class to which the data should be denormalized * @param string $format The format being deserialized from + * + * @return bool */ - public function supportsDenormalization(mixed $data, string $type, string $format = null): bool; + public function supportsDenormalization(mixed $data, string $type, string $format = null); } diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php index 419c58624addb..30eeafb47bac7 100644 --- a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php +++ b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php @@ -36,13 +36,15 @@ interface NormalizerInterface * @throws LogicException Occurs when the normalizer is not called in an expected context * @throws ExceptionInterface Occurs for all the other cases of errors */ - public function normalize(mixed $object, string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null; + public function normalize(mixed $object, string $format = null, array $context = []); /** * Checks whether the given class is supported for normalization by this normalizer. * * @param mixed $data Data to normalize * @param string $format The format being (de-)serialized from or into + * + * @return bool */ - public function supportsNormalization(mixed $data, string $format = null): bool; + public function supportsNormalization(mixed $data, string $format = null); } From 70310ca9f3d3aebe02bca32f7cec9d40a3e8080b Mon Sep 17 00:00:00 2001 From: Kevin Bond Date: Tue, 30 Nov 2021 13:33:01 -0500 Subject: [PATCH 12/52] [DoctrineBridge] fix calling get_class on non-object --- .../Constraints/UniqueEntityValidatorTest.php | 27 +++++++++++++++++++ .../Constraints/UniqueEntityValidator.php | 5 ++++ 2 files changed, 32 insertions(+) diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php index c0945114c9c23..bc0041c20b64c 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php @@ -37,6 +37,7 @@ use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntityValidator; use Symfony\Component\Validator\Exception\ConstraintDefinitionException; +use Symfony\Component\Validator\Exception\UnexpectedValueException; use Symfony\Component\Validator\Test\ConstraintValidatorTestCase; /** @@ -821,6 +822,32 @@ public function testValidateUniquenessWithEmptyIterator($entity, $result) $this->assertNoViolation(); } + public function testValueMustBeObject() + { + $constraint = new UniqueEntity([ + 'message' => 'myMessage', + 'fields' => ['name'], + 'em' => self::EM_NAME, + ]); + + $this->expectException(UnexpectedValueException::class); + + $this->validator->validate('foo', $constraint); + } + + public function testValueCanBeNull() + { + $constraint = new UniqueEntity([ + 'message' => 'myMessage', + 'fields' => ['name'], + 'em' => self::EM_NAME, + ]); + + $this->validator->validate(null, $constraint); + + $this->assertNoViolation(); + } + public function resultWithEmptyIterator(): array { $entity = new SingleIntIdEntity(1, 'foo'); diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php index df17e0eedd4c8..cce8cb9079723 100644 --- a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php +++ b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php @@ -16,6 +16,7 @@ use Symfony\Component\Validator\ConstraintValidator; use Symfony\Component\Validator\Exception\ConstraintDefinitionException; use Symfony\Component\Validator\Exception\UnexpectedTypeException; +use Symfony\Component\Validator\Exception\UnexpectedValueException; /** * Unique Entity Validator checks if one or a set of fields contain unique values. @@ -61,6 +62,10 @@ public function validate($entity, Constraint $constraint) return; } + if (!\is_object($entity)) { + throw new UnexpectedValueException($entity, 'object'); + } + if ($constraint->em) { $em = $this->registry->getManager($constraint->em); From bd4ace6cf9a3446c15f4b1bfa1d782e4ee4001ef Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Mon, 29 Nov 2021 19:01:24 +0100 Subject: [PATCH 13/52] [gha] swap the php versions we use in jobs --- .github/workflows/unit-tests.yml | 8 +- src/Symfony/Bridge/Doctrine/composer.json | 2 + .../Component/ErrorHandler/ErrorHandler.php | 4 +- .../Tests/phpt/exception_rethrown.phpt | 6 +- .../Tests/ConstraintValidatorTest.php | 4 +- src/Symfony/Component/Validator/composer.json | 2 +- .../VarDumper/Caster/ReflectionCaster.php | 20 ++-- .../Tests/Caster/ReflectionCasterTest.php | 98 +++---------------- 8 files changed, 43 insertions(+), 101 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 157f6462b4e67..9671caa0ed004 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -21,10 +21,10 @@ jobs: matrix: include: - php: '7.2' - - php: '8.1' - php: '7.4' - mode: high-deps - php: '8.0' + mode: high-deps + - php: '8.1' mode: low-deps - php: '8.2' mode: experimental @@ -172,14 +172,14 @@ jobs: exit 0 fi - (cd src/Symfony/Component/HttpFoundation; cp composer.json composer.bak; composer require --dev --no-update mongodb/mongodb) - if [[ "${{ matrix.mode }}" = low-deps ]]; then echo "$COMPONENTS" | xargs -n1 | parallel -j +3 "_run_tests {} 'cd {} && $COMPOSER_UP --prefer-lowest --prefer-stable && $PHPUNIT'" exit 0 fi + (cd src/Symfony/Component/HttpFoundation; cp composer.json composer.bak; composer require --dev --no-update mongodb/mongodb) + # matrix.mode = high-deps echo "$COMPONENTS" | xargs -n1 | parallel -j +3 "_run_tests {} 'cd {} && $COMPOSER_UP && $PHPUNIT$LEGACY'" || X=1 diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index 79961033bc0a6..cce2609cf1a89 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -49,11 +49,13 @@ "conflict": { "doctrine/dbal": "<2.7", "doctrine/orm": "<2.6.3", + "doctrine/lexer": "<1.1", "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0", "symfony/dependency-injection": "<3.4", "symfony/form": "<4.4", "symfony/http-kernel": "<4.3.7", "symfony/messenger": "<4.3", + "symfony/proxy-manager-bridge": "<4.4.19", "symfony/security-core": "<4.4", "symfony/validator": "<4.4.2|<5.0.2,>=5.0" }, diff --git a/src/Symfony/Component/ErrorHandler/ErrorHandler.php b/src/Symfony/Component/ErrorHandler/ErrorHandler.php index 9e523fd4c11f4..ceadcaf674fc6 100644 --- a/src/Symfony/Component/ErrorHandler/ErrorHandler.php +++ b/src/Symfony/Component/ErrorHandler/ErrorHandler.php @@ -609,7 +609,9 @@ public function handleException(\Throwable $exception) } $loggedErrors = $this->loggedErrors; - $this->loggedErrors = $exception === $handlerException ? 0 : $this->loggedErrors; + if ($exception === $handlerException) { + $this->loggedErrors &= ~$type; + } try { $this->handleException($handlerException); diff --git a/src/Symfony/Component/ErrorHandler/Tests/phpt/exception_rethrown.phpt b/src/Symfony/Component/ErrorHandler/Tests/phpt/exception_rethrown.phpt index 06540f4530121..be5ce6a5cdffa 100644 --- a/src/Symfony/Component/ErrorHandler/Tests/phpt/exception_rethrown.phpt +++ b/src/Symfony/Component/ErrorHandler/Tests/phpt/exception_rethrown.phpt @@ -16,7 +16,9 @@ if (true) { { public function log($level, $message, array $context = []): void { - echo 'LOG: ', $message, "\n"; + if (0 !== strpos($message, 'Deprecated: ')) { + echo 'LOG: ', $message, "\n"; + } } } } @@ -34,5 +36,5 @@ Exception {%S #message: "foo" #code: 0 #file: "%s" - #line: 25 + #line: 27 } diff --git a/src/Symfony/Component/Validator/Tests/ConstraintValidatorTest.php b/src/Symfony/Component/Validator/Tests/ConstraintValidatorTest.php index 6ca3eab41fd6e..aeaef472fb03d 100644 --- a/src/Symfony/Component/Validator/Tests/ConstraintValidatorTest.php +++ b/src/Symfony/Component/Validator/Tests/ConstraintValidatorTest.php @@ -15,13 +15,15 @@ use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\ConstraintValidator; -final class ConstraintValidatorTest extends TestCase +class ConstraintValidatorTest extends TestCase { /** * @dataProvider formatValueProvider */ public function testFormatValue($expected, $value, $format = 0) { + \Locale::setDefault('en'); + $this->assertSame($expected, (new TestFormatValueConstraintValidator())->formatValueProxy($value, $format)); } diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json index 0e84422e8deaf..72617c39cea09 100644 --- a/src/Symfony/Component/Validator/composer.json +++ b/src/Symfony/Component/Validator/composer.json @@ -41,7 +41,7 @@ "egulias/email-validator": "^2.1.10|^3" }, "conflict": { - "doctrine/lexer": "<1.0.2", + "doctrine/lexer": "<1.1", "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0", "symfony/dependency-injection": "<3.4", "symfony/http-kernel": "<4.4", diff --git a/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php b/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php index 819a618765dc5..2a74b25f21499 100644 --- a/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php +++ b/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php @@ -134,7 +134,7 @@ public static function castReflectionGenerator(\ReflectionGenerator $c, array $a array_unshift($trace, [ 'function' => 'yield', 'file' => $function->getExecutingFile(), - 'line' => $function->getExecutingLine() - 1, + 'line' => $function->getExecutingLine() - (int) (\PHP_VERSION_ID < 80100), ]); $trace[] = $frame; $a[$prefix.'trace'] = new TraceStub($trace, false, 0, -1, -1); @@ -263,15 +263,17 @@ public static function castParameter(\ReflectionParameter $c, array $a, Stub $st unset($a[$prefix.'allowsNull']); } - try { - $a[$prefix.'default'] = $v = $c->getDefaultValue(); - if ($c->isDefaultValueConstant()) { - $a[$prefix.'default'] = new ConstStub($c->getDefaultValueConstantName(), $v); - } - if (null === $v) { - unset($a[$prefix.'allowsNull']); + if ($c->isOptional()) { + try { + $a[$prefix.'default'] = $v = $c->getDefaultValue(); + if ($c->isDefaultValueConstant()) { + $a[$prefix.'default'] = new ConstStub($c->getDefaultValueConstantName(), $v); + } + if (null === $v) { + unset($a[$prefix.'allowsNull']); + } + } catch (\ReflectionException $e) { } - } catch (\ReflectionException $e) { } return $a; diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php index ff259b345793d..3dae54ce46b33 100644 --- a/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php +++ b/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php @@ -122,21 +122,8 @@ public function testReflectionParameter() { $var = new \ReflectionParameter(reflectionParameterFixture::class, 0); - if (\PHP_VERSION_ID < 80100) { - $this->assertDumpMatchesFormat( - <<<'EOTXT' -ReflectionParameter { - +name: "arg1" - position: 0 - typeHint: "Symfony\Component\VarDumper\Tests\Fixtures\NotLoadableClass" - default: null -} -EOTXT - , $var - ); - } else { - $this->assertDumpMatchesFormat( - <<<'EOTXT' + $this->assertDumpMatchesFormat( + <<<'EOTXT' ReflectionParameter { +name: "arg1" position: 0 @@ -145,8 +132,7 @@ public function testReflectionParameter() } EOTXT , $var - ); - } + ); } public function testReflectionParameterScalar() @@ -468,38 +454,20 @@ public function testGenerator() $generator = new GeneratorDemo(); $generator = $generator->baz(); - if (\PHP_VERSION_ID < 80100) { - $expectedDump = <<<'EODUMP' + $expectedDump = <<<'EODUMP' Generator { this: Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo { …} - executing: { + %s: { %sGeneratorDemo.php:14 { Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo->baz() › { › yield from bar(); › } } - } +%A} closed: false } EODUMP; - } else { - $expectedDump = <<<'EODUMP' -Generator { - this: Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo { …} - trace: { - ./src/Symfony/Component/VarDumper/Tests/Fixtures/GeneratorDemo.php:13 { - Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo->baz() - › public function baz() - › { - › yield from bar(); - } - Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo->baz() {} - } - closed: false -} -EODUMP; - } $this->assertDumpMatchesFormat($expectedDump, $generator); @@ -507,69 +475,33 @@ public function testGenerator() break; } - if (\PHP_VERSION_ID < 80100) { - $expectedDump = <<<'EODUMP' + $expectedDump = <<<'EODUMP' array:2 [ 0 => ReflectionGenerator { this: Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo { …} - trace: { - %s%eTests%eFixtures%eGeneratorDemo.php:9 { + %s: { + %s%eTests%eFixtures%eGeneratorDemo.php:%d { Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo::foo() - › { - › yield 1; - › } - } +%A › yield 1; +%A } %s%eTests%eFixtures%eGeneratorDemo.php:20 { …} %s%eTests%eFixtures%eGeneratorDemo.php:14 { …} - } +%A } closed: false } 1 => Generator { - executing: { - %sGeneratorDemo.php:10 { + %s: { + %s%eTests%eFixtures%eGeneratorDemo.php:%d { Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo::foo() › yield 1; › } › } - } - closed: false - } -] -EODUMP; - } else { - $expectedDump = <<<'EODUMP' -array:2 [ - 0 => ReflectionGenerator { - this: Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo { …} - trace: { - %s%eTests%eFixtures%eGeneratorDemo.php:9 { - Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo::foo() - › { - › yield 1; - › } - } - %s%eTests%eFixtures%eGeneratorDemo.php:20 { …} - %s%eTests%eFixtures%eGeneratorDemo.php:14 { …} - Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo->baz() {} - } - closed: false - } - 1 => Generator { - trace: { - ./src/Symfony/Component/VarDumper/Tests/Fixtures/GeneratorDemo.php:9 { - Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo::foo() - › { - › yield 1; - › } - } - Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo::foo() {} - } +%A } closed: false } ] EODUMP; - } $r = new \ReflectionGenerator($generator); $this->assertDumpMatchesFormat($expectedDump, [$r, $r->getExecutingGenerator()]); From afab34d8ed9050878d209946f68a645d18b91bbc Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 1 Dec 2021 15:17:12 +0100 Subject: [PATCH 14/52] [HttpKernel] fix sending Vary: Accept-Language when appropriate --- .../Component/HttpKernel/EventListener/LocaleListener.php | 1 + .../Component/HttpKernel/EventListener/ResponseListener.php | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php b/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php index 5d77377c6046b..f19e13649e988 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php @@ -70,6 +70,7 @@ private function setLocale(Request $request) $request->setLocale($locale); } elseif ($this->useAcceptLanguageHeader && $this->enabledLocales && ($preferredLanguage = $request->getPreferredLanguage($this->enabledLocales))) { $request->setLocale($preferredLanguage); + $request->attributes->set('_vary_by_language', true); } } diff --git a/src/Symfony/Component/HttpKernel/EventListener/ResponseListener.php b/src/Symfony/Component/HttpKernel/EventListener/ResponseListener.php index bb51c6dc0dbda..a4090159bb751 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/ResponseListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/ResponseListener.php @@ -50,6 +50,9 @@ public function onKernelResponse(ResponseEvent $event) if ($this->addContentLanguageHeader && !$response->isInformational() && !$response->isEmpty() && !$response->headers->has('Content-Language')) { $response->headers->set('Content-Language', $event->getRequest()->getLocale()); + } + + if ($event->getRequest()->attributes->get('_vary_by_language')) { $response->setVary('Accept-Language', false); } From 3f710c2e5eac0b1d19ff4c2c99012eff367becc8 Mon Sep 17 00:00:00 2001 From: David Maicher Date: Tue, 30 Nov 2021 21:15:45 +0100 Subject: [PATCH 15/52] [HttpFoundation] fix SessionHandlerFactory using connections --- .../Storage/Handler/SessionHandlerFactory.php | 2 +- .../Handler/SessionHandlerFactoryTest.php | 31 ++++++++++++++++++- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/SessionHandlerFactory.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/SessionHandlerFactory.php index 0f1ce5c2b8ecd..f3f7b201d9dea 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/SessionHandlerFactory.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/SessionHandlerFactory.php @@ -30,7 +30,7 @@ public static function createHandler($connection): AbstractSessionHandler throw new \TypeError(sprintf('Argument 1 passed to "%s()" must be a string or a connection object, "%s" given.', __METHOD__, get_debug_type($connection))); } - if ($options = parse_url($connection)) { + if ($options = \is_string($connection) ? parse_url($connection) : false) { parse_str($options['query'] ?? '', $options); } diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/SessionHandlerFactoryTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/SessionHandlerFactoryTest.php index 46d6cd40151d5..9f06a7c8675da 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/SessionHandlerFactoryTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/SessionHandlerFactoryTest.php @@ -12,6 +12,7 @@ namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler; use PHPUnit\Framework\TestCase; +use Symfony\Component\HttpFoundation\Session\Storage\Handler\RedisSessionHandler; use Symfony\Component\HttpFoundation\Session\Storage\Handler\SessionHandlerFactory; use Symfony\Component\HttpFoundation\Session\Storage\Handler\StrictSessionHandler; @@ -28,7 +29,7 @@ class SessionHandlerFactoryTest extends TestCase /** * @dataProvider provideConnectionDSN */ - public function testCreateHandler(string $connectionDSN, string $expectedPath, string $expectedHandlerType) + public function testCreateFileHandler(string $connectionDSN, string $expectedPath, string $expectedHandlerType) { $handler = SessionHandlerFactory::createHandler($connectionDSN); @@ -45,4 +46,32 @@ public function provideConnectionDSN(): array 'native file handler using provided save_path' => ['connectionDSN' => 'file://'.$base.'/session/storage', 'expectedPath' => $base.'/session/storage', 'expectedHandlerType' => StrictSessionHandler::class], ]; } + + /** + * @requires extension redis + */ + public function testCreateRedisHandlerFromConnectionObject() + { + $handler = SessionHandlerFactory::createHandler($this->createMock(\Redis::class)); + $this->assertInstanceOf(RedisSessionHandler::class, $handler); + } + + /** + * @requires extension redis + */ + public function testCreateRedisHandlerFromDsn() + { + $handler = SessionHandlerFactory::createHandler('redis://localhost?prefix=foo&ttl=3600&ignored=bar'); + $this->assertInstanceOf(RedisSessionHandler::class, $handler); + + $reflection = new \ReflectionObject($handler); + + $prefixProperty = $reflection->getProperty('prefix'); + $prefixProperty->setAccessible(true); + $this->assertSame('foo', $prefixProperty->getValue($handler)); + + $ttlProperty = $reflection->getProperty('ttl'); + $ttlProperty->setAccessible(true); + $this->assertSame('3600', $ttlProperty->getValue($handler)); + } } From 366cb1ad3aa4de4698c79fe4d065fd3fb6257de6 Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Tue, 30 Nov 2021 13:06:07 +0100 Subject: [PATCH 16/52] Avoid duplicated session listener registration in tests --- .../DependencyInjection/FrameworkExtension.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index 9b761dbdd3934..17950515dd922 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -350,6 +350,11 @@ public function load(array $configs, ContainerBuilder $container) $this->sessionConfigEnabled = true; $this->registerSessionConfiguration($config['session'], $container, $loader); + if (!empty($config['test'])) { + // test listener will replace the existing session listener + // as we are aliasing to avoid duplicated registered events + $container->setAlias('session_listener', 'test.session.listener'); + } } elseif (!empty($config['test'])) { $container->removeDefinition('test.session.listener'); } From 0e56bf22e2ccd91bba8653ae23754cc0252cb3e9 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 1 Dec 2021 16:43:39 +0100 Subject: [PATCH 17/52] Fix low-deps --- .github/workflows/unit-tests.yml | 3 +++ src/Symfony/Bridge/Doctrine/composer.json | 1 + src/Symfony/Component/Lock/composer.json | 1 - src/Symfony/Component/Runtime/composer.json | 6 +++--- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 9671caa0ed004..2442e0caf7b92 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -179,12 +179,14 @@ jobs: fi (cd src/Symfony/Component/HttpFoundation; cp composer.json composer.bak; composer require --dev --no-update mongodb/mongodb) + (cd src/Symfony/Component/Lock; cp composer.json composer.bak; composer require --dev --no-update mongodb/mongodb) # matrix.mode = high-deps echo "$COMPONENTS" | xargs -n1 | parallel -j +3 "_run_tests {} 'cd {} && $COMPOSER_UP && $PHPUNIT$LEGACY'" || X=1 # get a list of the patched components (relies on .github/build-packages.php being called in the previous step) (cd src/Symfony/Component/HttpFoundation; mv composer.bak composer.json) + (cd src/Symfony/Component/Lock; mv composer.bak composer.json) PATCHED_COMPONENTS=$(git diff --name-only src/ | grep composer.json || true) # for 5.4 LTS, checkout and test previous major with the patched components (only for patched components) @@ -198,6 +200,7 @@ jobs: git checkout -m FETCH_HEAD PATCHED_COMPONENTS=$(echo "$PATCHED_COMPONENTS" | xargs dirname | xargs -n1 -I{} bash -c "[ -e '{}/phpunit.xml.dist' ] && echo '{}'" | sort || true) (cd src/Symfony/Component/HttpFoundation; composer require --dev --no-update mongodb/mongodb) + (cd src/Symfony/Component/Lock; composer require --dev --no-update mongodb/mongodb) if [[ $PATCHED_COMPONENTS ]]; then echo "::group::install phpunit" ./phpunit install diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index 7bc4feb945a08..1ead9f0eb4b06 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -52,6 +52,7 @@ }, "conflict": { "doctrine/dbal": "<2.10", + "doctrine/lexer": "<1.1", "doctrine/orm": "<2.7.3", "phpunit/phpunit": "<5.4.3", "symfony/dependency-injection": "<4.4", diff --git a/src/Symfony/Component/Lock/composer.json b/src/Symfony/Component/Lock/composer.json index 2c4c81c96df40..134ffb57abedb 100644 --- a/src/Symfony/Component/Lock/composer.json +++ b/src/Symfony/Component/Lock/composer.json @@ -23,7 +23,6 @@ }, "require-dev": { "doctrine/dbal": "^2.10|^3.0", - "mongodb/mongodb": "~1.1", "predis/predis": "~1.0" }, "conflict": { diff --git a/src/Symfony/Component/Runtime/composer.json b/src/Symfony/Component/Runtime/composer.json index 668130cdbc2e2..9c8e19ded6d3e 100644 --- a/src/Symfony/Component/Runtime/composer.json +++ b/src/Symfony/Component/Runtime/composer.json @@ -21,10 +21,10 @@ }, "require-dev": { "composer/composer": "^1.0.2|^2.0", - "symfony/console": "^4.4|^5", + "symfony/console": "^4.4.30|^5.3.7", "symfony/dotenv": "^5.1", - "symfony/http-foundation": "^4.4|^5", - "symfony/http-kernel": "^4.4|^5" + "symfony/http-foundation": "^4.4.30|^5.3.7", + "symfony/http-kernel": "^4.4.30|^5.3.7" }, "conflict": { "symfony/dotenv": "<5.1" From 828fd2d14111ca496edf68d284ffa50d6b502aa8 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 1 Dec 2021 17:25:19 +0100 Subject: [PATCH 18/52] [HttpFoundation] fix tests --- .../Tests/Session/Storage/Handler/SessionHandlerFactoryTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/SessionHandlerFactoryTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/SessionHandlerFactoryTest.php index 9f06a7c8675da..8ec2be4b14b30 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/SessionHandlerFactoryTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/SessionHandlerFactoryTest.php @@ -72,6 +72,6 @@ public function testCreateRedisHandlerFromDsn() $ttlProperty = $reflection->getProperty('ttl'); $ttlProperty->setAccessible(true); - $this->assertSame('3600', $ttlProperty->getValue($handler)); + $this->assertSame(3600, $ttlProperty->getValue($handler)); } } From b2fe0e0f976dbb55e1acc05fa3fff519d515cc7d Mon Sep 17 00:00:00 2001 From: Thomas Calvet Date: Wed, 1 Dec 2021 10:04:50 +0100 Subject: [PATCH 19/52] [DependencyInjection] Skip parameter attribute configurators in AttributeAutoconfigurationPass if we can't get the constructor reflector --- .../AttributeAutoconfigurationPass.php | 19 ++++++++++++++----- .../Tests/Compiler/IntegrationTest.php | 16 ++++++++++++++++ 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AttributeAutoconfigurationPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AttributeAutoconfigurationPass.php index f5094996d949f..4db7185cf534b 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/AttributeAutoconfigurationPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/AttributeAutoconfigurationPass.php @@ -15,6 +15,7 @@ use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Definition; use Symfony\Component\DependencyInjection\Exception\LogicException; +use Symfony\Component\DependencyInjection\Exception\RuntimeException; /** * @author Alexander M. Turek @@ -99,11 +100,19 @@ protected function processValue($value, bool $isRoot = false) } } - if ($this->parameterAttributeConfigurators && $constructorReflector = $this->getConstructor($value, false)) { - foreach ($constructorReflector->getParameters() as $parameterReflector) { - foreach ($parameterReflector->getAttributes() as $attribute) { - if ($configurator = $this->parameterAttributeConfigurators[$attribute->getName()] ?? null) { - $configurator($conditionals, $attribute->newInstance(), $parameterReflector); + if ($this->parameterAttributeConfigurators) { + try { + $constructorReflector = $this->getConstructor($value, false); + } catch (RuntimeException $e) { + $constructorReflector = null; + } + + if ($constructorReflector) { + foreach ($constructorReflector->getParameters() as $parameterReflector) { + foreach ($parameterReflector->getAttributes() as $attribute) { + if ($configurator = $this->parameterAttributeConfigurators[$attribute->getName()] ?? null) { + $configurator($conditionals, $attribute->newInstance(), $parameterReflector); + } } } } diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php index 1e5df4879673e..6624f74901320 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php @@ -976,6 +976,11 @@ static function (ChildDefinition $definition, CustomParameterAttribute $attribut ->setPublic(true) ->setAutoconfigured(true); + $container->register('failing_factory', \stdClass::class); + $container->register('ccc', TaggedService4::class) + ->setFactory([new Reference('failing_factory'), 'create']) + ->setAutoconfigured(true); + $collector = new TagCollector(); $container->addCompilerPass($collector); @@ -996,6 +1001,17 @@ static function (ChildDefinition $definition, CustomParameterAttribute $attribut ['property' => 'name'], ['someAttribute' => 'on name', 'priority' => 0, 'property' => 'name'], ], + 'ccc' => [ + ['class' => TaggedService4::class], + ['method' => 'fooAction'], + ['someAttribute' => 'on fooAction', 'priority' => 0, 'method' => 'fooAction'], + ['parameter' => 'param1'], + ['someAttribute' => 'on param1 in fooAction', 'priority' => 0, 'parameter' => 'param1'], + ['method' => 'barAction'], + ['someAttribute' => 'on barAction', 'priority' => 0, 'method' => 'barAction'], + ['property' => 'name'], + ['someAttribute' => 'on name', 'priority' => 0, 'property' => 'name'], + ], ], $collector->collectedTags); } From 770425c75abbb875f58f5bfdc3903dfee05afcc9 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Wed, 1 Dec 2021 17:25:24 +0100 Subject: [PATCH 20/52] Prevent infinite nesting of lazy `ObjectManager` instances when `ObjectManager` is reset This patch ensures that the `ObjectManager` that the `Symfony\Bridge\Doctrine\ManagerRegistry` replaces during `Symfony\Bridge\Doctrine\ManagerRegistry#resetService()` operations is a fresh non-lazy service. Before this change, `Symfony\Bridge\Doctrine\ManagerRegistry#resetService()` would replace the initialization of the lazy proxy with a new service each time, but that service being lazy, this led to an additional proxy nesting level at each service reset call. That leads to general issues around memory reliability, stack trace nesting (and therefore bigger logged traces) and potentially even stack overflow problems, when running with XDebug. The problem seems to only apply when the `symfony/dependency-injection` `Container` is compiled as a set of small factory files: that's because each generated factory has a boolean flag that indicates whether a lazy or non-lazy version of a service is requested, as introduced in the original implementation at https://github.com/symfony/symfony/pull/7890 --- .../Bridge/Doctrine/ManagerRegistry.php | 2 +- .../Doctrine/Tests/ManagerRegistryTest.php | 93 +++++++++++++++++++ 2 files changed, 94 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Bridge/Doctrine/ManagerRegistry.php b/src/Symfony/Bridge/Doctrine/ManagerRegistry.php index 2139562dedbaf..0ed055fec64b7 100644 --- a/src/Symfony/Bridge/Doctrine/ManagerRegistry.php +++ b/src/Symfony/Bridge/Doctrine/ManagerRegistry.php @@ -62,7 +62,7 @@ function (&$wrappedInstance, LazyLoadingInterface $manager) use ($name) { $name = $this->aliases[$name]; } if (isset($this->fileMap[$name])) { - $wrappedInstance = $this->load($this->fileMap[$name]); + $wrappedInstance = $this->load($this->fileMap[$name], false); } else { $method = $this->methodMap[$name] ?? 'get'.strtr($name, $this->underscoreMap).'Service'; // BC with DI v3.4 $wrappedInstance = $this->{$method}(false); diff --git a/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php b/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php index a004935a6afdc..dcdc4ce6360fc 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php @@ -12,8 +12,15 @@ namespace Symfony\Bridge\Doctrine\Tests; use PHPUnit\Framework\TestCase; +use ProxyManager\Proxy\LazyLoadingInterface; +use ProxyManager\Proxy\ValueHolderInterface; use Symfony\Bridge\Doctrine\ManagerRegistry; +use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper; use Symfony\Bridge\ProxyManager\Tests\LazyProxy\Dumper\PhpDumperTest; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\ContainerInterface; +use Symfony\Component\DependencyInjection\Dumper\PhpDumper; +use Symfony\Component\Filesystem\Filesystem; class ManagerRegistryTest extends TestCase { @@ -39,6 +46,92 @@ public function testResetService() $this->assertSame($foo, $container->get('foo')); $this->assertObjectNotHasAttribute('bar', $foo); } + + /** + * When performing an entity manager lazy service reset, the reset operations may re-use the container + * to create a "fresh" service: when doing so, it can happen that the "fresh" service is itself a proxy. + * + * Because of that, the proxy will be populated with a wrapped value that is itself a proxy: repeating + * the reset operation keeps increasing this nesting until the application eventually runs into stack + * overflow or memory overflow operations, which can happen for long-running processes that rely on + * services that are reset very often. + */ + public function testResetServiceWillNotNestFurtherLazyServicesWithinEachOther() + { + // This test scenario only applies to containers composed as a set of generated sources + $this->dumpLazyServiceProjectAsFilesServiceContainer(); + + /** @var ContainerInterface $container */ + $container = new \LazyServiceProjectAsFilesServiceContainer(); + + $registry = new TestManagerRegistry( + 'irrelevant', + [], + ['defaultManager' => 'foo'], + 'irrelevant', + 'defaultManager', + 'irrelevant' + ); + $registry->setTestContainer($container); + + $service = $container->get('foo'); + + self::assertInstanceOf(\stdClass::class, $service); + self::assertInstanceOf(LazyLoadingInterface::class, $service); + self::assertInstanceOf(ValueHolderInterface::class, $service); + self::assertFalse($service->isProxyInitialized()); + + $service->initializeProxy(); + + self::assertTrue($container->initialized('foo')); + self::assertTrue($service->isProxyInitialized()); + + $registry->resetManager(); + $service->initializeProxy(); + + $wrappedValue = $service->getWrappedValueHolderValue(); + self::assertInstanceOf(\stdClass::class, $wrappedValue); + self::assertNotInstanceOf(LazyLoadingInterface::class, $wrappedValue); + self::assertNotInstanceOf(ValueHolderInterface::class, $wrappedValue); + } + + /** @return void */ + private function dumpLazyServiceProjectAsFilesServiceContainer() + { + if (class_exists(\LazyServiceProjectAsFilesServiceContainer::class, false)) { + return; + } + + $container = new ContainerBuilder(); + + $container->register('foo', \stdClass::class) + ->setPublic(true) + ->setLazy(true); + $container->compile(); + + $fileSystem = new Filesystem(); + + $temporaryPath = $fileSystem->tempnam(sys_get_temp_dir(), 'symfonyManagerRegistryTest'); + $fileSystem->remove($temporaryPath); + $fileSystem->mkdir($temporaryPath); + + $dumper = new PhpDumper($container); + + $dumper->setProxyDumper(new ProxyDumper()); + $containerFiles = $dumper->dump([ + 'class' => 'LazyServiceProjectAsFilesServiceContainer', + 'as_files' => true, + ]); + + array_walk( + $containerFiles, + static function (string $containerSources, string $fileName) use ($temporaryPath): void { + (new Filesystem())->dumpFile($temporaryPath.'/'.$fileName, $containerSources); + } + ); + + require $temporaryPath.'/LazyServiceProjectAsFilesServiceContainer.php'; + } } class TestManagerRegistry extends ManagerRegistry From 3dc5da1088a383e8ad9fa180054a07ea5dd1afee Mon Sep 17 00:00:00 2001 From: PierreRebeilleau Date: Wed, 1 Dec 2021 17:18:41 +0100 Subject: [PATCH 21/52] [Serializer] Remove DecoderInterface type hint for API Platform compatibility --- .github/expected-missing-return-types.diff | 353 +++++++++--------- .../Serializer/Encoder/DecoderInterface.php | 8 +- 2 files changed, 175 insertions(+), 186 deletions(-) diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff index 91fab2152b6c4..038db511c4403 100644 --- a/.github/expected-missing-return-types.diff +++ b/.github/expected-missing-return-types.diff @@ -1,15 +1,15 @@ # Run these steps to update this file: sed -i 's/ *"\*\*\/Tests\/"//' composer.json composer u -o -SYMFONY_PATCH_TYPE_DECLARATIONS='force=2' php .github/patch-types.php +SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.0' php .github/patch-types.php head=$(sed '/^diff /Q' .github/expected-missing-return-types.diff) (echo "$head" && echo && git diff -U2 composer.json src/) > .github/expected-missing-return-types.diff diff --git a/composer.json b/composer.json -index 0ad5f625a7..f614f93465 100644 +index 1bc576b112..589ef8c260 100644 --- a/composer.json +++ b/composer.json -@@ -174,5 +174,5 @@ +@@ -175,5 +175,5 @@ ], "exclude-from-classmap": [ - "**/Tests/" @@ -91,7 +91,7 @@ index c479f75d34..0d16baaff7 100644 { if (\is_string($resource) && \strlen($resource) !== ($i = strcspn($resource, '*?{[')) && !str_contains($resource, "\n")) { diff --git a/src/Symfony/Component/Config/Loader/Loader.php b/src/Symfony/Component/Config/Loader/Loader.php -index faa0f58369..414f8dc63d 100644 +index e0974fb151..f698b5271b 100644 --- a/src/Symfony/Component/Config/Loader/Loader.php +++ b/src/Symfony/Component/Config/Loader/Loader.php @@ -50,5 +50,5 @@ abstract class Loader implements LoaderInterface @@ -144,52 +144,52 @@ index 6b1c6c5fbe..bb80ed461e 100644 + public function isFresh(ResourceInterface $resource, int $timestamp): bool; } diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php -index 801575e8f4..a71eadda91 100644 +index b582435f7d..3d5f064773 100644 --- a/src/Symfony/Component/Console/Application.php +++ b/src/Symfony/Component/Console/Application.php -@@ -214,5 +214,5 @@ class Application implements ResetInterface +@@ -218,5 +218,5 @@ class Application implements ResetInterface * @return int 0 if everything went fine, or an error code */ - public function doRun(InputInterface $input, OutputInterface $output) + public function doRun(InputInterface $input, OutputInterface $output): int { if (true === $input->hasParameterOption(['--version', '-V'], true)) { -@@ -424,5 +424,5 @@ class Application implements ResetInterface +@@ -445,5 +445,5 @@ class Application implements ResetInterface * @return string */ - public function getLongVersion() + public function getLongVersion(): string { if ('UNKNOWN' !== $this->getName()) { -@@ -467,5 +467,5 @@ class Application implements ResetInterface +@@ -488,5 +488,5 @@ class Application implements ResetInterface * @return Command|null */ - public function add(Command $command) + public function add(Command $command): ?Command { $this->init(); -@@ -504,5 +504,5 @@ class Application implements ResetInterface +@@ -525,5 +525,5 @@ class Application implements ResetInterface * @throws CommandNotFoundException When given command name does not exist */ - public function get(string $name) + public function get(string $name): Command { $this->init(); -@@ -611,5 +611,5 @@ class Application implements ResetInterface +@@ -632,5 +632,5 @@ class Application implements ResetInterface * @throws CommandNotFoundException When command name is incorrect or ambiguous */ - public function find(string $name) + public function find(string $name): Command { $this->init(); -@@ -721,5 +721,5 @@ class Application implements ResetInterface +@@ -742,5 +742,5 @@ class Application implements ResetInterface * @return Command[] */ - public function all(string $namespace = null) + public function all(string $namespace = null): array { $this->init(); -@@ -920,5 +920,5 @@ class Application implements ResetInterface +@@ -941,5 +941,5 @@ class Application implements ResetInterface * @return int 0 if everything went fine, or an error code */ - protected function doRunCommand(Command $command, InputInterface $input, OutputInterface $output) @@ -197,17 +197,17 @@ index 801575e8f4..a71eadda91 100644 { foreach ($command->getHelperSet() as $helper) { diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php -index 761b31d0d2..bf4ff86dd5 100644 +index d6354b4ab1..b267917312 100644 --- a/src/Symfony/Component/Console/Command/Command.php +++ b/src/Symfony/Component/Console/Command/Command.php -@@ -169,5 +169,5 @@ class Command +@@ -171,5 +171,5 @@ class Command * @return bool */ - public function isEnabled() + public function isEnabled(): bool { return true; -@@ -195,5 +195,5 @@ class Command +@@ -197,5 +197,5 @@ class Command * @see setCode() */ - protected function execute(InputInterface $input, OutputInterface $output) @@ -215,16 +215,40 @@ index 761b31d0d2..bf4ff86dd5 100644 { throw new LogicException('You must override the execute() method in the concrete command class.'); diff --git a/src/Symfony/Component/Console/Helper/HelperInterface.php b/src/Symfony/Component/Console/Helper/HelperInterface.php -index 1d2b7bf..cb1f661 100644 +index 1d2b7bfb84..cb1f66152d 100644 --- a/src/Symfony/Component/Console/Helper/HelperInterface.php +++ b/src/Symfony/Component/Console/Helper/HelperInterface.php -@@ -33,5 +33,5 @@ interface HelperInterface - * +@@ -34,4 +34,4 @@ interface HelperInterface * @return string */ - public function getName(); + public function getName(): string; } +diff --git a/src/Symfony/Component/Console/Input/InputInterface.php b/src/Symfony/Component/Console/Input/InputInterface.php +index 024da1884e..943790e875 100644 +--- a/src/Symfony/Component/Console/Input/InputInterface.php ++++ b/src/Symfony/Component/Console/Input/InputInterface.php +@@ -54,5 +54,5 @@ interface InputInterface + * @return mixed + */ +- public function getParameterOption(string|array $values, string|bool|int|float|array|null $default = false, bool $onlyParams = false); ++ public function getParameterOption(string|array $values, string|bool|int|float|array|null $default = false, bool $onlyParams = false): mixed; + + /** +@@ -84,5 +84,5 @@ interface InputInterface + * @throws InvalidArgumentException When argument given doesn't exist + */ +- public function getArgument(string $name); ++ public function getArgument(string $name): mixed; + + /** +@@ -112,5 +112,5 @@ interface InputInterface + * @throws InvalidArgumentException When option given doesn't exist + */ +- public function getOption(string $name); ++ public function getOption(string $name): mixed; + + /** diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php index 1acec50de5..904e67a47b 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php @@ -348,7 +372,7 @@ index 479aeef880..272954c082 100644 + public function getFunctions(): array; } diff --git a/src/Symfony/Component/Form/AbstractExtension.php b/src/Symfony/Component/Form/AbstractExtension.php -index 7aff58e574..45d0b16d96 100644 +index 79d61e8bc0..7f34d95d84 100644 --- a/src/Symfony/Component/Form/AbstractExtension.php +++ b/src/Symfony/Component/Form/AbstractExtension.php @@ -114,5 +114,5 @@ abstract class AbstractExtension implements FormExtensionInterface @@ -366,7 +390,7 @@ index 7aff58e574..45d0b16d96 100644 { return null; diff --git a/src/Symfony/Component/Form/AbstractRendererEngine.php b/src/Symfony/Component/Form/AbstractRendererEngine.php -index 054d0f7173..fb84f2018e 100644 +index 3dbe0a8420..b4179c785c 100644 --- a/src/Symfony/Component/Form/AbstractRendererEngine.php +++ b/src/Symfony/Component/Form/AbstractRendererEngine.php @@ -135,5 +135,5 @@ abstract class AbstractRendererEngine implements FormRendererEngineInterface @@ -490,10 +514,10 @@ index 2f442cb536..d98909cfae 100644 + public function warmUp(string $cacheDir): array; } diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php -index 1c9b597872..598faeee34 100644 +index 3a3be3af49..971560c07b 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php -@@ -62,5 +62,5 @@ abstract class DataCollector implements DataCollectorInterface +@@ -59,5 +59,5 @@ abstract class DataCollector implements DataCollectorInterface * @return callable[] The casters to add to the cloner */ - protected function getCasters() @@ -511,10 +535,10 @@ index 1cb865fd66..f6f4efe7a7 100644 + public function getName(): string; } diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php -index 7d107dc2c6..5814e8681d 100644 +index 8e7b80a909..d757429d36 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php -@@ -446,5 +446,5 @@ class HttpCache implements HttpKernelInterface, TerminableInterface +@@ -448,5 +448,5 @@ class HttpCache implements HttpKernelInterface, TerminableInterface * @return Response */ - protected function forward(Request $request, bool $catch = false, Response $entry = null) @@ -522,7 +546,7 @@ index 7d107dc2c6..5814e8681d 100644 { if ($this->surrogate) { diff --git a/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php b/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php -index 1d277f2c15..0a4fcb13c2 100644 +index f4773eb62a..0ba648b57f 100644 --- a/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php +++ b/src/Symfony/Component/HttpKernel/HttpKernelBrowser.php @@ -61,5 +61,5 @@ class HttpKernelBrowser extends AbstractBrowser @@ -558,38 +582,38 @@ index 19ff0db181..f0f4a5829f 100644 /** diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php -index b17c3ecbbc..8bb4cb5824 100644 +index fe77644762..09dcfe166b 100644 --- a/src/Symfony/Component/OptionsResolver/OptionsResolver.php +++ b/src/Symfony/Component/OptionsResolver/OptionsResolver.php -@@ -484,5 +484,5 @@ class OptionsResolver implements Options +@@ -486,5 +486,5 @@ class OptionsResolver implements Options * @throws AccessException If called from a lazy option or normalizer */ - public function setNormalizer(string $option, \Closure $normalizer) + public function setNormalizer(string $option, \Closure $normalizer): static { if ($this->locked) { -@@ -568,5 +568,5 @@ class OptionsResolver implements Options +@@ -570,5 +570,5 @@ class OptionsResolver implements Options * @throws AccessException If called from a lazy option or normalizer */ - public function setAllowedValues(string $option, mixed $allowedValues) + public function setAllowedValues(string $option, mixed $allowedValues): static { if ($this->locked) { -@@ -608,5 +608,5 @@ class OptionsResolver implements Options +@@ -610,5 +610,5 @@ class OptionsResolver implements Options * @throws AccessException If called from a lazy option or normalizer */ - public function addAllowedValues(string $option, mixed $allowedValues) + public function addAllowedValues(string $option, mixed $allowedValues): static { if ($this->locked) { -@@ -648,5 +648,5 @@ class OptionsResolver implements Options +@@ -650,5 +650,5 @@ class OptionsResolver implements Options * @throws AccessException If called from a lazy option or normalizer */ - public function setAllowedTypes(string $option, string|array $allowedTypes) + public function setAllowedTypes(string $option, string|array $allowedTypes): static { if ($this->locked) { -@@ -682,5 +682,5 @@ class OptionsResolver implements Options +@@ -684,5 +684,5 @@ class OptionsResolver implements Options * @throws AccessException If called from a lazy option or normalizer */ - public function addAllowedTypes(string $option, string|array $allowedTypes) @@ -597,45 +621,45 @@ index b17c3ecbbc..8bb4cb5824 100644 { if ($this->locked) { diff --git a/src/Symfony/Component/PropertyAccess/PropertyPathInterface.php b/src/Symfony/Component/PropertyAccess/PropertyPathInterface.php -index 90eab97103..332d91b4e6 100644 +index fbb37d9f94..522e0487a9 100644 --- a/src/Symfony/Component/PropertyAccess/PropertyPathInterface.php +++ b/src/Symfony/Component/PropertyAccess/PropertyPathInterface.php -@@ -29,5 +29,5 @@ interface PropertyPathInterface extends \Traversable +@@ -31,5 +31,5 @@ interface PropertyPathInterface extends \Traversable * @return int */ - public function getLength(); + public function getLength(): int; /** -@@ -41,5 +41,5 @@ interface PropertyPathInterface extends \Traversable +@@ -43,5 +43,5 @@ interface PropertyPathInterface extends \Traversable * @return self|null */ - public function getParent(); + public function getParent(): ?\Symfony\Component\PropertyAccess\PropertyPathInterface; /** -@@ -48,5 +48,5 @@ interface PropertyPathInterface extends \Traversable - * @return array +@@ -50,5 +50,5 @@ interface PropertyPathInterface extends \Traversable + * @return list */ - public function getElements(); + public function getElements(): array; /** -@@ -59,5 +59,5 @@ interface PropertyPathInterface extends \Traversable +@@ -61,5 +61,5 @@ interface PropertyPathInterface extends \Traversable * @throws Exception\OutOfBoundsException If the offset is invalid */ - public function getElement(int $index); + public function getElement(int $index): string; /** -@@ -70,5 +70,5 @@ interface PropertyPathInterface extends \Traversable +@@ -72,5 +72,5 @@ interface PropertyPathInterface extends \Traversable * @throws Exception\OutOfBoundsException If the offset is invalid */ - public function isProperty(int $index); + public function isProperty(int $index): bool; /** -@@ -81,4 +81,4 @@ interface PropertyPathInterface extends \Traversable +@@ -83,4 +83,4 @@ interface PropertyPathInterface extends \Traversable * @throws Exception\OutOfBoundsException If the offset is invalid */ - public function isIndex(int $index); @@ -679,7 +703,7 @@ index 6da0bcb4c8..16e9765b1d 100644 + public function getTypes(string $class, string $property, array $context = []): ?array; } diff --git a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php -index d7f9d5bba1..1cbb9b032f 100644 +index 2dd0e5efbf..95e01d8955 100644 --- a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php +++ b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php @@ -260,5 +260,5 @@ abstract class AnnotationClassLoader implements LoaderInterface @@ -690,10 +714,10 @@ index d7f9d5bba1..1cbb9b032f 100644 { $name = str_replace('\\', '_', $class->name).'_'.$method->name; diff --git a/src/Symfony/Component/Routing/Router.php b/src/Symfony/Component/Routing/Router.php -index 8436fe7bd6..7b35b5e872 100644 +index 83c10427a1..e113d4a194 100644 --- a/src/Symfony/Component/Routing/Router.php +++ b/src/Symfony/Component/Routing/Router.php -@@ -181,5 +181,5 @@ class Router implements RouterInterface, RequestMatcherInterface +@@ -178,5 +178,5 @@ class Router implements RouterInterface, RequestMatcherInterface * {@inheritdoc} */ - public function getRouteCollection() @@ -732,10 +756,10 @@ index 7e401c3ff3..6b446ff376 100644 + public function vote(TokenInterface $token, mixed $subject, array $attributes): int; } diff --git a/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php b/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php -index 606c812fad..040c641bd7 100644 +index 298bc78cd9..3ef4176dd8 100644 --- a/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php +++ b/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php -@@ -80,5 +80,5 @@ class AuthenticationException extends RuntimeException +@@ -89,5 +89,5 @@ class AuthenticationException extends RuntimeException * @return string */ - public function getMessageKey() @@ -743,17 +767,17 @@ index 606c812fad..040c641bd7 100644 { return 'An authentication exception occurred.'; diff --git a/src/Symfony/Component/Security/Core/User/UserProviderInterface.php b/src/Symfony/Component/Security/Core/User/UserProviderInterface.php -index 33d489f6d7..7b1300b066 100644 +index ec90d413fa..9f1401aa91 100644 --- a/src/Symfony/Component/Security/Core/User/UserProviderInterface.php +++ b/src/Symfony/Component/Security/Core/User/UserProviderInterface.php -@@ -49,5 +49,5 @@ interface UserProviderInterface +@@ -45,5 +45,5 @@ interface UserProviderInterface * @throws UserNotFoundException if the user is not found */ - public function refreshUser(UserInterface $user); + public function refreshUser(UserInterface $user): UserInterface; /** -@@ -56,5 +56,5 @@ interface UserProviderInterface +@@ -52,5 +52,5 @@ interface UserProviderInterface * @return bool */ - public function supportsClass(string $class); @@ -771,10 +795,10 @@ index 91271d14a3..100c2fb549 100644 + public function start(Request $request, AuthenticationException $authException = null): Response; } diff --git a/src/Symfony/Component/Security/Http/Firewall.php b/src/Symfony/Component/Security/Http/Firewall.php -index 49b2b9a0d4..27ad80e8d0 100644 +index 0c313f8f09..acfc9f4b88 100644 --- a/src/Symfony/Component/Security/Http/Firewall.php +++ b/src/Symfony/Component/Security/Http/Firewall.php -@@ -100,5 +100,5 @@ class Firewall implements EventSubscriberInterface +@@ -106,5 +106,5 @@ class Firewall implements EventSubscriberInterface * {@inheritdoc} */ - public static function getSubscribedEvents() @@ -782,162 +806,90 @@ index 49b2b9a0d4..27ad80e8d0 100644 { return [ diff --git a/src/Symfony/Component/Security/Http/FirewallMapInterface.php b/src/Symfony/Component/Security/Http/FirewallMapInterface.php -index 6704940153..ee0f2ed470 100644 +index 480ea8ad6b..fa43d6a6e9 100644 --- a/src/Symfony/Component/Security/Http/FirewallMapInterface.php +++ b/src/Symfony/Component/Security/Http/FirewallMapInterface.php -@@ -36,4 +36,4 @@ interface FirewallMapInterface - * @return array of the format [[AuthenticationListener], ExceptionListener, LogoutListener] +@@ -38,4 +38,4 @@ interface FirewallMapInterface + * @return array{iterable, ExceptionListener, LogoutListener} */ - public function getListeners(Request $request); + public function getListeners(Request $request): array; } -diff --git a/src/Symfony/Component/Templating/Helper/HelperInterface.php b/src/Symfony/Component/Templating/Helper/HelperInterface.php -index 5dade65db5..db0d0a00ea 100644 ---- a/src/Symfony/Component/Templating/Helper/HelperInterface.php -+++ b/src/Symfony/Component/Templating/Helper/HelperInterface.php -@@ -24,5 +24,5 @@ interface HelperInterface - * @return string +diff --git a/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php b/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php +index 84a84ad1f3..6f66b6d32a 100644 +--- a/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php ++++ b/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php +@@ -35,5 +35,5 @@ interface DecoderInterface + * @throws UnexpectedValueException */ -- public function getName(); -+ public function getName(): string; +- public function decode(string $data, string $format, array $context = []); ++ public function decode(string $data, string $format, array $context = []): mixed; /** -diff --git a/src/Symfony/Component/Translation/Extractor/AbstractFileExtractor.php b/src/Symfony/Component/Translation/Extractor/AbstractFileExtractor.php -index 4c088b94f9..86107a636d 100644 ---- a/src/Symfony/Component/Translation/Extractor/AbstractFileExtractor.php -+++ b/src/Symfony/Component/Translation/Extractor/AbstractFileExtractor.php -@@ -59,9 +59,9 @@ abstract class AbstractFileExtractor +@@ -44,4 +44,4 @@ interface DecoderInterface * @return bool */ -- abstract protected function canBeExtracted(string $file); -+ abstract protected function canBeExtracted(string $file): bool; - - /** - * @return iterable - */ -- abstract protected function extractFromDirectory(string|array $resource); -+ abstract protected function extractFromDirectory(string|array $resource): iterable; +- public function supportsDecoding(string $format); ++ public function supportsDecoding(string $format): bool; } -diff --git a/src/Symfony/Component/Validator/Constraint.php b/src/Symfony/Component/Validator/Constraint.php -index 012a483de2..6573ad7ec5 100644 ---- a/src/Symfony/Component/Validator/Constraint.php -+++ b/src/Symfony/Component/Validator/Constraint.php -@@ -235,5 +235,5 @@ abstract class Constraint - * @see __construct() - */ -- public function getDefaultOption() -+ public function getDefaultOption(): ?string - { - return null; -@@ -249,5 +249,5 @@ abstract class Constraint - * @see __construct() - */ -- public function getRequiredOptions() -+ public function getRequiredOptions(): array - { - return []; -@@ -263,5 +263,5 @@ abstract class Constraint - * @return string - */ -- public function validatedBy() -+ public function validatedBy(): string - { - return static::class.'Validator'; -@@ -277,5 +277,5 @@ abstract class Constraint - * @return string|string[] One or more constant values - */ -- public function getTargets() -+ public function getTargets(): string|array - { - return self::PROPERTY_CONSTRAINT; -diff --git a/src/Symfony/Component/Console/Input/InputInterface.php b/src/Symfony/Component/Console/Input/InputInterface.php -index 024da1884e..943790e875 100644 ---- a/src/Symfony/Component/Console/Input/InputInterface.php -+++ b/src/Symfony/Component/Console/Input/InputInterface.php -@@ -54,5 +54,5 @@ interface InputInterface - * @return mixed - */ -- public function getParameterOption(string|array $values, string|bool|int|float|array|null $default = false, bool $onlyParams = false); -+ public function getParameterOption(string|array $values, string|bool|int|float|array|null $default = false, bool $onlyParams = false): mixed; - - /** -@@ -84,5 +84,5 @@ interface InputInterface - * @throws InvalidArgumentException When argument given doesn't exist - */ -- public function getArgument(string $name); -+ public function getArgument(string $name): mixed; - - /** -@@ -112,5 +112,5 @@ interface InputInterface - * @throws InvalidArgumentException When option given doesn't exist - */ -- public function getOption(string $name); -+ public function getOption(string $name): mixed; - - /** diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php -index b0a1f32..893fe59 100644 +index b0a1f3218b..893fe59e2f 100644 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php -@@ -222,7 +222,7 @@ abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerIn - * +@@ -223,5 +223,5 @@ abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerIn * @return string[]|AttributeMetadataInterface[]|bool */ - protected function getAllowedAttributes(string|object $classOrObject, array $context, bool $attributesAsString = false) + protected function getAllowedAttributes(string|object $classOrObject, array $context, bool $attributesAsString = false): array|bool { $allowExtraAttributes = $context[self::ALLOW_EXTRA_ATTRIBUTES] ?? $this->defaultContext[self::ALLOW_EXTRA_ATTRIBUTES]; - if (!$this->classMetadataFactory) { -@@ -272,7 +272,7 @@ abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerIn - * +@@ -273,5 +273,5 @@ abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerIn * @return bool */ - protected function isAllowedAttribute(object|string $classOrObject, string $attribute, string $format = null, array $context = []) + protected function isAllowedAttribute(object|string $classOrObject, string $attribute, string $format = null, array $context = []): bool { $ignoredAttributes = $context[self::IGNORED_ATTRIBUTES] ?? $this->defaultContext[self::IGNORED_ATTRIBUTES]; - if (\in_array($attribute, $ignoredAttributes)) { -@@ -323,7 +323,7 @@ abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerIn - * @throws RuntimeException +@@ -324,5 +324,5 @@ abstract class AbstractNormalizer implements NormalizerInterface, DenormalizerIn * @throws MissingConstructorArgumentsException */ - protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, string $format = null) + protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, string $format = null): object { if (null !== $object = $this->extractObjectToPopulate($class, $context, self::OBJECT_TO_POPULATE)) { - unset($context[self::OBJECT_TO_POPULATE]); diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php -index a241215..c6bcc63 100644 +index a241215133..2ed1af7a02 100644 --- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php -@@ -143,7 +143,7 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer - /** +@@ -136,5 +136,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer + * {@inheritdoc} + */ +- public function supportsNormalization(mixed $data, string $format = null) ++ public function supportsNormalization(mixed $data, string $format = null): bool + { + return \is_object($data) && !$data instanceof \Traversable; +@@ -144,5 +144,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer * {@inheritdoc} */ - public function normalize(mixed $object, string $format = null, array $context = []) + public function normalize(mixed $object, string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null { if (!isset($context['cache_key'])) { - $context['cache_key'] = $this->getCacheKey($format, $context); -@@ -276,7 +276,7 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer - /** +@@ -277,5 +277,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer * {@inheritdoc} */ - protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, string $format = null) + protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, string $format = null): object { if ($this->classDiscriminatorResolver && $mapping = $this->classDiscriminatorResolver->getMappingForClass($class)) { - if (!isset($data[$mapping->getTypeProperty()])) { -@@ -338,19 +338,19 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer - * +@@ -339,5 +339,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer * @return string[] */ - abstract protected function extractAttributes(object $object, string $format = null, array $context = []); + abstract protected function extractAttributes(object $object, string $format = null, array $context = []): array; /** - * Gets the attribute value. - * +@@ -346,10 +346,10 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer * @return mixed */ - abstract protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []); @@ -950,70 +902,103 @@ index a241215..c6bcc63 100644 + public function supportsDenormalization(mixed $data, string $type, string $format = null): bool { return class_exists($type) || (interface_exists($type, false) && $this->classDiscriminatorResolver && null !== $this->classDiscriminatorResolver->getMappingForClass($type)); - } -@@ -358,7 +358,7 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer - /** +@@ -359,5 +359,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer * {@inheritdoc} */ - public function denormalize(mixed $data, string $type, string $format = null, array $context = []) + public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed { if (!isset($context['cache_key'])) { - $context['cache_key'] = $this->getCacheKey($format, $context); diff --git a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php -index 5e94400..726d89c 100644 +index 5e94400b80..726d89cbb1 100644 --- a/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php +++ b/src/Symfony/Component/Serializer/Normalizer/DenormalizerInterface.php -@@ -44,7 +44,7 @@ interface DenormalizerInterface - * @throws RuntimeException Occurs if the class cannot be instantiated +@@ -45,5 +45,5 @@ interface DenormalizerInterface * @throws ExceptionInterface Occurs for all the other cases of errors */ - public function denormalize(mixed $data, string $type, string $format = null, array $context = []); + public function denormalize(mixed $data, string $type, string $format = null, array $context = []): mixed; /** - * Checks whether the given class is supported for denormalization by this normalizer. -@@ -55,5 +55,5 @@ interface DenormalizerInterface - * +@@ -56,4 +56,4 @@ interface DenormalizerInterface * @return bool */ - public function supportsDenormalization(mixed $data, string $type, string $format = null); + public function supportsDenormalization(mixed $data, string $type, string $format = null): bool; } diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php -index fb4bee4..00e8ad0 100644 +index 30eeafb47b..a7a60ad2f2 100644 --- a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php +++ b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php -@@ -36,7 +36,7 @@ interface NormalizerInterface - * @throws LogicException Occurs when the normalizer is not called in an expected context +@@ -37,5 +37,5 @@ interface NormalizerInterface * @throws ExceptionInterface Occurs for all the other cases of errors */ - public function normalize(mixed $object, string $format = null, array $context = []); + public function normalize(mixed $object, string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null; /** - * Checks whether the given class is supported for normalization by this normalizer. -diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php -index c6bcc63..2ed1af7 100644 ---- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php -+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php -@@ -135,7 +135,7 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer - /** - * {@inheritdoc} - */ -- public function supportsNormalization(mixed $data, string $format = null) -+ public function supportsNormalization(mixed $data, string $format = null): bool - { - return \is_object($data) && !$data instanceof \Traversable; - } -diff --git a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php -index d9f8df9..a7a60ad 100644 ---- a/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php -+++ b/src/Symfony/Component/Serializer/Normalizer/NormalizerInterface.php -@@ -46,5 +46,5 @@ interface NormalizerInterface - * +@@ -47,4 +47,4 @@ interface NormalizerInterface * @return bool */ - public function supportsNormalization(mixed $data, string $format = null); + public function supportsNormalization(mixed $data, string $format = null): bool; } +diff --git a/src/Symfony/Component/Templating/Helper/HelperInterface.php b/src/Symfony/Component/Templating/Helper/HelperInterface.php +index 5dade65db5..db0d0a00ea 100644 +--- a/src/Symfony/Component/Templating/Helper/HelperInterface.php ++++ b/src/Symfony/Component/Templating/Helper/HelperInterface.php +@@ -24,5 +24,5 @@ interface HelperInterface + * @return string + */ +- public function getName(); ++ public function getName(): string; + + /** +diff --git a/src/Symfony/Component/Translation/Extractor/AbstractFileExtractor.php b/src/Symfony/Component/Translation/Extractor/AbstractFileExtractor.php +index 4c088b94f9..86107a636d 100644 +--- a/src/Symfony/Component/Translation/Extractor/AbstractFileExtractor.php ++++ b/src/Symfony/Component/Translation/Extractor/AbstractFileExtractor.php +@@ -59,9 +59,9 @@ abstract class AbstractFileExtractor + * @return bool + */ +- abstract protected function canBeExtracted(string $file); ++ abstract protected function canBeExtracted(string $file): bool; + + /** + * @return iterable + */ +- abstract protected function extractFromDirectory(string|array $resource); ++ abstract protected function extractFromDirectory(string|array $resource): iterable; + } +diff --git a/src/Symfony/Component/Validator/Constraint.php b/src/Symfony/Component/Validator/Constraint.php +index d6dcdf178f..0ab8d9c10e 100644 +--- a/src/Symfony/Component/Validator/Constraint.php ++++ b/src/Symfony/Component/Validator/Constraint.php +@@ -239,5 +239,5 @@ abstract class Constraint + * @see __construct() + */ +- public function getDefaultOption() ++ public function getDefaultOption(): ?string + { + return null; +@@ -253,5 +253,5 @@ abstract class Constraint + * @see __construct() + */ +- public function getRequiredOptions() ++ public function getRequiredOptions(): array + { + return []; +@@ -267,5 +267,5 @@ abstract class Constraint + * @return string + */ +- public function validatedBy() ++ public function validatedBy(): string + { + return static::class.'Validator'; +@@ -281,5 +281,5 @@ abstract class Constraint + * @return string|string[] One or more constant values + */ +- public function getTargets() ++ public function getTargets(): string|array + { + return self::PROPERTY_CONSTRAINT; diff --git a/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php b/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php index 09ec9434df757..84a84ad1f3e69 100644 --- a/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php +++ b/src/Symfony/Component/Serializer/Encoder/DecoderInterface.php @@ -30,14 +30,18 @@ interface DecoderInterface * are encouraged to document which formats they support in a non-inherited * phpdoc comment. * + * @return mixed + * * @throws UnexpectedValueException */ - public function decode(string $data, string $format, array $context = []): mixed; + public function decode(string $data, string $format, array $context = []); /** * Checks whether the deserializer can decode from given format. * * @param string $format Format name + * + * @return bool */ - public function supportsDecoding(string $format): bool; + public function supportsDecoding(string $format); } From 05ee088911aad0a4f3307b28046190b962027bcd Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Wed, 1 Dec 2021 18:13:00 +0100 Subject: [PATCH 22/52] Fix using FileLinkFormatter after serialization --- .../Component/HttpKernel/Debug/FileLinkFormatter.php | 4 ++-- .../HttpKernel/Tests/Debug/FileLinkFormatterTest.php | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php b/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php index 2879273005428..fc85efce4ae00 100644 --- a/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php +++ b/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php @@ -35,8 +35,8 @@ class FileLinkFormatter ]; private array|false $fileLinkFormat; - private ?RequestStack $requestStack; - private ?string $baseDir; + private ?RequestStack $requestStack = null; + private ?string $baseDir = null; private \Closure|string|null $urlFormat; /** diff --git a/src/Symfony/Component/HttpKernel/Tests/Debug/FileLinkFormatterTest.php b/src/Symfony/Component/HttpKernel/Tests/Debug/FileLinkFormatterTest.php index 548112ad52fef..35a4e1658eb48 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Debug/FileLinkFormatterTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/Debug/FileLinkFormatterTest.php @@ -25,6 +25,13 @@ public function testWhenNoFileLinkFormatAndNoRequest() $this->assertFalse($sut->format('/kernel/root/src/my/very/best/file.php', 3)); } + public function testAfterUnserialize() + { + $sut = unserialize(serialize(new FileLinkFormatter())); + + $this->assertFalse($sut->format('/kernel/root/src/my/very/best/file.php', 3)); + } + public function testWhenFileLinkFormatAndNoRequest() { $file = __DIR__.\DIRECTORY_SEPARATOR.'file.php'; From a7c771250ae7ec97e11fbb4363b85ccd0789f298 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 2 Dec 2021 09:27:42 +0100 Subject: [PATCH 23/52] Tweak bug report template --- .github/ISSUE_TEMPLATE/1_Bug_report.yaml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/1_Bug_report.yaml b/.github/ISSUE_TEMPLATE/1_Bug_report.yaml index 5518d4e4ad79d..241c1f779bfaa 100644 --- a/.github/ISSUE_TEMPLATE/1_Bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/1_Bug_report.yaml @@ -14,7 +14,7 @@ body: id: description attributes: label: Description - description: A clear and consise description of the problem + description: A clear and concise description of the problem validations: required: true - type: textarea @@ -22,15 +22,21 @@ body: attributes: label: How to reproduce description: | - Code and/or config needed to reproduce the problem. - If it's a complex bug, create a "bug reproducer" as explained in https://symfony.com/doc/current/contributing/code/reproducer.html + ⚠️ This is the most important part of the report ⚠️ + Without a way to easily reproduce your issue, there is little chance we will be able to help you and work on a fix. + Please, take the time to show us some code and/or config that is needed for others to reproduce the problem easily. + Most of the time, creating a "bug reproducer" as explained in the URL below is the best way to help us + and increases the chances someone will have a look at it: + https://symfony.com/doc/current/contributing/code/reproducer.html validations: required: true - type: textarea id: possible-solution attributes: label: Possible Solution - description: "Optional: only if you have suggestions on a fix/reason for the bug" + description: | + Optional: only if you have suggestions on a fix/reason for the bug + Don't hesitate to create a pull request with your solution, it helps get faster feedback. - type: textarea id: additional-context attributes: From 620d06c774ce148829ef6a0f32433567a0ccc1ac Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 2 Dec 2021 14:32:36 +0100 Subject: [PATCH 24/52] Remove unneeded files --- .github/ISSUE_TEMPLATE/1_Bug_report.md | 22 --------------------- .github/ISSUE_TEMPLATE/2_Feature_request.md | 12 ----------- 2 files changed, 34 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/1_Bug_report.md delete mode 100644 .github/ISSUE_TEMPLATE/2_Feature_request.md diff --git a/.github/ISSUE_TEMPLATE/1_Bug_report.md b/.github/ISSUE_TEMPLATE/1_Bug_report.md deleted file mode 100644 index aef16611e0f77..0000000000000 --- a/.github/ISSUE_TEMPLATE/1_Bug_report.md +++ /dev/null @@ -1,22 +0,0 @@ ---- -name: 🐛 Bug Report -about: ⚠️ See below for security reports -labels: Bug - ---- - -**Symfony version(s) affected**: x.y.z - -**Description** - - -**How to reproduce** - - -**Possible Solution** - - -**Additional context** - diff --git a/.github/ISSUE_TEMPLATE/2_Feature_request.md b/.github/ISSUE_TEMPLATE/2_Feature_request.md deleted file mode 100644 index 908c5ee52664d..0000000000000 --- a/.github/ISSUE_TEMPLATE/2_Feature_request.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -name: 🚀 Feature Request -about: RFC and ideas for new features and improvements - ---- - -**Description** - - -**Example** - From 53cfbfda640ea7c11da7076a6e1f8e3ffc709834 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 2 Dec 2021 14:45:50 +0100 Subject: [PATCH 25/52] Add missing files from 5.3 --- .github/ISSUE_TEMPLATE/3_Support_question.md | 11 +++++++++++ .github/ISSUE_TEMPLATE/4_Documentation_issue.md | 10 ++++++++++ 2 files changed, 21 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/3_Support_question.md create mode 100644 .github/ISSUE_TEMPLATE/4_Documentation_issue.md diff --git a/.github/ISSUE_TEMPLATE/3_Support_question.md b/.github/ISSUE_TEMPLATE/3_Support_question.md new file mode 100644 index 0000000000000..9480710c15655 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/3_Support_question.md @@ -0,0 +1,11 @@ +--- +name: ⛔ Support Question +about: See https://symfony.com/support for questions about using Symfony and its components + +--- + +We use GitHub issues only to discuss about Symfony bugs and new features. For +this kind of questions about using Symfony or third-party bundles, please use +any of the support alternatives shown in https://symfony.com/support + +Thanks! diff --git a/.github/ISSUE_TEMPLATE/4_Documentation_issue.md b/.github/ISSUE_TEMPLATE/4_Documentation_issue.md new file mode 100644 index 0000000000000..0855c3c5f1e12 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/4_Documentation_issue.md @@ -0,0 +1,10 @@ +--- +name: ⛔ Documentation Issue +about: See https://github.com/symfony/symfony-docs/issues for documentation issues + +--- + +Symfony Documentation has its own dedicated repository. Please open your +documentation-related issue at https://github.com/symfony/symfony-docs/issues + +Thanks! From 058720f4ed8c69b660932c1f52bc8f8ca9c80dcd Mon Sep 17 00:00:00 2001 From: gjuric Date: Thu, 2 Dec 2021 10:40:44 +0100 Subject: [PATCH 26/52] Document deprecations in Security Tokens --- UPGRADE-5.4.md | 16 ++++++++++++++++ UPGRADE-6.0.md | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/UPGRADE-5.4.md b/UPGRADE-5.4.md index a2ce35807705d..2f5ca06682a12 100644 --- a/UPGRADE-5.4.md +++ b/UPGRADE-5.4.md @@ -170,3 +170,19 @@ Security * Deprecate passing the strategy as string to `AccessDecisionManager`, pass an instance of `AccessDecisionStrategyInterface` instead * Flag `AccessDecisionManager` as `@final` + * Deprecate passing `$credentials` to `PreAuthenticatedToken`, + `SwitchUserToken` and `UsernamePasswordToken`: + + Before: + ```php + $token = new UsernamePasswordToken($user, $credentials, $firewallName, $roles); + $token = new PreAuthenticatedToken($user, $credentials, $firewallName, $roles); + $token = new SwitchUserToken($user, $credentials, $firewallName, $roles, $originalToken); + ``` + + After: + ```php + $token = new UsernamePasswordToken($user, $firewallName, $roles); + $token = new PreAuthenticatedToken($user, $firewallName, $roles); + $token = new SwitchUserToken($user, $firewallName, $roles, $originalToken); + ``` diff --git a/UPGRADE-6.0.md b/UPGRADE-6.0.md index 10c9dcc9199e3..0f3b9e29bbd77 100644 --- a/UPGRADE-6.0.md +++ b/UPGRADE-6.0.md @@ -408,6 +408,22 @@ Security ``` * `AccessDecisionManager` does not accept strings as strategy anymore, pass an instance of `AccessDecisionStrategyInterface` instead + * Removed the `$credentials` argument of `PreAuthenticatedToken`, + `SwitchUserToken` and `UsernamePasswordToken`: + + Before: + ```php + $token = new UsernamePasswordToken($user, $credentials, $firewallName, $roles); + $token = new PreAuthenticatedToken($user, $credentials, $firewallName, $roles); + $token = new SwitchUserToken($user, $credentials, $firewallName, $roles, $originalToken); + ``` + + After: + ```php + $token = new UsernamePasswordToken($user, $firewallName, $roles); + $token = new PreAuthenticatedToken($user, $firewallName, $roles); + $token = new SwitchUserToken($user, $firewallName, $roles, $originalToken); + ``` SecurityBundle -------------- From c3374d276aba6f3c49919c4a7ab9a2c1dbac07bf Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 2 Dec 2021 14:54:19 +0100 Subject: [PATCH 27/52] Fix description that does not work well --- .github/ISSUE_TEMPLATE/1_Bug_report.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/1_Bug_report.yaml b/.github/ISSUE_TEMPLATE/1_Bug_report.yaml index 241c1f779bfaa..ef0f72c794278 100644 --- a/.github/ISSUE_TEMPLATE/1_Bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/1_Bug_report.yaml @@ -1,5 +1,5 @@ name: 🐛 Bug Report -description: ⚠️ See below for security reports +description: ⚠️ NEVER report security issues, read https://symfony.com/security instead labels: Bug body: From 10b3b6870e892889b1a6f4ac85fddcd0a35c1b2f Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Thu, 2 Dec 2021 15:49:54 +0100 Subject: [PATCH 28/52] Use external links instead of fake issue templates --- .github/ISSUE_TEMPLATE/3_Support_question.md | 11 ----------- .github/ISSUE_TEMPLATE/4_Documentation_issue.md | 10 ---------- .github/ISSUE_TEMPLATE/config.yml | 8 ++++++++ 3 files changed, 8 insertions(+), 21 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/3_Support_question.md delete mode 100644 .github/ISSUE_TEMPLATE/4_Documentation_issue.md create mode 100644 .github/ISSUE_TEMPLATE/config.yml diff --git a/.github/ISSUE_TEMPLATE/3_Support_question.md b/.github/ISSUE_TEMPLATE/3_Support_question.md deleted file mode 100644 index 9480710c15655..0000000000000 --- a/.github/ISSUE_TEMPLATE/3_Support_question.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -name: ⛔ Support Question -about: See https://symfony.com/support for questions about using Symfony and its components - ---- - -We use GitHub issues only to discuss about Symfony bugs and new features. For -this kind of questions about using Symfony or third-party bundles, please use -any of the support alternatives shown in https://symfony.com/support - -Thanks! diff --git a/.github/ISSUE_TEMPLATE/4_Documentation_issue.md b/.github/ISSUE_TEMPLATE/4_Documentation_issue.md deleted file mode 100644 index 0855c3c5f1e12..0000000000000 --- a/.github/ISSUE_TEMPLATE/4_Documentation_issue.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -name: ⛔ Documentation Issue -about: See https://github.com/symfony/symfony-docs/issues for documentation issues - ---- - -Symfony Documentation has its own dedicated repository. Please open your -documentation-related issue at https://github.com/symfony/symfony-docs/issues - -Thanks! diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 0000000000000..34227566ed84a --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,8 @@ +blank_issues_enabled: false +contact_links: + - name: Support Question + url: https://symfony.com/support + about: We use GitHub issues only to discuss about Symfony bugs and new features. For this kind of questions about using Symfony or third-party bundles, please use any of the support alternatives shown in https://symfony.com/support + - name: Documentation Issue + url: https://github.com/symfony/symfony-docs/issues + about: Symfony Documentation has its own dedicated repository. From 47c3ed317f247d4c99ef54b5b0979e673c6f56b6 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Thu, 2 Dec 2021 17:04:53 +0100 Subject: [PATCH 29/52] Don't rely on deprecated strategy constants --- .../SecurityBundle/Resources/views/Collector/security.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig b/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig index 0771f15a803b7..91e75ce0c5347 100644 --- a/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig +++ b/src/Symfony/Bundle/SecurityBundle/Resources/views/Collector/security.html.twig @@ -407,7 +407,7 @@ {% for voter_detail in decision.voter_details %} {{ profiler_dump(voter_detail['class']) }} - {% if collector.voterStrategy == constant('Symfony\\Component\\Security\\Core\\Authorization\\AccessDecisionManager::STRATEGY_UNANIMOUS') %} + {% if collector.voterStrategy == 'unanimous' %} attribute {{ voter_detail['attributes'][0] }} {% endif %} From e044b179d0d118348f5741c47ccf02661d16748b Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Thu, 2 Dec 2021 18:38:19 +0100 Subject: [PATCH 30/52] Fix compatibility with symfony/security-core 6.x --- src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php | 5 ++++- .../Tests/Controller/AbstractControllerTest.php | 12 +++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php b/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php index 7d4475a7e21ca..c5bad9c4e5185 100644 --- a/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php +++ b/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php @@ -123,7 +123,10 @@ public function loginUser(object $user, string $firewallContext = 'main'): self } $token = new TestBrowserToken($user->getRoles(), $user, $firewallContext); - $token->setAuthenticated(true); + // @deprecated since Symfony 5.4 + if (method_exists($token, 'setAuthenticated')) { + $token->setAuthenticated(true); + } $container = $this->getContainer(); $container->get('security.untracked_token_storage')->setToken($token); diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php index c6353acdb75c7..c24738545d343 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php @@ -138,7 +138,12 @@ public function testForward() public function testGetUser() { $user = new InMemoryUser('user', 'pass'); - $token = new UsernamePasswordToken($user, 'pass', 'default', ['ROLE_USER']); + if (method_exists(UsernamePasswordToken::class, 'setAuthenticated')) { + // @deprecated since Symfony 5.4 + $token = new UsernamePasswordToken($user, 'pass', 'default', ['ROLE_USER']); + } else { + $token = new UsernamePasswordToken($user, 'default', ['ROLE_USER']); + } $controller = $this->createController(); $controller->setContainer($this->getContainerWithTokenStorage($token)); @@ -148,6 +153,11 @@ public function testGetUser() public function testGetUserAnonymousUserConvertedToNull() { + // @deprecated since Symfony 5.4 + if (!class_exists(AnonymousToken::class)) { + $this->markTestSkipped('This test requires "symfony/security-core" <6.0.'); + } + $token = new AnonymousToken('default', 'anon.'); $controller = $this->createController(); From 481cb9e1e42a273114f6fbc347e538e902ba1664 Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Fri, 3 Dec 2021 09:00:22 +0100 Subject: [PATCH 31/52] Fix merge --- .../Tests/Controller/AbstractControllerTest.php | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php index 6697e96a37d9a..9a5c5510ce14e 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/AbstractControllerTest.php @@ -138,12 +138,7 @@ public function testForward() public function testGetUser() { $user = new InMemoryUser('user', 'pass'); - if (method_exists(UsernamePasswordToken::class, 'setAuthenticated')) { - // @deprecated since Symfony 5.4 - $token = new UsernamePasswordToken($user, 'pass', 'default', ['ROLE_USER']); - } else { - $token = new UsernamePasswordToken($user, 'default', ['ROLE_USER']); - } + $token = new UsernamePasswordToken($user, 'default', ['ROLE_USER']); $controller = $this->createController(); $controller->setContainer($this->getContainerWithTokenStorage($token)); @@ -156,11 +151,6 @@ public function testGetUser() */ public function testGetUserAnonymousUserConvertedToNull() { - // @deprecated since Symfony 5.4 - if (!class_exists(AnonymousToken::class)) { - $this->markTestSkipped('This test requires "symfony/security-core" <6.0.'); - } - $token = new AnonymousToken('default', 'anon.'); $controller = $this->createController(); From 3c1c8542d1493f1f6c6bac6d49548aec963c7664 Mon Sep 17 00:00:00 2001 From: Thomas Calvet Date: Fri, 3 Dec 2021 12:31:53 +0100 Subject: [PATCH 32/52] Remove return void PHPDoc in test --- src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php b/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php index dcdc4ce6360fc..dd7dabcc87db1 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/ManagerRegistryTest.php @@ -95,7 +95,6 @@ public function testResetServiceWillNotNestFurtherLazyServicesWithinEachOther() self::assertNotInstanceOf(ValueHolderInterface::class, $wrappedValue); } - /** @return void */ private function dumpLazyServiceProjectAsFilesServiceContainer() { if (class_exists(\LazyServiceProjectAsFilesServiceContainer::class, false)) { From 80a9c9fa403ebf7bdb3a87d0e4b69d4c1ee05763 Mon Sep 17 00:00:00 2001 From: Hugo Alliaume Date: Thu, 2 Dec 2021 13:32:05 +0100 Subject: [PATCH 33/52] [Translation][Loco] Make http requests synchronous when reading the Loco API --- .../Translation/Bridge/Loco/LocoProvider.php | 54 ++++++++----------- 1 file changed, 22 insertions(+), 32 deletions(-) diff --git a/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php b/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php index 3882176d8d54a..cea4121f7364e 100644 --- a/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php +++ b/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php @@ -92,47 +92,37 @@ public function read(array $domains, array $locales): TranslatorBag { $domains = $domains ?: ['*']; $translatorBag = new TranslatorBag(); - $responses = []; foreach ($locales as $locale) { foreach ($domains as $domain) { - $responses[] = [ - 'response' => $this->client->request('GET', sprintf('export/locale/%s.xlf', rawurlencode($locale)), [ - 'query' => [ - 'filter' => $domain, - 'status' => 'translated', - ], - ]), - 'locale' => $locale, - 'domain' => $domain, - ]; - } - } - - foreach ($responses as $response) { - $locale = $response['locale']; - $domain = $response['domain']; - $response = $response['response']; + // Loco forbids concurrent requests, so the requests must be synchronous in order to prevent "429 Too Many Requests" errors. + $response = $this->client->request('GET', sprintf('export/locale/%s.xlf', rawurlencode($locale)), [ + 'query' => [ + 'filter' => $domain, + 'status' => 'translated', + ], + ]); + + if (404 === $response->getStatusCode()) { + $this->logger->warning(sprintf('Locale "%s" for domain "%s" does not exist in Loco.', $locale, $domain)); + continue; + } - if (404 === $response->getStatusCode()) { - $this->logger->warning(sprintf('Locale "%s" for domain "%s" does not exist in Loco.', $locale, $domain)); - continue; - } + $responseContent = $response->getContent(false); - $responseContent = $response->getContent(false); + if (200 !== $response->getStatusCode()) { + throw new ProviderException('Unable to read the Loco response: '.$responseContent, $response); + } - if (200 !== $response->getStatusCode()) { - throw new ProviderException('Unable to read the Loco response: '.$responseContent, $response); - } + $locoCatalogue = $this->loader->load($responseContent, $locale, $domain); + $catalogue = new MessageCatalogue($locale); - $locoCatalogue = $this->loader->load($responseContent, $locale, $domain); - $catalogue = new MessageCatalogue($locale); + foreach ($locoCatalogue->all($domain) as $key => $message) { + $catalogue->set($this->retrieveKeyFromId($key, $domain), $message, $domain); + } - foreach ($locoCatalogue->all($domain) as $key => $message) { - $catalogue->set($this->retrieveKeyFromId($key, $domain), $message, $domain); + $translatorBag->addCatalogue($catalogue); } - - $translatorBag->addCatalogue($catalogue); } return $translatorBag; From d95f49e202af8f0a911bf14e9808053065a918f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20TAMARELLE?= Date: Fri, 3 Dec 2021 17:14:10 +0100 Subject: [PATCH 34/52] Remove dead code in tests --- .../Tests/Command/EventDispatcherDebugCommandTest.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/EventDispatcherDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/EventDispatcherDebugCommandTest.php index ce653c6bfaaaa..a506ac2d2915f 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/EventDispatcherDebugCommandTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/EventDispatcherDebugCommandTest.php @@ -41,12 +41,6 @@ public function provideCompletionSuggestions() private function createCommandCompletionTester(): CommandCompletionTester { - $dispatcher = new EventDispatcher(); - $otherDispatcher = new EventDispatcher(); - - $dispatcher->addListener('event', ['Listener']); - $otherDispatcher->addListener('other_event', ['OtherListener']); - $dispatchers = new ServiceLocator([ 'event_dispatcher' => function () { $dispatcher = new EventDispatcher(); From 05e78b34c569965f709fd4ba44e5bc02ec253334 Mon Sep 17 00:00:00 2001 From: Robin Chalas Date: Sat, 4 Dec 2021 18:10:39 +0100 Subject: [PATCH 35/52] [SecurityBundle] Fix ambiguous deprecation message on missing provider --- .../SecurityBundle/DependencyInjection/SecurityExtension.php | 2 +- .../Tests/DependencyInjection/SecurityExtensionTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php index d937a54c43dfc..d64b2c38ac7e7 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php @@ -704,7 +704,7 @@ private function getUserProvider(ContainerBuilder $container, string $id, array if ('remember_me' === $factoryKey || 'anonymous' === $factoryKey || 'custom_authenticators' === $factoryKey) { if ('custom_authenticators' === $factoryKey) { - trigger_deprecation('symfony/security-bundle', '5.4', 'Not configuring explicitly the provider for the "%s" listener on "%s" firewall is deprecated because it\'s ambiguous as there is more than one registered provider.', $factoryKey, $id); + trigger_deprecation('symfony/security-bundle', '5.4', 'Not configuring explicitly the provider for the "%s" firewall is deprecated because it\'s ambiguous as there is more than one registered provider. Set the "provider" key to one of the configured providers, even if your custom authenticators don\'t use it.', $id); } return 'security.user_providers'; diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php index 5037bf2b93549..4f8c8ce127a16 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php @@ -397,7 +397,7 @@ public function testFirewallWithNoUserProviderTriggerDeprecation() ], ]); - $this->expectDeprecation('Since symfony/security-bundle 5.4: Not configuring explicitly the provider for the "custom_authenticators" listener on "some_firewall" firewall is deprecated because it\'s ambiguous as there is more than one registered provider.'); + $this->expectDeprecation('Since symfony/security-bundle 5.4: Not configuring explicitly the provider for the "some_firewall" firewall is deprecated because it\'s ambiguous as there is more than one registered provider. Set the "provider" key to one of the configured providers, even if your custom authenticators don\'t use it.'); $container->compile(); } From 3842b3ada76c56bdbf91393ceccf56491b2773e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Sun, 5 Dec 2021 16:02:40 +0100 Subject: [PATCH 36/52] Fix: Wording --- .../Bundle/FrameworkBundle/Command/ContainerLintCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerLintCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerLintCommand.php index 137311bd6358d..2df5b72559c64 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerLintCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerLintCommand.php @@ -74,7 +74,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int return 1; } - $io->success('The container was lint successfully: all services are injected with values that are compatible with their type declarations.'); + $io->success('The container was linted successfully: all services are injected with values that are compatible with their type declarations.'); return 0; } From c1c8c2067723be3876e08d5c14b26a539d4d4e54 Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Sun, 5 Dec 2021 16:41:54 +0100 Subject: [PATCH 37/52] Fix parameter types for ProcessHelper::mustRun() --- src/Symfony/Component/Console/Helper/ProcessHelper.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/Console/Helper/ProcessHelper.php b/src/Symfony/Component/Console/Helper/ProcessHelper.php index d580357b93ffd..862d09f214522 100644 --- a/src/Symfony/Component/Console/Helper/ProcessHelper.php +++ b/src/Symfony/Component/Console/Helper/ProcessHelper.php @@ -95,10 +95,10 @@ public function run(OutputInterface $output, $cmd, $error = null, callable $call * This is identical to run() except that an exception is thrown if the process * exits with a non-zero exit code. * - * @param string|Process $cmd An instance of Process or a command to run - * @param string|null $error An error message that must be displayed if something went wrong - * @param callable|null $callback A PHP callback to run whenever there is some - * output available on STDOUT or STDERR + * @param array|Process $cmd An instance of Process or a command to run + * @param string|null $error An error message that must be displayed if something went wrong + * @param callable|null $callback A PHP callback to run whenever there is some + * output available on STDOUT or STDERR * * @return Process The process that ran * From 62581a9c9961119238c06ad3d4c286f6201bf11b Mon Sep 17 00:00:00 2001 From: Tomasz Kusy Date: Sun, 5 Dec 2021 19:21:16 +0100 Subject: [PATCH 38/52] Fix TranslationTrait for multiple domains --- .../Translation/Command/TranslationTrait.php | 3 +- .../Command/TranslationPullCommandTest.php | 77 +++++++++++++++++++ 2 files changed, 78 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/Translation/Command/TranslationTrait.php b/src/Symfony/Component/Translation/Command/TranslationTrait.php index 6a2b1ba86ded3..eafaffd3f10d4 100644 --- a/src/Symfony/Component/Translation/Command/TranslationTrait.php +++ b/src/Symfony/Component/Translation/Command/TranslationTrait.php @@ -32,8 +32,7 @@ private function readLocalTranslations(array $locales, array $domains, array $tr if ($domains) { foreach ($domains as $domain) { - $catalogue = $this->filterCatalogue($catalogue, $domain); - $bag->addCatalogue($catalogue); + $bag->addCatalogue($this->filterCatalogue($catalogue, $domain)); } } else { $bag->addCatalogue($catalogue); diff --git a/src/Symfony/Component/Translation/Tests/Command/TranslationPullCommandTest.php b/src/Symfony/Component/Translation/Tests/Command/TranslationPullCommandTest.php index 2d647341bfbf1..7494a1c84c8fc 100644 --- a/src/Symfony/Component/Translation/Tests/Command/TranslationPullCommandTest.php +++ b/src/Symfony/Component/Translation/Tests/Command/TranslationPullCommandTest.php @@ -424,6 +424,83 @@ public function testPullMessagesWithDefaultLocale() , file_get_contents($filenameFr)); } + public function testPullMessagesMultipleDomains() + { + $arrayLoader = new ArrayLoader(); + $filenameMessages = $this->createFile(['note' => 'NOTE']); + $filenameDomain = $this->createFile(['note' => 'NOTE'], 'en', 'domain.%locale%.xlf'); + $locales = ['en']; + $domains = ['messages', 'domain']; + + $providerReadTranslatorBag = new TranslatorBag(); + $providerReadTranslatorBag->addCatalogue($arrayLoader->load([ + 'new.foo' => 'newFoo', + ], 'en')); + + $providerReadTranslatorBag->addCatalogue($arrayLoader->load([ + 'new.foo' => 'newFoo', + ], 'en', + 'domain' + )); + + $provider = $this->createMock(ProviderInterface::class); + $provider->expects($this->once()) + ->method('read') + ->with($domains, $locales) + ->willReturn($providerReadTranslatorBag); + + $provider->expects($this->once()) + ->method('__toString') + ->willReturn('null://default'); + + $tester = $this->createCommandTester($provider, $locales, $domains, 'en'); + $tester->execute(['--locales' => ['en'], '--domains' => ['messages', 'domain']]); + + $this->assertStringContainsString('[OK] New translations from "null" has been written locally (for "en" locale(s), and "messages, domain" domain(s)).', trim($tester->getDisplay())); + $this->assertXmlStringEqualsXmlString(<< + + +
+ +
+ + + new.foo + newFoo + + + note + NOTE + + + + +XLIFF + , file_get_contents($filenameMessages)); + $this->assertXmlStringEqualsXmlString(<< + + +
+ +
+ + + new.foo + newFoo + + + note + NOTE + + + + +XLIFF + , file_get_contents($filenameDomain)); + } + private function createCommandTester(ProviderInterface $provider, array $locales = ['en'], array $domains = ['messages'], $defaultLocale = 'en'): CommandTester { $writer = new TranslationWriter(); From 36b466e0f2a7c4045e66ee27691721ea188afe76 Mon Sep 17 00:00:00 2001 From: "simon.chrzanowski" Date: Fri, 3 Dec 2021 11:20:33 +0100 Subject: [PATCH 39/52] use $sessionId instead of $sessionCookiePath on SessionUtils::popSessionCookie call --- .../HttpKernel/EventListener/AbstractSessionListener.php | 2 +- .../HttpKernel/Tests/EventListener/SessionListenerTest.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php b/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php index 0867cad073dea..08b6faac0e7e9 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/AbstractSessionListener.php @@ -146,7 +146,7 @@ public function onKernelResponse(ResponseEvent $event) $sessionCookieHttpOnly = $this->sessionOptions['cookie_httponly'] ?? true; $sessionCookieSameSite = $this->sessionOptions['cookie_samesite'] ?? Cookie::SAMESITE_LAX; - SessionUtils::popSessionCookie($sessionName, $sessionCookiePath); + SessionUtils::popSessionCookie($sessionName, $sessionId); $request = $event->getRequest(); $requestSessionCookieId = $request->cookies->get($sessionName); diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php index d82aba64513e4..9924c27d11af9 100644 --- a/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php @@ -312,6 +312,7 @@ public function testSessionUsageLogIfStatelessAndSessionUsed() public function testSessionIsSavedWhenUnexpectedSessionExceptionThrown() { $session = $this->createMock(Session::class); + $session->expects($this->exactly(1))->method('getId')->willReturn('123456'); $session->expects($this->exactly(1))->method('getName')->willReturn('PHPSESSID'); $session->method('isStarted')->willReturn(true); $session->expects($this->exactly(2))->method('getUsageIndex')->will($this->onConsecutiveCalls(0, 1)); From f3c196a03f0b2d9dadae0cf9f987f37512593ce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20TAMARELLE?= Date: Mon, 6 Dec 2021 17:23:18 +0100 Subject: [PATCH 40/52] Handle alias in completion script --- src/Symfony/Component/Console/Resources/completion.bash | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Symfony/Component/Console/Resources/completion.bash b/src/Symfony/Component/Console/Resources/completion.bash index 971af088ba116..c5e89c3c282ab 100644 --- a/src/Symfony/Component/Console/Resources/completion.bash +++ b/src/Symfony/Component/Console/Resources/completion.bash @@ -9,6 +9,12 @@ _sf_{{ COMMAND_NAME }}() { # Use newline as only separator to allow space in completion values IFS=$'\n' local sf_cmd="${COMP_WORDS[0]}" + + # for an alias, get the real script behind it + if [[ $(type -t $sf_cmd) == "alias" ]]; then + sf_cmd=$(alias $sf_cmd | sed -E "s/alias $sf_cmd='(.*)'/\1/") + fi + if [ ! -f "$sf_cmd" ]; then return 1 fi From 681b4c1853257d603bb2792a089cfc269dfe16de Mon Sep 17 00:00:00 2001 From: Wouter de Jong Date: Mon, 6 Dec 2021 20:27:27 +0100 Subject: [PATCH 41/52] Fix KernelBrowser::loginUser() causing deprecation --- src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php b/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php index c5bad9c4e5185..d77708036b4d8 100644 --- a/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php +++ b/src/Symfony/Bundle/FrameworkBundle/KernelBrowser.php @@ -125,7 +125,7 @@ public function loginUser(object $user, string $firewallContext = 'main'): self $token = new TestBrowserToken($user->getRoles(), $user, $firewallContext); // @deprecated since Symfony 5.4 if (method_exists($token, 'setAuthenticated')) { - $token->setAuthenticated(true); + $token->setAuthenticated(true, false); } $container = $this->getContainer(); From 63534799518c9b860003dda14d9b25f8b0dfcfad Mon Sep 17 00:00:00 2001 From: Thomas Calvet Date: Tue, 7 Dec 2021 12:11:51 +0100 Subject: [PATCH 42/52] Remove duplicated entry in UPGRADE-6.0.md --- UPGRADE-6.0.md | 1 - 1 file changed, 1 deletion(-) diff --git a/UPGRADE-6.0.md b/UPGRADE-6.0.md index 0f3b9e29bbd77..18c46c0b55aa8 100644 --- a/UPGRADE-6.0.md +++ b/UPGRADE-6.0.md @@ -124,7 +124,6 @@ HttpFoundation * Removed the `Request::HEADER_X_FORWARDED_ALL` constant, use either `Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO` or `Request::HEADER_X_FORWARDED_AWS_ELB` or `Request::HEADER_X_FORWARDED_TRAEFIK`constants instead * Rename `RequestStack::getMasterRequest()` to `getMainRequest()` * Not passing `FILTER_REQUIRE_ARRAY` or `FILTER_FORCE_ARRAY` flags to `InputBag::filter()` when filtering an array will throw `BadRequestException` - * Removed the `Request::HEADER_X_FORWARDED_ALL` constant * Retrieving non-scalar values using `InputBag::get()` will throw `BadRequestException` (use `InputBad::all()` instead to retrieve an array) * Passing non-scalar default value as the second argument `InputBag::get()` will throw `\InvalidArgumentException` * Passing non-scalar, non-array value as the second argument `InputBag::set()` will throw `\InvalidArgumentException` From 94265270b1e048e827b4b6e753961875b6803cbc Mon Sep 17 00:00:00 2001 From: Gary PEGEOT Date: Tue, 7 Dec 2021 12:41:14 +0000 Subject: [PATCH 43/52] [Messenger] [DI] Add auto-registration for BatchHandlerInterface --- .../FrameworkBundle/DependencyInjection/FrameworkExtension.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index 17950515dd922..3c46bc4609981 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -107,6 +107,7 @@ use Symfony\Component\Messenger\Bridge\Amqp\Transport\AmqpTransportFactory; use Symfony\Component\Messenger\Bridge\Beanstalkd\Transport\BeanstalkdTransportFactory; use Symfony\Component\Messenger\Bridge\Redis\Transport\RedisTransportFactory; +use Symfony\Component\Messenger\Handler\BatchHandlerInterface; use Symfony\Component\Messenger\Handler\MessageHandlerInterface; use Symfony\Component\Messenger\MessageBus; use Symfony\Component\Messenger\MessageBusInterface; @@ -582,6 +583,8 @@ public function load(array $configs, ContainerBuilder $container) ->addTag('validator.initializer'); $container->registerForAutoconfiguration(MessageHandlerInterface::class) ->addTag('messenger.message_handler'); + $container->registerForAutoconfiguration(BatchHandlerInterface::class) + ->addTag('messenger.message_handler'); $container->registerForAutoconfiguration(TransportFactoryInterface::class) ->addTag('messenger.transport_factory'); $container->registerForAutoconfiguration(MimeTypeGuesserInterface::class) From 4af20e42be91f38d82315034d256afb99db524b0 Mon Sep 17 00:00:00 2001 From: Thomas Calvet Date: Tue, 7 Dec 2021 12:16:45 +0100 Subject: [PATCH 44/52] Remove UPGRADE-5.4.md --- UPGRADE-5.4.md | 188 ------------------------------------------------- 1 file changed, 188 deletions(-) delete mode 100644 UPGRADE-5.4.md diff --git a/UPGRADE-5.4.md b/UPGRADE-5.4.md deleted file mode 100644 index 2f5ca06682a12..0000000000000 --- a/UPGRADE-5.4.md +++ /dev/null @@ -1,188 +0,0 @@ -UPGRADE FROM 5.3 to 5.4 -======================= - -Cache ------ - - * Deprecate `DoctrineProvider` and `DoctrineAdapter` because these classes have been added to the `doctrine/cache` package - * Deprecate usage of `PdoAdapter` with a `Doctrine\DBAL\Connection` or a DBAL URL. Use the new `DoctrineDbalAdapter` instead - -Console -------- - - * Deprecate `HelperSet::setCommand()` and `getCommand()` without replacement - -DoctrineBridge --------------- - - * Add argument `$bundleDir` to `AbstractDoctrineExtension::getMappingDriverBundleConfigDefaults()` - * Add argument `$bundleDir` to `AbstractDoctrineExtension::getMappingResourceConfigDirectory()` - -Finder ------- - - * Deprecate `Comparator::setTarget()` and `Comparator::setOperator()` - * Add a constructor to `Comparator` that allows setting target and operator - -Form ------- - - * Deprecate calling `FormErrorIterator::children()` if the current element is not iterable. - -FrameworkBundle ---------------- - - * Deprecate the `framework.translator.enabled_locales` config option, use `framework.enabled_locales` instead - * Deprecate the `AdapterInterface` autowiring alias, use `CacheItemPoolInterface` instead - * Deprecate the public `profiler` service to private - * Deprecate `get()`, `has()`, `getDoctrine()`, and `dispatchMessage()` in `AbstractController`, use method/constructor injection instead - * Deprecate the `cache.adapter.doctrine` service: The Doctrine Cache library is deprecated. Either switch to Symfony Cache or use the PSR-6 adapters provided by Doctrine Cache. - * In `framework.cache` configuration, using `cache.adapter.pdo` adapter with a Doctrine DBAL connection is deprecated, use `cache.adapter.doctrine_dbal` instead. - -HttpKernel ----------- - - * Deprecate `AbstractTestSessionListener::getSession` inject a session in the request instead - -HttpFoundation --------------- - - * Deprecate passing `null` as `$requestIp` to `IpUtils::checkIp()`, `IpUtils::checkIp4()` or `IpUtils::checkIp6()`, pass an empty string instead. - * Mark `Request::get()` internal, use explicit input sources instead - * Deprecate `upload_progress.*` and `url_rewriter.tags` session options - -Lock ----- - - * Deprecate usage of `PdoStore` with a `Doctrine\DBAL\Connection` or a DBAL url, use the new `DoctrineDbalStore` instead - * Deprecate usage of `PostgreSqlStore` with a `Doctrine\DBAL\Connection` or a DBAL url, use the new `DoctrineDbalPostgreSqlStore` instead - -Messenger ---------- - - * Deprecate not setting the `delete_after_ack` config option (or DSN parameter) using the Redis transport, - its default value will change to `true` in 6.0 - * Deprecate not setting the `reset_on_message` config option, its default value will change to `true` in 6.0 - -Monolog -------- - - * Deprecate `ResetLoggersWorkerSubscriber` to reset buffered logs in messenger - workers, use "reset_on_message" option in messenger configuration instead. - -SecurityBundle --------------- - - * Deprecate `FirewallConfig::getListeners()`, use `FirewallConfig::getAuthenticators()` instead - * Deprecate `security.authentication.basic_entry_point` and `security.authentication.retry_entry_point` services, the logic is moved into the - `HttpBasicAuthenticator` and `ChannelListener` respectively - * Deprecate not setting `$authenticatorManagerEnabled` to `true` in `SecurityDataCollector` and `DebugFirewallCommand` - * Deprecate `SecurityFactoryInterface` and `SecurityExtension::addSecurityListenerFactory()` in favor of - `AuthenticatorFactoryInterface` and `SecurityExtension::addAuthenticatorFactory()` - * Add `AuthenticatorFactoryInterface::getPriority()` which replaces `SecurityFactoryInterface::getPosition()`. - Previous positions are mapped to the following priorities: - - | Position | Constant | Priority | - | ----------- | ----------------------------------------------------- | -------- | - | pre_auth | `RemoteUserFactory::PRIORITY`/`X509Factory::PRIORITY` | -10 | - | form | `FormLoginFactory::PRIORITY` | -30 | - | http | `HttpBasicFactory::PRIORITY` | -50 | - | remember_me | `RememberMeFactory::PRIORITY` | -60 | - | anonymous | n/a | -70 | - - * Deprecate passing an array of arrays as 1st argument to `MainConfiguration`, pass a sorted flat array of - factories instead. - * Deprecate the `always_authenticate_before_granting` option - -Security --------- - - * Deprecate `AuthenticationEvents::AUTHENTICATION_FAILURE`, use the `LoginFailureEvent` instead - * Deprecate the `$authenticationEntryPoint` argument of `ChannelListener`, and add `$httpPort` and `$httpsPort` arguments - * Deprecate `RetryAuthenticationEntryPoint`, this code is now inlined in the `ChannelListener` - * Deprecate `FormAuthenticationEntryPoint` and `BasicAuthenticationEntryPoint`, in the new system the `FormLoginAuthenticator` - and `HttpBasicAuthenticator` should be used instead - * Deprecate `AbstractRememberMeServices`, `PersistentTokenBasedRememberMeServices`, `RememberMeServicesInterface`, - `TokenBasedRememberMeServices`, use the remember me handler alternatives instead - * Deprecate `AnonymousToken`, as the related authenticator was deprecated in 5.3 - * Deprecate `Token::getCredentials()`, tokens should no longer contain credentials (as they represent authenticated sessions) - * Deprecate not returning an `UserInterface` from `Token::getUser()` - * Deprecate `AuthenticatedVoter::IS_AUTHENTICATED_ANONYMOUSLY` and `AuthenticatedVoter::IS_ANONYMOUS`, - use `AuthenticatedVoter::PUBLIC_ACCESS` instead. - - Before: - ```yaml - # config/packages/security.yaml - security: - # ... - access_control: - - { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY } - ``` - - After: - ```yaml - # config/packages/security.yaml - security: - # ... - access_control: - - { path: ^/login, roles: PUBLIC_ACCESS } - ``` - - * Deprecate `AuthenticationTrustResolverInterface::isAnonymous()` and the `is_anonymous()` expression function - as anonymous no longer exists in version 6, use the `isFullFledged()` or the new `isAuthenticated()` instead - if you want to check if the request is (fully) authenticated. - * Deprecate the `$authManager` argument of `AccessListener`, the argument will be removed - * Deprecate the `$authenticationManager` argument of the `AuthorizationChecker` constructor, the argument will be removed - * Deprecate setting the `$alwaysAuthenticate` argument to `true` and not setting the - `$exceptionOnNoToken argument to `false` of `AuthorizationChecker` (this is the default - behavior when using `enable_authenticator_manager: true`) - * Deprecate not setting the `$exceptionOnNoToken` argument of `AccessListener` to `false` - (this is the default behavior when using `enable_authenticator_manager: true`) - * Deprecate `TokenInterface:isAuthenticated()` and `setAuthenticated()` methods, - return `null` from `getUser()` instead when a token is not authenticated - * Deprecate `DeauthenticatedEvent`, use `TokenDeauthenticatedEvent` instead - * Deprecate `CookieClearingLogoutHandler`, `SessionLogoutHandler` and `CsrfTokenClearingLogoutHandler`. - Use `CookieClearingLogoutListener`, `SessionLogoutListener` and `CsrfTokenClearingLogoutListener` instead - * Deprecate `AuthenticatorInterface::createAuthenticatedToken()`, use `AuthenticatorInterface::createToken()` instead - * Deprecate `PassportInterface`, `UserPassportInterface` and `PassportTrait`, use `Passport` instead. - As such, the return type declaration of `AuthenticatorInterface::authenticate()` will change to `Passport` in 6.0 - * Deprecate not configuring explicitly a provider for custom_authenticators when there is more than one registered provider - - Before: - ```php - class MyAuthenticator implements AuthenticatorInterface - { - public function authenticate(Request $request): PassportInterface - { - } - } - ``` - - After: - ```php - class MyAuthenticator implements AuthenticatorInterface - { - public function authenticate(Request $request): Passport - { - } - } - ``` - * Deprecate passing the strategy as string to `AccessDecisionManager`, - pass an instance of `AccessDecisionStrategyInterface` instead - * Flag `AccessDecisionManager` as `@final` - * Deprecate passing `$credentials` to `PreAuthenticatedToken`, - `SwitchUserToken` and `UsernamePasswordToken`: - - Before: - ```php - $token = new UsernamePasswordToken($user, $credentials, $firewallName, $roles); - $token = new PreAuthenticatedToken($user, $credentials, $firewallName, $roles); - $token = new SwitchUserToken($user, $credentials, $firewallName, $roles, $originalToken); - ``` - - After: - ```php - $token = new UsernamePasswordToken($user, $firewallName, $roles); - $token = new PreAuthenticatedToken($user, $firewallName, $roles); - $token = new SwitchUserToken($user, $firewallName, $roles, $originalToken); - ``` From dfb9de48d99cc6d2286c7abb767f4a72a078f762 Mon Sep 17 00:00:00 2001 From: Thomas Calvet Date: Tue, 7 Dec 2021 17:35:17 +0100 Subject: [PATCH 45/52] Fix UPGRADE files for framework.messenger.reset_on_message option --- UPGRADE-5.4.md | 4 ++-- UPGRADE-6.0.md | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/UPGRADE-5.4.md b/UPGRADE-5.4.md index 2f5ca06682a12..d7492d23f3cfb 100644 --- a/UPGRADE-5.4.md +++ b/UPGRADE-5.4.md @@ -38,6 +38,7 @@ FrameworkBundle * Deprecate `get()`, `has()`, `getDoctrine()`, and `dispatchMessage()` in `AbstractController`, use method/constructor injection instead * Deprecate the `cache.adapter.doctrine` service: The Doctrine Cache library is deprecated. Either switch to Symfony Cache or use the PSR-6 adapters provided by Doctrine Cache. * In `framework.cache` configuration, using `cache.adapter.pdo` adapter with a Doctrine DBAL connection is deprecated, use `cache.adapter.doctrine_dbal` instead. + * Deprecate not setting the `framework.messenger.reset_on_message` config option, its default value will change to `true` in 6.0 HttpKernel ---------- @@ -62,13 +63,12 @@ Messenger * Deprecate not setting the `delete_after_ack` config option (or DSN parameter) using the Redis transport, its default value will change to `true` in 6.0 - * Deprecate not setting the `reset_on_message` config option, its default value will change to `true` in 6.0 Monolog ------- * Deprecate `ResetLoggersWorkerSubscriber` to reset buffered logs in messenger - workers, use "reset_on_message" option in messenger configuration instead. + workers, use `framework.messenger.reset_on_message` option in FrameworkBundle messenger configuration instead. SecurityBundle -------------- diff --git a/UPGRADE-6.0.md b/UPGRADE-6.0.md index 18c46c0b55aa8..347263738c7b4 100644 --- a/UPGRADE-6.0.md +++ b/UPGRADE-6.0.md @@ -172,7 +172,6 @@ Messenger * Removed the `prefetch_count` parameter in the AMQP bridge. * Removed the use of TLS option for Redis Bridge, use `rediss://127.0.0.1` instead of `redis://127.0.0.1?tls=1` * The `delete_after_ack` config option of the Redis transport now defaults to `true` - * The `reset_on_message` config option now defaults to `true` Mime ---- From 47298dcef80beefbfa1f8fedcb49fb2ca6fef42f Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Wed, 8 Dec 2021 11:40:53 +0100 Subject: [PATCH 46/52] do not call preg_match() on null --- src/Symfony/Component/HttpFoundation/Request.php | 2 +- .../Component/HttpFoundation/Tests/RequestTest.php | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php index b6e6c3036b80f..cbe61a152a885 100644 --- a/src/Symfony/Component/HttpFoundation/Request.php +++ b/src/Symfony/Component/HttpFoundation/Request.php @@ -1502,7 +1502,7 @@ public function isMethodCacheable() public function getProtocolVersion() { if ($this->isFromTrustedProxy()) { - preg_match('~^(HTTP/)?([1-9]\.[0-9]) ~', $this->headers->get('Via'), $matches); + preg_match('~^(HTTP/)?([1-9]\.[0-9]) ~', $this->headers->get('Via') ?? '', $matches); if ($matches) { return 'HTTP/'.$matches[2]; diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php index 798c355d37138..6035dd5d32da9 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php @@ -2230,7 +2230,10 @@ public function testProtocolVersion($serverProtocol, $trustedProxy, $via, $expec $request = new Request(); $request->server->set('SERVER_PROTOCOL', $serverProtocol); $request->server->set('REMOTE_ADDR', '1.1.1.1'); - $request->headers->set('Via', $via); + + if (null !== $via) { + $request->headers->set('Via', $via); + } $this->assertSame($expected, $request->getProtocolVersion()); } @@ -2238,9 +2241,11 @@ public function testProtocolVersion($serverProtocol, $trustedProxy, $via, $expec public function protocolVersionProvider() { return [ - 'untrusted without via' => ['HTTP/2.0', false, '', 'HTTP/2.0'], + 'untrusted with empty via' => ['HTTP/2.0', false, '', 'HTTP/2.0'], + 'untrusted without via' => ['HTTP/2.0', false, null, 'HTTP/2.0'], 'untrusted with via' => ['HTTP/2.0', false, '1.0 fred, 1.1 nowhere.com (Apache/1.1)', 'HTTP/2.0'], - 'trusted without via' => ['HTTP/2.0', true, '', 'HTTP/2.0'], + 'trusted with empty via' => ['HTTP/2.0', true, '', 'HTTP/2.0'], + 'trusted without via' => ['HTTP/2.0', true, null, 'HTTP/2.0'], 'trusted with via' => ['HTTP/2.0', true, '1.0 fred, 1.1 nowhere.com (Apache/1.1)', 'HTTP/1.0'], 'trusted with via and protocol name' => ['HTTP/2.0', true, 'HTTP/1.0 fred, HTTP/1.1 nowhere.com (Apache/1.1)', 'HTTP/1.0'], 'trusted with broken via' => ['HTTP/2.0', true, 'HTTP/1^0 foo', 'HTTP/2.0'], From 52aaa561497c371e5b544fc8c9d334d5fa0202df Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 7 Dec 2021 12:27:08 +0100 Subject: [PATCH 47/52] Remove FQCN type hints on properties --- .../Doctrine/CacheWarmer/ProxyCacheWarmer.php | 2 +- .../Bridge/Doctrine/ContainerAwareEventManager.php | 2 +- .../DataCollector/DoctrineDataCollector.php | 2 +- .../Doctrine/DataFixtures/ContainerAwareLoader.php | 2 +- .../Form/ChoiceList/DoctrineChoiceLoader.php | 6 +++--- .../Bridge/Doctrine/Form/ChoiceList/IdReader.php | 4 ++-- .../Form/ChoiceList/ORMQueryBuilderLoader.php | 2 +- .../Bridge/Doctrine/IdGenerator/UlidGenerator.php | 2 +- .../Bridge/Doctrine/IdGenerator/UuidGenerator.php | 7 ++----- .../DoctrineClearEntityManagerWorkerSubscriber.php | 2 +- .../Doctrine/PropertyInfo/DoctrineExtractor.php | 2 +- .../Security/RememberMe/DoctrineTokenProvider.php | 2 +- .../Doctrine/Security/User/EntityUserProvider.php | 2 +- .../Constraints/UniqueEntityValidator.php | 2 +- .../Bridge/Doctrine/Validator/DoctrineLoader.php | 2 +- .../Bridge/Monolog/Command/ServerLogCommand.php | 5 ++--- .../Bridge/Monolog/Formatter/ConsoleFormatter.php | 4 ++-- .../Monolog/Formatter/VarDumperFormatter.php | 2 +- .../Bridge/Monolog/Handler/ChromePhpHandler.php | 2 +- .../Bridge/Monolog/Handler/ConsoleHandler.php | 2 +- .../Handler/ElasticsearchLogstashHandler.php | 2 +- .../FingersCrossed/HttpCodeActivationStrategy.php | 5 ++--- .../FingersCrossed/NotFoundActivationStrategy.php | 5 ++--- .../Bridge/Monolog/Handler/FirePHPHandler.php | 2 +- .../Bridge/Monolog/Handler/MailerHandler.php | 4 ++-- .../Bridge/Monolog/Handler/NotifierHandler.php | 2 +- .../Bridge/Monolog/Processor/DebugProcessor.php | 2 +- .../Instantiator/LazyLoadingValueHolderFactory.php | 2 +- .../LazyProxy/Instantiator/RuntimeInstantiator.php | 2 +- .../LazyProxy/PhpDumper/ProxyDumper.php | 4 ++-- src/Symfony/Bridge/Twig/AppVariable.php | 4 ++-- src/Symfony/Bridge/Twig/Command/DebugCommand.php | 4 ++-- src/Symfony/Bridge/Twig/Command/LintCommand.php | 2 +- .../Twig/DataCollector/TwigDataCollector.php | 4 ++-- .../Twig/ErrorRenderer/TwigErrorRenderer.php | 4 ++-- .../Bridge/Twig/Extension/AssetExtension.php | 2 +- src/Symfony/Bridge/Twig/Extension/CsrfRuntime.php | 2 +- .../Bridge/Twig/Extension/DumpExtension.php | 4 ++-- .../Bridge/Twig/Extension/FormExtension.php | 2 +- .../Twig/Extension/HttpFoundationExtension.php | 2 +- .../Bridge/Twig/Extension/HttpKernelRuntime.php | 4 ++-- .../Bridge/Twig/Extension/LogoutUrlExtension.php | 2 +- .../Bridge/Twig/Extension/ProfilerExtension.php | 2 +- .../Bridge/Twig/Extension/RoutingExtension.php | 2 +- .../Bridge/Twig/Extension/SecurityExtension.php | 4 ++-- .../Bridge/Twig/Extension/SerializerRuntime.php | 2 +- .../Bridge/Twig/Extension/StopwatchExtension.php | 2 +- .../Bridge/Twig/Extension/TranslationExtension.php | 4 ++-- .../Bridge/Twig/Extension/WebLinkExtension.php | 2 +- .../Bridge/Twig/Extension/WorkflowExtension.php | 2 +- .../Bridge/Twig/Form/TwigRendererEngine.php | 4 ++-- src/Symfony/Bridge/Twig/Mime/BodyRenderer.php | 4 ++-- .../Bridge/Twig/Mime/WrappedTemplatedEmail.php | 4 ++-- .../TranslationDefaultDomainNodeVisitor.php | 2 +- .../Bridge/Twig/Translation/TwigExtractor.php | 2 +- .../CacheWarmer/AnnotationsCacheWarmer.php | 2 +- .../CacheWarmer/CachePoolClearerCacheWarmer.php | 2 +- .../CacheWarmer/ConfigBuilderCacheWarmer.php | 4 ++-- .../CacheWarmer/RouterCacheWarmer.php | 2 +- .../CacheWarmer/TranslationsCacheWarmer.php | 4 ++-- .../CacheWarmer/ValidatorCacheWarmer.php | 2 +- .../Command/AssetsInstallCommand.php | 2 +- .../FrameworkBundle/Command/CacheClearCommand.php | 4 ++-- .../Command/CachePoolClearCommand.php | 2 +- .../Command/CachePoolDeleteCommand.php | 2 +- .../FrameworkBundle/Command/CacheWarmupCommand.php | 2 +- .../Command/ContainerLintCommand.php | 2 +- .../Command/DebugAutowiringCommand.php | 2 +- .../Command/EventDispatcherDebugCommand.php | 2 +- .../FrameworkBundle/Command/RouterDebugCommand.php | 4 ++-- .../FrameworkBundle/Command/RouterMatchCommand.php | 2 +- .../Command/SecretsDecryptToLocalCommand.php | 4 ++-- .../Command/SecretsEncryptFromLocalCommand.php | 4 ++-- .../Command/SecretsGenerateKeysCommand.php | 4 ++-- .../FrameworkBundle/Command/SecretsListCommand.php | 4 ++-- .../Command/SecretsRemoveCommand.php | 4 ++-- .../FrameworkBundle/Command/SecretsSetCommand.php | 4 ++-- .../Command/TranslationDebugCommand.php | 6 +++--- .../Command/TranslationUpdateCommand.php | 6 +++--- .../Bundle/FrameworkBundle/Console/Application.php | 2 +- .../Console/Descriptor/TextDescriptor.php | 2 +- .../Controller/RedirectController.php | 2 +- .../Controller/TemplateController.php | 2 +- .../Bundle/FrameworkBundle/HttpCache/HttpCache.php | 4 ++-- .../Resources/config/mailer_debug.php | 1 - .../Bundle/FrameworkBundle/Routing/Router.php | 2 +- .../Bundle/FrameworkBundle/Test/TestContainer.php | 2 +- .../DependencyInjection/FrameworkExtensionTest.php | 1 - .../CacheWarmer/ExpressionCacheWarmer.php | 2 +- .../Command/DebugFirewallCommand.php | 4 ++-- .../DataCollector/SecurityDataCollector.php | 12 ++++++------ .../Debug/TraceableListenerTrait.php | 3 +-- .../EventListener/FirewallListener.php | 4 ++-- .../SecurityBundle/EventListener/VoteListener.php | 2 +- .../RememberMe/DecoratedRememberMeHandler.php | 2 +- .../SecurityBundle/Security/FirewallAwareTrait.php | 8 +++----- .../SecurityBundle/Security/FirewallContext.php | 6 +++--- .../Bundle/SecurityBundle/Security/FirewallMap.php | 2 +- .../Security/LazyFirewallContext.php | 2 +- .../Security/Factory/AbstractFactoryTest.php | 2 +- .../EventSubscriber/RequestTrackerSubscriber.php | 2 +- .../TwigBundle/CacheWarmer/TemplateCacheWarmer.php | 4 ++-- src/Symfony/Bundle/TwigBundle/TemplateIterator.php | 2 +- .../EventListener/WebDebugToolbarListener.php | 8 ++++---- .../Asset/Context/RequestStackContext.php | 2 +- src/Symfony/Component/Asset/Package.php | 4 ++-- src/Symfony/Component/Asset/Packages.php | 2 +- .../JsonManifestVersionStrategy.php | 2 +- src/Symfony/Component/BrowserKit/HttpBrowser.php | 2 +- .../Component/Cache/Adapter/ApcuAdapter.php | 2 +- .../Cache/Adapter/CouchbaseBucketAdapter.php | 4 ++-- .../Cache/Adapter/CouchbaseCollectionAdapter.php | 4 ++-- .../Cache/Adapter/DoctrineDbalAdapter.php | 4 ++-- .../Component/Cache/Adapter/MemcachedAdapter.php | 6 +++--- src/Symfony/Component/Cache/Adapter/PdoAdapter.php | 4 ++-- .../Component/Cache/Adapter/TagAwareAdapter.php | 2 +- src/Symfony/Component/Cache/CacheItem.php | 2 +- .../Cache/Marshaller/DeflateMarshaller.php | 2 +- .../Cache/Marshaller/SodiumMarshaller.php | 2 +- .../Cache/Marshaller/TagAwareMarshaller.php | 2 +- .../Cache/Messenger/EarlyExpirationDispatcher.php | 4 ++-- .../Cache/Messenger/EarlyExpirationHandler.php | 2 +- .../Cache/Messenger/EarlyExpirationMessage.php | 2 +- src/Symfony/Component/Cache/Psr16Cache.php | 2 +- .../Component/Cache/Traits/FilesystemTrait.php | 3 +-- .../Cache/Traits/RedisClusterNodeProxy.php | 2 +- .../Component/Cache/Traits/RedisClusterProxy.php | 4 ++-- src/Symfony/Component/Cache/Traits/RedisProxy.php | 2 +- src/Symfony/Component/Cache/Traits/RedisTrait.php | 4 ++-- src/Symfony/Component/Console/Application.php | 14 +++++++------- .../Component/Console/CI/GithubActionReporter.php | 2 +- src/Symfony/Component/Console/Command/Command.php | 8 ++++---- .../Component/Console/Command/HelpCommand.php | 2 +- .../Component/Console/Command/LazyCommand.php | 2 +- .../Component/Console/Command/LockableTrait.php | 3 +-- .../CommandLoader/ContainerCommandLoader.php | 2 +- src/Symfony/Component/Console/Cursor.php | 2 +- .../Console/Descriptor/ApplicationDescription.php | 2 +- .../Component/Console/Event/ConsoleEvent.php | 4 ++-- .../Console/EventListener/ErrorListener.php | 2 +- .../Console/Formatter/NullOutputFormatter.php | 2 +- .../Console/Formatter/OutputFormatter.php | 2 +- .../Console/Formatter/OutputFormatterStyle.php | 2 +- .../Formatter/OutputFormatterStyleStack.php | 2 +- src/Symfony/Component/Console/Helper/Dumper.php | 6 +++--- .../Component/Console/Helper/ProgressBar.php | 6 +++--- .../Component/Console/Helper/ProgressIndicator.php | 2 +- src/Symfony/Component/Console/Helper/Table.php | 4 ++-- .../Component/Console/Input/InputDefinition.php | 4 ++-- .../Component/Console/Logger/ConsoleLogger.php | 2 +- .../Component/Console/Output/ConsoleOutput.php | 2 +- .../Console/Output/ConsoleSectionOutput.php | 2 +- .../Component/Console/Output/NullOutput.php | 2 +- src/Symfony/Component/Console/Output/Output.php | 2 +- .../Component/Console/Style/OutputStyle.php | 2 +- .../Component/Console/Style/SymfonyStyle.php | 10 +++++----- .../Component/Console/Tester/ApplicationTester.php | 2 +- .../Component/Console/Tester/CommandTester.php | 2 +- .../Component/Console/Tester/TesterTrait.php | 4 ++-- .../Component/CssSelector/CssSelectorConverter.php | 2 +- .../Component/CssSelector/Node/AttributeNode.php | 2 +- .../Component/CssSelector/Node/ClassNode.php | 2 +- .../CssSelector/Node/CombinedSelectorNode.php | 4 ++-- .../Component/CssSelector/Node/FunctionNode.php | 2 +- .../Component/CssSelector/Node/HashNode.php | 2 +- .../Component/CssSelector/Node/NegationNode.php | 4 ++-- .../Component/CssSelector/Node/PseudoNode.php | 2 +- .../Component/CssSelector/Node/SelectorNode.php | 2 +- .../CssSelector/Parser/Handler/HashHandler.php | 4 ++-- .../Parser/Handler/IdentifierHandler.php | 4 ++-- .../CssSelector/Parser/Handler/NumberHandler.php | 2 +- .../CssSelector/Parser/Handler/StringHandler.php | 4 ++-- .../Component/CssSelector/Parser/Parser.php | 2 +- .../Component/CssSelector/Parser/TokenStream.php | 2 +- .../Parser/Tokenizer/TokenizerEscaping.php | 2 +- .../Component/CssSelector/XPath/Translator.php | 2 +- .../Argument/ServiceLocatorArgument.php | 2 +- .../Compiler/AbstractRecursivePass.php | 2 +- .../Compiler/AnalyzeServiceReferencesPass.php | 4 ++-- .../Compiler/CheckTypeDeclarationsPass.php | 2 +- .../DependencyInjection/Compiler/Compiler.php | 4 ++-- .../Compiler/InlineServiceDefinitionsPass.php | 4 ++-- .../DependencyInjection/Compiler/PassConfig.php | 2 +- .../Compiler/ResolveInvalidReferencesPass.php | 4 ++-- .../Compiler/ResolveParameterPlaceHoldersPass.php | 3 +-- .../Compiler/ServiceReferenceGraphEdge.php | 4 ++-- .../Config/ContainerParametersResourceChecker.php | 2 +- .../DependencyInjection/ContainerBuilder.php | 6 +++--- .../DependencyInjection/Dumper/PhpDumper.php | 4 ++-- .../DependencyInjection/Dumper/YamlDumper.php | 2 +- .../DependencyInjection/EnvVarProcessor.php | 2 +- .../DependencyInjection/Loader/ClosureLoader.php | 2 +- .../Loader/Configurator/AbstractConfigurator.php | 3 +-- .../Loader/Configurator/ContainerConfigurator.php | 4 ++-- .../Loader/Configurator/ParametersConfigurator.php | 2 +- .../Loader/Configurator/PrototypeConfigurator.php | 2 +- .../Loader/Configurator/ServiceConfigurator.php | 2 +- .../Loader/Configurator/ServicesConfigurator.php | 6 +++--- .../DependencyInjection/Loader/PhpFileLoader.php | 2 +- .../DependencyInjection/Loader/YamlFileLoader.php | 2 +- .../ParameterBag/ContainerBag.php | 2 +- .../DependencyInjection/ReverseContainer.php | 4 ++-- .../DependencyInjection/ServiceLocator.php | 2 +- .../Tests/Fixtures/FooClassWithEnumAttribute.php | 2 +- .../Tests/Fixtures/LocatorConsumer.php | 2 +- .../Tests/Fixtures/LocatorConsumerConsumer.php | 2 +- .../LocatorConsumerWithDefaultIndexMethod.php | 2 +- ...aultIndexMethodAndWithDefaultPriorityMethod.php | 2 +- .../LocatorConsumerWithDefaultPriorityMethod.php | 2 +- .../Tests/Fixtures/LocatorConsumerWithoutIndex.php | 2 +- src/Symfony/Component/DomCrawler/Crawler.php | 2 +- src/Symfony/Component/DomCrawler/Form.php | 2 +- .../Component/Dotenv/Exception/FormatException.php | 2 +- .../Component/ErrorHandler/ErrorHandler.php | 2 +- .../ErrorRenderer/HtmlErrorRenderer.php | 2 +- .../ErrorRenderer/SerializerErrorRenderer.php | 4 ++-- .../Debug/TraceableEventDispatcher.php | 4 ++-- .../EventDispatcher/Debug/WrappedListener.php | 6 +++--- .../EventDispatcher/ImmutableEventDispatcher.php | 2 +- .../ExpressionLanguage/ExpressionLanguage.php | 8 ++++---- .../ExpressionLanguage/ParsedExpression.php | 2 +- .../Component/ExpressionLanguage/Parser.php | 2 +- src/Symfony/Component/Form/AbstractExtension.php | 2 +- src/Symfony/Component/Form/Button.php | 4 ++-- src/Symfony/Component/Form/ButtonBuilder.php | 2 +- .../ChoiceList/Factory/CachingFactoryDecorator.php | 2 +- .../ChoiceList/Factory/PropertyAccessDecorator.php | 4 ++-- .../Component/Form/ChoiceList/LazyChoiceList.php | 2 +- .../ChoiceList/Loader/AbstractChoiceLoader.php | 2 +- .../Loader/FilterChoiceLoaderDecorator.php | 2 +- .../Component/Form/Command/DebugCommand.php | 4 ++-- .../Form/Console/Descriptor/TextDescriptor.php | 2 +- .../Form/Extension/Core/CoreExtension.php | 6 +++--- .../Core/DataAccessor/PropertyPathAccessor.php | 2 +- .../Form/Extension/Core/DataMapper/DataMapper.php | 2 +- .../DataTransformer/ChoiceToValueTransformer.php | 2 +- .../DataTransformer/ChoicesToValuesTransformer.php | 2 +- .../TransformationFailureListener.php | 2 +- .../Form/Extension/Core/Type/ChoiceType.php | 4 ++-- .../Form/Extension/Core/Type/ColorType.php | 2 +- .../Form/Extension/Core/Type/FileType.php | 2 +- .../Form/Extension/Core/Type/FormType.php | 2 +- .../Core/Type/TransformationFailureExtension.php | 2 +- .../Form/Extension/Csrf/CsrfExtension.php | 4 ++-- .../Csrf/EventListener/CsrfValidationListener.php | 6 +++--- .../Extension/Csrf/Type/FormTypeCsrfExtension.php | 6 +++--- .../DataCollector/DataCollectorExtension.php | 2 +- .../EventListener/DataCollectorListener.php | 2 +- .../Extension/DataCollector/FormDataCollector.php | 2 +- .../Proxy/ResolvedTypeDataCollectorProxy.php | 4 ++-- .../ResolvedTypeFactoryDataCollectorProxy.php | 4 ++-- .../Type/DataCollectorTypeExtension.php | 2 +- .../DependencyInjectionExtension.php | 4 ++-- .../HttpFoundationRequestHandler.php | 2 +- .../Type/FormTypeHttpFoundationExtension.php | 2 +- .../Validator/EventListener/ValidationListener.php | 4 ++-- .../Validator/Type/FormTypeValidatorExtension.php | 4 ++-- .../Validator/Type/UploadValidatorExtension.php | 2 +- .../Extension/Validator/ValidatorExtension.php | 6 +++--- .../Extension/Validator/ValidatorTypeGuesser.php | 2 +- .../Validator/ViolationMapper/MappingRule.php | 2 +- .../Validator/ViolationMapper/RelativePath.php | 2 +- .../Validator/ViolationMapper/ViolationMapper.php | 4 ++-- src/Symfony/Component/Form/Form.php | 12 ++++++------ src/Symfony/Component/Form/FormConfigBuilder.php | 12 ++++++------ src/Symfony/Component/Form/FormError.php | 2 +- src/Symfony/Component/Form/FormErrorIterator.php | 2 +- src/Symfony/Component/Form/FormEvent.php | 2 +- src/Symfony/Component/Form/FormFactory.php | 2 +- src/Symfony/Component/Form/FormFactoryBuilder.php | 2 +- src/Symfony/Component/Form/FormRegistry.php | 4 ++-- src/Symfony/Component/Form/FormRenderer.php | 4 ++-- .../Component/Form/NativeRequestHandler.php | 2 +- src/Symfony/Component/Form/PreloadedExtension.php | 2 +- src/Symfony/Component/Form/ResolvedFormType.php | 6 +++--- src/Symfony/Component/Form/Util/ServerParams.php | 2 +- src/Symfony/Component/HttpClient/AmpHttpClient.php | 2 +- .../Component/HttpClient/CachingHttpClient.php | 4 ++-- .../Component/HttpClient/CurlHttpClient.php | 2 +- .../Component/HttpClient/DecoratorTrait.php | 2 +- .../HttpClient/Exception/HttpExceptionTrait.php | 2 +- src/Symfony/Component/HttpClient/HttplugClient.php | 8 ++++---- .../Component/HttpClient/Internal/AmpBody.php | 2 +- .../HttpClient/Internal/AmpClientState.php | 2 +- .../HttpClient/Internal/CurlClientState.php | 5 ++--- .../HttpClient/Internal/HttplugWaitLoop.php | 6 +++--- .../HttpClient/Internal/PushedResponse.php | 2 +- .../Component/HttpClient/MockHttpClient.php | 2 +- .../Component/HttpClient/NativeHttpClient.php | 2 +- .../HttpClient/NoPrivateNetworkHttpClient.php | 2 +- src/Symfony/Component/HttpClient/Psr18Client.php | 10 +++++----- .../Component/HttpClient/Response/AmpResponse.php | 4 ++-- .../Component/HttpClient/Response/AsyncContext.php | 4 ++-- .../HttpClient/Response/AsyncResponse.php | 4 ++-- .../Component/HttpClient/Response/CurlResponse.php | 2 +- .../HttpClient/Response/HttplugPromise.php | 2 +- .../HttpClient/Response/NativeResponse.php | 2 +- .../HttpClient/Response/StreamWrapper.php | 4 ++-- .../HttpClient/Response/TraceableResponse.php | 6 +++--- .../HttpClient/Response/TransportResponseTrait.php | 8 +++----- .../Component/HttpClient/RetryableHttpClient.php | 4 ++-- .../Component/HttpClient/ScopingHttpClient.php | 2 +- .../Component/HttpClient/TraceableHttpClient.php | 4 ++-- .../HttpFoundation/ExpressionRequestMatcher.php | 4 ++-- .../HttpFoundation/Session/SessionBagProxy.php | 2 +- .../HttpFoundation/Session/SessionFactory.php | 4 ++-- .../Storage/Handler/MarshallingSessionHandler.php | 4 ++-- .../Storage/Handler/MemcachedSessionHandler.php | 2 +- .../Storage/Handler/MongoDbSessionHandler.php | 4 ++-- .../Session/Storage/Handler/PdoSessionHandler.php | 2 +- .../Storage/Handler/RedisSessionHandler.php | 2 +- .../Storage/MockFileSessionStorageFactory.php | 2 +- .../Storage/NativeSessionStorageFactory.php | 4 ++-- .../Storage/PhpBridgeSessionStorageFactory.php | 4 ++-- .../Test/Constraint/ResponseFormatSame.php | 2 +- src/Symfony/Component/HttpFoundation/UrlHelper.php | 4 ++-- .../Component/HttpKernel/Config/FileLocator.php | 2 +- .../HttpKernel/Controller/ArgumentResolver.php | 2 +- .../NotTaggedControllerValueResolver.php | 2 +- .../ArgumentResolver/ServiceValueResolver.php | 2 +- .../ArgumentResolver/TraceableValueResolver.php | 4 ++-- .../HttpKernel/Controller/ControllerResolver.php | 2 +- .../HttpKernel/Controller/ErrorController.php | 4 ++-- .../Controller/TraceableArgumentResolver.php | 4 ++-- .../Controller/TraceableControllerResolver.php | 4 ++-- .../DataCollector/ConfigDataCollector.php | 2 +- .../HttpKernel/DataCollector/DataCollector.php | 3 +-- .../HttpKernel/DataCollector/DumpDataCollector.php | 6 +++--- .../DataCollector/EventDataCollector.php | 6 +++--- .../DataCollector/LoggerDataCollector.php | 6 +++--- .../DataCollector/RequestDataCollector.php | 2 +- .../HttpKernel/DataCollector/TimeDataCollector.php | 4 ++-- .../HttpKernel/Debug/FileLinkFormatter.php | 2 +- .../AddAnnotatedClassesToCachePass.php | 2 +- .../LazyLoadingFragmentHandler.php | 2 +- .../Component/HttpKernel/Event/KernelEvent.php | 4 ++-- .../Component/HttpKernel/Event/RequestEvent.php | 2 +- .../Component/HttpKernel/Event/ResponseEvent.php | 2 +- .../Component/HttpKernel/Event/TerminateEvent.php | 2 +- .../EventListener/DebugHandlersListener.php | 4 ++-- .../HttpKernel/EventListener/DumpListener.php | 6 +++--- .../HttpKernel/EventListener/FragmentListener.php | 2 +- .../EventListener/LocaleAwareListener.php | 2 +- .../HttpKernel/EventListener/LocaleListener.php | 4 ++-- .../HttpKernel/EventListener/ProfilerListener.php | 6 +++--- .../HttpKernel/EventListener/RouterListener.php | 8 ++++---- .../HttpKernel/EventListener/SessionListener.php | 2 -- .../HttpKernel/EventListener/SurrogateListener.php | 2 +- .../Fragment/AbstractSurrogateFragmentRenderer.php | 6 +++--- .../HttpKernel/Fragment/FragmentHandler.php | 2 +- .../HttpKernel/Fragment/FragmentUriGenerator.php | 4 ++-- .../Fragment/HIncludeFragmentRenderer.php | 4 ++-- .../HttpKernel/Fragment/InlineFragmentRenderer.php | 4 ++-- .../Component/HttpKernel/HttpCache/HttpCache.php | 10 +++++----- .../Component/HttpKernel/HttpClientKernel.php | 2 +- src/Symfony/Component/HttpKernel/HttpKernel.php | 2 +- .../Component/HttpKernel/Profiler/Profiler.php | 4 ++-- .../Tests/EventListener/SessionListenerTest.php | 2 -- .../Data/Bundle/Reader/BufferedBundleReader.php | 4 ++-- .../Intl/Data/Bundle/Reader/BundleEntryReader.php | 2 +- .../Intl/Data/Generator/AbstractDataGenerator.php | 2 +- .../Data/Util/ArrayAccessibleResourceBundle.php | 2 +- .../Component/Ldap/Adapter/ExtLdap/Adapter.php | 4 ++-- .../Component/Ldap/Adapter/ExtLdap/Collection.php | 4 ++-- .../Ldap/Adapter/ExtLdap/EntryManager.php | 2 +- src/Symfony/Component/Ldap/Ldap.php | 2 +- .../Ldap/Security/CheckLdapCredentialsListener.php | 2 +- .../Component/Ldap/Security/LdapAuthenticator.php | 2 +- src/Symfony/Component/Ldap/Security/LdapUser.php | 2 +- .../Component/Ldap/Security/LdapUserProvider.php | 2 +- .../Ldap/Tests/Adapter/ExtLdap/LdapManagerTest.php | 1 - src/Symfony/Component/Lock/Lock.php | 4 ++-- src/Symfony/Component/Lock/LockFactory.php | 2 +- src/Symfony/Component/Lock/Store/CombinedStore.php | 2 +- .../Lock/Store/DoctrineDbalPostgreSqlStore.php | 2 +- .../Component/Lock/Store/DoctrineDbalStore.php | 2 +- .../Component/Lock/Store/MemcachedStore.php | 2 +- src/Symfony/Component/Lock/Store/MongoDbStore.php | 4 ++-- src/Symfony/Component/Lock/Store/PdoStore.php | 2 +- .../Component/Lock/Store/PostgreSqlStore.php | 2 +- src/Symfony/Component/Lock/Store/RedisStore.php | 2 +- .../Component/Lock/Store/ZookeeperStore.php | 2 +- .../Mailer/DataCollector/MessageDataCollector.php | 2 +- src/Symfony/Component/Mailer/DelayedEnvelope.php | 2 +- src/Symfony/Component/Mailer/Envelope.php | 2 +- .../Component/Mailer/Event/MessageEvent.php | 4 ++-- .../Mailer/EventListener/EnvelopeListener.php | 2 +- .../Mailer/EventListener/MessageListener.php | 4 ++-- .../Mailer/EventListener/MessageLoggerListener.php | 2 +- .../Mailer/Exception/HttpTransportException.php | 2 +- src/Symfony/Component/Mailer/Mailer.php | 6 +++--- .../Component/Mailer/Messenger/MessageHandler.php | 2 +- .../Mailer/Messenger/SendEmailMessage.php | 4 ++-- src/Symfony/Component/Mailer/SentMessage.php | 6 +++--- .../Mailer/Transport/AbstractTransport.php | 4 ++-- .../Mailer/Transport/FailoverTransport.php | 2 +- .../Mailer/Transport/SendmailTransport.php | 4 ++-- .../Mailer/Transport/Smtp/SmtpTransport.php | 2 +- .../Component/Mailer/Transport/Transports.php | 2 +- .../AmazonSqs/Transport/AmazonSqsReceiver.php | 4 ++-- .../Bridge/AmazonSqs/Transport/AmazonSqsSender.php | 4 ++-- .../AmazonSqs/Transport/AmazonSqsTransport.php | 8 ++++---- .../Transport/AmazonSqsTransportFactory.php | 2 +- .../Bridge/AmazonSqs/Transport/Connection.php | 5 ++--- .../Bridge/Amqp/Transport/AmqpReceivedStamp.php | 2 +- .../Bridge/Amqp/Transport/AmqpReceiver.php | 4 ++-- .../Messenger/Bridge/Amqp/Transport/AmqpSender.php | 4 ++-- .../Bridge/Amqp/Transport/AmqpTransport.php | 8 ++++---- .../Messenger/Bridge/Amqp/Transport/Connection.php | 8 ++++---- .../Beanstalkd/Transport/BeanstalkdReceiver.php | 4 ++-- .../Beanstalkd/Transport/BeanstalkdSender.php | 4 ++-- .../Beanstalkd/Transport/BeanstalkdTransport.php | 8 ++++---- .../Bridge/Beanstalkd/Transport/Connection.php | 2 +- .../Bridge/Doctrine/Transport/Connection.php | 2 +- .../Bridge/Doctrine/Transport/DoctrineReceiver.php | 4 ++-- .../Bridge/Doctrine/Transport/DoctrineSender.php | 4 ++-- .../Doctrine/Transport/DoctrineTransport.php | 8 ++++---- .../Transport/DoctrineTransportFactory.php | 2 +- .../Bridge/Redis/Transport/Connection.php | 2 +- .../Bridge/Redis/Transport/RedisClusterProxy.php | 2 +- .../Bridge/Redis/Transport/RedisProxy.php | 2 +- .../Bridge/Redis/Transport/RedisReceiver.php | 4 ++-- .../Bridge/Redis/Transport/RedisSender.php | 4 ++-- .../Bridge/Redis/Transport/RedisTransport.php | 8 ++++---- .../Messenger/Command/ConsumeMessagesCommand.php | 10 +++++----- .../Command/FailedMessagesRetryCommand.php | 6 +++--- .../Messenger/Command/SetupTransportsCommand.php | 2 +- .../Messenger/Command/StopWorkersCommand.php | 2 +- .../Messenger/Event/AbstractWorkerMessageEvent.php | 2 +- .../Event/SendMessageToTransportsEvent.php | 2 +- .../Messenger/Event/WorkerRunningEvent.php | 2 +- .../Messenger/Event/WorkerStartedEvent.php | 2 +- .../Messenger/Event/WorkerStoppedEvent.php | 2 +- .../EventListener/ResetServicesListener.php | 2 +- .../SendFailedMessageForRetryListener.php | 8 ++++---- ...SendFailedMessageToFailureTransportListener.php | 4 ++-- .../StopWorkerOnFailureLimitListener.php | 2 +- .../StopWorkerOnMemoryLimitListener.php | 2 +- .../StopWorkerOnMessageLimitListener.php | 2 +- .../StopWorkerOnRestartSignalListener.php | 4 ++-- .../StopWorkerOnSigtermSignalListener.php | 2 +- .../StopWorkerOnTimeLimitListener.php | 2 +- .../Messenger/Exception/HandlerFailedException.php | 2 +- .../Exception/ValidationFailedException.php | 2 +- src/Symfony/Component/Messenger/HandleTrait.php | 2 +- .../Messenger/Handler/HandlerDescriptor.php | 2 +- .../Messenger/Middleware/ActivationMiddleware.php | 2 +- .../DispatchAfterCurrentBusMiddleware.php | 4 ++-- .../Middleware/HandleMessageMiddleware.php | 2 +- .../Middleware/RouterContextMiddleware.php | 2 +- .../Messenger/Middleware/SendMessageMiddleware.php | 4 ++-- .../Messenger/Middleware/StackMiddleware.php | 2 +- .../Messenger/Middleware/TraceableMiddleware.php | 6 +++--- .../Messenger/Middleware/ValidationMiddleware.php | 2 +- .../Component/Messenger/RoutableMessageBus.php | 4 ++-- .../Messenger/Stamp/ErrorDetailsStamp.php | 2 +- .../Component/Messenger/TraceableMessageBus.php | 2 +- .../Messenger/Transport/InMemoryTransport.php | 2 +- .../Transport/Receiver/SingleMessageReceiver.php | 4 ++-- .../Messenger/Transport/Sender/SendersLocator.php | 2 +- .../Transport/Serialization/Serializer.php | 2 +- .../Messenger/Transport/Sync/SyncTransport.php | 2 +- .../Transport/Sync/SyncTransportFactory.php | 2 +- src/Symfony/Component/Messenger/Worker.php | 8 ++++---- src/Symfony/Component/Mime/Crypto/DkimSigner.php | 2 +- .../Component/Mime/Header/MailboxHeader.php | 2 +- .../Component/Mime/Header/ParameterizedHeader.php | 2 +- src/Symfony/Component/Mime/Header/PathHeader.php | 2 +- src/Symfony/Component/Mime/Message.php | 4 ++-- .../Bridge/AmazonSns/AmazonSnsTransport.php | 2 +- .../Clickatell/Tests/ClickatellTransportTest.php | 1 - .../Bridge/FakeChat/FakeChatEmailTransport.php | 2 +- .../Bridge/FakeChat/FakeChatLoggerTransport.php | 2 +- .../Bridge/FakeChat/FakeChatTransportFactory.php | 4 ++-- .../Bridge/FakeSms/FakeSmsEmailTransport.php | 2 +- .../Bridge/FakeSms/FakeSmsLoggerTransport.php | 2 +- .../Bridge/FakeSms/FakeSmsTransportFactory.php | 4 ++-- .../Notifier/Bridge/Mercure/MercureTransport.php | 2 +- .../Bridge/Mercure/MercureTransportFactory.php | 2 +- .../Bridge/OneSignal/OneSignalTransportFactory.php | 1 - .../Tests/OneSignalTransportFactoryTest.php | 1 - .../OneSignal/Tests/OneSignalTransportTest.php | 1 - .../Bridge/Sms77/Sms77TransportFactory.php | 1 - .../Sms77/Tests/Sms77TransportFactoryTest.php | 1 - .../Bridge/Sms77/Tests/Sms77TransportTest.php | 1 - .../Vonage/Tests/VonageTransportFactoryTest.php | 1 - .../Bridge/Vonage/Tests/VonageTransportTest.php | 1 - .../Bridge/Vonage/VonageTransportFactory.php | 1 - .../Component/Notifier/Channel/BrowserChannel.php | 2 +- .../Component/Notifier/Channel/EmailChannel.php | 6 +++--- src/Symfony/Component/Notifier/Chatter.php | 6 +++--- .../DataCollector/NotificationDataCollector.php | 2 +- .../Notifier/Event/FailedMessageEvent.php | 2 +- .../Component/Notifier/Event/MessageEvent.php | 2 +- .../Component/Notifier/Event/SentMessageEvent.php | 2 +- .../EventListener/NotificationLoggerListener.php | 2 +- .../SendFailedMessageToNotifierListener.php | 2 +- .../Notifier/Exception/TransportException.php | 2 +- .../Component/Notifier/Message/ChatMessage.php | 4 ++-- .../Component/Notifier/Message/EmailMessage.php | 4 ++-- .../Component/Notifier/Message/NullMessage.php | 2 +- .../Component/Notifier/Message/SentMessage.php | 2 +- .../Notifier/Messenger/MessageHandler.php | 2 +- .../Notifier/Notification/Notification.php | 2 +- src/Symfony/Component/Notifier/Notifier.php | 2 +- src/Symfony/Component/Notifier/Texter.php | 6 +++--- .../Notifier/Transport/AbstractTransport.php | 2 +- .../Notifier/Transport/FailoverTransport.php | 2 +- .../Component/Notifier/Transport/NullTransport.php | 2 +- .../Command/UserPasswordHashCommand.php | 2 +- .../Hasher/MigratingPasswordHasher.php | 2 +- .../PasswordHasher/Hasher/UserPasswordHasher.php | 2 +- .../Exception/MaxWaitDurationExceededException.php | 2 +- .../Exception/RateLimitExceededException.php | 2 +- .../RateLimiter/Policy/ResetLimiterTrait.php | 6 ++---- .../Component/RateLimiter/Policy/TokenBucket.php | 2 +- .../RateLimiter/Policy/TokenBucketLimiter.php | 2 +- .../Component/RateLimiter/RateLimiterFactory.php | 4 ++-- src/Symfony/Component/RateLimiter/Reservation.php | 2 +- .../Component/RateLimiter/Storage/CacheStorage.php | 2 +- .../Routing/Generator/Dumper/GeneratorDumper.php | 2 +- .../Loader/Configurator/AliasConfigurator.php | 2 +- .../Loader/Configurator/CollectionConfigurator.php | 4 ++-- .../Loader/Configurator/ImportConfigurator.php | 2 +- .../Loader/Configurator/RoutingConfigurator.php | 2 +- .../Component/Routing/Loader/ContainerLoader.php | 2 +- .../Component/Routing/Loader/YamlFileLoader.php | 2 +- .../Matcher/Dumper/CompiledUrlMatcherDumper.php | 2 +- .../Routing/Matcher/Dumper/MatcherDumper.php | 2 +- .../Routing/Matcher/ExpressionLanguageProvider.php | 2 +- src/Symfony/Component/Routing/Route.php | 2 +- src/Symfony/Component/Routing/Router.php | 2 +- .../RememberMe/CacheTokenVerifier.php | 2 +- .../Core/Authentication/Token/AbstractToken.php | 2 +- .../Authentication/Token/Storage/TokenStorage.php | 2 +- .../Token/Storage/UsageTrackingTokenStorage.php | 4 ++-- .../Core/Authentication/Token/SwitchUserToken.php | 2 +- .../Core/Authorization/AccessDecisionManager.php | 2 +- .../Core/Authorization/AuthorizationChecker.php | 4 ++-- .../TraceableAccessDecisionManager.php | 5 ++--- .../Authorization/Voter/AuthenticatedVoter.php | 2 +- .../Core/Authorization/Voter/ExpressionVoter.php | 8 ++++---- .../Authorization/Voter/RoleHierarchyVoter.php | 2 +- .../Core/Authorization/Voter/TraceableVoter.php | 4 ++-- .../Security/Core/Event/AuthenticationEvent.php | 2 +- .../Component/Security/Core/Event/VoteEvent.php | 2 +- .../Core/Exception/AccountStatusException.php | 2 +- .../Core/Exception/AuthenticationException.php | 2 +- .../Core/Exception/LazyResponseException.php | 2 +- src/Symfony/Component/Security/Core/Security.php | 2 +- .../Core/Signature/ExpiredSignatureStorage.php | 2 +- .../Security/Core/Signature/SignatureHasher.php | 4 ++-- .../Constraints/UserPasswordValidator.php | 4 ++-- .../Component/Security/Csrf/CsrfTokenManager.php | 4 ++-- .../Csrf/TokenStorage/SessionTokenStorage.php | 2 +- .../Http/Authentication/AuthenticationUtils.php | 2 +- .../Http/Authentication/AuthenticatorManager.php | 6 +++--- .../CustomAuthenticationFailureHandler.php | 2 +- .../CustomAuthenticationSuccessHandler.php | 2 +- .../AbstractPreAuthenticatedAuthenticator.php | 6 +++--- .../Authenticator/Debug/TraceableAuthenticator.php | 6 +++--- .../TraceableAuthenticatorManagerListener.php | 2 +- .../Http/Authenticator/FormLoginAuthenticator.php | 10 +++++----- .../Http/Authenticator/HttpBasicAuthenticator.php | 4 ++-- .../Http/Authenticator/JsonLoginAuthenticator.php | 12 ++++++------ .../Http/Authenticator/LoginLinkAuthenticator.php | 8 ++++---- .../Passport/Badge/PasswordUpgradeBadge.php | 2 +- .../Authenticator/Passport/Badge/UserBadge.php | 2 +- .../Http/Authenticator/RememberMeAuthenticator.php | 6 +++--- .../Security/Http/Controller/UserValueResolver.php | 2 +- .../Http/Event/AuthenticationTokenCreatedEvent.php | 4 ++-- .../Security/Http/Event/CheckPassportEvent.php | 4 ++-- .../Security/Http/Event/InteractiveLoginEvent.php | 4 ++-- .../Security/Http/Event/LoginFailureEvent.php | 10 +++++----- .../Security/Http/Event/LoginSuccessEvent.php | 10 +++++----- .../Component/Security/Http/Event/LogoutEvent.php | 6 +++--- .../Security/Http/Event/SwitchUserEvent.php | 6 +++--- .../Http/Event/TokenDeauthenticatedEvent.php | 4 ++-- .../EventListener/CheckCredentialsListener.php | 2 +- .../CheckRememberMeConditionsListener.php | 2 +- .../Http/EventListener/CsrfProtectionListener.php | 2 +- .../CsrfTokenClearingLogoutListener.php | 2 +- .../Http/EventListener/DefaultLogoutListener.php | 2 +- .../Http/EventListener/LoginThrottlingListener.php | 4 ++-- .../EventListener/PasswordMigratingListener.php | 2 +- .../Http/EventListener/RememberMeListener.php | 4 ++-- .../Http/EventListener/SessionStrategyListener.php | 2 +- .../Http/EventListener/UserCheckerListener.php | 2 +- .../Http/EventListener/UserProviderListener.php | 2 +- src/Symfony/Component/Security/Http/Firewall.php | 4 ++-- .../Security/Http/Firewall/AccessListener.php | 6 +++--- .../Http/Firewall/AuthenticatorManagerListener.php | 2 +- .../Security/Http/Firewall/ChannelListener.php | 4 ++-- .../Security/Http/Firewall/ContextListener.php | 8 ++++---- .../Security/Http/Firewall/ExceptionListener.php | 12 ++++++------ .../Security/Http/Firewall/LogoutListener.php | 8 ++++---- .../Security/Http/Firewall/SwitchUserListener.php | 12 ++++++------ src/Symfony/Component/Security/Http/HttpUtils.php | 4 ++-- .../Http/Impersonate/ImpersonateUrlGenerator.php | 6 +++--- .../Security/Http/LoginLink/LoginLinkHandler.php | 6 +++--- .../Http/LoginLink/LoginLinkNotification.php | 2 +- .../Security/Http/Logout/LogoutUrlGenerator.php | 6 +++--- .../Http/RateLimiter/DefaultLoginRateLimiter.php | 4 ++-- .../Http/RememberMe/AbstractRememberMeHandler.php | 2 +- .../RememberMe/PersistentRememberMeHandler.php | 4 ++-- .../Http/RememberMe/SignatureRememberMeHandler.php | 2 +- .../Authenticator/AbstractAuthenticatorTest.php | 1 - .../Http/Tests/Firewall/AccessListenerTest.php | 1 - .../String/Resources/WcswidthDataGenerator.php | 3 +-- src/Symfony/Component/Templating/PhpEngine.php | 2 +- .../Translation/Bridge/Crowdin/CrowdinProvider.php | 8 ++++---- .../Bridge/Crowdin/CrowdinProviderFactory.php | 8 ++++---- .../Translation/Bridge/Loco/LocoProvider.php | 6 +++--- .../Bridge/Loco/LocoProviderFactory.php | 6 +++--- .../Bridge/Lokalise/LokaliseProvider.php | 6 +++--- .../Bridge/Lokalise/LokaliseProviderFactory.php | 6 +++--- .../Translation/Command/TranslationPullCommand.php | 6 +++--- .../Translation/Command/TranslationPushCommand.php | 4 ++-- .../DataCollector/TranslationDataCollector.php | 2 +- .../Translation/DataCollectorTranslator.php | 2 +- .../Translation/Exception/ProviderException.php | 2 +- .../Translation/Formatter/MessageFormatter.php | 4 ++-- .../Component/Translation/LoggingTranslator.php | 4 ++-- .../Component/Translation/MessageCatalogue.php | 2 +- .../Translation/Provider/FilteringProvider.php | 2 +- .../Translation/PseudoLocalizationTranslator.php | 2 +- .../Translation/Test/ProviderFactoryTestCase.php | 8 ++++---- .../Translation/Test/ProviderTestCase.php | 8 ++++---- src/Symfony/Component/Translation/Translator.php | 4 ++-- .../Component/Uid/Command/GenerateUlidCommand.php | 2 +- .../Component/Uid/Command/GenerateUuidCommand.php | 2 +- .../Component/Uid/Factory/NameBasedUuidFactory.php | 2 +- .../Component/Uid/Factory/TimeBasedUuidFactory.php | 2 +- src/Symfony/Component/Uid/Factory/UuidFactory.php | 4 ++-- .../Component/Validator/Command/DebugCommand.php | 2 +- .../Component/Validator/ConstraintViolation.php | 2 +- .../Constraints/AbstractComparisonValidator.php | 2 +- .../Validator/Constraints/BicValidator.php | 2 +- .../ExpressionLanguageSyntaxValidator.php | 2 +- .../Validator/Constraints/ExpressionValidator.php | 2 +- .../NotCompromisedPasswordValidator.php | 2 +- .../Validator/Constraints/RangeValidator.php | 2 +- .../ContainerConstraintValidatorFactory.php | 2 +- .../Validator/Context/ExecutionContext.php | 10 +++++----- .../Validator/Context/ExecutionContextFactory.php | 2 +- .../DataCollector/ValidatorDataCollector.php | 2 +- .../Exception/ValidationFailedException.php | 2 +- .../Mapping/Loader/PropertyInfoLoader.php | 6 +++--- .../Validator/Mapping/Loader/YamlFileLoader.php | 2 +- .../Validator/Test/ConstraintValidatorTestCase.php | 6 +++--- .../Validator/RecursiveContextualValidator.php | 6 +++--- .../Validator/Validator/TraceableValidator.php | 2 +- .../Component/Validator/ValidatorBuilder.php | 10 +++++----- .../Violation/ConstraintViolationBuilder.php | 6 +++--- .../VarDumper/Command/Descriptor/CliDescriptor.php | 2 +- .../Command/Descriptor/HtmlDescriptor.php | 2 +- .../VarDumper/Command/ServerDumpCommand.php | 2 +- .../ContextProvider/RequestContextProvider.php | 4 ++-- .../ContextProvider/SourceContextProvider.php | 2 +- .../VarDumper/Dumper/ContextualizedDumper.php | 2 +- .../Component/VarDumper/Dumper/ServerDumper.php | 4 ++-- .../Component/VarDumper/Server/DumpServer.php | 2 +- .../VarDumper/Tests/Fixtures/Php81Enums.php | 4 ++-- .../EventListener/AddLinkHeaderListener.php | 2 +- src/Symfony/Component/Workflow/Definition.php | 2 +- .../Component/Workflow/DefinitionBuilder.php | 2 +- src/Symfony/Component/Workflow/Event/Event.php | 6 +++--- .../Component/Workflow/Event/GuardEvent.php | 2 +- .../Workflow/EventListener/AuditTrailListener.php | 2 +- .../Workflow/EventListener/GuardExpression.php | 2 +- .../Workflow/EventListener/GuardListener.php | 12 ++++++------ .../Exception/NotEnabledTransitionException.php | 2 +- .../Workflow/Exception/TransitionException.php | 2 +- src/Symfony/Component/Workflow/Workflow.php | 6 +++--- src/Symfony/Component/Yaml/Command/LintCommand.php | 2 +- 675 files changed, 1066 insertions(+), 1107 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php b/src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php index 91cc25026a8b6..e90c82af15b4a 100644 --- a/src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php +++ b/src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php @@ -24,7 +24,7 @@ */ class ProxyCacheWarmer implements CacheWarmerInterface { - private ManagerRegistry $registry; + private $registry; public function __construct(ManagerRegistry $registry) { diff --git a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php index 82a4f36ce349c..0b979dbea3d47 100644 --- a/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php +++ b/src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php @@ -33,7 +33,7 @@ class ContainerAwareEventManager extends EventManager private array $initialized = []; private bool $initializedSubscribers = false; private array $methods = []; - private ContainerInterface $container; + private $container; /** * @param list $subscriberIds List of subscribers, subscriber ids, or [events, listener] tuples diff --git a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php index a8e55ee881e01..6c5194897dac4 100644 --- a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php +++ b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php @@ -28,7 +28,7 @@ */ class DoctrineDataCollector extends DataCollector { - private ManagerRegistry $registry; + private $registry; private array $connections; private array $managers; diff --git a/src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php b/src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php index 98acccda50ba9..7ccd1df106f70 100644 --- a/src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php +++ b/src/Symfony/Bridge/Doctrine/DataFixtures/ContainerAwareLoader.php @@ -25,7 +25,7 @@ */ class ContainerAwareLoader extends Loader { - private ContainerInterface $container; + private $container; public function __construct(ContainerInterface $container) { diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php index e191bea3ca16d..9730690009b0f 100644 --- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php +++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/DoctrineChoiceLoader.php @@ -22,10 +22,10 @@ */ class DoctrineChoiceLoader extends AbstractChoiceLoader { - private ObjectManager $manager; + private $manager; private string $class; - private ?IdReader $idReader; - private ?EntityLoaderInterface $objectLoader; + private $idReader; + private $objectLoader; /** * Creates a new choice loader. diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php index 15a685bbc9bef..35b2430f781cb 100644 --- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php +++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/IdReader.php @@ -24,8 +24,8 @@ */ class IdReader { - private ObjectManager $om; - private ClassMetadata $classMetadata; + private $om; + private $classMetadata; private bool $singleId; private bool $intId; private string $idField; diff --git a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php index b0121df1b1da5..5c74ad5ebabbb 100644 --- a/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php +++ b/src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php @@ -31,7 +31,7 @@ class ORMQueryBuilderLoader implements EntityLoaderInterface * * This property should only be accessed through queryBuilder. */ - private QueryBuilder $queryBuilder; + private $queryBuilder; public function __construct(QueryBuilder $queryBuilder) { diff --git a/src/Symfony/Bridge/Doctrine/IdGenerator/UlidGenerator.php b/src/Symfony/Bridge/Doctrine/IdGenerator/UlidGenerator.php index c06a9a872c103..b3923d11c051a 100644 --- a/src/Symfony/Bridge/Doctrine/IdGenerator/UlidGenerator.php +++ b/src/Symfony/Bridge/Doctrine/IdGenerator/UlidGenerator.php @@ -18,7 +18,7 @@ final class UlidGenerator extends AbstractIdGenerator { - private ?UlidFactory $factory; + private $factory; public function __construct(UlidFactory $factory = null) { diff --git a/src/Symfony/Bridge/Doctrine/IdGenerator/UuidGenerator.php b/src/Symfony/Bridge/Doctrine/IdGenerator/UuidGenerator.php index 2fdaa6947574e..20de11118a982 100644 --- a/src/Symfony/Bridge/Doctrine/IdGenerator/UuidGenerator.php +++ b/src/Symfony/Bridge/Doctrine/IdGenerator/UuidGenerator.php @@ -13,16 +13,13 @@ use Doctrine\ORM\EntityManager; use Doctrine\ORM\Id\AbstractIdGenerator; -use Symfony\Component\Uid\Factory\NameBasedUuidFactory; -use Symfony\Component\Uid\Factory\RandomBasedUuidFactory; -use Symfony\Component\Uid\Factory\TimeBasedUuidFactory; use Symfony\Component\Uid\Factory\UuidFactory; use Symfony\Component\Uid\Uuid; final class UuidGenerator extends AbstractIdGenerator { - private UuidFactory $protoFactory; - private UuidFactory|NameBasedUuidFactory|RandomBasedUuidFactory|TimeBasedUuidFactory $factory; + private $protoFactory; + private $factory; private ?string $entityGetter = null; public function __construct(UuidFactory $factory = null) diff --git a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineClearEntityManagerWorkerSubscriber.php b/src/Symfony/Bridge/Doctrine/Messenger/DoctrineClearEntityManagerWorkerSubscriber.php index 9b464351fa09d..e06ba250b8e17 100644 --- a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineClearEntityManagerWorkerSubscriber.php +++ b/src/Symfony/Bridge/Doctrine/Messenger/DoctrineClearEntityManagerWorkerSubscriber.php @@ -23,7 +23,7 @@ */ class DoctrineClearEntityManagerWorkerSubscriber implements EventSubscriberInterface { - private ManagerRegistry $managerRegistry; + private $managerRegistry; public function __construct(ManagerRegistry $managerRegistry) { diff --git a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php index 58bee3386ef8f..eedb55077605a 100644 --- a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php +++ b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php @@ -31,7 +31,7 @@ */ class DoctrineExtractor implements PropertyListExtractorInterface, PropertyTypeExtractorInterface, PropertyAccessExtractorInterface { - private EntityManagerInterface $entityManager; + private $entityManager; public function __construct(EntityManagerInterface $entityManager) { diff --git a/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php b/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php index 8d497086a1422..780999f4385ce 100644 --- a/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php +++ b/src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php @@ -43,7 +43,7 @@ */ class DoctrineTokenProvider implements TokenProviderInterface, TokenVerifierInterface { - private Connection $conn; + private $conn; public function __construct(Connection $conn) { diff --git a/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php b/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php index f7baf6ba69b9d..b5ae03d549dee 100644 --- a/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php +++ b/src/Symfony/Bridge/Doctrine/Security/User/EntityUserProvider.php @@ -32,7 +32,7 @@ */ class EntityUserProvider implements UserProviderInterface, PasswordUpgraderInterface { - private ManagerRegistry $registry; + private $registry; private ?string $managerName; private string $classOrAlias; private string $class; diff --git a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php index 1274607287560..e56ff0f026175 100644 --- a/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php +++ b/src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php @@ -27,7 +27,7 @@ */ class UniqueEntityValidator extends ConstraintValidator { - private ManagerRegistry $registry; + private $registry; public function __construct(ManagerRegistry $registry) { diff --git a/src/Symfony/Bridge/Doctrine/Validator/DoctrineLoader.php b/src/Symfony/Bridge/Doctrine/Validator/DoctrineLoader.php index d06a34a40f630..04d59227f4492 100644 --- a/src/Symfony/Bridge/Doctrine/Validator/DoctrineLoader.php +++ b/src/Symfony/Bridge/Doctrine/Validator/DoctrineLoader.php @@ -32,7 +32,7 @@ final class DoctrineLoader implements LoaderInterface { use AutoMappingTrait; - private EntityManagerInterface $entityManager; + private $entityManager; private ?string $classValidatorRegexp; public function __construct(EntityManagerInterface $entityManager, string $classValidatorRegexp = null) diff --git a/src/Symfony/Bridge/Monolog/Command/ServerLogCommand.php b/src/Symfony/Bridge/Monolog/Command/ServerLogCommand.php index 3168e2598b5dc..5a5dd1774a066 100644 --- a/src/Symfony/Bridge/Monolog/Command/ServerLogCommand.php +++ b/src/Symfony/Bridge/Monolog/Command/ServerLogCommand.php @@ -12,7 +12,6 @@ namespace Symfony\Bridge\Monolog\Command; use Monolog\Formatter\FormatterInterface; -use Monolog\Handler\HandlerInterface; use Monolog\Logger; use Symfony\Bridge\Monolog\Formatter\ConsoleFormatter; use Symfony\Bridge\Monolog\Handler\ConsoleHandler; @@ -33,8 +32,8 @@ class ServerLogCommand extends Command { private const BG_COLOR = ['black', 'blue', 'cyan', 'green', 'magenta', 'red', 'white', 'yellow']; - private ExpressionLanguage $el; - private HandlerInterface $handler; + private $el; + private $handler; public function isEnabled(): bool { diff --git a/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php b/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php index 5778dbb3b37c0..b7d2adc7dffa6 100644 --- a/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php +++ b/src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php @@ -42,14 +42,14 @@ class ConsoleFormatter implements FormatterInterface ]; private array $options; - private VarCloner $cloner; + private $cloner; /** * @var resource|null */ private $outputBuffer; - private CliDumper $dumper; + private $dumper; /** * Available options: diff --git a/src/Symfony/Bridge/Monolog/Formatter/VarDumperFormatter.php b/src/Symfony/Bridge/Monolog/Formatter/VarDumperFormatter.php index e745afec13650..d895cac1d5c6b 100644 --- a/src/Symfony/Bridge/Monolog/Formatter/VarDumperFormatter.php +++ b/src/Symfony/Bridge/Monolog/Formatter/VarDumperFormatter.php @@ -19,7 +19,7 @@ */ class VarDumperFormatter implements FormatterInterface { - private VarCloner $cloner; + private $cloner; public function __construct(VarCloner $cloner = null) { diff --git a/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php b/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php index 059dc539e1681..ba2f136a381b6 100644 --- a/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php +++ b/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php @@ -25,7 +25,7 @@ class ChromePhpHandler extends BaseChromePhpHandler { private array $headers = []; - private Response $response; + private $response; /** * Adds the headers to the response once it's created. diff --git a/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php b/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php index 3c911f3cfa91d..3c42efd8f510a 100644 --- a/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php +++ b/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php @@ -43,7 +43,7 @@ */ class ConsoleHandler extends AbstractProcessingHandler implements EventSubscriberInterface { - private ?OutputInterface $output; + private $output; private array $verbosityLevelMap = [ OutputInterface::VERBOSITY_QUIET => Logger::ERROR, OutputInterface::VERBOSITY_NORMAL => Logger::WARNING, diff --git a/src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php b/src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php index 65486f6b9d444..66dade361c641 100644 --- a/src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php +++ b/src/Symfony/Bridge/Monolog/Handler/ElasticsearchLogstashHandler.php @@ -47,7 +47,7 @@ class ElasticsearchLogstashHandler extends AbstractHandler private string $endpoint; private string $index; - private HttpClientInterface $client; + private $client; /** * @var \SplObjectStorage diff --git a/src/Symfony/Bridge/Monolog/Handler/FingersCrossed/HttpCodeActivationStrategy.php b/src/Symfony/Bridge/Monolog/Handler/FingersCrossed/HttpCodeActivationStrategy.php index fc78f2dc32c49..ddc5443b1ab18 100644 --- a/src/Symfony/Bridge/Monolog/Handler/FingersCrossed/HttpCodeActivationStrategy.php +++ b/src/Symfony/Bridge/Monolog/Handler/FingersCrossed/HttpCodeActivationStrategy.php @@ -12,7 +12,6 @@ namespace Symfony\Bridge\Monolog\Handler\FingersCrossed; use Monolog\Handler\FingersCrossed\ActivationStrategyInterface; -use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\HttpKernel\Exception\HttpException; /** @@ -27,9 +26,9 @@ final class HttpCodeActivationStrategy implements ActivationStrategyInterface * @param array $exclusions each exclusion must have a "code" and "urls" keys */ public function __construct( - private RequestStack $requestStack, + private $requestStack, private array $exclusions, - private ActivationStrategyInterface $inner, + private $inner, ) { foreach ($exclusions as $exclusion) { if (!\array_key_exists('code', $exclusion)) { diff --git a/src/Symfony/Bridge/Monolog/Handler/FingersCrossed/NotFoundActivationStrategy.php b/src/Symfony/Bridge/Monolog/Handler/FingersCrossed/NotFoundActivationStrategy.php index 808d863cec663..22f54bdf6d2da 100644 --- a/src/Symfony/Bridge/Monolog/Handler/FingersCrossed/NotFoundActivationStrategy.php +++ b/src/Symfony/Bridge/Monolog/Handler/FingersCrossed/NotFoundActivationStrategy.php @@ -12,7 +12,6 @@ namespace Symfony\Bridge\Monolog\Handler\FingersCrossed; use Monolog\Handler\FingersCrossed\ActivationStrategyInterface; -use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\HttpKernel\Exception\HttpException; /** @@ -27,9 +26,9 @@ final class NotFoundActivationStrategy implements ActivationStrategyInterface private string $exclude; public function __construct( - private RequestStack $requestStack, + private $requestStack, array $excludedUrls, - private ActivationStrategyInterface $inner + private $inner ) { $this->exclude = '{('.implode('|', $excludedUrls).')}i'; } diff --git a/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php b/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php index b06f3244e73b8..c9dc672c98021 100644 --- a/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php +++ b/src/Symfony/Bridge/Monolog/Handler/FirePHPHandler.php @@ -25,7 +25,7 @@ class FirePHPHandler extends BaseFirePHPHandler { private array $headers = []; - private Response $response; + private $response; /** * Adds the headers to the response once it's created. diff --git a/src/Symfony/Bridge/Monolog/Handler/MailerHandler.php b/src/Symfony/Bridge/Monolog/Handler/MailerHandler.php index a7610f337be2a..07208979bc451 100644 --- a/src/Symfony/Bridge/Monolog/Handler/MailerHandler.php +++ b/src/Symfony/Bridge/Monolog/Handler/MailerHandler.php @@ -24,8 +24,8 @@ */ class MailerHandler extends AbstractProcessingHandler { - private MailerInterface $mailer; - private \Closure|Email $messageTemplate; + private $mailer; + private $messageTemplate; public function __construct(MailerInterface $mailer, callable|Email $messageTemplate, string|int $level = Logger::DEBUG, bool $bubble = true) { diff --git a/src/Symfony/Bridge/Monolog/Handler/NotifierHandler.php b/src/Symfony/Bridge/Monolog/Handler/NotifierHandler.php index 9355ee23457f5..13961b1bec890 100644 --- a/src/Symfony/Bridge/Monolog/Handler/NotifierHandler.php +++ b/src/Symfony/Bridge/Monolog/Handler/NotifierHandler.php @@ -24,7 +24,7 @@ */ class NotifierHandler extends AbstractHandler { - private NotifierInterface $notifier; + private $notifier; public function __construct(NotifierInterface $notifier, string|int $level = Logger::ERROR, bool $bubble = true) { diff --git a/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php b/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php index bca5b948c6b9b..0f2ae6cda0d74 100644 --- a/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php +++ b/src/Symfony/Bridge/Monolog/Processor/DebugProcessor.php @@ -21,7 +21,7 @@ class DebugProcessor implements DebugLoggerInterface, ResetInterface { private array $records = []; private array $errorCount = []; - private ?RequestStack $requestStack; + private $requestStack; public function __construct(RequestStack $requestStack = null) { diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/Instantiator/LazyLoadingValueHolderFactory.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/Instantiator/LazyLoadingValueHolderFactory.php index 696c0b2e3952e..abd2b1d384f1d 100644 --- a/src/Symfony/Bridge/ProxyManager/LazyProxy/Instantiator/LazyLoadingValueHolderFactory.php +++ b/src/Symfony/Bridge/ProxyManager/LazyProxy/Instantiator/LazyLoadingValueHolderFactory.php @@ -20,7 +20,7 @@ */ class LazyLoadingValueHolderFactory extends BaseFactory { - private ProxyGeneratorInterface $generator; + private $generator; /** * {@inheritdoc} diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/Instantiator/RuntimeInstantiator.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/Instantiator/RuntimeInstantiator.php index 003986b8d00fc..1fd3459ae4cb4 100644 --- a/src/Symfony/Bridge/ProxyManager/LazyProxy/Instantiator/RuntimeInstantiator.php +++ b/src/Symfony/Bridge/ProxyManager/LazyProxy/Instantiator/RuntimeInstantiator.php @@ -25,7 +25,7 @@ */ class RuntimeInstantiator implements InstantiatorInterface { - private LazyLoadingValueHolderFactory $factory; + private $factory; public function __construct() { diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php index a5d3707e8ae61..d3f23d393e50f 100644 --- a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php +++ b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php @@ -26,8 +26,8 @@ class ProxyDumper implements DumperInterface { private string $salt; - private LazyLoadingValueHolderGenerator $proxyGenerator; - private BaseGeneratorStrategy $classGenerator; + private $proxyGenerator; + private $classGenerator; public function __construct(string $salt = '') { diff --git a/src/Symfony/Bridge/Twig/AppVariable.php b/src/Symfony/Bridge/Twig/AppVariable.php index d21f6448a481b..a6103a25c884a 100644 --- a/src/Symfony/Bridge/Twig/AppVariable.php +++ b/src/Symfony/Bridge/Twig/AppVariable.php @@ -25,8 +25,8 @@ */ class AppVariable { - private TokenStorageInterface $tokenStorage; - private RequestStack $requestStack; + private $tokenStorage; + private $requestStack; private string $environment; private bool $debug; diff --git a/src/Symfony/Bridge/Twig/Command/DebugCommand.php b/src/Symfony/Bridge/Twig/Command/DebugCommand.php index 542ec78218d4d..e78723be91d1f 100644 --- a/src/Symfony/Bridge/Twig/Command/DebugCommand.php +++ b/src/Symfony/Bridge/Twig/Command/DebugCommand.php @@ -36,7 +36,7 @@ #[AsCommand(name: 'debug:twig', description: 'Show a list of twig functions, filters, globals and tests')] class DebugCommand extends Command { - private Environment $twig; + private $twig; private ?string $projectDir; private array $bundlesMetadata; private ?string $twigDefaultPath; @@ -46,7 +46,7 @@ class DebugCommand extends Command */ private array $filesystemLoaders; - private ?FileLinkFormatter $fileLinkFormatter; + private $fileLinkFormatter; public function __construct(Environment $twig, string $projectDir = null, array $bundlesMetadata = [], string $twigDefaultPath = null, FileLinkFormatter $fileLinkFormatter = null) { diff --git a/src/Symfony/Bridge/Twig/Command/LintCommand.php b/src/Symfony/Bridge/Twig/Command/LintCommand.php index 6e73b9c3bb573..b7295c87840e2 100644 --- a/src/Symfony/Bridge/Twig/Command/LintCommand.php +++ b/src/Symfony/Bridge/Twig/Command/LintCommand.php @@ -39,7 +39,7 @@ #[AsCommand(name: 'lint:twig', description: 'Lint a Twig template and outputs encountered errors')] class LintCommand extends Command { - private Environment $twig; + private $twig; private string $format; public function __construct(Environment $twig) diff --git a/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php b/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php index f41aa479cb794..ed27f6b89a365 100644 --- a/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php +++ b/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php @@ -28,8 +28,8 @@ */ class TwigDataCollector extends DataCollector implements LateDataCollectorInterface { - private Profile $profile; - private ?Environment $twig; + private $profile; + private $twig; private array $computed; public function __construct(Profile $profile, Environment $twig = null) diff --git a/src/Symfony/Bridge/Twig/ErrorRenderer/TwigErrorRenderer.php b/src/Symfony/Bridge/Twig/ErrorRenderer/TwigErrorRenderer.php index ef3d433b94ce9..50cc9cc91d5b3 100644 --- a/src/Symfony/Bridge/Twig/ErrorRenderer/TwigErrorRenderer.php +++ b/src/Symfony/Bridge/Twig/ErrorRenderer/TwigErrorRenderer.php @@ -25,8 +25,8 @@ */ class TwigErrorRenderer implements ErrorRendererInterface { - private Environment $twig; - private HtmlErrorRenderer $fallbackErrorRenderer; + private $twig; + private $fallbackErrorRenderer; private \Closure|bool $debug; /** diff --git a/src/Symfony/Bridge/Twig/Extension/AssetExtension.php b/src/Symfony/Bridge/Twig/Extension/AssetExtension.php index 35c69b6988910..694821f7bf6b8 100644 --- a/src/Symfony/Bridge/Twig/Extension/AssetExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/AssetExtension.php @@ -22,7 +22,7 @@ */ final class AssetExtension extends AbstractExtension { - private Packages $packages; + private $packages; public function __construct(Packages $packages) { diff --git a/src/Symfony/Bridge/Twig/Extension/CsrfRuntime.php b/src/Symfony/Bridge/Twig/Extension/CsrfRuntime.php index 216d9c92f10ed..c3d5da6470c25 100644 --- a/src/Symfony/Bridge/Twig/Extension/CsrfRuntime.php +++ b/src/Symfony/Bridge/Twig/Extension/CsrfRuntime.php @@ -19,7 +19,7 @@ */ final class CsrfRuntime { - private CsrfTokenManagerInterface $csrfTokenManager; + private $csrfTokenManager; public function __construct(CsrfTokenManagerInterface $csrfTokenManager) { diff --git a/src/Symfony/Bridge/Twig/Extension/DumpExtension.php b/src/Symfony/Bridge/Twig/Extension/DumpExtension.php index 1ce6593a13ec0..46ad8eaf679c2 100644 --- a/src/Symfony/Bridge/Twig/Extension/DumpExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/DumpExtension.php @@ -26,8 +26,8 @@ */ final class DumpExtension extends AbstractExtension { - private ClonerInterface $cloner; - private ?HtmlDumper $dumper; + private $cloner; + private $dumper; public function __construct(ClonerInterface $cloner, HtmlDumper $dumper = null) { diff --git a/src/Symfony/Bridge/Twig/Extension/FormExtension.php b/src/Symfony/Bridge/Twig/Extension/FormExtension.php index 6e42928a71c82..f7d82e042138d 100644 --- a/src/Symfony/Bridge/Twig/Extension/FormExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/FormExtension.php @@ -30,7 +30,7 @@ */ final class FormExtension extends AbstractExtension { - private ?TranslatorInterface $translator; + private $translator; public function __construct(TranslatorInterface $translator = null) { diff --git a/src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php b/src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php index 365e11733c92b..a9ee05c4d0093 100644 --- a/src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php @@ -23,7 +23,7 @@ */ final class HttpFoundationExtension extends AbstractExtension { - private UrlHelper $urlHelper; + private $urlHelper; public function __construct(UrlHelper $urlHelper) { diff --git a/src/Symfony/Bridge/Twig/Extension/HttpKernelRuntime.php b/src/Symfony/Bridge/Twig/Extension/HttpKernelRuntime.php index b059bf1aae4c3..7c86d7dd40add 100644 --- a/src/Symfony/Bridge/Twig/Extension/HttpKernelRuntime.php +++ b/src/Symfony/Bridge/Twig/Extension/HttpKernelRuntime.php @@ -22,8 +22,8 @@ */ final class HttpKernelRuntime { - private FragmentHandler $handler; - private ?FragmentUriGeneratorInterface $fragmentUriGenerator; + private $handler; + private $fragmentUriGenerator; public function __construct(FragmentHandler $handler, FragmentUriGeneratorInterface $fragmentUriGenerator = null) { diff --git a/src/Symfony/Bridge/Twig/Extension/LogoutUrlExtension.php b/src/Symfony/Bridge/Twig/Extension/LogoutUrlExtension.php index 5b29b4896906e..071b9ff247f1d 100644 --- a/src/Symfony/Bridge/Twig/Extension/LogoutUrlExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/LogoutUrlExtension.php @@ -22,7 +22,7 @@ */ final class LogoutUrlExtension extends AbstractExtension { - private LogoutUrlGenerator $generator; + private $generator; public function __construct(LogoutUrlGenerator $generator) { diff --git a/src/Symfony/Bridge/Twig/Extension/ProfilerExtension.php b/src/Symfony/Bridge/Twig/Extension/ProfilerExtension.php index f63aa41cf2738..cba3ab8d46329 100644 --- a/src/Symfony/Bridge/Twig/Extension/ProfilerExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/ProfilerExtension.php @@ -21,7 +21,7 @@ */ final class ProfilerExtension extends BaseProfilerExtension { - private ?Stopwatch $stopwatch; + private $stopwatch; /** * @var \SplObjectStorage diff --git a/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php b/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php index 26591fd5533b5..800c22f6d4c2c 100644 --- a/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php @@ -25,7 +25,7 @@ */ final class RoutingExtension extends AbstractExtension { - private UrlGeneratorInterface $generator; + private $generator; public function __construct(UrlGeneratorInterface $generator) { diff --git a/src/Symfony/Bridge/Twig/Extension/SecurityExtension.php b/src/Symfony/Bridge/Twig/Extension/SecurityExtension.php index 3f24b82de5a17..aedeefdca9d52 100644 --- a/src/Symfony/Bridge/Twig/Extension/SecurityExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/SecurityExtension.php @@ -25,8 +25,8 @@ */ final class SecurityExtension extends AbstractExtension { - private ?AuthorizationCheckerInterface $securityChecker; - private ?ImpersonateUrlGenerator $impersonateUrlGenerator; + private $securityChecker; + private $impersonateUrlGenerator; public function __construct(AuthorizationCheckerInterface $securityChecker = null, ImpersonateUrlGenerator $impersonateUrlGenerator = null) { diff --git a/src/Symfony/Bridge/Twig/Extension/SerializerRuntime.php b/src/Symfony/Bridge/Twig/Extension/SerializerRuntime.php index b48be3aae0163..dbffa31c2741b 100644 --- a/src/Symfony/Bridge/Twig/Extension/SerializerRuntime.php +++ b/src/Symfony/Bridge/Twig/Extension/SerializerRuntime.php @@ -19,7 +19,7 @@ */ final class SerializerRuntime implements RuntimeExtensionInterface { - private SerializerInterface $serializer; + private $serializer; public function __construct(SerializerInterface $serializer) { diff --git a/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php b/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php index 972cd1acda44c..635216f23203b 100644 --- a/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php @@ -23,7 +23,7 @@ */ final class StopwatchExtension extends AbstractExtension { - private ?Stopwatch $stopwatch; + private $stopwatch; private bool $enabled; public function __construct(Stopwatch $stopwatch = null, bool $enabled = true) diff --git a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php index 8371291d04f85..fa5c66fd43c63 100644 --- a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php @@ -34,8 +34,8 @@ class_exists(TranslatorTrait::class); */ final class TranslationExtension extends AbstractExtension { - private ?TranslatorInterface $translator; - private ?TranslationNodeVisitor $translationNodeVisitor; + private $translator; + private $translationNodeVisitor; public function __construct(TranslatorInterface $translator = null, TranslationNodeVisitor $translationNodeVisitor = null) { diff --git a/src/Symfony/Bridge/Twig/Extension/WebLinkExtension.php b/src/Symfony/Bridge/Twig/Extension/WebLinkExtension.php index de2884a71b987..652a75762c63b 100644 --- a/src/Symfony/Bridge/Twig/Extension/WebLinkExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/WebLinkExtension.php @@ -24,7 +24,7 @@ */ final class WebLinkExtension extends AbstractExtension { - private RequestStack $requestStack; + private $requestStack; public function __construct(RequestStack $requestStack) { diff --git a/src/Symfony/Bridge/Twig/Extension/WorkflowExtension.php b/src/Symfony/Bridge/Twig/Extension/WorkflowExtension.php index 2b13d29195afe..3ee1ac3d6b6b2 100644 --- a/src/Symfony/Bridge/Twig/Extension/WorkflowExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/WorkflowExtension.php @@ -25,7 +25,7 @@ */ final class WorkflowExtension extends AbstractExtension { - private Registry $workflowRegistry; + private $workflowRegistry; public function __construct(Registry $workflowRegistry) { diff --git a/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php b/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php index 6f408ebb584ad..693ee81239924 100644 --- a/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php +++ b/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php @@ -21,8 +21,8 @@ */ class TwigRendererEngine extends AbstractRendererEngine { - private Environment $environment; - private Template $template; + private $environment; + private $template; public function __construct(array $defaultThemes, Environment $environment) { diff --git a/src/Symfony/Bridge/Twig/Mime/BodyRenderer.php b/src/Symfony/Bridge/Twig/Mime/BodyRenderer.php index e1b27046805a7..e50efa06f6efe 100644 --- a/src/Symfony/Bridge/Twig/Mime/BodyRenderer.php +++ b/src/Symfony/Bridge/Twig/Mime/BodyRenderer.php @@ -22,9 +22,9 @@ */ final class BodyRenderer implements BodyRendererInterface { - private Environment $twig; + private $twig; private array $context; - private HtmlConverter $converter; + private $converter; public function __construct(Environment $twig, array $context = []) { diff --git a/src/Symfony/Bridge/Twig/Mime/WrappedTemplatedEmail.php b/src/Symfony/Bridge/Twig/Mime/WrappedTemplatedEmail.php index e0b3bef29308f..b567667883ef3 100644 --- a/src/Symfony/Bridge/Twig/Mime/WrappedTemplatedEmail.php +++ b/src/Symfony/Bridge/Twig/Mime/WrappedTemplatedEmail.php @@ -21,8 +21,8 @@ */ final class WrappedTemplatedEmail { - private Environment $twig; - private TemplatedEmail $message; + private $twig; + private $message; public function __construct(Environment $twig, TemplatedEmail $message) { diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php index 61c8b5ff52083..213365ed9f1ef 100644 --- a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php +++ b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php @@ -30,7 +30,7 @@ */ final class TranslationDefaultDomainNodeVisitor extends AbstractNodeVisitor { - private Scope $scope; + private $scope; public function __construct() { diff --git a/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php b/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php index b53ab80df2747..1ec9a13d2d5cf 100644 --- a/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php +++ b/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php @@ -37,7 +37,7 @@ class TwigExtractor extends AbstractFileExtractor implements ExtractorInterface */ private string $prefix = ''; - private Environment $twig; + private $twig; public function __construct(Environment $twig) { diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php index 6bc39acc27923..e10471617b2e3 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php +++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php @@ -25,7 +25,7 @@ */ class AnnotationsCacheWarmer extends AbstractPhpFileCacheWarmer { - private Reader $annotationReader; + private $annotationReader; private ?string $excludeRegexp; private bool $debug; diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/CachePoolClearerCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/CachePoolClearerCacheWarmer.php index 41041aedaed99..cd184cf64762c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/CachePoolClearerCacheWarmer.php +++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/CachePoolClearerCacheWarmer.php @@ -25,7 +25,7 @@ */ final class CachePoolClearerCacheWarmer implements CacheWarmerInterface { - private Psr6CacheClearer $poolClearer; + private $poolClearer; private array $pools; /** diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ConfigBuilderCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ConfigBuilderCacheWarmer.php index 70c42c1e05301..c0d96c5ea7b74 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ConfigBuilderCacheWarmer.php +++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ConfigBuilderCacheWarmer.php @@ -28,8 +28,8 @@ */ class ConfigBuilderCacheWarmer implements CacheWarmerInterface { - private KernelInterface $kernel; - private ?LoggerInterface $logger; + private $kernel; + private $logger; public function __construct(KernelInterface $kernel, LoggerInterface $logger = null) { diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php index 21dd3a2728845..6cdf176bb33bb 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php +++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php @@ -26,7 +26,7 @@ */ class RouterCacheWarmer implements CacheWarmerInterface, ServiceSubscriberInterface { - private ContainerInterface $container; + private $container; public function __construct(ContainerInterface $container) { diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TranslationsCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TranslationsCacheWarmer.php index 8cddae7e308ce..78820decd811a 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TranslationsCacheWarmer.php +++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TranslationsCacheWarmer.php @@ -24,8 +24,8 @@ */ class TranslationsCacheWarmer implements CacheWarmerInterface, ServiceSubscriberInterface { - private ContainerInterface $container; - private TranslatorInterface $translator; + private $container; + private $translator; public function __construct(ContainerInterface $container) { diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php index e28e21eb98324..6b2c558be96e5 100644 --- a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php +++ b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php @@ -28,7 +28,7 @@ */ class ValidatorCacheWarmer extends AbstractPhpFileCacheWarmer { - private ValidatorBuilder $validatorBuilder; + private $validatorBuilder; /** * @param string $phpArrayFile The PHP file where metadata are cached diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php index 020eb8aae9393..47067ebbab6a3 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php @@ -41,7 +41,7 @@ class AssetsInstallCommand extends Command public const METHOD_ABSOLUTE_SYMLINK = 'absolute symlink'; public const METHOD_RELATIVE_SYMLINK = 'relative symlink'; - private Filesystem $filesystem; + private $filesystem; private string $projectDir; public function __construct(Filesystem $filesystem, string $projectDir) diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php index fb96ee8844dea..d9b2730506020 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php @@ -37,8 +37,8 @@ #[AsCommand(name: 'cache:clear', description: 'Clear the cache')] class CacheClearCommand extends Command { - private CacheClearerInterface $cacheClearer; - private Filesystem $filesystem; + private $cacheClearer; + private $filesystem; public function __construct(CacheClearerInterface $cacheClearer, Filesystem $filesystem = null) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php index 65da5d7709487..1861645054380 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php @@ -31,7 +31,7 @@ #[AsCommand(name: 'cache:pool:clear', description: 'Clear cache pools')] final class CachePoolClearCommand extends Command { - private Psr6CacheClearer $poolClearer; + private $poolClearer; private ?array $poolNames; /** diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolDeleteCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolDeleteCommand.php index 546bd631d492c..16aa16c0004ce 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolDeleteCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolDeleteCommand.php @@ -29,7 +29,7 @@ #[AsCommand(name: 'cache:pool:delete', description: 'Delete an item from a cache pool')] final class CachePoolDeleteCommand extends Command { - private Psr6CacheClearer $poolClearer; + private $poolClearer; private ?array $poolNames; /** diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheWarmupCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheWarmupCommand.php index 36c2f76e7e3cf..7a8e0cc555246 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/CacheWarmupCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/CacheWarmupCommand.php @@ -30,7 +30,7 @@ #[AsCommand(name: 'cache:warmup', description: 'Warm up an empty cache')] class CacheWarmupCommand extends Command { - private CacheWarmerAggregate $cacheWarmer; + private $cacheWarmer; public function __construct(CacheWarmerAggregate $cacheWarmer) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerLintCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerLintCommand.php index bb595e305f591..1009e18fd84a8 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerLintCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerLintCommand.php @@ -31,7 +31,7 @@ #[AsCommand(name: 'lint:container', description: 'Ensure that arguments injected into services match type declarations')] final class ContainerLintCommand extends Command { - private ContainerBuilder $containerBuilder; + private $containerBuilder; /** * {@inheritdoc} diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php index 58e7ae1b437c1..92a76bdcf77e4 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php @@ -34,7 +34,7 @@ class DebugAutowiringCommand extends ContainerDebugCommand { private bool $supportsHref; - private ?FileLinkFormatter $fileLinkFormatter; + private $fileLinkFormatter; public function __construct(string $name = null, FileLinkFormatter $fileLinkFormatter = null) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/EventDispatcherDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/EventDispatcherDebugCommand.php index a8bb8303071db..0a8cdaf04aac7 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/EventDispatcherDebugCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/EventDispatcherDebugCommand.php @@ -37,7 +37,7 @@ class EventDispatcherDebugCommand extends Command { private const DEFAULT_DISPATCHER = 'event_dispatcher'; - private ContainerInterface $dispatchers; + private $dispatchers; public function __construct(ContainerInterface $dispatchers) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php index ed61ddd8ff7b3..cf2c93b05e781 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php @@ -39,8 +39,8 @@ class RouterDebugCommand extends Command { use BuildDebugContainerTrait; - private RouterInterface $router; - private ?FileLinkFormatter $fileLinkFormatter; + private $router; + private $fileLinkFormatter; public function __construct(RouterInterface $router, FileLinkFormatter $fileLinkFormatter = null) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php index da78d510a6b4c..d61b3c1345adb 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php @@ -33,7 +33,7 @@ #[AsCommand(name: 'router:match', description: 'Help debug routes by simulating a path info match')] class RouterMatchCommand extends Command { - private RouterInterface $router; + private $router; private iterable $expressionLanguageProviders; /** diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsDecryptToLocalCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsDecryptToLocalCommand.php index 823c0f10d8d1a..255de463ef6df 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsDecryptToLocalCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsDecryptToLocalCommand.php @@ -28,8 +28,8 @@ #[AsCommand(name: 'secrets:decrypt-to-local', description: 'Decrypt all secrets and stores them in the local vault')] final class SecretsDecryptToLocalCommand extends Command { - private AbstractVault $vault; - private ?AbstractVault $localVault; + private $vault; + private $localVault; public function __construct(AbstractVault $vault, AbstractVault $localVault = null) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsEncryptFromLocalCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsEncryptFromLocalCommand.php index aa5d25fc8dc2d..439e060a2d5bb 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsEncryptFromLocalCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsEncryptFromLocalCommand.php @@ -27,8 +27,8 @@ #[AsCommand(name: 'secrets:encrypt-from-local', description: 'Encrypt all local secrets to the vault')] final class SecretsEncryptFromLocalCommand extends Command { - private AbstractVault $vault; - private ?AbstractVault $localVault; + private $vault; + private $localVault; public function __construct(AbstractVault $vault, AbstractVault $localVault = null) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsGenerateKeysCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsGenerateKeysCommand.php index 40816665781bf..eeeaa2a391db6 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsGenerateKeysCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsGenerateKeysCommand.php @@ -30,8 +30,8 @@ #[AsCommand(name: 'secrets:generate-keys', description: 'Generate new encryption keys')] final class SecretsGenerateKeysCommand extends Command { - private AbstractVault $vault; - private ?AbstractVault $localVault; + private $vault; + private $localVault; public function __construct(AbstractVault $vault, AbstractVault $localVault = null) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsListCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsListCommand.php index 96f0f3762d393..1ce6bbcb7dc89 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsListCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsListCommand.php @@ -31,8 +31,8 @@ #[AsCommand(name: 'secrets:list', description: 'List all secrets')] final class SecretsListCommand extends Command { - private AbstractVault $vault; - private ?AbstractVault $localVault; + private $vault; + private $localVault; public function __construct(AbstractVault $vault, AbstractVault $localVault = null) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsRemoveCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsRemoveCommand.php index dfbfcf2267469..5e68295e715e4 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsRemoveCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsRemoveCommand.php @@ -32,8 +32,8 @@ #[AsCommand(name: 'secrets:remove', description: 'Remove a secret from the vault')] final class SecretsRemoveCommand extends Command { - private AbstractVault $vault; - private ?AbstractVault $localVault; + private $vault; + private $localVault; public function __construct(AbstractVault $vault, AbstractVault $localVault = null) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsSetCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsSetCommand.php index 1a0a500d89872..21113b759b23f 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/SecretsSetCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/SecretsSetCommand.php @@ -33,8 +33,8 @@ #[AsCommand(name: 'secrets:set', description: 'Set a secret in the vault')] final class SecretsSetCommand extends Command { - private AbstractVault $vault; - private ?AbstractVault $localVault; + private $vault; + private $localVault; public function __construct(AbstractVault $vault, AbstractVault $localVault = null) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php index 906f160b4f11f..63881d3b1ecf0 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php @@ -50,9 +50,9 @@ class TranslationDebugCommand extends Command public const MESSAGE_UNUSED = 1; public const MESSAGE_EQUALS_FALLBACK = 2; - private TranslatorInterface $translator; - private TranslationReaderInterface $reader; - private ExtractorInterface $extractor; + private $translator; + private $reader; + private $extractor; private ?string $defaultTransPath; private ?string $defaultViewsPath; private array $transPaths; diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php index 002a80e049b7c..e3128ef3c5c1c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php +++ b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php @@ -50,9 +50,9 @@ class TranslationUpdateCommand extends Command 'xlf20' => ['xlf', '2.0'], ]; - private TranslationWriterInterface $writer; - private TranslationReaderInterface $reader; - private ExtractorInterface $extractor; + private $writer; + private $reader; + private $extractor; private string $defaultLocale; private ?string $defaultTransPath; private ?string $defaultViewsPath; diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php index 5f7cb53420d6f..8e9921dd85f8b 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Application.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Application.php @@ -29,7 +29,7 @@ */ class Application extends BaseApplication { - private KernelInterface $kernel; + private $kernel; private bool $commandsRegistered = false; private array $registrationErrors = []; diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php index 7f1b4d01ab3c6..581395efd0035 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php +++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php @@ -37,7 +37,7 @@ */ class TextDescriptor extends Descriptor { - private ?FileLinkFormatter $fileLinkFormatter; + private $fileLinkFormatter; public function __construct(FileLinkFormatter $fileLinkFormatter = null) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php index 992fc802231fc..ea1517b9eeff5 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php +++ b/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php @@ -27,7 +27,7 @@ */ class RedirectController { - private ?UrlGeneratorInterface $router; + private $router; private ?int $httpPort; private ?int $httpsPort; diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php index 4aacf24fc05a7..2283dbc91fccf 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php +++ b/src/Symfony/Bundle/FrameworkBundle/Controller/TemplateController.php @@ -23,7 +23,7 @@ */ class TemplateController { - private ?Environment $twig; + private $twig; public function __construct(Environment $twig = null) { diff --git a/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php b/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php index 102892b2f426c..1e50bd56b6337 100644 --- a/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php +++ b/src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php @@ -30,8 +30,8 @@ class HttpCache extends BaseHttpCache protected $cacheDir; protected $kernel; - private ?StoreInterface $store = null; - private ?SurrogateInterface $surrogate; + private $store = null; + private $surrogate; private array $options; /** diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer_debug.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer_debug.php index 3fb6ce0a42d49..cdb205750f05d 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer_debug.php +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/mailer_debug.php @@ -12,7 +12,6 @@ namespace Symfony\Component\DependencyInjection\Loader\Configurator; use Symfony\Component\Mailer\DataCollector\MessageDataCollector; -use Symfony\Component\Mailer\EventListener\MessageLoggerListener; return static function (ContainerConfigurator $container) { $container->services() diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php index b213019d3579a..cb442ca7ccdaf 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php +++ b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php @@ -33,7 +33,7 @@ */ class Router extends BaseRouter implements WarmableInterface, ServiceSubscriberInterface { - private ContainerInterface $container; + private $container; private array $collectedParameters = []; private \Closure $paramFetcher; diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/TestContainer.php b/src/Symfony/Bundle/FrameworkBundle/Test/TestContainer.php index 4ce5772d91e63..d645adc8ae6ec 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Test/TestContainer.php +++ b/src/Symfony/Bundle/FrameworkBundle/Test/TestContainer.php @@ -28,7 +28,7 @@ */ class TestContainer extends Container { - private KernelInterface $kernel; + private $kernel; private string $privateServicesLocatorId; public function __construct(KernelInterface $kernel, string $privateServicesLocatorId) diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php index e0a90423700c2..4b34e561f10b7 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php @@ -14,7 +14,6 @@ use Doctrine\Common\Annotations\Annotation; use Psr\Cache\CacheItemPoolInterface; use Psr\Log\LoggerAwareInterface; -use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait; use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddAnnotationsCachedReaderPass; use Symfony\Bundle\FrameworkBundle\DependencyInjection\FrameworkExtension; use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage; diff --git a/src/Symfony/Bundle/SecurityBundle/CacheWarmer/ExpressionCacheWarmer.php b/src/Symfony/Bundle/SecurityBundle/CacheWarmer/ExpressionCacheWarmer.php index 41036f81d31bb..a874e276feb5e 100644 --- a/src/Symfony/Bundle/SecurityBundle/CacheWarmer/ExpressionCacheWarmer.php +++ b/src/Symfony/Bundle/SecurityBundle/CacheWarmer/ExpressionCacheWarmer.php @@ -18,7 +18,7 @@ class ExpressionCacheWarmer implements CacheWarmerInterface { private iterable $expressions; - private ExpressionLanguage $expressionLanguage; + private $expressionLanguage; /** * @param iterable $expressions diff --git a/src/Symfony/Bundle/SecurityBundle/Command/DebugFirewallCommand.php b/src/Symfony/Bundle/SecurityBundle/Command/DebugFirewallCommand.php index 880e5f088b3b5..d8778328092b3 100644 --- a/src/Symfony/Bundle/SecurityBundle/Command/DebugFirewallCommand.php +++ b/src/Symfony/Bundle/SecurityBundle/Command/DebugFirewallCommand.php @@ -33,8 +33,8 @@ final class DebugFirewallCommand extends Command { private array $firewallNames; - private ContainerInterface $contexts; - private ContainerInterface $eventDispatchers; + private $contexts; + private $eventDispatchers; private array $authenticators; /** diff --git a/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php b/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php index 27c6e10bcfde0..3e6d1dde7f255 100644 --- a/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php +++ b/src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php @@ -36,12 +36,12 @@ */ class SecurityDataCollector extends DataCollector implements LateDataCollectorInterface { - private ?TokenStorageInterface $tokenStorage; - private ?RoleHierarchyInterface $roleHierarchy; - private ?LogoutUrlGenerator $logoutUrlGenerator; - private ?AccessDecisionManagerInterface $accessDecisionManager; - private ?FirewallMapInterface $firewallMap; - private ?TraceableFirewallListener $firewall; + private $tokenStorage; + private $roleHierarchy; + private $logoutUrlGenerator; + private $accessDecisionManager; + private $firewallMap; + private $firewall; private bool $hasVarDumper; public function __construct(TokenStorageInterface $tokenStorage = null, RoleHierarchyInterface $roleHierarchy = null, LogoutUrlGenerator $logoutUrlGenerator = null, AccessDecisionManagerInterface $accessDecisionManager = null, FirewallMapInterface $firewallMap = null, TraceableFirewallListener $firewall = null) diff --git a/src/Symfony/Bundle/SecurityBundle/Debug/TraceableListenerTrait.php b/src/Symfony/Bundle/SecurityBundle/Debug/TraceableListenerTrait.php index 2ae1f4af9bb34..ed2f8e7144f02 100644 --- a/src/Symfony/Bundle/SecurityBundle/Debug/TraceableListenerTrait.php +++ b/src/Symfony/Bundle/SecurityBundle/Debug/TraceableListenerTrait.php @@ -11,7 +11,6 @@ namespace Symfony\Bundle\SecurityBundle\Debug; -use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Security\Http\Authenticator\Debug\TraceableAuthenticatorManagerListener; use Symfony\Component\VarDumper\Caster\ClassStub; @@ -22,7 +21,7 @@ */ trait TraceableListenerTrait { - private ?Response $response = null; + private $response = null; private mixed $listener; private ?float $time = null; private object $stub; diff --git a/src/Symfony/Bundle/SecurityBundle/EventListener/FirewallListener.php b/src/Symfony/Bundle/SecurityBundle/EventListener/FirewallListener.php index 98f54c8634abd..414c5f12aec9f 100644 --- a/src/Symfony/Bundle/SecurityBundle/EventListener/FirewallListener.php +++ b/src/Symfony/Bundle/SecurityBundle/EventListener/FirewallListener.php @@ -25,8 +25,8 @@ */ class FirewallListener extends Firewall { - private FirewallMapInterface $map; - private LogoutUrlGenerator $logoutUrlGenerator; + private $map; + private $logoutUrlGenerator; public function __construct(FirewallMapInterface $map, EventDispatcherInterface $dispatcher, LogoutUrlGenerator $logoutUrlGenerator) { diff --git a/src/Symfony/Bundle/SecurityBundle/EventListener/VoteListener.php b/src/Symfony/Bundle/SecurityBundle/EventListener/VoteListener.php index ef715f5271a34..1b37d92373705 100644 --- a/src/Symfony/Bundle/SecurityBundle/EventListener/VoteListener.php +++ b/src/Symfony/Bundle/SecurityBundle/EventListener/VoteListener.php @@ -24,7 +24,7 @@ */ class VoteListener implements EventSubscriberInterface { - private TraceableAccessDecisionManager $traceableAccessDecisionManager; + private $traceableAccessDecisionManager; public function __construct(TraceableAccessDecisionManager $traceableAccessDecisionManager) { diff --git a/src/Symfony/Bundle/SecurityBundle/RememberMe/DecoratedRememberMeHandler.php b/src/Symfony/Bundle/SecurityBundle/RememberMe/DecoratedRememberMeHandler.php index 56c2886c6c607..a060fb5116ffb 100644 --- a/src/Symfony/Bundle/SecurityBundle/RememberMe/DecoratedRememberMeHandler.php +++ b/src/Symfony/Bundle/SecurityBundle/RememberMe/DecoratedRememberMeHandler.php @@ -24,7 +24,7 @@ */ final class DecoratedRememberMeHandler implements RememberMeHandlerInterface { - private RememberMeHandlerInterface $handler; + private $handler; public function __construct(RememberMeHandlerInterface $handler) { diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallAwareTrait.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallAwareTrait.php index d422675377afa..47afbf14c5e47 100644 --- a/src/Symfony/Bundle/SecurityBundle/Security/FirewallAwareTrait.php +++ b/src/Symfony/Bundle/SecurityBundle/Security/FirewallAwareTrait.php @@ -11,8 +11,6 @@ namespace Symfony\Bundle\SecurityBundle\Security; -use Psr\Container\ContainerInterface; -use Symfony\Component\HttpFoundation\RequestStack; /** * Provides basic functionality for services mapped by the firewall name @@ -24,9 +22,9 @@ */ trait FirewallAwareTrait { - private ContainerInterface $locator; - private RequestStack $requestStack; - private FirewallMap $firewallMap; + private $locator; + private $requestStack; + private $firewallMap; private function getForFirewall(): object { diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php index a81f6d8983113..3813420d28081 100644 --- a/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php +++ b/src/Symfony/Bundle/SecurityBundle/Security/FirewallContext.php @@ -23,9 +23,9 @@ class FirewallContext { private iterable $listeners; - private ?ExceptionListener $exceptionListener; - private ?LogoutListener $logoutListener; - private ?FirewallConfig $config; + private $exceptionListener; + private $logoutListener; + private $config; /** * @param iterable $listeners diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php index 21e5b8aa68279..4c8543df73fda 100644 --- a/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php +++ b/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php @@ -24,7 +24,7 @@ */ class FirewallMap implements FirewallMapInterface { - private ContainerInterface $container; + private $container; private iterable $map; public function __construct(ContainerInterface $container, iterable $map) diff --git a/src/Symfony/Bundle/SecurityBundle/Security/LazyFirewallContext.php b/src/Symfony/Bundle/SecurityBundle/Security/LazyFirewallContext.php index 23d96b6bbf479..9d8396a8830c9 100644 --- a/src/Symfony/Bundle/SecurityBundle/Security/LazyFirewallContext.php +++ b/src/Symfony/Bundle/SecurityBundle/Security/LazyFirewallContext.php @@ -25,7 +25,7 @@ */ class LazyFirewallContext extends FirewallContext { - private TokenStorage $tokenStorage; + private $tokenStorage; public function __construct(iterable $listeners, ?ExceptionListener $exceptionListener, ?LogoutListener $logoutListener, ?FirewallConfig $config, TokenStorage $tokenStorage) { diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Security/Factory/AbstractFactoryTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Security/Factory/AbstractFactoryTest.php index ff4108d25cdc9..ba1a1f8428c6b 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Security/Factory/AbstractFactoryTest.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/Security/Factory/AbstractFactoryTest.php @@ -17,7 +17,7 @@ class AbstractFactoryTest extends TestCase { - private ContainerBuilder $container; + private $container; protected function setUp(): void { diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/RequestTrackerBundle/EventSubscriber/RequestTrackerSubscriber.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/RequestTrackerBundle/EventSubscriber/RequestTrackerSubscriber.php index 9496200e0486d..9f442aeb11710 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/RequestTrackerBundle/EventSubscriber/RequestTrackerSubscriber.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/RequestTrackerBundle/EventSubscriber/RequestTrackerSubscriber.php @@ -17,7 +17,7 @@ final class RequestTrackerSubscriber implements EventSubscriberInterface { - private ?Request $lastRequest; + private $lastRequest; public static function getSubscribedEvents(): array { diff --git a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php index cd55a6ecd26ff..1d88c5d73eb31 100644 --- a/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php +++ b/src/Symfony/Bundle/TwigBundle/CacheWarmer/TemplateCacheWarmer.php @@ -24,8 +24,8 @@ */ class TemplateCacheWarmer implements CacheWarmerInterface, ServiceSubscriberInterface { - private ContainerInterface $container; - private Environment $twig; + private $container; + private $twig; private iterable $iterator; public function __construct(ContainerInterface $container, iterable $iterator) diff --git a/src/Symfony/Bundle/TwigBundle/TemplateIterator.php b/src/Symfony/Bundle/TwigBundle/TemplateIterator.php index d8a7ad67d6d68..d001cbcc74ad7 100644 --- a/src/Symfony/Bundle/TwigBundle/TemplateIterator.php +++ b/src/Symfony/Bundle/TwigBundle/TemplateIterator.php @@ -25,7 +25,7 @@ */ class TemplateIterator implements \IteratorAggregate { - private KernelInterface $kernel; + private $kernel; private \Traversable $templates; private array $paths; private ?string $defaultPath; diff --git a/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php b/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php index f4bfec100e3a6..55f8565b20db5 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php +++ b/src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php @@ -40,13 +40,13 @@ class WebDebugToolbarListener implements EventSubscriberInterface public const DISABLED = 1; public const ENABLED = 2; - private Environment $twig; - private ?UrlGeneratorInterface $urlGenerator; + private $twig; + private $urlGenerator; private bool $interceptRedirects; private int $mode; private string $excludedAjaxPaths; - private ?ContentSecurityPolicyHandler $cspHandler; - private ?DumpDataCollector $dumpDataCollector; + private $cspHandler; + private $dumpDataCollector; public function __construct(Environment $twig, bool $interceptRedirects = false, int $mode = self::ENABLED, UrlGeneratorInterface $urlGenerator = null, string $excludedAjaxPaths = '^/bundles|^/_wdt', ContentSecurityPolicyHandler $cspHandler = null, DumpDataCollector $dumpDataCollector = null) { diff --git a/src/Symfony/Component/Asset/Context/RequestStackContext.php b/src/Symfony/Component/Asset/Context/RequestStackContext.php index 19cd52613cb97..6265257b1ceb8 100644 --- a/src/Symfony/Component/Asset/Context/RequestStackContext.php +++ b/src/Symfony/Component/Asset/Context/RequestStackContext.php @@ -20,7 +20,7 @@ */ class RequestStackContext implements ContextInterface { - private RequestStack $requestStack; + private $requestStack; private string $basePath; private bool $secure; diff --git a/src/Symfony/Component/Asset/Package.php b/src/Symfony/Component/Asset/Package.php index 610e858e910c0..7bc03ee13ea38 100644 --- a/src/Symfony/Component/Asset/Package.php +++ b/src/Symfony/Component/Asset/Package.php @@ -23,8 +23,8 @@ */ class Package implements PackageInterface { - private VersionStrategyInterface $versionStrategy; - private ContextInterface $context; + private $versionStrategy; + private $context; public function __construct(VersionStrategyInterface $versionStrategy, ContextInterface $context = null) { diff --git a/src/Symfony/Component/Asset/Packages.php b/src/Symfony/Component/Asset/Packages.php index 6ca4850490812..b7ebd6c76b32a 100644 --- a/src/Symfony/Component/Asset/Packages.php +++ b/src/Symfony/Component/Asset/Packages.php @@ -22,7 +22,7 @@ */ class Packages { - private ?PackageInterface $defaultPackage; + private $defaultPackage; private array $packages = []; /** diff --git a/src/Symfony/Component/Asset/VersionStrategy/JsonManifestVersionStrategy.php b/src/Symfony/Component/Asset/VersionStrategy/JsonManifestVersionStrategy.php index 42eff289516c1..804313a049b72 100644 --- a/src/Symfony/Component/Asset/VersionStrategy/JsonManifestVersionStrategy.php +++ b/src/Symfony/Component/Asset/VersionStrategy/JsonManifestVersionStrategy.php @@ -33,7 +33,7 @@ class JsonManifestVersionStrategy implements VersionStrategyInterface { private string $manifestPath; private array $manifestData; - private ?HttpClientInterface $httpClient; + private $httpClient; private bool $strictMode; /** diff --git a/src/Symfony/Component/BrowserKit/HttpBrowser.php b/src/Symfony/Component/BrowserKit/HttpBrowser.php index bf73f6754c54f..4f036e2dc7145 100644 --- a/src/Symfony/Component/BrowserKit/HttpBrowser.php +++ b/src/Symfony/Component/BrowserKit/HttpBrowser.php @@ -26,7 +26,7 @@ */ class HttpBrowser extends AbstractBrowser { - private HttpClientInterface $client; + private $client; public function __construct(HttpClientInterface $client = null, History $history = null, CookieJar $cookieJar = null) { diff --git a/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php b/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php index 46807ed3130a5..f5f04641fdf28 100644 --- a/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/ApcuAdapter.php @@ -20,7 +20,7 @@ */ class ApcuAdapter extends AbstractAdapter { - private ?MarshallerInterface $marshaller; + private $marshaller; /** * @throws CacheException if APCu is not enabled diff --git a/src/Symfony/Component/Cache/Adapter/CouchbaseBucketAdapter.php b/src/Symfony/Component/Cache/Adapter/CouchbaseBucketAdapter.php index e30bb7f84806c..1107c1dae5807 100644 --- a/src/Symfony/Component/Cache/Adapter/CouchbaseBucketAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/CouchbaseBucketAdapter.php @@ -36,8 +36,8 @@ class CouchbaseBucketAdapter extends AbstractAdapter 'durabilityTimeout', ]; - private \CouchbaseBucket $bucket; - private MarshallerInterface $marshaller; + private $bucket; + private $marshaller; public function __construct(\CouchbaseBucket $bucket, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null) { diff --git a/src/Symfony/Component/Cache/Adapter/CouchbaseCollectionAdapter.php b/src/Symfony/Component/Cache/Adapter/CouchbaseCollectionAdapter.php index f62fac81fe080..6c91ef42cc73c 100644 --- a/src/Symfony/Component/Cache/Adapter/CouchbaseCollectionAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/CouchbaseCollectionAdapter.php @@ -29,8 +29,8 @@ class CouchbaseCollectionAdapter extends AbstractAdapter { private const MAX_KEY_LENGTH = 250; - private Collection $connection; - private MarshallerInterface $marshaller; + private $connection; + private $marshaller; public function __construct(Collection $connection, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null) { diff --git a/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php b/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php index 774cdf4ceb11d..606f341d9f058 100644 --- a/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/DoctrineDbalAdapter.php @@ -27,8 +27,8 @@ class DoctrineDbalAdapter extends AbstractAdapter implements PruneableInterface { protected $maxIdLength = 255; - private MarshallerInterface $marshaller; - private Connection $conn; + private $marshaller; + private $conn; private string $platformName; private string $serverVersion; private string $table = 'cache_items'; diff --git a/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php b/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php index 349f8c4f031ab..1e82b0658bdca 100644 --- a/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php @@ -39,9 +39,9 @@ class MemcachedAdapter extends AbstractAdapter \Memcached::OPT_SERIALIZER => \Memcached::SERIALIZER_PHP, ]; - private MarshallerInterface $marshaller; - private \Memcached $client; - private \Memcached $lazyClient; + private $marshaller; + private $client; + private $lazyClient; /** * Using a MemcachedAdapter with a TagAwareAdapter for storing tags is discouraged. diff --git a/src/Symfony/Component/Cache/Adapter/PdoAdapter.php b/src/Symfony/Component/Cache/Adapter/PdoAdapter.php index 4b76b2004e529..7c3c705c0af0f 100644 --- a/src/Symfony/Component/Cache/Adapter/PdoAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/PdoAdapter.php @@ -21,8 +21,8 @@ class PdoAdapter extends AbstractAdapter implements PruneableInterface { protected $maxIdLength = 255; - private MarshallerInterface $marshaller; - private \PDO|Connection $conn; + private $marshaller; + private $conn; private string $dsn; private string $driver; private string $serverVersion; diff --git a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php index a36551d308de7..a6f66eec15bba 100644 --- a/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php @@ -34,7 +34,7 @@ class TagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterfac public const TAGS_PREFIX = "\0tags\0"; private array $deferred = []; - private AdapterInterface $tags; + private $tags; private array $knownTagVersions = []; private float $knownTagVersionsTtl; diff --git a/src/Symfony/Component/Cache/CacheItem.php b/src/Symfony/Component/Cache/CacheItem.php index f6453ea7c004c..710dd56b5b988 100644 --- a/src/Symfony/Component/Cache/CacheItem.php +++ b/src/Symfony/Component/Cache/CacheItem.php @@ -29,7 +29,7 @@ final class CacheItem implements ItemInterface protected float|int|null $expiry = null; protected array $metadata = []; protected array $newMetadata = []; - protected ?ItemInterface $innerItem = null; + protected $innerItem = null; protected ?string $poolHash = null; protected bool $isTaggable = false; diff --git a/src/Symfony/Component/Cache/Marshaller/DeflateMarshaller.php b/src/Symfony/Component/Cache/Marshaller/DeflateMarshaller.php index 95e3d320694aa..ef861fab9f515 100644 --- a/src/Symfony/Component/Cache/Marshaller/DeflateMarshaller.php +++ b/src/Symfony/Component/Cache/Marshaller/DeflateMarshaller.php @@ -20,7 +20,7 @@ */ class DeflateMarshaller implements MarshallerInterface { - private MarshallerInterface $marshaller; + private $marshaller; public function __construct(MarshallerInterface $marshaller) { diff --git a/src/Symfony/Component/Cache/Marshaller/SodiumMarshaller.php b/src/Symfony/Component/Cache/Marshaller/SodiumMarshaller.php index 4d8a04ee6da45..a8119dcd25564 100644 --- a/src/Symfony/Component/Cache/Marshaller/SodiumMarshaller.php +++ b/src/Symfony/Component/Cache/Marshaller/SodiumMarshaller.php @@ -21,7 +21,7 @@ */ class SodiumMarshaller implements MarshallerInterface { - private MarshallerInterface $marshaller; + private $marshaller; private array $decryptionKeys; /** diff --git a/src/Symfony/Component/Cache/Marshaller/TagAwareMarshaller.php b/src/Symfony/Component/Cache/Marshaller/TagAwareMarshaller.php index 60961538584e2..6a21a1ab9505a 100644 --- a/src/Symfony/Component/Cache/Marshaller/TagAwareMarshaller.php +++ b/src/Symfony/Component/Cache/Marshaller/TagAwareMarshaller.php @@ -18,7 +18,7 @@ */ class TagAwareMarshaller implements MarshallerInterface { - private MarshallerInterface $marshaller; + private $marshaller; public function __construct(MarshallerInterface $marshaller = null) { diff --git a/src/Symfony/Component/Cache/Messenger/EarlyExpirationDispatcher.php b/src/Symfony/Component/Cache/Messenger/EarlyExpirationDispatcher.php index 25b5023b32fd3..e4d9ea0a5ff82 100644 --- a/src/Symfony/Component/Cache/Messenger/EarlyExpirationDispatcher.php +++ b/src/Symfony/Component/Cache/Messenger/EarlyExpirationDispatcher.php @@ -23,8 +23,8 @@ */ class EarlyExpirationDispatcher { - private MessageBusInterface $bus; - private ReverseContainer $reverseContainer; + private $bus; + private $reverseContainer; private ?\Closure $callbackWrapper; public function __construct(MessageBusInterface $bus, ReverseContainer $reverseContainer, callable $callbackWrapper = null) diff --git a/src/Symfony/Component/Cache/Messenger/EarlyExpirationHandler.php b/src/Symfony/Component/Cache/Messenger/EarlyExpirationHandler.php index 043b4a177c6fb..88e725ab0a8df 100644 --- a/src/Symfony/Component/Cache/Messenger/EarlyExpirationHandler.php +++ b/src/Symfony/Component/Cache/Messenger/EarlyExpirationHandler.php @@ -20,7 +20,7 @@ */ class EarlyExpirationHandler implements MessageHandlerInterface { - private ReverseContainer $reverseContainer; + private $reverseContainer; private array $processedNonces = []; public function __construct(ReverseContainer $reverseContainer) diff --git a/src/Symfony/Component/Cache/Messenger/EarlyExpirationMessage.php b/src/Symfony/Component/Cache/Messenger/EarlyExpirationMessage.php index 7d5bee43fee96..9633e08d2d9d5 100644 --- a/src/Symfony/Component/Cache/Messenger/EarlyExpirationMessage.php +++ b/src/Symfony/Component/Cache/Messenger/EarlyExpirationMessage.php @@ -20,7 +20,7 @@ */ final class EarlyExpirationMessage { - private CacheItem $item; + private $item; private string $pool; private string|array $callback; diff --git a/src/Symfony/Component/Cache/Psr16Cache.php b/src/Symfony/Component/Cache/Psr16Cache.php index e235df8618166..98f3994b3dde4 100644 --- a/src/Symfony/Component/Cache/Psr16Cache.php +++ b/src/Symfony/Component/Cache/Psr16Cache.php @@ -31,7 +31,7 @@ class Psr16Cache implements CacheInterface, PruneableInterface, ResettableInterf private const METADATA_EXPIRY_OFFSET = 1527506807; private \Closure $createCacheItem; - private ?CacheItem $cacheItemPrototype = null; + private $cacheItemPrototype = null; public function __construct(CacheItemPoolInterface $pool) { diff --git a/src/Symfony/Component/Cache/Traits/FilesystemTrait.php b/src/Symfony/Component/Cache/Traits/FilesystemTrait.php index 05ad8ed674a64..b25c8d65d240b 100644 --- a/src/Symfony/Component/Cache/Traits/FilesystemTrait.php +++ b/src/Symfony/Component/Cache/Traits/FilesystemTrait.php @@ -12,7 +12,6 @@ namespace Symfony\Component\Cache\Traits; use Symfony\Component\Cache\Exception\CacheException; -use Symfony\Component\Cache\Marshaller\MarshallerInterface; /** * @author Nicolas Grekas @@ -24,7 +23,7 @@ trait FilesystemTrait { use FilesystemCommonTrait; - private MarshallerInterface $marshaller; + private $marshaller; public function prune(): bool { diff --git a/src/Symfony/Component/Cache/Traits/RedisClusterNodeProxy.php b/src/Symfony/Component/Cache/Traits/RedisClusterNodeProxy.php index afcfb3a1392bf..8d738bbb5f9c1 100644 --- a/src/Symfony/Component/Cache/Traits/RedisClusterNodeProxy.php +++ b/src/Symfony/Component/Cache/Traits/RedisClusterNodeProxy.php @@ -25,7 +25,7 @@ class RedisClusterNodeProxy { private array $host; - private \RedisCluster|RedisClusterProxy $redis; + private $redis; public function __construct(array $host, \RedisCluster|RedisClusterProxy $redis) { diff --git a/src/Symfony/Component/Cache/Traits/RedisClusterProxy.php b/src/Symfony/Component/Cache/Traits/RedisClusterProxy.php index b4b750cfea301..741e114b4bfb6 100644 --- a/src/Symfony/Component/Cache/Traits/RedisClusterProxy.php +++ b/src/Symfony/Component/Cache/Traits/RedisClusterProxy.php @@ -10,15 +10,15 @@ */ namespace Symfony\Component\Cache\Traits; - /** + * @author Alessandro Chitolina * * @internal */ class RedisClusterProxy { - private \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|RedisProxy $redis; + private $redis; private \Closure $initializer; public function __construct(\Closure $initializer) diff --git a/src/Symfony/Component/Cache/Traits/RedisProxy.php b/src/Symfony/Component/Cache/Traits/RedisProxy.php index a477dc87e7412..463e7249e39cb 100644 --- a/src/Symfony/Component/Cache/Traits/RedisProxy.php +++ b/src/Symfony/Component/Cache/Traits/RedisProxy.php @@ -18,7 +18,7 @@ */ class RedisProxy { - private \Redis $redis; + private $redis; private \Closure $initializer; private bool $ready = false; diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php index fc833beb7f23a..fa96679028e71 100644 --- a/src/Symfony/Component/Cache/Traits/RedisTrait.php +++ b/src/Symfony/Component/Cache/Traits/RedisTrait.php @@ -44,8 +44,8 @@ trait RedisTrait 'failover' => 'none', 'ssl' => null, // see https://php.net/context.ssl ]; - private \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|RedisProxy|RedisClusterProxy $redis; - private MarshallerInterface $marshaller; + private $redis; + private $marshaller; private function init(\Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|RedisProxy|RedisClusterProxy $redis, string $namespace, int $defaultLifetime, ?MarshallerInterface $marshaller) { diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php index b582435f7d102..09234f5eb55b7 100644 --- a/src/Symfony/Component/Console/Application.php +++ b/src/Symfony/Component/Console/Application.php @@ -72,20 +72,20 @@ class Application implements ResetInterface { private array $commands = []; private bool $wantHelps = false; - private ?Command $runningCommand = null; + private $runningCommand = null; private string $name; private string $version; - private ?CommandLoaderInterface $commandLoader = null; + private $commandLoader = null; private bool $catchExceptions = true; private bool $autoExit = true; - private InputDefinition $definition; - private HelperSet $helperSet; - private ?EventDispatcherInterface $dispatcher = null; - private Terminal $terminal; + private $definition; + private $helperSet; + private $dispatcher = null; + private $terminal; private string $defaultCommand; private bool $singleCommand = false; private bool $initialized = false; - private SignalRegistry $signalRegistry; + private $signalRegistry; private array $signalsToDispatchEvent = []; public function __construct(string $name = 'UNKNOWN', string $version = 'UNKNOWN') diff --git a/src/Symfony/Component/Console/CI/GithubActionReporter.php b/src/Symfony/Component/Console/CI/GithubActionReporter.php index 7e5565469a954..a15c1ff18b864 100644 --- a/src/Symfony/Component/Console/CI/GithubActionReporter.php +++ b/src/Symfony/Component/Console/CI/GithubActionReporter.php @@ -20,7 +20,7 @@ */ class GithubActionReporter { - private OutputInterface $output; + private $output; /** * @see https://github.com/actions/toolkit/blob/5e5e1b7aacba68a53836a34db4a288c3c1c1585b/packages/core/src/command.ts#L80-L85 diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php index d6354b4ab119c..e69bae0982417 100644 --- a/src/Symfony/Component/Console/Command/Command.php +++ b/src/Symfony/Component/Console/Command/Command.php @@ -47,20 +47,20 @@ class Command */ protected static $defaultDescription; - private ?Application $application = null; + private $application = null; private ?string $name = null; private ?string $processTitle = null; private array $aliases = []; - private InputDefinition $definition; + private $definition; private bool $hidden = false; private string $help = ''; private string $description = ''; - private ?InputDefinition $fullDefinition = null; + private $fullDefinition = null; private bool $ignoreValidationErrors = false; private ?\Closure $code = null; private array $synopsis = []; private array $usages = []; - private ?HelperSet $helperSet = null; + private $helperSet = null; public static function getDefaultName(): ?string { diff --git a/src/Symfony/Component/Console/Command/HelpCommand.php b/src/Symfony/Component/Console/Command/HelpCommand.php index ad4b813e44e47..66f8593ebc2fc 100644 --- a/src/Symfony/Component/Console/Command/HelpCommand.php +++ b/src/Symfony/Component/Console/Command/HelpCommand.php @@ -27,7 +27,7 @@ */ class HelpCommand extends Command { - private Command $command; + private $command; /** * {@inheritdoc} diff --git a/src/Symfony/Component/Console/Command/LazyCommand.php b/src/Symfony/Component/Console/Command/LazyCommand.php index b674a6387b323..aec4126791faf 100644 --- a/src/Symfony/Component/Console/Command/LazyCommand.php +++ b/src/Symfony/Component/Console/Command/LazyCommand.php @@ -24,7 +24,7 @@ */ final class LazyCommand extends Command { - private \Closure|Command $command; + private $command; private ?bool $isEnabled; public function __construct(string $name, array $aliases, string $description, bool $isHidden, \Closure $commandFactory, ?bool $isEnabled = true) diff --git a/src/Symfony/Component/Console/Command/LockableTrait.php b/src/Symfony/Component/Console/Command/LockableTrait.php index 67923a9e81881..796955142e895 100644 --- a/src/Symfony/Component/Console/Command/LockableTrait.php +++ b/src/Symfony/Component/Console/Command/LockableTrait.php @@ -13,7 +13,6 @@ use Symfony\Component\Console\Exception\LogicException; use Symfony\Component\Lock\LockFactory; -use Symfony\Component\Lock\LockInterface; use Symfony\Component\Lock\Store\FlockStore; use Symfony\Component\Lock\Store\SemaphoreStore; @@ -24,7 +23,7 @@ */ trait LockableTrait { - private ?LockInterface $lock = null; + private $lock = null; /** * Locks a command. diff --git a/src/Symfony/Component/Console/CommandLoader/ContainerCommandLoader.php b/src/Symfony/Component/Console/CommandLoader/ContainerCommandLoader.php index 651fb665e08ed..9b26577f0243c 100644 --- a/src/Symfony/Component/Console/CommandLoader/ContainerCommandLoader.php +++ b/src/Symfony/Component/Console/CommandLoader/ContainerCommandLoader.php @@ -22,7 +22,7 @@ */ class ContainerCommandLoader implements CommandLoaderInterface { - private ContainerInterface $container; + private $container; private array $commandMap; /** diff --git a/src/Symfony/Component/Console/Cursor.php b/src/Symfony/Component/Console/Cursor.php index 03e8c618b76dd..995e3d7dd7e63 100644 --- a/src/Symfony/Component/Console/Cursor.php +++ b/src/Symfony/Component/Console/Cursor.php @@ -18,7 +18,7 @@ */ final class Cursor { - private OutputInterface $output; + private $output; private $input; /** diff --git a/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php index 5f32173ae5a48..0802f1b38bd74 100644 --- a/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php +++ b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php @@ -24,7 +24,7 @@ class ApplicationDescription { public const GLOBAL_NAMESPACE = '_global'; - private Application $application; + private $application; private ?string $namespace; private bool $showHidden; private array $namespaces; diff --git a/src/Symfony/Component/Console/Event/ConsoleEvent.php b/src/Symfony/Component/Console/Event/ConsoleEvent.php index 6ba1615fe0984..56b8a9a60e1f1 100644 --- a/src/Symfony/Component/Console/Event/ConsoleEvent.php +++ b/src/Symfony/Component/Console/Event/ConsoleEvent.php @@ -25,8 +25,8 @@ class ConsoleEvent extends Event { protected $command; - private InputInterface $input; - private OutputInterface $output; + private $input; + private $output; public function __construct(?Command $command, InputInterface $input, OutputInterface $output) { diff --git a/src/Symfony/Component/Console/EventListener/ErrorListener.php b/src/Symfony/Component/Console/EventListener/ErrorListener.php index bcd9183311de7..61bd9d3443a4e 100644 --- a/src/Symfony/Component/Console/EventListener/ErrorListener.php +++ b/src/Symfony/Component/Console/EventListener/ErrorListener.php @@ -24,7 +24,7 @@ */ class ErrorListener implements EventSubscriberInterface { - private ?LoggerInterface $logger; + private $logger; public function __construct(LoggerInterface $logger = null) { diff --git a/src/Symfony/Component/Console/Formatter/NullOutputFormatter.php b/src/Symfony/Component/Console/Formatter/NullOutputFormatter.php index d14db326a050d..d770e1465ff6c 100644 --- a/src/Symfony/Component/Console/Formatter/NullOutputFormatter.php +++ b/src/Symfony/Component/Console/Formatter/NullOutputFormatter.php @@ -16,7 +16,7 @@ */ final class NullOutputFormatter implements OutputFormatterInterface { - private NullOutputFormatterStyle $style; + private $style; /** * {@inheritdoc} diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatter.php b/src/Symfony/Component/Console/Formatter/OutputFormatter.php index bc47f6e104da6..c914a12461288 100644 --- a/src/Symfony/Component/Console/Formatter/OutputFormatter.php +++ b/src/Symfony/Component/Console/Formatter/OutputFormatter.php @@ -23,7 +23,7 @@ class OutputFormatter implements WrappableOutputFormatterInterface { private bool $decorated; private array $styles = []; - private OutputFormatterStyleStack $styleStack; + private $styleStack; public function __clone() { diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php b/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php index 9e8ea967ebf49..0a009e962ccf6 100644 --- a/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php +++ b/src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php @@ -20,7 +20,7 @@ */ class OutputFormatterStyle implements OutputFormatterStyleInterface { - private Color $color; + private $color; private string $foreground; private string $background; private array $options; diff --git a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php index e72b641bae6f9..b425449ef389f 100644 --- a/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php +++ b/src/Symfony/Component/Console/Formatter/OutputFormatterStyleStack.php @@ -24,7 +24,7 @@ class OutputFormatterStyleStack implements ResetInterface */ private array $styles = []; - private OutputFormatterStyleInterface $emptyStyle; + private $emptyStyle; public function __construct(OutputFormatterStyleInterface $emptyStyle = null) { diff --git a/src/Symfony/Component/Console/Helper/Dumper.php b/src/Symfony/Component/Console/Helper/Dumper.php index 76b76c0a4047d..50190951b4864 100644 --- a/src/Symfony/Component/Console/Helper/Dumper.php +++ b/src/Symfony/Component/Console/Helper/Dumper.php @@ -21,9 +21,9 @@ */ final class Dumper { - private OutputInterface $output; - private ?CliDumper $dumper; - private ?ClonerInterface $cloner; + private $output; + private $dumper; + private $cloner; private \Closure $handler; public function __construct(OutputInterface $output, CliDumper $dumper = null, ClonerInterface $cloner = null) diff --git a/src/Symfony/Component/Console/Helper/ProgressBar.php b/src/Symfony/Component/Console/Helper/ProgressBar.php index b087b4b924728..72c26f2f32f4a 100644 --- a/src/Symfony/Component/Console/Helper/ProgressBar.php +++ b/src/Symfony/Component/Console/Helper/ProgressBar.php @@ -47,7 +47,7 @@ final class ProgressBar private float $lastWriteTime = 0; private float $minSecondsBetweenRedraws = 0; private float $maxSecondsBetweenRedraws = 1; - private OutputInterface $output; + private $output; private int $step = 0; private ?int $max = null; private int $startTime; @@ -56,9 +56,9 @@ final class ProgressBar private int $formatLineCount; private array $messages = []; private bool $overwrite = true; - private Terminal $terminal; + private $terminal; private ?string $previousMessage = null; - private Cursor $cursor; + private $cursor; private static array $formatters; private static array $formats; diff --git a/src/Symfony/Component/Console/Helper/ProgressIndicator.php b/src/Symfony/Component/Console/Helper/ProgressIndicator.php index 9ca24e9424a4c..c746f9b92e467 100644 --- a/src/Symfony/Component/Console/Helper/ProgressIndicator.php +++ b/src/Symfony/Component/Console/Helper/ProgressIndicator.php @@ -31,7 +31,7 @@ class ProgressIndicator 'very_verbose_no_ansi' => ' %message% (%elapsed:6s%, %memory:6s%)', ]; - private OutputInterface $output; + private $output; private int $startTime; private ?string $format = null; private ?string $message = null; diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php index 94abf74d11dea..2e87ed9c74bdf 100644 --- a/src/Symfony/Component/Console/Helper/Table.php +++ b/src/Symfony/Component/Console/Helper/Table.php @@ -43,8 +43,8 @@ class Table private bool $horizontal = false; private array $effectiveColumnWidths = []; private int $numberOfColumns; - private OutputInterface $output; - private TableStyle $style; + private $output; + private $style; private array $columnStyles = []; private array $columnWidths = []; private array $columnMaxWidths = []; diff --git a/src/Symfony/Component/Console/Input/InputDefinition.php b/src/Symfony/Component/Console/Input/InputDefinition.php index f4b14a1c89fb1..cb270d81fa9e3 100644 --- a/src/Symfony/Component/Console/Input/InputDefinition.php +++ b/src/Symfony/Component/Console/Input/InputDefinition.php @@ -30,8 +30,8 @@ class InputDefinition { private array $arguments = []; private int $requiredCount = 0; - private ?InputArgument $lastArrayArgument = null; - private ?InputArgument $lastOptionalArgument = null; + private $lastArrayArgument = null; + private $lastOptionalArgument = null; private array $options = []; private array $negations = []; private array $shortcuts = []; diff --git a/src/Symfony/Component/Console/Logger/ConsoleLogger.php b/src/Symfony/Component/Console/Logger/ConsoleLogger.php index 8d028ac8e02ea..61a7821508d87 100644 --- a/src/Symfony/Component/Console/Logger/ConsoleLogger.php +++ b/src/Symfony/Component/Console/Logger/ConsoleLogger.php @@ -29,7 +29,7 @@ class ConsoleLogger extends AbstractLogger public const INFO = 'info'; public const ERROR = 'error'; - private OutputInterface $output; + private $output; private array $verbosityLevelMap = [ LogLevel::EMERGENCY => OutputInterface::VERBOSITY_NORMAL, LogLevel::ALERT => OutputInterface::VERBOSITY_NORMAL, diff --git a/src/Symfony/Component/Console/Output/ConsoleOutput.php b/src/Symfony/Component/Console/Output/ConsoleOutput.php index 1ed7f20a2b3d2..3326cdf2303d5 100644 --- a/src/Symfony/Component/Console/Output/ConsoleOutput.php +++ b/src/Symfony/Component/Console/Output/ConsoleOutput.php @@ -29,7 +29,7 @@ */ class ConsoleOutput extends StreamOutput implements ConsoleOutputInterface { - private OutputInterface $stderr; + private $stderr; private array $consoleSectionOutputs = []; /** diff --git a/src/Symfony/Component/Console/Output/ConsoleSectionOutput.php b/src/Symfony/Component/Console/Output/ConsoleSectionOutput.php index d4c2f20c71741..92dca79682b53 100644 --- a/src/Symfony/Component/Console/Output/ConsoleSectionOutput.php +++ b/src/Symfony/Component/Console/Output/ConsoleSectionOutput.php @@ -24,7 +24,7 @@ class ConsoleSectionOutput extends StreamOutput private array $content = []; private int $lines = 0; private array $sections; - private Terminal $terminal; + private $terminal; /** * @param resource $stream diff --git a/src/Symfony/Component/Console/Output/NullOutput.php b/src/Symfony/Component/Console/Output/NullOutput.php index 768207f0ee957..87214ec497c05 100644 --- a/src/Symfony/Component/Console/Output/NullOutput.php +++ b/src/Symfony/Component/Console/Output/NullOutput.php @@ -24,7 +24,7 @@ */ class NullOutput implements OutputInterface { - private NullOutputFormatter $formatter; + private $formatter; /** * {@inheritdoc} diff --git a/src/Symfony/Component/Console/Output/Output.php b/src/Symfony/Component/Console/Output/Output.php index c337e113faaf3..58c1837b742c8 100644 --- a/src/Symfony/Component/Console/Output/Output.php +++ b/src/Symfony/Component/Console/Output/Output.php @@ -30,7 +30,7 @@ abstract class Output implements OutputInterface { private int $verbosity; - private OutputFormatterInterface $formatter; + private $formatter; /** * @param int|null $verbosity The verbosity level (one of the VERBOSITY constants in OutputInterface) diff --git a/src/Symfony/Component/Console/Style/OutputStyle.php b/src/Symfony/Component/Console/Style/OutputStyle.php index 1338f04c6487f..0b2ded36c4d1b 100644 --- a/src/Symfony/Component/Console/Style/OutputStyle.php +++ b/src/Symfony/Component/Console/Style/OutputStyle.php @@ -23,7 +23,7 @@ */ abstract class OutputStyle implements OutputInterface, StyleInterface { - private OutputInterface $output; + private $output; public function __construct(OutputInterface $output) { diff --git a/src/Symfony/Component/Console/Style/SymfonyStyle.php b/src/Symfony/Component/Console/Style/SymfonyStyle.php index 58640ab5f0f3d..78af16670f7ba 100644 --- a/src/Symfony/Component/Console/Style/SymfonyStyle.php +++ b/src/Symfony/Component/Console/Style/SymfonyStyle.php @@ -38,12 +38,12 @@ class SymfonyStyle extends OutputStyle { public const MAX_LINE_LENGTH = 120; - private InputInterface $input; - private OutputInterface $output; - private SymfonyQuestionHelper $questionHelper; - private ProgressBar $progressBar; + private $input; + private $output; + private $questionHelper; + private $progressBar; private int $lineLength; - private TrimmedBufferOutput $bufferedOutput; + private $bufferedOutput; public function __construct(InputInterface $input, OutputInterface $output) { diff --git a/src/Symfony/Component/Console/Tester/ApplicationTester.php b/src/Symfony/Component/Console/Tester/ApplicationTester.php index ffa21cba4de66..0404020c615bf 100644 --- a/src/Symfony/Component/Console/Tester/ApplicationTester.php +++ b/src/Symfony/Component/Console/Tester/ApplicationTester.php @@ -28,7 +28,7 @@ class ApplicationTester { use TesterTrait; - private Application $application; + private $application; public function __construct(Application $application) { diff --git a/src/Symfony/Component/Console/Tester/CommandTester.php b/src/Symfony/Component/Console/Tester/CommandTester.php index 2ff813b7dc222..f6ee4b7309956 100644 --- a/src/Symfony/Component/Console/Tester/CommandTester.php +++ b/src/Symfony/Component/Console/Tester/CommandTester.php @@ -24,7 +24,7 @@ class CommandTester { use TesterTrait; - private Command $command; + private $command; public function __construct(Command $command) { diff --git a/src/Symfony/Component/Console/Tester/TesterTrait.php b/src/Symfony/Component/Console/Tester/TesterTrait.php index 0d2a371e4b327..b238f958be39e 100644 --- a/src/Symfony/Component/Console/Tester/TesterTrait.php +++ b/src/Symfony/Component/Console/Tester/TesterTrait.php @@ -23,10 +23,10 @@ */ trait TesterTrait { - private StreamOutput $output; + private $output; private array $inputs = []; private bool $captureStreamsIndependently = false; - private InputInterface $input; + private $input; private int $statusCode; /** diff --git a/src/Symfony/Component/CssSelector/CssSelectorConverter.php b/src/Symfony/Component/CssSelector/CssSelectorConverter.php index a322e93fbb18c..86ccb7958f004 100644 --- a/src/Symfony/Component/CssSelector/CssSelectorConverter.php +++ b/src/Symfony/Component/CssSelector/CssSelectorConverter.php @@ -26,7 +26,7 @@ */ class CssSelectorConverter { - private Translator $translator; + private $translator; private array $cache; private static array $xmlCache = []; diff --git a/src/Symfony/Component/CssSelector/Node/AttributeNode.php b/src/Symfony/Component/CssSelector/Node/AttributeNode.php index bca9db7006717..bca91eb88d755 100644 --- a/src/Symfony/Component/CssSelector/Node/AttributeNode.php +++ b/src/Symfony/Component/CssSelector/Node/AttributeNode.php @@ -23,7 +23,7 @@ */ class AttributeNode extends AbstractNode { - private NodeInterface $selector; + private $selector; private ?string $namespace; private string $attribute; private string $operator; diff --git a/src/Symfony/Component/CssSelector/Node/ClassNode.php b/src/Symfony/Component/CssSelector/Node/ClassNode.php index b9284073ce34b..0e937688366cf 100644 --- a/src/Symfony/Component/CssSelector/Node/ClassNode.php +++ b/src/Symfony/Component/CssSelector/Node/ClassNode.php @@ -23,7 +23,7 @@ */ class ClassNode extends AbstractNode { - private NodeInterface $selector; + private $selector; private string $name; public function __construct(NodeInterface $selector, string $name) diff --git a/src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php b/src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php index 33889948569c7..f5f996974cb84 100644 --- a/src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php +++ b/src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php @@ -23,9 +23,9 @@ */ class CombinedSelectorNode extends AbstractNode { - private NodeInterface $selector; + private $selector; private string $combinator; - private NodeInterface $subSelector; + private $subSelector; public function __construct(NodeInterface $selector, string $combinator, NodeInterface $subSelector) { diff --git a/src/Symfony/Component/CssSelector/Node/FunctionNode.php b/src/Symfony/Component/CssSelector/Node/FunctionNode.php index 5bfca1842f385..e91a1662d0d6c 100644 --- a/src/Symfony/Component/CssSelector/Node/FunctionNode.php +++ b/src/Symfony/Component/CssSelector/Node/FunctionNode.php @@ -25,7 +25,7 @@ */ class FunctionNode extends AbstractNode { - private NodeInterface $selector; + private $selector; private string $name; private array $arguments; diff --git a/src/Symfony/Component/CssSelector/Node/HashNode.php b/src/Symfony/Component/CssSelector/Node/HashNode.php index 5f5923fb691bc..119b0d57e0fb2 100644 --- a/src/Symfony/Component/CssSelector/Node/HashNode.php +++ b/src/Symfony/Component/CssSelector/Node/HashNode.php @@ -23,7 +23,7 @@ */ class HashNode extends AbstractNode { - private NodeInterface $selector; + private $selector; private string $id; public function __construct(NodeInterface $selector, string $id) diff --git a/src/Symfony/Component/CssSelector/Node/NegationNode.php b/src/Symfony/Component/CssSelector/Node/NegationNode.php index c75d052b03da2..f00522fb96a85 100644 --- a/src/Symfony/Component/CssSelector/Node/NegationNode.php +++ b/src/Symfony/Component/CssSelector/Node/NegationNode.php @@ -23,8 +23,8 @@ */ class NegationNode extends AbstractNode { - private NodeInterface $selector; - private NodeInterface $subSelector; + private $selector; + private $subSelector; public function __construct(NodeInterface $selector, NodeInterface $subSelector) { diff --git a/src/Symfony/Component/CssSelector/Node/PseudoNode.php b/src/Symfony/Component/CssSelector/Node/PseudoNode.php index 6825f3a3db4c1..5d6325a5eae67 100644 --- a/src/Symfony/Component/CssSelector/Node/PseudoNode.php +++ b/src/Symfony/Component/CssSelector/Node/PseudoNode.php @@ -23,7 +23,7 @@ */ class PseudoNode extends AbstractNode { - private NodeInterface $selector; + private $selector; private string $identifier; public function __construct(NodeInterface $selector, string $identifier) diff --git a/src/Symfony/Component/CssSelector/Node/SelectorNode.php b/src/Symfony/Component/CssSelector/Node/SelectorNode.php index b1d6c58e0a68e..55fae1e762cb5 100644 --- a/src/Symfony/Component/CssSelector/Node/SelectorNode.php +++ b/src/Symfony/Component/CssSelector/Node/SelectorNode.php @@ -23,7 +23,7 @@ */ class SelectorNode extends AbstractNode { - private NodeInterface $tree; + private $tree; private ?string $pseudoElement; public function __construct(NodeInterface $tree, string $pseudoElement = null) diff --git a/src/Symfony/Component/CssSelector/Parser/Handler/HashHandler.php b/src/Symfony/Component/CssSelector/Parser/Handler/HashHandler.php index cde8cda2b23e5..7ae9b438ca0ab 100644 --- a/src/Symfony/Component/CssSelector/Parser/Handler/HashHandler.php +++ b/src/Symfony/Component/CssSelector/Parser/Handler/HashHandler.php @@ -29,8 +29,8 @@ */ class HashHandler implements HandlerInterface { - private TokenizerPatterns $patterns; - private TokenizerEscaping $escaping; + private $patterns; + private $escaping; public function __construct(TokenizerPatterns $patterns, TokenizerEscaping $escaping) { diff --git a/src/Symfony/Component/CssSelector/Parser/Handler/IdentifierHandler.php b/src/Symfony/Component/CssSelector/Parser/Handler/IdentifierHandler.php index 2b9e02e05038f..7b2a14e2c33e6 100644 --- a/src/Symfony/Component/CssSelector/Parser/Handler/IdentifierHandler.php +++ b/src/Symfony/Component/CssSelector/Parser/Handler/IdentifierHandler.php @@ -29,8 +29,8 @@ */ class IdentifierHandler implements HandlerInterface { - private TokenizerPatterns $patterns; - private TokenizerEscaping $escaping; + private $patterns; + private $escaping; public function __construct(TokenizerPatterns $patterns, TokenizerEscaping $escaping) { diff --git a/src/Symfony/Component/CssSelector/Parser/Handler/NumberHandler.php b/src/Symfony/Component/CssSelector/Parser/Handler/NumberHandler.php index d3bbe5f41157e..8291a68d13d43 100644 --- a/src/Symfony/Component/CssSelector/Parser/Handler/NumberHandler.php +++ b/src/Symfony/Component/CssSelector/Parser/Handler/NumberHandler.php @@ -28,7 +28,7 @@ */ class NumberHandler implements HandlerInterface { - private TokenizerPatterns $patterns; + private $patterns; public function __construct(TokenizerPatterns $patterns) { diff --git a/src/Symfony/Component/CssSelector/Parser/Handler/StringHandler.php b/src/Symfony/Component/CssSelector/Parser/Handler/StringHandler.php index 341c75fc78ff6..6ce83cdc9b1c3 100644 --- a/src/Symfony/Component/CssSelector/Parser/Handler/StringHandler.php +++ b/src/Symfony/Component/CssSelector/Parser/Handler/StringHandler.php @@ -31,8 +31,8 @@ */ class StringHandler implements HandlerInterface { - private TokenizerPatterns $patterns; - private TokenizerEscaping $escaping; + private $patterns; + private $escaping; public function __construct(TokenizerPatterns $patterns, TokenizerEscaping $escaping) { diff --git a/src/Symfony/Component/CssSelector/Parser/Parser.php b/src/Symfony/Component/CssSelector/Parser/Parser.php index df77e2ce4a19c..d73489edfb481 100644 --- a/src/Symfony/Component/CssSelector/Parser/Parser.php +++ b/src/Symfony/Component/CssSelector/Parser/Parser.php @@ -27,7 +27,7 @@ */ class Parser implements ParserInterface { - private Tokenizer $tokenizer; + private $tokenizer; public function __construct(Tokenizer $tokenizer = null) { diff --git a/src/Symfony/Component/CssSelector/Parser/TokenStream.php b/src/Symfony/Component/CssSelector/Parser/TokenStream.php index 69f777807db4e..e2c15a642d122 100644 --- a/src/Symfony/Component/CssSelector/Parser/TokenStream.php +++ b/src/Symfony/Component/CssSelector/Parser/TokenStream.php @@ -37,7 +37,7 @@ class TokenStream private array $used = []; private int $cursor = 0; - private ?Token $peeked; + private $peeked; private bool $peeking = false; /** diff --git a/src/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerEscaping.php b/src/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerEscaping.php index 8c4b9f7423e9b..013e827d2b999 100644 --- a/src/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerEscaping.php +++ b/src/Symfony/Component/CssSelector/Parser/Tokenizer/TokenizerEscaping.php @@ -23,7 +23,7 @@ */ class TokenizerEscaping { - private TokenizerPatterns $patterns; + private $patterns; public function __construct(TokenizerPatterns $patterns) { diff --git a/src/Symfony/Component/CssSelector/XPath/Translator.php b/src/Symfony/Component/CssSelector/XPath/Translator.php index 128a4a9397ac3..c0bb29dee6384 100644 --- a/src/Symfony/Component/CssSelector/XPath/Translator.php +++ b/src/Symfony/Component/CssSelector/XPath/Translator.php @@ -30,7 +30,7 @@ */ class Translator implements TranslatorInterface { - private ParserInterface $mainParser; + private $mainParser; /** * @var ParserInterface[] diff --git a/src/Symfony/Component/DependencyInjection/Argument/ServiceLocatorArgument.php b/src/Symfony/Component/DependencyInjection/Argument/ServiceLocatorArgument.php index afac026d52e72..dcb122c481abf 100644 --- a/src/Symfony/Component/DependencyInjection/Argument/ServiceLocatorArgument.php +++ b/src/Symfony/Component/DependencyInjection/Argument/ServiceLocatorArgument.php @@ -22,7 +22,7 @@ class ServiceLocatorArgument implements ArgumentInterface { use ReferenceSetArgumentTrait; - private ?TaggedIteratorArgument $taggedIteratorArgument = null; + private $taggedIteratorArgument = null; /** * @param Reference[]|TaggedIteratorArgument $values diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php index 1acec50de5c89..49495f941a5ea 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php @@ -32,7 +32,7 @@ abstract class AbstractRecursivePass implements CompilerPassInterface protected $currentId; private bool $processExpressions = false; - private ExpressionLanguage $expressionLanguage; + private $expressionLanguage; private bool $inExpression = false; /** diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php index 4f53882d90569..fbec79259e931 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php @@ -30,8 +30,8 @@ */ class AnalyzeServiceReferencesPass extends AbstractRecursivePass { - private ServiceReferenceGraph $graph; - private ?Definition $currentDefinition = null; + private $graph; + private $currentDefinition = null; private bool $onlyConstructorArguments; private bool $hasProxyDumper; private bool $lazy; diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php index 56c498d75daa4..73b79e4180bb5 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php @@ -62,7 +62,7 @@ final class CheckTypeDeclarationsPass extends AbstractRecursivePass private bool $autoload; private array $skippedIds; - private ExpressionLanguage $expressionLanguage; + private $expressionLanguage; /** * @param bool $autoload Whether services who's class in not loaded should be checked or not. diff --git a/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php b/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php index 81ebd65924d31..c61a5f2b9a73a 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php @@ -21,9 +21,9 @@ */ class Compiler { - private PassConfig $passConfig; + private $passConfig; private array $log = []; - private ServiceReferenceGraph $serviceReferenceGraph; + private $serviceReferenceGraph; public function __construct() { diff --git a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php index b65f56a17be4e..76a37d9df6d81 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php @@ -24,13 +24,13 @@ */ class InlineServiceDefinitionsPass extends AbstractRecursivePass { - private ?AnalyzeServiceReferencesPass $analyzingPass; + private $analyzingPass; private array $cloningIds = []; private array $connectedIds = []; private array $notInlinedIds = []; private array $inlinedIds = []; private array $notInlinableIds = []; - private ?ServiceReferenceGraph $graph = null; + private $graph = null; public function __construct(AnalyzeServiceReferencesPass $analyzingPass = null) { diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php index 4373833180319..2d511dec1c5c3 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php @@ -28,7 +28,7 @@ class PassConfig public const TYPE_OPTIMIZE = 'optimization'; public const TYPE_REMOVE = 'removing'; - private MergeExtensionConfigurationPass $mergePass; + private $mergePass; private array $afterRemovingPasses; private array $beforeOptimizationPasses; private array $beforeRemovingPasses = []; diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php index d1bc44c99d278..993a9fe794316 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php @@ -29,8 +29,8 @@ */ class ResolveInvalidReferencesPass implements CompilerPassInterface { - private ContainerBuilder $container; - private RuntimeException $signalingException; + private $container; + private $signalingException; private string $currentId; /** diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php index 6b381913d11d2..2b559b8b30f26 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php @@ -14,7 +14,6 @@ use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Definition; use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException; -use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface; /** * Resolves all parameter placeholders "%somevalue%" to their real values. @@ -23,7 +22,7 @@ */ class ResolveParameterPlaceHoldersPass extends AbstractRecursivePass { - private ParameterBagInterface $bag; + private $bag; public function __construct( private bool $resolveArrays = true, diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphEdge.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphEdge.php index b607164a6d6c7..f14b0e8dca219 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphEdge.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/ServiceReferenceGraphEdge.php @@ -20,8 +20,8 @@ */ class ServiceReferenceGraphEdge { - private ServiceReferenceGraphNode $sourceNode; - private ServiceReferenceGraphNode $destNode; + private $sourceNode; + private $destNode; private mixed $value; private bool $lazy; private bool $weak; diff --git a/src/Symfony/Component/DependencyInjection/Config/ContainerParametersResourceChecker.php b/src/Symfony/Component/DependencyInjection/Config/ContainerParametersResourceChecker.php index 6901127056876..db2a2d047faf0 100644 --- a/src/Symfony/Component/DependencyInjection/Config/ContainerParametersResourceChecker.php +++ b/src/Symfony/Component/DependencyInjection/Config/ContainerParametersResourceChecker.php @@ -20,7 +20,7 @@ */ class ContainerParametersResourceChecker implements ResourceCheckerInterface { - private ContainerInterface $container; + private $container; public function __construct(ContainerInterface $container) { diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php index 2ae4dcb633113..17650e4137b40 100644 --- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php +++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php @@ -83,10 +83,10 @@ class ContainerBuilder extends Container implements TaggedContainerInterface */ private array $extensionConfigs = []; - private Compiler $compiler; + private $compiler; private bool $trackResources; - private ?InstantiatorInterface $proxyInstantiator = null; - private ExpressionLanguage $expressionLanguage; + private $proxyInstantiator = null; + private $expressionLanguage; /** * @var ExpressionFunctionProviderInterface[] diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php index 6a319b41af653..ddb9b195aa464 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php @@ -69,7 +69,7 @@ class PhpDumper extends Dumper private ?\SplObjectStorage $inlinedDefinitions = null; private ?array $serviceCalls = null; private array $reservedVariables = ['instance', 'class', 'this', 'container']; - private ExpressionLanguage $expressionLanguage; + private $expressionLanguage; private ?string $targetDirRegex = null; private int $targetDirMaxMatches; private string $docStar; @@ -90,7 +90,7 @@ class PhpDumper extends Dumper private string $serviceLocatorTag; private array $exportedVariables = []; private string $baseClass; - private ProxyDumper $proxyDumper; + private $proxyDumper; /** * {@inheritdoc} diff --git a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php index 5b872e0eb246e..12f0be63aff21 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php @@ -37,7 +37,7 @@ */ class YamlDumper extends Dumper { - private YmlDumper $dumper; + private $dumper; /** * Dumps the service container as an YAML string. diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php index d9610893e3b4f..ca66af554044c 100644 --- a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php +++ b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php @@ -20,7 +20,7 @@ */ class EnvVarProcessor implements EnvVarProcessorInterface { - private ContainerInterface $container; + private $container; private \Traversable $loaders; private array $loadedVars = []; diff --git a/src/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php b/src/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php index d84563603e012..c4efdbe5ef494 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php @@ -23,7 +23,7 @@ */ class ClosureLoader extends Loader { - private ContainerBuilder $container; + private $container; public function __construct(ContainerBuilder $container, string $env = null) { diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractConfigurator.php index f41fed1b686ad..da4f26b4878b3 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractConfigurator.php +++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractConfigurator.php @@ -12,7 +12,6 @@ namespace Symfony\Component\DependencyInjection\Loader\Configurator; use Symfony\Component\Config\Loader\ParamConfigurator; -use Symfony\Component\DependencyInjection\Alias; use Symfony\Component\DependencyInjection\Argument\AbstractArgument; use Symfony\Component\DependencyInjection\Argument\ArgumentInterface; use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument; @@ -32,7 +31,7 @@ abstract class AbstractConfigurator public static $valuePreProcessor; /** @internal */ - protected Definition|Alias|null $definition = null; + protected $definition = null; public function __call(string $method, array $args) { diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php index 77fc321659d5a..5bf57c8962b95 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php +++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php @@ -30,8 +30,8 @@ class ContainerConfigurator extends AbstractConfigurator { public const FACTORY = 'container'; - private ContainerBuilder $container; - private PhpFileLoader $loader; + private $container; + private $loader; private array $instanceof; private string $path; private string $file; diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ParametersConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ParametersConfigurator.php index 6460bbc7b0f3e..d3e9fd9e7979b 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ParametersConfigurator.php +++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ParametersConfigurator.php @@ -20,7 +20,7 @@ class ParametersConfigurator extends AbstractConfigurator { public const FACTORY = 'parameters'; - private ContainerBuilder $container; + private $container; public function __construct(ContainerBuilder $container) { diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/PrototypeConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/PrototypeConfigurator.php index d01ef934bd3ae..e56faf2d70ee5 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/PrototypeConfigurator.php +++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/PrototypeConfigurator.php @@ -37,7 +37,7 @@ class PrototypeConfigurator extends AbstractServiceConfigurator public const FACTORY = 'load'; - private PhpFileLoader $loader; + private $loader; private string $resource; private ?array $excludes = null; private bool $allowParent; diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php index 49aff7ea947e7..016bccad7b9b3 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php +++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php @@ -41,7 +41,7 @@ class ServiceConfigurator extends AbstractServiceConfigurator public const FACTORY = 'services'; - private ContainerBuilder $container; + private $container; private array $instanceof; private bool $allowParent; private ?string $path; diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServicesConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServicesConfigurator.php index d5dca0e3276d1..5445edf5efe91 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServicesConfigurator.php +++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServicesConfigurator.php @@ -26,9 +26,9 @@ class ServicesConfigurator extends AbstractConfigurator { public const FACTORY = 'services'; - private Definition $defaults; - private ContainerBuilder $container; - private PhpFileLoader $loader; + private $defaults; + private $container; + private $loader; private array $instanceof; private ?string $path; private string $anonymousHash; diff --git a/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php index 86da211310b7a..001a28c82ed23 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php @@ -34,7 +34,7 @@ class PhpFileLoader extends FileLoader { protected $autoRegisterAliasesForSinglyImplementedInterfaces = false; - private ?ConfigBuilderGeneratorInterface $generator; + private $generator; public function __construct(ContainerBuilder $container, FileLocatorInterface $locator, string $env = null, ConfigBuilderGeneratorInterface $generator = null) { diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php index df06ffc105913..2c7f41364cec1 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php @@ -106,7 +106,7 @@ class YamlFileLoader extends FileLoader 'bind' => 'bind', ]; - private YamlParser $yamlParser; + private $yamlParser; private int $anonymousServicesCount; private string $anonymousServicesSuffix; diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ContainerBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ContainerBag.php index b3f23302155b6..435394c95d22b 100644 --- a/src/Symfony/Component/DependencyInjection/ParameterBag/ContainerBag.php +++ b/src/Symfony/Component/DependencyInjection/ParameterBag/ContainerBag.php @@ -18,7 +18,7 @@ */ class ContainerBag extends FrozenParameterBag implements ContainerBagInterface { - private Container $container; + private $container; public function __construct(Container $container) { diff --git a/src/Symfony/Component/DependencyInjection/ReverseContainer.php b/src/Symfony/Component/DependencyInjection/ReverseContainer.php index 9635c5bceefe5..0483f0ddceddf 100644 --- a/src/Symfony/Component/DependencyInjection/ReverseContainer.php +++ b/src/Symfony/Component/DependencyInjection/ReverseContainer.php @@ -21,8 +21,8 @@ */ final class ReverseContainer { - private Container $serviceContainer; - private ContainerInterface $reversibleLocator; + private $serviceContainer; + private $reversibleLocator; private string $tagName; private \Closure $getServiceId; diff --git a/src/Symfony/Component/DependencyInjection/ServiceLocator.php b/src/Symfony/Component/DependencyInjection/ServiceLocator.php index ca21075b75034..c079b531b9ea9 100644 --- a/src/Symfony/Component/DependencyInjection/ServiceLocator.php +++ b/src/Symfony/Component/DependencyInjection/ServiceLocator.php @@ -31,7 +31,7 @@ class ServiceLocator implements ServiceProviderInterface } private ?string $externalId = null; - private ?Container $container = null; + private $container = null; /** * {@inheritdoc} diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/FooClassWithEnumAttribute.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/FooClassWithEnumAttribute.php index 3b2235efdd76b..93e863b66034d 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/FooClassWithEnumAttribute.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/FooClassWithEnumAttribute.php @@ -4,7 +4,7 @@ class FooClassWithEnumAttribute { - private FooUnitEnum $bar; + private $bar; public function __construct(FooUnitEnum $bar) { diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/LocatorConsumer.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/LocatorConsumer.php index 487cce16c0da8..7f68a926a8e3f 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/LocatorConsumer.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/LocatorConsumer.php @@ -18,7 +18,7 @@ final class LocatorConsumer { public function __construct( #[TaggedLocator('foo_bar', indexAttribute: 'foo')] - private ContainerInterface $locator, + private $locator, ) { } diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/LocatorConsumerConsumer.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/LocatorConsumerConsumer.php index c686754c5ad7e..ac4c21c0d50a6 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/LocatorConsumerConsumer.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/LocatorConsumerConsumer.php @@ -14,7 +14,7 @@ final class LocatorConsumerConsumer { public function __construct( - private LocatorConsumer $locatorConsumer + private $locatorConsumer ) { } diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/LocatorConsumerWithDefaultIndexMethod.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/LocatorConsumerWithDefaultIndexMethod.php index 6519e4393a68e..c8d8fb8c3a268 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/LocatorConsumerWithDefaultIndexMethod.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/LocatorConsumerWithDefaultIndexMethod.php @@ -9,7 +9,7 @@ final class LocatorConsumerWithDefaultIndexMethod { public function __construct( #[TaggedLocator(tag: 'foo_bar', defaultIndexMethod: 'getDefaultFooName')] - private ContainerInterface $locator, + private $locator, ) { } diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/LocatorConsumerWithDefaultIndexMethodAndWithDefaultPriorityMethod.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/LocatorConsumerWithDefaultIndexMethodAndWithDefaultPriorityMethod.php index f809a8b36ca55..6305c4473cf5f 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/LocatorConsumerWithDefaultIndexMethodAndWithDefaultPriorityMethod.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/LocatorConsumerWithDefaultIndexMethodAndWithDefaultPriorityMethod.php @@ -9,7 +9,7 @@ final class LocatorConsumerWithDefaultIndexMethodAndWithDefaultPriorityMethod { public function __construct( #[TaggedLocator(tag: 'foo_bar', defaultIndexMethod: 'getDefaultFooName', defaultPriorityMethod: 'getPriority')] - private ContainerInterface $locator, + private $locator, ) { } diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/LocatorConsumerWithDefaultPriorityMethod.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/LocatorConsumerWithDefaultPriorityMethod.php index 0fedc2b268089..5ea8ec00fbf19 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/LocatorConsumerWithDefaultPriorityMethod.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/LocatorConsumerWithDefaultPriorityMethod.php @@ -9,7 +9,7 @@ final class LocatorConsumerWithDefaultPriorityMethod { public function __construct( #[TaggedLocator(tag: 'foo_bar', defaultPriorityMethod: 'getPriority')] - private ContainerInterface $locator, + private $locator, ) { } diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/LocatorConsumerWithoutIndex.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/LocatorConsumerWithoutIndex.php index 74b81659527ca..f35be5c7af772 100644 --- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/LocatorConsumerWithoutIndex.php +++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/LocatorConsumerWithoutIndex.php @@ -18,7 +18,7 @@ final class LocatorConsumerWithoutIndex { public function __construct( #[TaggedLocator('foo_bar')] - private ContainerInterface $locator, + private $locator, ) { } diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php index f6da9d613bdf6..d30b30e64a2d0 100644 --- a/src/Symfony/Component/DomCrawler/Crawler.php +++ b/src/Symfony/Component/DomCrawler/Crawler.php @@ -58,7 +58,7 @@ class Crawler implements \Countable, \IteratorAggregate */ private bool $isHtml = true; - private ?HTML5 $html5Parser; + private $html5Parser; /** * @param \DOMNodeList|\DOMNode|\DOMNode[]|string|null $node A Node to use as the base for the crawling diff --git a/src/Symfony/Component/DomCrawler/Form.php b/src/Symfony/Component/DomCrawler/Form.php index 050bec619bebc..8d0b2aa461520 100644 --- a/src/Symfony/Component/DomCrawler/Form.php +++ b/src/Symfony/Component/DomCrawler/Form.php @@ -22,7 +22,7 @@ class Form extends Link implements \ArrayAccess { private \DOMElement $button; - private FormFieldRegistry $fields; + private $fields; private ?string $baseHref; /** diff --git a/src/Symfony/Component/Dotenv/Exception/FormatException.php b/src/Symfony/Component/Dotenv/Exception/FormatException.php index 8f1aa84b2612f..3ac77e592d6a1 100644 --- a/src/Symfony/Component/Dotenv/Exception/FormatException.php +++ b/src/Symfony/Component/Dotenv/Exception/FormatException.php @@ -18,7 +18,7 @@ */ final class FormatException extends \LogicException implements ExceptionInterface { - private FormatExceptionContext $context; + private $context; public function __construct(string $message, FormatExceptionContext $context, int $code = 0, \Throwable $previous = null) { diff --git a/src/Symfony/Component/ErrorHandler/ErrorHandler.php b/src/Symfony/Component/ErrorHandler/ErrorHandler.php index d08ac0b1b8acf..cf7759d62953e 100644 --- a/src/Symfony/Component/ErrorHandler/ErrorHandler.php +++ b/src/Symfony/Component/ErrorHandler/ErrorHandler.php @@ -97,7 +97,7 @@ class ErrorHandler private bool $isRecursive = false; private bool $isRoot = false; private $exceptionHandler; - private ?BufferingLogger $bootstrappingLogger = null; + private $bootstrappingLogger = null; private static ?string $reservedMemory = null; private static array $silencedErrorCache = []; diff --git a/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php b/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php index ab0e39414e626..34033e7fe6f5e 100644 --- a/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php +++ b/src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php @@ -38,7 +38,7 @@ class HtmlErrorRenderer implements ErrorRendererInterface private string|array|FileLinkFormatter|false $fileLinkFormat; private ?string $projectDir; private string|\Closure $outputBuffer; - private ?LoggerInterface $logger; + private $logger; private static string $template = 'views/error.html.php'; diff --git a/src/Symfony/Component/ErrorHandler/ErrorRenderer/SerializerErrorRenderer.php b/src/Symfony/Component/ErrorHandler/ErrorRenderer/SerializerErrorRenderer.php index 771deca8e47f8..db5546f91b865 100644 --- a/src/Symfony/Component/ErrorHandler/ErrorRenderer/SerializerErrorRenderer.php +++ b/src/Symfony/Component/ErrorHandler/ErrorRenderer/SerializerErrorRenderer.php @@ -24,9 +24,9 @@ */ class SerializerErrorRenderer implements ErrorRendererInterface { - private SerializerInterface $serializer; + private $serializer; private string|\Closure $format; - private ErrorRendererInterface $fallbackErrorRenderer; + private $fallbackErrorRenderer; private bool|\Closure $debug; /** diff --git a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php index 4b44d5dd78f58..7fe26db1529a6 100644 --- a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php +++ b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php @@ -36,10 +36,10 @@ class TraceableEventDispatcher implements EventDispatcherInterface, ResetInterfa * @var \SplObjectStorage|null */ private ?\SplObjectStorage $callStack = null; - private EventDispatcherInterface $dispatcher; + private $dispatcher; private array $wrappedListeners = []; private array $orphanedEvents = []; - private ?RequestStack $requestStack; + private $requestStack; private string $currentRequestHash = ''; public function __construct(EventDispatcherInterface $dispatcher, Stopwatch $stopwatch, LoggerInterface $logger = null, RequestStack $requestStack = null) diff --git a/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php b/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php index c2fe127dcf562..a986bb9717d46 100644 --- a/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php +++ b/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php @@ -26,10 +26,10 @@ final class WrappedListener private string $name; private bool $called = false; private bool $stoppedPropagation = false; - private Stopwatch $stopwatch; - private ?EventDispatcherInterface $dispatcher; + private $stopwatch; + private $dispatcher; private string $pretty; - private ClassStub|string $stub; + private $stub; private ?int $priority = null; private static bool $hasClassStub; diff --git a/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php index a54358284985e..655ae3de45e05 100644 --- a/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php +++ b/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php @@ -18,7 +18,7 @@ */ class ImmutableEventDispatcher implements EventDispatcherInterface { - private EventDispatcherInterface $dispatcher; + private $dispatcher; public function __construct(EventDispatcherInterface $dispatcher) { diff --git a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php index e076eb9bc56e0..d42912f8e6ddd 100644 --- a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php +++ b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php @@ -24,10 +24,10 @@ class_exists(ParsedExpression::class); */ class ExpressionLanguage { - private CacheItemPoolInterface $cache; - private Lexer $lexer; - private Parser $parser; - private Compiler $compiler; + private $cache; + private $lexer; + private $parser; + private $compiler; protected array $functions = []; diff --git a/src/Symfony/Component/ExpressionLanguage/ParsedExpression.php b/src/Symfony/Component/ExpressionLanguage/ParsedExpression.php index ca684ccd5f10a..1416db1784c46 100644 --- a/src/Symfony/Component/ExpressionLanguage/ParsedExpression.php +++ b/src/Symfony/Component/ExpressionLanguage/ParsedExpression.php @@ -20,7 +20,7 @@ */ class ParsedExpression extends Expression { - private Node $nodes; + private $nodes; public function __construct(string $expression, Node $nodes) { diff --git a/src/Symfony/Component/ExpressionLanguage/Parser.php b/src/Symfony/Component/ExpressionLanguage/Parser.php index 7bbbf0ea126e4..65e6b688b2eda 100644 --- a/src/Symfony/Component/ExpressionLanguage/Parser.php +++ b/src/Symfony/Component/ExpressionLanguage/Parser.php @@ -26,7 +26,7 @@ class Parser public const OPERATOR_LEFT = 1; public const OPERATOR_RIGHT = 2; - private TokenStream $stream; + private $stream; private array $unaryOperators; private array $binaryOperators; private array $functions; diff --git a/src/Symfony/Component/Form/AbstractExtension.php b/src/Symfony/Component/Form/AbstractExtension.php index 79d61e8bc0a3f..5a077a42a6a14 100644 --- a/src/Symfony/Component/Form/AbstractExtension.php +++ b/src/Symfony/Component/Form/AbstractExtension.php @@ -36,7 +36,7 @@ abstract class AbstractExtension implements FormExtensionInterface /** * The type guesser provided by this extension. */ - private ?FormTypeGuesserInterface $typeGuesser = null; + private $typeGuesser = null; /** * Whether the type guesser has been loaded. diff --git a/src/Symfony/Component/Form/Button.php b/src/Symfony/Component/Form/Button.php index 92d00ee14554f..ad10066facf8e 100644 --- a/src/Symfony/Component/Form/Button.php +++ b/src/Symfony/Component/Form/Button.php @@ -25,8 +25,8 @@ */ class Button implements \IteratorAggregate, FormInterface { - private ?FormInterface $parent = null; - private FormConfigInterface $config; + private $parent = null; + private $config; private bool $submitted = false; /** diff --git a/src/Symfony/Component/Form/ButtonBuilder.php b/src/Symfony/Component/Form/ButtonBuilder.php index 7c8f186e12d4a..30e07fb811c8b 100644 --- a/src/Symfony/Component/Form/ButtonBuilder.php +++ b/src/Symfony/Component/Form/ButtonBuilder.php @@ -29,7 +29,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface protected $locked = false; private bool $disabled = false; - private ResolvedFormTypeInterface $type; + private $type; private string $name; private array $attributes = []; private array $options; diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php b/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php index f5174bcfd5cc1..fb7b945162289 100644 --- a/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php +++ b/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php @@ -27,7 +27,7 @@ */ class CachingFactoryDecorator implements ChoiceListFactoryInterface, ResetInterface { - private ChoiceListFactoryInterface $decoratedFactory; + private $decoratedFactory; /** * @var ChoiceListInterface[] diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php b/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php index 8a678e7e18ca4..782c122989576 100644 --- a/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php +++ b/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php @@ -38,8 +38,8 @@ */ class PropertyAccessDecorator implements ChoiceListFactoryInterface { - private ChoiceListFactoryInterface $decoratedFactory; - private PropertyAccessorInterface $propertyAccessor; + private $decoratedFactory; + private $propertyAccessor; public function __construct(ChoiceListFactoryInterface $decoratedFactory, PropertyAccessorInterface $propertyAccessor = null) { diff --git a/src/Symfony/Component/Form/ChoiceList/LazyChoiceList.php b/src/Symfony/Component/Form/ChoiceList/LazyChoiceList.php index e339bcd249f6b..1518658b9befc 100644 --- a/src/Symfony/Component/Form/ChoiceList/LazyChoiceList.php +++ b/src/Symfony/Component/Form/ChoiceList/LazyChoiceList.php @@ -27,7 +27,7 @@ */ class LazyChoiceList implements ChoiceListInterface { - private ChoiceLoaderInterface $loader; + private $loader; /** * The callable creating string values for each choice. diff --git a/src/Symfony/Component/Form/ChoiceList/Loader/AbstractChoiceLoader.php b/src/Symfony/Component/Form/ChoiceList/Loader/AbstractChoiceLoader.php index def29c80ded33..b8f2aa7a4beea 100644 --- a/src/Symfony/Component/Form/ChoiceList/Loader/AbstractChoiceLoader.php +++ b/src/Symfony/Component/Form/ChoiceList/Loader/AbstractChoiceLoader.php @@ -22,7 +22,7 @@ abstract class AbstractChoiceLoader implements ChoiceLoaderInterface /** * The loaded choice list. */ - private ArrayChoiceList $choiceList; + private $choiceList; /** * @final diff --git a/src/Symfony/Component/Form/ChoiceList/Loader/FilterChoiceLoaderDecorator.php b/src/Symfony/Component/Form/ChoiceList/Loader/FilterChoiceLoaderDecorator.php index 12e6d0e2a12c4..569276e7adc22 100644 --- a/src/Symfony/Component/Form/ChoiceList/Loader/FilterChoiceLoaderDecorator.php +++ b/src/Symfony/Component/Form/ChoiceList/Loader/FilterChoiceLoaderDecorator.php @@ -18,7 +18,7 @@ */ class FilterChoiceLoaderDecorator extends AbstractChoiceLoader { - private ChoiceLoaderInterface $decoratedLoader; + private $decoratedLoader; private \Closure $filter; public function __construct(ChoiceLoaderInterface $loader, callable $filter) diff --git a/src/Symfony/Component/Form/Command/DebugCommand.php b/src/Symfony/Component/Form/Command/DebugCommand.php index d5545a67042c8..23008e3458734 100644 --- a/src/Symfony/Component/Form/Command/DebugCommand.php +++ b/src/Symfony/Component/Form/Command/DebugCommand.php @@ -35,12 +35,12 @@ #[AsCommand(name: 'debug:form', description: 'Display form type information')] class DebugCommand extends Command { - private FormRegistryInterface $formRegistry; + private $formRegistry; private array $namespaces; private array $types; private array $extensions; private array $guessers; - private ?FileLinkFormatter $fileLinkFormatter; + private $fileLinkFormatter; public function __construct(FormRegistryInterface $formRegistry, array $namespaces = ['Symfony\Component\Form\Extension\Core\Type'], array $types = [], array $extensions = [], array $guessers = [], FileLinkFormatter $fileLinkFormatter = null) { diff --git a/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php b/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php index ba79d806adcb9..4862a674c2b52 100644 --- a/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php +++ b/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php @@ -24,7 +24,7 @@ */ class TextDescriptor extends Descriptor { - private ?FileLinkFormatter $fileLinkFormatter; + private $fileLinkFormatter; public function __construct(FileLinkFormatter $fileLinkFormatter = null) { diff --git a/src/Symfony/Component/Form/Extension/Core/CoreExtension.php b/src/Symfony/Component/Form/Extension/Core/CoreExtension.php index 951bf345c0c42..9eae0a0ce18c2 100644 --- a/src/Symfony/Component/Form/Extension/Core/CoreExtension.php +++ b/src/Symfony/Component/Form/Extension/Core/CoreExtension.php @@ -28,9 +28,9 @@ */ class CoreExtension extends AbstractExtension { - private PropertyAccessorInterface $propertyAccessor; - private ChoiceListFactoryInterface $choiceListFactory; - private ?TranslatorInterface $translator; + private $propertyAccessor; + private $choiceListFactory; + private $translator; public function __construct(PropertyAccessorInterface $propertyAccessor = null, ChoiceListFactoryInterface $choiceListFactory = null, TranslatorInterface $translator = null) { diff --git a/src/Symfony/Component/Form/Extension/Core/DataAccessor/PropertyPathAccessor.php b/src/Symfony/Component/Form/Extension/Core/DataAccessor/PropertyPathAccessor.php index aab95f3741d7e..f73187bb4d5ac 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataAccessor/PropertyPathAccessor.php +++ b/src/Symfony/Component/Form/Extension/Core/DataAccessor/PropertyPathAccessor.php @@ -28,7 +28,7 @@ */ class PropertyPathAccessor implements DataAccessorInterface { - private PropertyAccessorInterface $propertyAccessor; + private $propertyAccessor; public function __construct(PropertyAccessorInterface $propertyAccessor = null) { diff --git a/src/Symfony/Component/Form/Extension/Core/DataMapper/DataMapper.php b/src/Symfony/Component/Form/Extension/Core/DataMapper/DataMapper.php index 58f6ff5e5a093..2b8f98f7019e1 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataMapper/DataMapper.php +++ b/src/Symfony/Component/Form/Extension/Core/DataMapper/DataMapper.php @@ -25,7 +25,7 @@ */ class DataMapper implements DataMapperInterface { - private DataAccessorInterface $dataAccessor; + private $dataAccessor; public function __construct(DataAccessorInterface $dataAccessor = null) { diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php index f7b0798224320..b02ffab716d8c 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoiceToValueTransformer.php @@ -20,7 +20,7 @@ */ class ChoiceToValueTransformer implements DataTransformerInterface { - private ChoiceListInterface $choiceList; + private $choiceList; public function __construct(ChoiceListInterface $choiceList) { diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php index e2f1f2f22d107..96f217e6e70bf 100644 --- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php +++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php @@ -20,7 +20,7 @@ */ class ChoicesToValuesTransformer implements DataTransformerInterface { - private ChoiceListInterface $choiceList; + private $choiceList; public function __construct(ChoiceListInterface $choiceList) { diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/TransformationFailureListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/TransformationFailureListener.php index ae705fc57ad79..d2fbfeb887961 100644 --- a/src/Symfony/Component/Form/Extension/Core/EventListener/TransformationFailureListener.php +++ b/src/Symfony/Component/Form/Extension/Core/EventListener/TransformationFailureListener.php @@ -22,7 +22,7 @@ */ class TransformationFailureListener implements EventSubscriberInterface { - private ?TranslatorInterface $translator; + private $translator; public function __construct(TranslatorInterface $translator = null) { diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php index 3980d579fa340..f01f212ab7488 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php @@ -49,8 +49,8 @@ class ChoiceType extends AbstractType { - private ChoiceListFactoryInterface $choiceListFactory; - private ?TranslatorInterface $translator; + private $choiceListFactory; + private $translator; public function __construct(ChoiceListFactoryInterface $choiceListFactory = null, TranslatorInterface $translator = null) { diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php b/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php index cca92e6e264a8..f8caf35477920 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/ColorType.php @@ -26,7 +26,7 @@ class ColorType extends AbstractType */ private const HTML5_PATTERN = '/^#[0-9a-f]{6}$/i'; - private ?TranslatorInterface $translator; + private $translator; public function __construct(TranslatorInterface $translator = null) { diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php index 89f70bcde8a8e..37fbd624420b1 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php @@ -33,7 +33,7 @@ class FileType extends AbstractType self::MIB_BYTES => 'MiB', ]; - private ?TranslatorInterface $translator; + private $translator; public function __construct(TranslatorInterface $translator = null) { diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php index b2ad2062363f9..8b02a26dd6ebc 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php @@ -28,7 +28,7 @@ class FormType extends BaseType { - private DataMapper $dataMapper; + private $dataMapper; public function __construct(PropertyAccessorInterface $propertyAccessor = null) { diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TransformationFailureExtension.php b/src/Symfony/Component/Form/Extension/Core/Type/TransformationFailureExtension.php index c73bd295822e7..f766633c9b469 100644 --- a/src/Symfony/Component/Form/Extension/Core/Type/TransformationFailureExtension.php +++ b/src/Symfony/Component/Form/Extension/Core/Type/TransformationFailureExtension.php @@ -21,7 +21,7 @@ */ class TransformationFailureExtension extends AbstractTypeExtension { - private ?TranslatorInterface $translator; + private $translator; public function __construct(TranslatorInterface $translator = null) { diff --git a/src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php b/src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php index 97228f56c9bd9..e7460d610c9b8 100644 --- a/src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php +++ b/src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php @@ -22,8 +22,8 @@ */ class CsrfExtension extends AbstractExtension { - private CsrfTokenManagerInterface $tokenManager; - private ?TranslatorInterface $translator; + private $tokenManager; + private $translator; private ?string $translationDomain; public function __construct(CsrfTokenManagerInterface $tokenManager, TranslatorInterface $translator = null, string $translationDomain = null) diff --git a/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php b/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php index 732b036de1fbb..a6428fac2ca10 100644 --- a/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php +++ b/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php @@ -26,12 +26,12 @@ class CsrfValidationListener implements EventSubscriberInterface { private string $fieldName; - private CsrfTokenManagerInterface $tokenManager; + private $tokenManager; private string $tokenId; private string $errorMessage; - private ?TranslatorInterface $translator; + private $translator; private ?string $translationDomain; - private ServerParams $serverParams; + private $serverParams; public static function getSubscribedEvents(): array { diff --git a/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php b/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php index ca3bf22dff3d9..e8f90fe3263df 100644 --- a/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php +++ b/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php @@ -28,12 +28,12 @@ */ class FormTypeCsrfExtension extends AbstractTypeExtension { - private CsrfTokenManagerInterface $defaultTokenManager; + private $defaultTokenManager; private bool $defaultEnabled; private string $defaultFieldName; - private ?TranslatorInterface $translator; + private $translator; private ?string $translationDomain; - private ?ServerParams $serverParams; + private $serverParams; public function __construct(CsrfTokenManagerInterface $defaultTokenManager, bool $defaultEnabled = true, string $defaultFieldName = '_token', TranslatorInterface $translator = null, string $translationDomain = null, ServerParams $serverParams = null) { diff --git a/src/Symfony/Component/Form/Extension/DataCollector/DataCollectorExtension.php b/src/Symfony/Component/Form/Extension/DataCollector/DataCollectorExtension.php index cafd0ffc665d4..3e4785670ecd6 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/DataCollectorExtension.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/DataCollectorExtension.php @@ -21,7 +21,7 @@ */ class DataCollectorExtension extends AbstractExtension { - private FormDataCollectorInterface $dataCollector; + private $dataCollector; public function __construct(FormDataCollectorInterface $dataCollector) { diff --git a/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php b/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php index dbc36123c7437..4007935d62c8b 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/EventListener/DataCollectorListener.php @@ -24,7 +24,7 @@ */ class DataCollectorListener implements EventSubscriberInterface { - private FormDataCollectorInterface $dataCollector; + private $dataCollector; public function __construct(FormDataCollectorInterface $dataCollector) { diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php index 023a63fe174df..8bf2c48008f7b 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php @@ -33,7 +33,7 @@ */ class FormDataCollector extends DataCollector implements FormDataCollectorInterface { - private FormDataExtractorInterface $dataExtractor; + private $dataExtractor; /** * Stores the collected data per {@link FormInterface} instance. diff --git a/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php b/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php index 7563e778e87aa..ca010e7edb5d8 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php @@ -27,8 +27,8 @@ */ class ResolvedTypeDataCollectorProxy implements ResolvedFormTypeInterface { - private ResolvedFormTypeInterface $proxiedType; - private FormDataCollectorInterface $dataCollector; + private $proxiedType; + private $dataCollector; public function __construct(ResolvedFormTypeInterface $proxiedType, FormDataCollectorInterface $dataCollector) { diff --git a/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeFactoryDataCollectorProxy.php b/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeFactoryDataCollectorProxy.php index 835a7e879ab5a..606e269be9493 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeFactoryDataCollectorProxy.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeFactoryDataCollectorProxy.php @@ -24,8 +24,8 @@ */ class ResolvedTypeFactoryDataCollectorProxy implements ResolvedFormTypeFactoryInterface { - private ResolvedFormTypeFactoryInterface $proxiedFactory; - private FormDataCollectorInterface $dataCollector; + private $proxiedFactory; + private $dataCollector; public function __construct(ResolvedFormTypeFactoryInterface $proxiedFactory, FormDataCollectorInterface $dataCollector) { diff --git a/src/Symfony/Component/Form/Extension/DataCollector/Type/DataCollectorTypeExtension.php b/src/Symfony/Component/Form/Extension/DataCollector/Type/DataCollectorTypeExtension.php index 73f8a214fac5a..b6b98cc3a4698 100644 --- a/src/Symfony/Component/Form/Extension/DataCollector/Type/DataCollectorTypeExtension.php +++ b/src/Symfony/Component/Form/Extension/DataCollector/Type/DataCollectorTypeExtension.php @@ -25,7 +25,7 @@ */ class DataCollectorTypeExtension extends AbstractTypeExtension { - private DataCollectorListener $listener; + private $listener; public function __construct(FormDataCollectorInterface $dataCollector) { diff --git a/src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php b/src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php index 5fe0371df7091..0a24e18f1b31f 100644 --- a/src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php +++ b/src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php @@ -20,9 +20,9 @@ class DependencyInjectionExtension implements FormExtensionInterface { - private ?FormTypeGuesserChain $guesser = null; + private $guesser = null; private bool $guesserLoaded = false; - private ContainerInterface $typeContainer; + private $typeContainer; private array $typeExtensionServices; private iterable $guesserServices; diff --git a/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php b/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php index 7180bafd813c3..57eb23420625d 100644 --- a/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php +++ b/src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php @@ -28,7 +28,7 @@ */ class HttpFoundationRequestHandler implements RequestHandlerInterface { - private ServerParams $serverParams; + private $serverParams; public function __construct(ServerParams $serverParams = null) { diff --git a/src/Symfony/Component/Form/Extension/HttpFoundation/Type/FormTypeHttpFoundationExtension.php b/src/Symfony/Component/Form/Extension/HttpFoundation/Type/FormTypeHttpFoundationExtension.php index 3d283d0e4ed55..0d77f06ce3fd8 100644 --- a/src/Symfony/Component/Form/Extension/HttpFoundation/Type/FormTypeHttpFoundationExtension.php +++ b/src/Symfony/Component/Form/Extension/HttpFoundation/Type/FormTypeHttpFoundationExtension.php @@ -22,7 +22,7 @@ */ class FormTypeHttpFoundationExtension extends AbstractTypeExtension { - private RequestHandlerInterface $requestHandler; + private $requestHandler; public function __construct(RequestHandlerInterface $requestHandler = null) { diff --git a/src/Symfony/Component/Form/Extension/Validator/EventListener/ValidationListener.php b/src/Symfony/Component/Form/Extension/Validator/EventListener/ValidationListener.php index 3d010b77c5b6b..22520ee205b33 100644 --- a/src/Symfony/Component/Form/Extension/Validator/EventListener/ValidationListener.php +++ b/src/Symfony/Component/Form/Extension/Validator/EventListener/ValidationListener.php @@ -23,8 +23,8 @@ */ class ValidationListener implements EventSubscriberInterface { - private ValidatorInterface $validator; - private ViolationMapperInterface $violationMapper; + private $validator; + private $violationMapper; /** * {@inheritdoc} diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php index 40fe64df40a9e..865047fa04f31 100644 --- a/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php +++ b/src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php @@ -27,8 +27,8 @@ */ class FormTypeValidatorExtension extends BaseValidatorExtension { - private ValidatorInterface $validator; - private ViolationMapper $violationMapper; + private $validator; + private $violationMapper; private bool $legacyErrorMessages; public function __construct(ValidatorInterface $validator, bool $legacyErrorMessages = true, FormRendererInterface $formRenderer = null, TranslatorInterface $translator = null) diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php index b5ddecd99d38d..0730c73601e13 100644 --- a/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php +++ b/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php @@ -23,7 +23,7 @@ */ class UploadValidatorExtension extends AbstractTypeExtension { - private TranslatorInterface $translator; + private $translator; private ?string $translationDomain; public function __construct(TranslatorInterface $translator, string $translationDomain = null) diff --git a/src/Symfony/Component/Form/Extension/Validator/ValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/ValidatorExtension.php index 3a0ec662a11c8..5e79071b1e4db 100644 --- a/src/Symfony/Component/Form/Extension/Validator/ValidatorExtension.php +++ b/src/Symfony/Component/Form/Extension/Validator/ValidatorExtension.php @@ -27,9 +27,9 @@ */ class ValidatorExtension extends AbstractExtension { - private ValidatorInterface $validator; - private ?FormRendererInterface $formRenderer; - private ?TranslatorInterface $translator; + private $validator; + private $formRenderer; + private $translator; private bool $legacyErrorMessages; public function __construct(ValidatorInterface $validator, bool $legacyErrorMessages = true, FormRendererInterface $formRenderer = null, TranslatorInterface $translator = null) diff --git a/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php b/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php index 7c9afa7c9b4d6..9e7c724afa40b 100644 --- a/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php +++ b/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php @@ -21,7 +21,7 @@ class ValidatorTypeGuesser implements FormTypeGuesserInterface { - private MetadataFactoryInterface $metadataFactory; + private $metadataFactory; public function __construct(MetadataFactoryInterface $metadataFactory) { diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/MappingRule.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/MappingRule.php index 6e33f222979f6..0202ac16df7d6 100644 --- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/MappingRule.php +++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/MappingRule.php @@ -19,7 +19,7 @@ */ class MappingRule { - private FormInterface $origin; + private $origin; private string $propertyPath; private string $targetPath; diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/RelativePath.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/RelativePath.php index 0384edb4449d7..d32d90d41eecb 100644 --- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/RelativePath.php +++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/RelativePath.php @@ -19,7 +19,7 @@ */ class RelativePath extends PropertyPath { - private FormInterface $root; + private $root; public function __construct(FormInterface $root, string $propertyPath) { diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php index cdcd1c1a76599..8e4b6d4b36a06 100644 --- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php +++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php @@ -28,8 +28,8 @@ */ class ViolationMapper implements ViolationMapperInterface { - private ?FormRendererInterface $formRenderer; - private ?TranslatorInterface $translator; + private $formRenderer; + private $translator; private bool $allowNonSynchronized = false; public function __construct(FormRendererInterface $formRenderer = null, TranslatorInterface $translator = null) diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php index bed1fcb6c376c..2b7ac7ced867a 100644 --- a/src/Symfony/Component/Form/Form.php +++ b/src/Symfony/Component/Form/Form.php @@ -71,15 +71,15 @@ */ class Form implements \IteratorAggregate, FormInterface, ClearableErrorsInterface { - private FormConfigInterface $config; - private ?FormInterface $parent = null; + private $config; + private $parent = null; /** * A map of FormInterface instances. * * @var OrderedHashMap */ - private OrderedHashMap $children; + private $children; /** * @var FormError[] @@ -91,7 +91,7 @@ class Form implements \IteratorAggregate, FormInterface, ClearableErrorsInterfac /** * The button that was used to submit the form. */ - private FormInterface|ClickableInterface|null $clickedButton = null; + private $clickedButton = null; private mixed $modelData = null; private mixed $normData = null; @@ -105,7 +105,7 @@ class Form implements \IteratorAggregate, FormInterface, ClearableErrorsInterfac /** * The transformation failure generated during submission, if any. */ - private ?TransformationFailedException $transformationFailure = null; + private $transformationFailure = null; /** * Whether the form's data has been initialized. @@ -131,7 +131,7 @@ class Form implements \IteratorAggregate, FormInterface, ClearableErrorsInterfac */ private bool $inheritData; - private ?PropertyPathInterface $propertyPath = null; + private $propertyPath = null; /** * @throws LogicException if a data mapper is not provided for a compound form diff --git a/src/Symfony/Component/Form/FormConfigBuilder.php b/src/Symfony/Component/Form/FormConfigBuilder.php index 9bbe7abcc48c6..02731ff449335 100644 --- a/src/Symfony/Component/Form/FormConfigBuilder.php +++ b/src/Symfony/Component/Form/FormConfigBuilder.php @@ -34,17 +34,17 @@ class FormConfigBuilder implements FormConfigBuilderInterface /** @var bool */ protected $locked = false; - private EventDispatcherInterface $dispatcher; + private $dispatcher; private string $name; - private ?PropertyPathInterface $propertyPath = null; + private $propertyPath = null; private bool $mapped = true; private bool $byReference = true; private bool $inheritData = false; private bool $compound = false; - private ResolvedFormTypeInterface $type; + private $type; private array $viewTransformers = []; private array $modelTransformers = []; - private ?DataMapperInterface $dataMapper = null; + private $dataMapper = null; private bool $required = true; private bool $disabled = false; private bool $errorBubbling = false; @@ -53,10 +53,10 @@ class FormConfigBuilder implements FormConfigBuilderInterface private mixed $data = null; private ?string $dataClass; private bool $dataLocked = false; - private FormFactoryInterface $formFactory; + private $formFactory; private string $action = ''; private string $method = 'POST'; - private RequestHandlerInterface $requestHandler; + private $requestHandler; private bool $autoInitialize = false; private array $options; private ?\Closure $isEmptyCallback = null; diff --git a/src/Symfony/Component/Form/FormError.php b/src/Symfony/Component/Form/FormError.php index aafd723f22673..59dbc4937625e 100644 --- a/src/Symfony/Component/Form/FormError.php +++ b/src/Symfony/Component/Form/FormError.php @@ -30,7 +30,7 @@ class FormError /** * The form that spawned this error. */ - private ?FormInterface $origin = null; + private $origin = null; /** * Any array key in $messageParameters will be used as a placeholder in diff --git a/src/Symfony/Component/Form/FormErrorIterator.php b/src/Symfony/Component/Form/FormErrorIterator.php index 7b0574dd9fc82..79b0d6206dca9 100644 --- a/src/Symfony/Component/Form/FormErrorIterator.php +++ b/src/Symfony/Component/Form/FormErrorIterator.php @@ -40,7 +40,7 @@ class FormErrorIterator implements \RecursiveIterator, \SeekableIterator, \Array */ public const INDENTATION = ' '; - private FormInterface $form; + private $form; private array $errors; /** diff --git a/src/Symfony/Component/Form/FormEvent.php b/src/Symfony/Component/Form/FormEvent.php index c9c3053cfe9a9..5a9956fda3ace 100644 --- a/src/Symfony/Component/Form/FormEvent.php +++ b/src/Symfony/Component/Form/FormEvent.php @@ -18,7 +18,7 @@ */ class FormEvent extends Event { - private FormInterface $form; + private $form; protected $data; public function __construct(FormInterface $form, mixed $data) diff --git a/src/Symfony/Component/Form/FormFactory.php b/src/Symfony/Component/Form/FormFactory.php index 2f5e172f7a27b..087fd75af89cd 100644 --- a/src/Symfony/Component/Form/FormFactory.php +++ b/src/Symfony/Component/Form/FormFactory.php @@ -16,7 +16,7 @@ class FormFactory implements FormFactoryInterface { - private FormRegistryInterface $registry; + private $registry; public function __construct(FormRegistryInterface $registry) { diff --git a/src/Symfony/Component/Form/FormFactoryBuilder.php b/src/Symfony/Component/Form/FormFactoryBuilder.php index 0ad58a660eb0c..0413a6df3fd95 100644 --- a/src/Symfony/Component/Form/FormFactoryBuilder.php +++ b/src/Symfony/Component/Form/FormFactoryBuilder.php @@ -22,7 +22,7 @@ class FormFactoryBuilder implements FormFactoryBuilderInterface { private bool $forceCoreExtension; - private ResolvedFormTypeFactoryInterface $resolvedTypeFactory; + private $resolvedTypeFactory; /** * @var FormExtensionInterface[] diff --git a/src/Symfony/Component/Form/FormRegistry.php b/src/Symfony/Component/Form/FormRegistry.php index acd392d3376f5..18f91ce535717 100644 --- a/src/Symfony/Component/Form/FormRegistry.php +++ b/src/Symfony/Component/Form/FormRegistry.php @@ -33,8 +33,8 @@ class FormRegistry implements FormRegistryInterface */ private array $types = []; - private FormTypeGuesserInterface|null|false $guesser = false; - private ResolvedFormTypeFactoryInterface $resolvedTypeFactory; + private $guesser = false; + private $resolvedTypeFactory; private array $checkedTypes = []; /** diff --git a/src/Symfony/Component/Form/FormRenderer.php b/src/Symfony/Component/Form/FormRenderer.php index ab8ff1aa3bd3b..513ce4abd83c0 100644 --- a/src/Symfony/Component/Form/FormRenderer.php +++ b/src/Symfony/Component/Form/FormRenderer.php @@ -25,8 +25,8 @@ class FormRenderer implements FormRendererInterface { public const CACHE_KEY_VAR = 'unique_block_prefix'; - private FormRendererEngineInterface $engine; - private ?CsrfTokenManagerInterface $csrfTokenManager; + private $engine; + private $csrfTokenManager; private array $blockNameHierarchyMap = []; private array $hierarchyLevelMap = []; private array $variableStack = []; diff --git a/src/Symfony/Component/Form/NativeRequestHandler.php b/src/Symfony/Component/Form/NativeRequestHandler.php index 272239e65ba6c..d821b5cef4abb 100644 --- a/src/Symfony/Component/Form/NativeRequestHandler.php +++ b/src/Symfony/Component/Form/NativeRequestHandler.php @@ -21,7 +21,7 @@ */ class NativeRequestHandler implements RequestHandlerInterface { - private ServerParams $serverParams; + private $serverParams; /** * The allowed keys of the $_FILES array. diff --git a/src/Symfony/Component/Form/PreloadedExtension.php b/src/Symfony/Component/Form/PreloadedExtension.php index 3c0ae26e89dcc..d15eb801ecc5e 100644 --- a/src/Symfony/Component/Form/PreloadedExtension.php +++ b/src/Symfony/Component/Form/PreloadedExtension.php @@ -22,7 +22,7 @@ class PreloadedExtension implements FormExtensionInterface { private array $types = []; private array $typeExtensions = []; - private ?FormTypeGuesserInterface $typeGuesser; + private $typeGuesser; /** * Creates a new preloaded extension. diff --git a/src/Symfony/Component/Form/ResolvedFormType.php b/src/Symfony/Component/Form/ResolvedFormType.php index 37a5bf45becb8..619ce4bb9dca1 100644 --- a/src/Symfony/Component/Form/ResolvedFormType.php +++ b/src/Symfony/Component/Form/ResolvedFormType.php @@ -23,16 +23,16 @@ */ class ResolvedFormType implements ResolvedFormTypeInterface { - private FormTypeInterface $innerType; + private $innerType; /** * @var FormTypeExtensionInterface[] */ private array $typeExtensions; - private ?ResolvedFormTypeInterface $parent; + private $parent; - private OptionsResolver $optionsResolver; + private $optionsResolver; /** * @param FormTypeExtensionInterface[] $typeExtensions diff --git a/src/Symfony/Component/Form/Util/ServerParams.php b/src/Symfony/Component/Form/Util/ServerParams.php index 0038cb83ccf9c..cc7225d5cd3c6 100644 --- a/src/Symfony/Component/Form/Util/ServerParams.php +++ b/src/Symfony/Component/Form/Util/ServerParams.php @@ -18,7 +18,7 @@ */ class ServerParams { - private ?RequestStack $requestStack; + private $requestStack; public function __construct(RequestStack $requestStack = null) { diff --git a/src/Symfony/Component/HttpClient/AmpHttpClient.php b/src/Symfony/Component/HttpClient/AmpHttpClient.php index 0e945b681f057..1439af2bbc113 100644 --- a/src/Symfony/Component/HttpClient/AmpHttpClient.php +++ b/src/Symfony/Component/HttpClient/AmpHttpClient.php @@ -43,7 +43,7 @@ final class AmpHttpClient implements HttpClientInterface, LoggerAwareInterface, use LoggerAwareTrait; private array $defaultOptions = self::OPTIONS_DEFAULTS; - private AmpClientState $multi; + private $multi; /** * @param array $defaultOptions Default requests' options diff --git a/src/Symfony/Component/HttpClient/CachingHttpClient.php b/src/Symfony/Component/HttpClient/CachingHttpClient.php index b2d8156899d37..0271fda647266 100644 --- a/src/Symfony/Component/HttpClient/CachingHttpClient.php +++ b/src/Symfony/Component/HttpClient/CachingHttpClient.php @@ -35,8 +35,8 @@ class CachingHttpClient implements HttpClientInterface, ResetInterface { use HttpClientTrait; - private HttpClientInterface $client; - private HttpCache $cache; + private $client; + private $cache; private array $defaultOptions = self::OPTIONS_DEFAULTS; public function __construct(HttpClientInterface $client, StoreInterface $store, array $defaultOptions = []) diff --git a/src/Symfony/Component/HttpClient/CurlHttpClient.php b/src/Symfony/Component/HttpClient/CurlHttpClient.php index 86b8f9c274821..d5e0668491746 100644 --- a/src/Symfony/Component/HttpClient/CurlHttpClient.php +++ b/src/Symfony/Component/HttpClient/CurlHttpClient.php @@ -48,7 +48,7 @@ final class CurlHttpClient implements HttpClientInterface, LoggerAwareInterface, /** * An internal object to share state between the client and its responses. */ - private CurlClientState $multi; + private $multi; private static array $curlVersion; diff --git a/src/Symfony/Component/HttpClient/DecoratorTrait.php b/src/Symfony/Component/HttpClient/DecoratorTrait.php index 45a90e57e960e..a08b725c99d69 100644 --- a/src/Symfony/Component/HttpClient/DecoratorTrait.php +++ b/src/Symfony/Component/HttpClient/DecoratorTrait.php @@ -23,7 +23,7 @@ */ trait DecoratorTrait { - private HttpClientInterface $client; + private $client; public function __construct(HttpClientInterface $client = null) { diff --git a/src/Symfony/Component/HttpClient/Exception/HttpExceptionTrait.php b/src/Symfony/Component/HttpClient/Exception/HttpExceptionTrait.php index f44ecd1e7af47..7ab27524faa0f 100644 --- a/src/Symfony/Component/HttpClient/Exception/HttpExceptionTrait.php +++ b/src/Symfony/Component/HttpClient/Exception/HttpExceptionTrait.php @@ -20,7 +20,7 @@ */ trait HttpExceptionTrait { - private ResponseInterface $response; + private $response; public function __construct(ResponseInterface $response) { diff --git a/src/Symfony/Component/HttpClient/HttplugClient.php b/src/Symfony/Component/HttpClient/HttplugClient.php index 8abdc6635e479..2987710aadafb 100644 --- a/src/Symfony/Component/HttpClient/HttplugClient.php +++ b/src/Symfony/Component/HttpClient/HttplugClient.php @@ -58,16 +58,16 @@ */ final class HttplugClient implements HttplugInterface, HttpAsyncClient, RequestFactory, StreamFactory, UriFactory, ResetInterface { - private HttpClientInterface $client; - private ResponseFactoryInterface $responseFactory; - private StreamFactoryInterface $streamFactory; + private $client; + private $responseFactory; + private $streamFactory; /** * @var \SplObjectStorage|null */ private ?\SplObjectStorage $promisePool; - private HttplugWaitLoop $waitLoop; + private $waitLoop; public function __construct(HttpClientInterface $client = null, ResponseFactoryInterface $responseFactory = null, StreamFactoryInterface $streamFactory = null) { diff --git a/src/Symfony/Component/HttpClient/Internal/AmpBody.php b/src/Symfony/Component/HttpClient/Internal/AmpBody.php index bd995e17d8b81..a6ff7635b36bf 100644 --- a/src/Symfony/Component/HttpClient/Internal/AmpBody.php +++ b/src/Symfony/Component/HttpClient/Internal/AmpBody.php @@ -25,7 +25,7 @@ */ class AmpBody implements RequestBody, InputStream { - private ResourceInputStream|\Closure|string $body; + private $body; private array $info; private \Closure $onProgress; private ?int $offset = 0; diff --git a/src/Symfony/Component/HttpClient/Internal/AmpClientState.php b/src/Symfony/Component/HttpClient/Internal/AmpClientState.php index 83bbca75b4027..28906e6290edc 100644 --- a/src/Symfony/Component/HttpClient/Internal/AmpClientState.php +++ b/src/Symfony/Component/HttpClient/Internal/AmpClientState.php @@ -49,7 +49,7 @@ final class AmpClientState extends ClientState private \Closure $clientConfigurator; private int $maxHostConnections; private int $maxPendingPushes; - private ?LoggerInterface $logger; + private $logger; public function __construct(?callable $clientConfigurator, int $maxHostConnections, int $maxPendingPushes, ?LoggerInterface &$logger) { diff --git a/src/Symfony/Component/HttpClient/Internal/CurlClientState.php b/src/Symfony/Component/HttpClient/Internal/CurlClientState.php index a0ef5ad477001..85153c1f99c57 100644 --- a/src/Symfony/Component/HttpClient/Internal/CurlClientState.php +++ b/src/Symfony/Component/HttpClient/Internal/CurlClientState.php @@ -11,7 +11,6 @@ namespace Symfony\Component\HttpClient\Internal; -use Psr\Log\LoggerInterface; /** * Internal representation of the cURL client's state. @@ -25,11 +24,11 @@ final class CurlClientState extends ClientState public \CurlMultiHandle $handle; /** @var PushedResponse[] */ public array $pushedResponses = []; - public DnsCache $dnsCache; + public $dnsCache; /** @var float[] */ public array $pauseExpiries = []; public int $execCounter = \PHP_INT_MIN; - public ?LoggerInterface $logger = null; + public $logger = null; public function __construct() { diff --git a/src/Symfony/Component/HttpClient/Internal/HttplugWaitLoop.php b/src/Symfony/Component/HttpClient/Internal/HttplugWaitLoop.php index b86417bc7f4e6..10ff3d5ba8755 100644 --- a/src/Symfony/Component/HttpClient/Internal/HttplugWaitLoop.php +++ b/src/Symfony/Component/HttpClient/Internal/HttplugWaitLoop.php @@ -30,10 +30,10 @@ */ final class HttplugWaitLoop { - private HttpClientInterface $client; + private $client; private ?\SplObjectStorage $promisePool; - private ResponseFactoryInterface $responseFactory; - private StreamFactoryInterface $streamFactory; + private $responseFactory; + private $streamFactory; /** * @param \SplObjectStorage|null $promisePool diff --git a/src/Symfony/Component/HttpClient/Internal/PushedResponse.php b/src/Symfony/Component/HttpClient/Internal/PushedResponse.php index f1e0ad687fd49..51c94e9ba4d31 100644 --- a/src/Symfony/Component/HttpClient/Internal/PushedResponse.php +++ b/src/Symfony/Component/HttpClient/Internal/PushedResponse.php @@ -22,7 +22,7 @@ */ final class PushedResponse { - public CurlResponse $response; + public $response; /** @var string[] */ public array $requestHeaders; diff --git a/src/Symfony/Component/HttpClient/MockHttpClient.php b/src/Symfony/Component/HttpClient/MockHttpClient.php index 85500412dd522..ecb2423d5bd03 100644 --- a/src/Symfony/Component/HttpClient/MockHttpClient.php +++ b/src/Symfony/Component/HttpClient/MockHttpClient.php @@ -28,7 +28,7 @@ class MockHttpClient implements HttpClientInterface, ResetInterface { use HttpClientTrait; - private ResponseInterface|\Closure|iterable|null $responseFactory; + private $responseFactory; private int $requestsCount = 0; private array $defaultOptions = []; diff --git a/src/Symfony/Component/HttpClient/NativeHttpClient.php b/src/Symfony/Component/HttpClient/NativeHttpClient.php index 30f4caac2afff..cf3e303a7d0f4 100644 --- a/src/Symfony/Component/HttpClient/NativeHttpClient.php +++ b/src/Symfony/Component/HttpClient/NativeHttpClient.php @@ -37,7 +37,7 @@ final class NativeHttpClient implements HttpClientInterface, LoggerAwareInterfac use LoggerAwareTrait; private array $defaultOptions = self::OPTIONS_DEFAULTS; - private NativeClientState $multi; + private $multi; /** * @param array $defaultOptions Default request's options diff --git a/src/Symfony/Component/HttpClient/NoPrivateNetworkHttpClient.php b/src/Symfony/Component/HttpClient/NoPrivateNetworkHttpClient.php index 9185dd304f579..d3ea5ad5ee7f6 100644 --- a/src/Symfony/Component/HttpClient/NoPrivateNetworkHttpClient.php +++ b/src/Symfony/Component/HttpClient/NoPrivateNetworkHttpClient.php @@ -45,7 +45,7 @@ final class NoPrivateNetworkHttpClient implements HttpClientInterface, LoggerAwa '::/128', ]; - private HttpClientInterface $client; + private $client; private string|array|null $subnets; /** diff --git a/src/Symfony/Component/HttpClient/Psr18Client.php b/src/Symfony/Component/HttpClient/Psr18Client.php index aa713601baa46..64898edfa2bcb 100644 --- a/src/Symfony/Component/HttpClient/Psr18Client.php +++ b/src/Symfony/Component/HttpClient/Psr18Client.php @@ -52,9 +52,9 @@ */ final class Psr18Client implements ClientInterface, RequestFactoryInterface, StreamFactoryInterface, UriFactoryInterface, ResetInterface { - private HttpClientInterface $client; - private ResponseFactoryInterface $responseFactory; - private StreamFactoryInterface $streamFactory; + private $client; + private $responseFactory; + private $streamFactory; public function __construct(HttpClientInterface $client = null, ResponseFactoryInterface $responseFactory = null, StreamFactoryInterface $streamFactory = null) { @@ -205,7 +205,7 @@ public function reset() */ class Psr18NetworkException extends \RuntimeException implements NetworkExceptionInterface { - private RequestInterface $request; + private $request; public function __construct(TransportExceptionInterface $e, RequestInterface $request) { @@ -224,7 +224,7 @@ public function getRequest(): RequestInterface */ class Psr18RequestException extends \InvalidArgumentException implements RequestExceptionInterface { - private RequestInterface $request; + private $request; public function __construct(TransportExceptionInterface $e, RequestInterface $request) { diff --git a/src/Symfony/Component/HttpClient/Response/AmpResponse.php b/src/Symfony/Component/HttpClient/Response/AmpResponse.php index c1cfeeca63aa6..3c9b4bb136c67 100644 --- a/src/Symfony/Component/HttpClient/Response/AmpResponse.php +++ b/src/Symfony/Component/HttpClient/Response/AmpResponse.php @@ -45,9 +45,9 @@ final class AmpResponse implements ResponseInterface, StreamableInterface private static string $nextId = 'a'; - private AmpClientState $multi; + private $multi; private ?array $options; - private CancellationTokenSource $canceller; + private $canceller; private \Closure $onProgress; private static ?string $delay = null; diff --git a/src/Symfony/Component/HttpClient/Response/AsyncContext.php b/src/Symfony/Component/HttpClient/Response/AsyncContext.php index a762d4352b2e0..a0295102536eb 100644 --- a/src/Symfony/Component/HttpClient/Response/AsyncContext.php +++ b/src/Symfony/Component/HttpClient/Response/AsyncContext.php @@ -25,8 +25,8 @@ final class AsyncContext { private $passthru; - private HttpClientInterface $client; - private ResponseInterface $response; + private $client; + private $response; private array $info = []; private $content; private int $offset; diff --git a/src/Symfony/Component/HttpClient/Response/AsyncResponse.php b/src/Symfony/Component/HttpClient/Response/AsyncResponse.php index d26933283b3d5..4bc76a8edf0b6 100644 --- a/src/Symfony/Component/HttpClient/Response/AsyncResponse.php +++ b/src/Symfony/Component/HttpClient/Response/AsyncResponse.php @@ -34,8 +34,8 @@ final class AsyncResponse implements ResponseInterface, StreamableInterface private const FIRST_CHUNK_YIELDED = 1; private const LAST_CHUNK_YIELDED = 2; - private ?HttpClientInterface $client; - private ResponseInterface $response; + private $client; + private $response; private array $info = ['canceled' => false]; private $passthru; private $stream; diff --git a/src/Symfony/Component/HttpClient/Response/CurlResponse.php b/src/Symfony/Component/HttpClient/Response/CurlResponse.php index d064953a7eb3b..08762491dcd73 100644 --- a/src/Symfony/Component/HttpClient/Response/CurlResponse.php +++ b/src/Symfony/Component/HttpClient/Response/CurlResponse.php @@ -33,7 +33,7 @@ final class CurlResponse implements ResponseInterface, StreamableInterface use TransportResponseTrait; private static bool $performing = false; - private CurlClientState $multi; + private $multi; /** * @var resource diff --git a/src/Symfony/Component/HttpClient/Response/HttplugPromise.php b/src/Symfony/Component/HttpClient/Response/HttplugPromise.php index 1e8090732f729..66e0d90a863ff 100644 --- a/src/Symfony/Component/HttpClient/Response/HttplugPromise.php +++ b/src/Symfony/Component/HttpClient/Response/HttplugPromise.php @@ -23,7 +23,7 @@ */ final class HttplugPromise implements HttplugPromiseInterface { - private GuzzlePromiseInterface $promise; + private $promise; public function __construct(GuzzlePromiseInterface $promise) { diff --git a/src/Symfony/Component/HttpClient/Response/NativeResponse.php b/src/Symfony/Component/HttpClient/Response/NativeResponse.php index f157ad110b6ce..1e9344f3dd9f3 100644 --- a/src/Symfony/Component/HttpClient/Response/NativeResponse.php +++ b/src/Symfony/Component/HttpClient/Response/NativeResponse.php @@ -43,7 +43,7 @@ final class NativeResponse implements ResponseInterface, StreamableInterface */ private $buffer; - private NativeClientState $multi; + private $multi; private float $pauseExpiry = 0.0; /** diff --git a/src/Symfony/Component/HttpClient/Response/StreamWrapper.php b/src/Symfony/Component/HttpClient/Response/StreamWrapper.php index 9879c78d26acc..03b07a2dcbfe0 100644 --- a/src/Symfony/Component/HttpClient/Response/StreamWrapper.php +++ b/src/Symfony/Component/HttpClient/Response/StreamWrapper.php @@ -25,9 +25,9 @@ class StreamWrapper /** @var resource|string|null */ public $context; - private HttpClientInterface|ResponseInterface $client; + private $client; - private ResponseInterface $response; + private $response; /** @var resource|null */ private $content; diff --git a/src/Symfony/Component/HttpClient/Response/TraceableResponse.php b/src/Symfony/Component/HttpClient/Response/TraceableResponse.php index 1549a6178090e..f8a7ceedccaa3 100644 --- a/src/Symfony/Component/HttpClient/Response/TraceableResponse.php +++ b/src/Symfony/Component/HttpClient/Response/TraceableResponse.php @@ -31,10 +31,10 @@ */ class TraceableResponse implements ResponseInterface, StreamableInterface { - private HttpClientInterface $client; - private ResponseInterface $response; + private $client; + private $response; private mixed $content; - private ?StopwatchEvent $event; + private $event; public function __construct(HttpClientInterface $client, ResponseInterface $response, &$content, StopwatchEvent $event = null) { diff --git a/src/Symfony/Component/HttpClient/Response/TransportResponseTrait.php b/src/Symfony/Component/HttpClient/Response/TransportResponseTrait.php index 37051613d0510..33a74a4206225 100644 --- a/src/Symfony/Component/HttpClient/Response/TransportResponseTrait.php +++ b/src/Symfony/Component/HttpClient/Response/TransportResponseTrait.php @@ -11,13 +11,11 @@ namespace Symfony\Component\HttpClient\Response; -use Psr\Log\LoggerInterface; use Symfony\Component\HttpClient\Chunk\DataChunk; use Symfony\Component\HttpClient\Chunk\ErrorChunk; use Symfony\Component\HttpClient\Chunk\FirstChunk; use Symfony\Component\HttpClient\Chunk\LastChunk; use Symfony\Component\HttpClient\Exception\TransportException; -use Symfony\Component\HttpClient\Internal\Canary; use Symfony\Component\HttpClient\Internal\ClientState; /** @@ -41,10 +39,10 @@ trait TransportResponseTrait private $handle; private int|string $id; private ?float $timeout = 0; - private \InflateContext|bool|null $inflate = null; + private $inflate = null; private ?array $finalInfo = null; - private Canary $canary; - private ?LoggerInterface $logger = null; + private $canary; + private $logger = null; /** * {@inheritdoc} diff --git a/src/Symfony/Component/HttpClient/RetryableHttpClient.php b/src/Symfony/Component/HttpClient/RetryableHttpClient.php index a38791ef25c76..3c7c7aae0e93a 100644 --- a/src/Symfony/Component/HttpClient/RetryableHttpClient.php +++ b/src/Symfony/Component/HttpClient/RetryableHttpClient.php @@ -32,9 +32,9 @@ class RetryableHttpClient implements HttpClientInterface, ResetInterface { use AsyncDecoratorTrait; - private RetryStrategyInterface $strategy; + private $strategy; private int $maxRetries; - private LoggerInterface $logger; + private $logger; /** * @param int $maxRetries The maximum number of times to retry diff --git a/src/Symfony/Component/HttpClient/ScopingHttpClient.php b/src/Symfony/Component/HttpClient/ScopingHttpClient.php index ba51081dcdc19..74bb82045f488 100644 --- a/src/Symfony/Component/HttpClient/ScopingHttpClient.php +++ b/src/Symfony/Component/HttpClient/ScopingHttpClient.php @@ -28,7 +28,7 @@ class ScopingHttpClient implements HttpClientInterface, ResetInterface, LoggerAw { use HttpClientTrait; - private HttpClientInterface $client; + private $client; private array $defaultOptionsByRegexp; private ?string $defaultRegexp; diff --git a/src/Symfony/Component/HttpClient/TraceableHttpClient.php b/src/Symfony/Component/HttpClient/TraceableHttpClient.php index a1302b16467a9..f584f6158fd98 100644 --- a/src/Symfony/Component/HttpClient/TraceableHttpClient.php +++ b/src/Symfony/Component/HttpClient/TraceableHttpClient.php @@ -26,9 +26,9 @@ */ final class TraceableHttpClient implements HttpClientInterface, ResetInterface, LoggerAwareInterface { - private HttpClientInterface $client; + private $client; private array $tracedRequests = []; - private ?Stopwatch $stopwatch; + private $stopwatch; public function __construct(HttpClientInterface $client, Stopwatch $stopwatch = null) { diff --git a/src/Symfony/Component/HttpFoundation/ExpressionRequestMatcher.php b/src/Symfony/Component/HttpFoundation/ExpressionRequestMatcher.php index f2a07307df114..9dbf2f74379cf 100644 --- a/src/Symfony/Component/HttpFoundation/ExpressionRequestMatcher.php +++ b/src/Symfony/Component/HttpFoundation/ExpressionRequestMatcher.php @@ -21,8 +21,8 @@ */ class ExpressionRequestMatcher extends RequestMatcher { - private ExpressionLanguage $language; - private Expression|string $expression; + private $language; + private $expression; public function setExpression(ExpressionLanguage $language, Expression|string $expression) { diff --git a/src/Symfony/Component/HttpFoundation/Session/SessionBagProxy.php b/src/Symfony/Component/HttpFoundation/Session/SessionBagProxy.php index a5bdc92c987ef..1d405e3c7f81f 100644 --- a/src/Symfony/Component/HttpFoundation/Session/SessionBagProxy.php +++ b/src/Symfony/Component/HttpFoundation/Session/SessionBagProxy.php @@ -18,7 +18,7 @@ */ final class SessionBagProxy implements SessionBagInterface { - private SessionBagInterface $bag; + private $bag; private array $data; private ?int $usageIndex; private ?\Closure $usageReporter; diff --git a/src/Symfony/Component/HttpFoundation/Session/SessionFactory.php b/src/Symfony/Component/HttpFoundation/Session/SessionFactory.php index 098bc1ce01196..ffbd82cc410aa 100644 --- a/src/Symfony/Component/HttpFoundation/Session/SessionFactory.php +++ b/src/Symfony/Component/HttpFoundation/Session/SessionFactory.php @@ -22,8 +22,8 @@ class_exists(Session::class); */ class SessionFactory implements SessionFactoryInterface { - private RequestStack $requestStack; - private SessionStorageFactoryInterface $storageFactory; + private $requestStack; + private $storageFactory; private ?\Closure $usageReporter; public function __construct(RequestStack $requestStack, SessionStorageFactoryInterface $storageFactory, callable $usageReporter = null) diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MarshallingSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MarshallingSessionHandler.php index 9962fef3d6c4c..377d1e090c21e 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MarshallingSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MarshallingSessionHandler.php @@ -18,8 +18,8 @@ */ class MarshallingSessionHandler implements \SessionHandlerInterface, \SessionUpdateTimestampHandlerInterface { - private AbstractSessionHandler $handler; - private MarshallerInterface $marshaller; + private $handler; + private $marshaller; public function __construct(AbstractSessionHandler $handler, MarshallerInterface $marshaller) { diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php index ebea8ede379f3..f5ef11daab76d 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MemcachedSessionHandler.php @@ -21,7 +21,7 @@ */ class MemcachedSessionHandler extends AbstractSessionHandler { - private \Memcached $memcached; + private $memcached; /** * Time to live in seconds. diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php index f9957d3b74c54..b370e80028849 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php @@ -26,8 +26,8 @@ */ class MongoDbSessionHandler extends AbstractSessionHandler { - private Client $mongo; - private Collection $collection; + private $mongo; + private $collection; private array $options; /** diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php index 843fedf0e493b..3dd7c0940f73e 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php @@ -65,7 +65,7 @@ class PdoSessionHandler extends AbstractSessionHandler */ public const LOCK_TRANSACTIONAL = 2; - private \PDO $pdo; + private $pdo; /** * DSN string or null for session.save_path or false when lazy connection disabled. diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php index b07a955da3f5d..db9c189d2c433 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/RedisSessionHandler.php @@ -23,7 +23,7 @@ */ class RedisSessionHandler extends AbstractSessionHandler { - private \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|RedisProxy|RedisClusterProxy $redis; + private $redis; /** * Key prefix for shared environments. diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorageFactory.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorageFactory.php index 8ecf943dcb39b..c354d12aefabd 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorageFactory.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/MockFileSessionStorageFactory.php @@ -23,7 +23,7 @@ class MockFileSessionStorageFactory implements SessionStorageFactoryInterface { private ?string $savePath; private string $name; - private ?MetadataBag $metaBag; + private $metaBag; /** * @see MockFileSessionStorage constructor. diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorageFactory.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorageFactory.php index ecbd6feb7bc09..ea6c7de1e0d75 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorageFactory.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorageFactory.php @@ -23,8 +23,8 @@ class_exists(NativeSessionStorage::class); class NativeSessionStorageFactory implements SessionStorageFactoryInterface { private array $options; - private AbstractProxy|\SessionHandlerInterface|null $handler; - private ?MetadataBag $metaBag; + private $handler; + private $metaBag; private bool $secure; /** diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorageFactory.php b/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorageFactory.php index 6d729cc66c16e..cce1ec6c33c4f 100644 --- a/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorageFactory.php +++ b/src/Symfony/Component/HttpFoundation/Session/Storage/PhpBridgeSessionStorageFactory.php @@ -22,8 +22,8 @@ class_exists(PhpBridgeSessionStorage::class); */ class PhpBridgeSessionStorageFactory implements SessionStorageFactoryInterface { - private AbstractProxy|\SessionHandlerInterface|null $handler; - private ?MetadataBag $metaBag; + private $handler; + private $metaBag; private bool $secure; public function __construct(AbstractProxy|\SessionHandlerInterface $handler = null, MetadataBag $metaBag = null, bool $secure = false) diff --git a/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseFormatSame.php b/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseFormatSame.php index 765849960e647..cb9699c325ec7 100644 --- a/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseFormatSame.php +++ b/src/Symfony/Component/HttpFoundation/Test/Constraint/ResponseFormatSame.php @@ -22,7 +22,7 @@ */ final class ResponseFormatSame extends Constraint { - private Request $request; + private $request; private ?string $format; public function __construct(Request $request, ?string $format) diff --git a/src/Symfony/Component/HttpFoundation/UrlHelper.php b/src/Symfony/Component/HttpFoundation/UrlHelper.php index c3e05d2b2f8c0..c15f101cdf80b 100644 --- a/src/Symfony/Component/HttpFoundation/UrlHelper.php +++ b/src/Symfony/Component/HttpFoundation/UrlHelper.php @@ -20,8 +20,8 @@ */ final class UrlHelper { - private RequestStack $requestStack; - private ?RequestContext $requestContext; + private $requestStack; + private $requestContext; public function __construct(RequestStack $requestStack, RequestContext $requestContext = null) { diff --git a/src/Symfony/Component/HttpKernel/Config/FileLocator.php b/src/Symfony/Component/HttpKernel/Config/FileLocator.php index e2a460eccd0ac..60923387afabb 100644 --- a/src/Symfony/Component/HttpKernel/Config/FileLocator.php +++ b/src/Symfony/Component/HttpKernel/Config/FileLocator.php @@ -21,7 +21,7 @@ */ class FileLocator extends BaseFileLocator { - private KernelInterface $kernel; + private $kernel; public function __construct(KernelInterface $kernel) { diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php index 30fae1b3df3a9..e712c727d0335 100644 --- a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php +++ b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver.php @@ -27,7 +27,7 @@ */ final class ArgumentResolver implements ArgumentResolverInterface { - private ArgumentMetadataFactoryInterface $argumentMetadataFactory; + private $argumentMetadataFactory; private iterable $argumentValueResolvers; /** diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/NotTaggedControllerValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/NotTaggedControllerValueResolver.php index 22a4d2ae74498..d4971cc1a5074 100644 --- a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/NotTaggedControllerValueResolver.php +++ b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/NotTaggedControllerValueResolver.php @@ -24,7 +24,7 @@ */ final class NotTaggedControllerValueResolver implements ArgumentValueResolverInterface { - private ContainerInterface $container; + private $container; public function __construct(ContainerInterface $container) { diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/ServiceValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/ServiceValueResolver.php index a8e940f880a34..4ffb8c99eb4b5 100644 --- a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/ServiceValueResolver.php +++ b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/ServiceValueResolver.php @@ -24,7 +24,7 @@ */ final class ServiceValueResolver implements ArgumentValueResolverInterface { - private ContainerInterface $container; + private $container; public function __construct(ContainerInterface $container) { diff --git a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/TraceableValueResolver.php b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/TraceableValueResolver.php index a84513223b347..bde3c90c1a634 100644 --- a/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/TraceableValueResolver.php +++ b/src/Symfony/Component/HttpKernel/Controller/ArgumentResolver/TraceableValueResolver.php @@ -23,8 +23,8 @@ */ final class TraceableValueResolver implements ArgumentValueResolverInterface { - private ArgumentValueResolverInterface $inner; - private Stopwatch $stopwatch; + private $inner; + private $stopwatch; public function __construct(ArgumentValueResolverInterface $inner, Stopwatch $stopwatch) { diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php index 06b244fdb582e..f3791103985e7 100644 --- a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php +++ b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php @@ -23,7 +23,7 @@ */ class ControllerResolver implements ControllerResolverInterface { - private ?LoggerInterface $logger; + private $logger; public function __construct(LoggerInterface $logger = null) { diff --git a/src/Symfony/Component/HttpKernel/Controller/ErrorController.php b/src/Symfony/Component/HttpKernel/Controller/ErrorController.php index 9dd2116866c4b..e039c38401f44 100644 --- a/src/Symfony/Component/HttpKernel/Controller/ErrorController.php +++ b/src/Symfony/Component/HttpKernel/Controller/ErrorController.php @@ -25,9 +25,9 @@ */ class ErrorController { - private HttpKernelInterface $kernel; + private $kernel; private string|object|array|null $controller; - private ErrorRendererInterface $errorRenderer; + private $errorRenderer; public function __construct(HttpKernelInterface $kernel, string|object|array|null $controller, ErrorRendererInterface $errorRenderer) { diff --git a/src/Symfony/Component/HttpKernel/Controller/TraceableArgumentResolver.php b/src/Symfony/Component/HttpKernel/Controller/TraceableArgumentResolver.php index 585c1147241f2..bc8092075e1c1 100644 --- a/src/Symfony/Component/HttpKernel/Controller/TraceableArgumentResolver.php +++ b/src/Symfony/Component/HttpKernel/Controller/TraceableArgumentResolver.php @@ -19,8 +19,8 @@ */ class TraceableArgumentResolver implements ArgumentResolverInterface { - private ArgumentResolverInterface $resolver; - private Stopwatch $stopwatch; + private $resolver; + private $stopwatch; public function __construct(ArgumentResolverInterface $resolver, Stopwatch $stopwatch) { diff --git a/src/Symfony/Component/HttpKernel/Controller/TraceableControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/TraceableControllerResolver.php index c485dd12772d0..017226e3fe1db 100644 --- a/src/Symfony/Component/HttpKernel/Controller/TraceableControllerResolver.php +++ b/src/Symfony/Component/HttpKernel/Controller/TraceableControllerResolver.php @@ -19,8 +19,8 @@ */ class TraceableControllerResolver implements ControllerResolverInterface { - private ControllerResolverInterface $resolver; - private Stopwatch $stopwatch; + private $resolver; + private $stopwatch; public function __construct(ControllerResolverInterface $resolver, Stopwatch $stopwatch) { diff --git a/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php index 63217f7dca2b5..359bffed16e60 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php @@ -24,7 +24,7 @@ */ class ConfigDataCollector extends DataCollector implements LateDataCollectorInterface { - private KernelInterface $kernel; + private $kernel; /** * Sets the Kernel associated with this Request. diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php index 3a3be3af494bc..1289cf0ea9399 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php @@ -13,7 +13,6 @@ use Symfony\Component\VarDumper\Caster\CutStub; use Symfony\Component\VarDumper\Caster\ReflectionCaster; -use Symfony\Component\VarDumper\Cloner\ClonerInterface; use Symfony\Component\VarDumper\Cloner\Data; use Symfony\Component\VarDumper\Cloner\Stub; use Symfony\Component\VarDumper\Cloner\VarCloner; @@ -33,7 +32,7 @@ abstract class DataCollector implements DataCollectorInterface */ protected $data = []; - private ClonerInterface $cloner; + private $cloner; /** * Converts the variable into a serializable Data instance. diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php index 9950fdebca9b3..4577af65b214a 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php @@ -31,7 +31,7 @@ */ class DumpDataCollector extends DataCollector implements DataDumperInterface { - private ?Stopwatch $stopwatch = null; + private $stopwatch = null; private string|FileLinkFormatter|false $fileLinkFormat; private int $dataCount = 0; private bool $isCollected = true; @@ -39,8 +39,8 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface private int $clonesIndex = 0; private array $rootRefs; private string $charset; - private ?RequestStack $requestStack; - private DataDumperInterface|Connection|null $dumper; + private $requestStack; + private $dumper; private mixed $sourceContextProvider; public function __construct(Stopwatch $stopwatch = null, string|FileLinkFormatter $fileLinkFormat = null, string $charset = null, RequestStack $requestStack = null, DataDumperInterface|Connection $dumper = null) diff --git a/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php index 18c074d85b054..20c8670bbc8a6 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/EventDataCollector.php @@ -28,9 +28,9 @@ */ class EventDataCollector extends DataCollector implements LateDataCollectorInterface { - private ?EventDispatcherInterface $dispatcher; - private ?RequestStack $requestStack; - private ?Request $currentRequest = null; + private $dispatcher; + private $requestStack; + private $currentRequest = null; public function __construct(EventDispatcherInterface $dispatcher = null, RequestStack $requestStack = null) { diff --git a/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php index e4ecf6f749434..68fc3420bda85 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/LoggerDataCollector.php @@ -24,10 +24,10 @@ */ class LoggerDataCollector extends DataCollector implements LateDataCollectorInterface { - private DebugLoggerInterface $logger; + private $logger; private ?string $containerPathPrefix; - private ?Request $currentRequest = null; - private ?RequestStack $requestStack; + private $currentRequest = null; + private $requestStack; private ?array $processedLogs = null; public function __construct(object $logger = null, string $containerPathPrefix = null, RequestStack $requestStack = null) diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php index b3c9c786721f4..00647dd1394d4 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php @@ -36,7 +36,7 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter */ private \SplObjectStorage $controllers; private array $sessionUsages = []; - private ?RequestStack $requestStack; + private $requestStack; public function __construct(RequestStack $requestStack = null) { diff --git a/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php index b32e56f81fe4a..43799060f6c41 100644 --- a/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php +++ b/src/Symfony/Component/HttpKernel/DataCollector/TimeDataCollector.php @@ -24,8 +24,8 @@ */ class TimeDataCollector extends DataCollector implements LateDataCollectorInterface { - private ?KernelInterface $kernel; - private ?Stopwatch $stopwatch; + private $kernel; + private $stopwatch; public function __construct(KernelInterface $kernel = null, Stopwatch $stopwatch = null) { diff --git a/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php b/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php index fc85efce4ae00..09416069bd2dd 100644 --- a/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php +++ b/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php @@ -35,7 +35,7 @@ class FileLinkFormatter ]; private array|false $fileLinkFormat; - private ?RequestStack $requestStack = null; + private $requestStack = null; private ?string $baseDir = null; private \Closure|string|null $urlFormat; diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php index 12703b3d29ed2..4bb60b41f7c50 100644 --- a/src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php +++ b/src/Symfony/Component/HttpKernel/DependencyInjection/AddAnnotatedClassesToCachePass.php @@ -25,7 +25,7 @@ */ class AddAnnotatedClassesToCachePass implements CompilerPassInterface { - private Kernel $kernel; + private $kernel; public function __construct(Kernel $kernel) { diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/LazyLoadingFragmentHandler.php b/src/Symfony/Component/HttpKernel/DependencyInjection/LazyLoadingFragmentHandler.php index d6f5905d17fda..9a06a5f587e63 100644 --- a/src/Symfony/Component/HttpKernel/DependencyInjection/LazyLoadingFragmentHandler.php +++ b/src/Symfony/Component/HttpKernel/DependencyInjection/LazyLoadingFragmentHandler.php @@ -23,7 +23,7 @@ */ class LazyLoadingFragmentHandler extends FragmentHandler { - private ContainerInterface $container; + private $container; /** * @var array diff --git a/src/Symfony/Component/HttpKernel/Event/KernelEvent.php b/src/Symfony/Component/HttpKernel/Event/KernelEvent.php index e64cc419b91e4..2f9fe3390517d 100644 --- a/src/Symfony/Component/HttpKernel/Event/KernelEvent.php +++ b/src/Symfony/Component/HttpKernel/Event/KernelEvent.php @@ -22,8 +22,8 @@ */ class KernelEvent extends Event { - private HttpKernelInterface $kernel; - private Request $request; + private $kernel; + private $request; private ?int $requestType; /** diff --git a/src/Symfony/Component/HttpKernel/Event/RequestEvent.php b/src/Symfony/Component/HttpKernel/Event/RequestEvent.php index c7cfcc1e1311e..8e2616f63eac0 100644 --- a/src/Symfony/Component/HttpKernel/Event/RequestEvent.php +++ b/src/Symfony/Component/HttpKernel/Event/RequestEvent.php @@ -24,7 +24,7 @@ */ class RequestEvent extends KernelEvent { - private ?Response $response = null; + private $response = null; /** * Returns the response object. diff --git a/src/Symfony/Component/HttpKernel/Event/ResponseEvent.php b/src/Symfony/Component/HttpKernel/Event/ResponseEvent.php index 4a57d989ac863..1e56ebea2c633 100644 --- a/src/Symfony/Component/HttpKernel/Event/ResponseEvent.php +++ b/src/Symfony/Component/HttpKernel/Event/ResponseEvent.php @@ -26,7 +26,7 @@ */ final class ResponseEvent extends KernelEvent { - private Response $response; + private $response; public function __construct(HttpKernelInterface $kernel, Request $request, int $requestType, Response $response) { diff --git a/src/Symfony/Component/HttpKernel/Event/TerminateEvent.php b/src/Symfony/Component/HttpKernel/Event/TerminateEvent.php index 0caefdf4d54a3..014ca535fe082 100644 --- a/src/Symfony/Component/HttpKernel/Event/TerminateEvent.php +++ b/src/Symfony/Component/HttpKernel/Event/TerminateEvent.php @@ -25,7 +25,7 @@ */ final class TerminateEvent extends KernelEvent { - private Response $response; + private $response; public function __construct(HttpKernelInterface $kernel, Request $request, Response $response) { diff --git a/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php b/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php index 4726a069783a8..2477d7d757170 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/DebugHandlersListener.php @@ -33,8 +33,8 @@ class DebugHandlersListener implements EventSubscriberInterface { private string|object|null $earlyHandler; private ?\Closure $exceptionHandler; - private ?LoggerInterface $logger; - private ?LoggerInterface $deprecationLogger; + private $logger; + private $deprecationLogger; private array|int|null $levels; private ?int $throwAt; private bool $scream; diff --git a/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php b/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php index 151f96ea7e0d7..3a3eff28fc8ef 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/DumpListener.php @@ -25,9 +25,9 @@ */ class DumpListener implements EventSubscriberInterface { - private ClonerInterface $cloner; - private DataDumperInterface $dumper; - private ?Connection $connection; + private $cloner; + private $dumper; + private $connection; public function __construct(ClonerInterface $cloner, DataDumperInterface $dumper, Connection $connection = null) { diff --git a/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php b/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php index 5c2fb09623653..2f0861b2f33f4 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php @@ -33,7 +33,7 @@ */ class FragmentListener implements EventSubscriberInterface { - private UriSigner $signer; + private $signer; private string $fragmentPath; /** diff --git a/src/Symfony/Component/HttpKernel/EventListener/LocaleAwareListener.php b/src/Symfony/Component/HttpKernel/EventListener/LocaleAwareListener.php index 9fd67347b2532..ebfa63acde525 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/LocaleAwareListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/LocaleAwareListener.php @@ -26,7 +26,7 @@ class LocaleAwareListener implements EventSubscriberInterface { private iterable $localeAwareServices; - private RequestStack $requestStack; + private $requestStack; /** * @param iterable $localeAwareServices diff --git a/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php b/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php index bcf6178622307..9d027cd5f8f10 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php @@ -29,9 +29,9 @@ */ class LocaleListener implements EventSubscriberInterface { - private ?RequestContextAwareInterface $router; + private $router; private string $defaultLocale; - private RequestStack $requestStack; + private $requestStack; private bool $useAcceptLanguageHeader; private array $enabledLocales; diff --git a/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php b/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php index fac19763c41f0..1aa7a50ea7773 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php @@ -31,14 +31,14 @@ */ class ProfilerListener implements EventSubscriberInterface { - private Profiler $profiler; - private ?RequestMatcherInterface $matcher; + private $profiler; + private $matcher; private bool $onlyException; private bool $onlyMainRequests; private ?\Throwable $exception = null; /** @var \SplObjectStorage */ private \SplObjectStorage $profiles; - private RequestStack $requestStack; + private $requestStack; private ?string $collectParameter; /** @var \SplObjectStorage */ private \SplObjectStorage $parents; diff --git a/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php b/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php index fbef9b1ff3054..834b81ae7e5df 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/RouterListener.php @@ -42,10 +42,10 @@ */ class RouterListener implements EventSubscriberInterface { - private RequestMatcherInterface|UrlMatcherInterface $matcher; - private RequestContext $context; - private ?LoggerInterface $logger; - private RequestStack $requestStack; + private $matcher; + private $context; + private $logger; + private $requestStack; private ?string $projectDir; private bool $debug; diff --git a/src/Symfony/Component/HttpKernel/EventListener/SessionListener.php b/src/Symfony/Component/HttpKernel/EventListener/SessionListener.php index f5f002d9f8ce1..ec23a2e9886b1 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/SessionListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/SessionListener.php @@ -12,8 +12,6 @@ namespace Symfony\Component\HttpKernel\EventListener; use Symfony\Component\HttpFoundation\Session\SessionInterface; -use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage; -use Symfony\Component\HttpKernel\Event\RequestEvent; /** * Sets the session in the request. diff --git a/src/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php b/src/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php index 3d1be0f2e1097..9081bff652976 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/SurrogateListener.php @@ -26,7 +26,7 @@ */ class SurrogateListener implements EventSubscriberInterface { - private ?SurrogateInterface $surrogate; + private $surrogate; public function __construct(SurrogateInterface $surrogate = null) { diff --git a/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php index af04fafc06926..f23ea7db1e428 100644 --- a/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php +++ b/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php @@ -24,9 +24,9 @@ */ abstract class AbstractSurrogateFragmentRenderer extends RoutableFragmentRenderer { - private ?SurrogateInterface $surrogate; - private FragmentRendererInterface $inlineStrategy; - private ?UriSigner $signer; + private $surrogate; + private $inlineStrategy; + private $signer; /** * The "fallback" strategy when surrogate is not available should always be an diff --git a/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php b/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php index dfc03db42d74d..5883376b0d463 100644 --- a/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php +++ b/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php @@ -31,7 +31,7 @@ class FragmentHandler { private bool $debug; private array $renderers = []; - private RequestStack $requestStack; + private $requestStack; /** * @param FragmentRendererInterface[] $renderers An array of FragmentRendererInterface instances diff --git a/src/Symfony/Component/HttpKernel/Fragment/FragmentUriGenerator.php b/src/Symfony/Component/HttpKernel/Fragment/FragmentUriGenerator.php index 0fdeba56137d4..81aeba2772789 100644 --- a/src/Symfony/Component/HttpKernel/Fragment/FragmentUriGenerator.php +++ b/src/Symfony/Component/HttpKernel/Fragment/FragmentUriGenerator.php @@ -25,8 +25,8 @@ final class FragmentUriGenerator implements FragmentUriGeneratorInterface { private string $fragmentPath; - private ?UriSigner $signer; - private ?RequestStack $requestStack; + private $signer; + private $requestStack; public function __construct(string $fragmentPath, UriSigner $signer = null, RequestStack $requestStack = null) { diff --git a/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php index a004f4d2b47d1..fd66ed63f0381 100644 --- a/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php +++ b/src/Symfony/Component/HttpKernel/Fragment/HIncludeFragmentRenderer.php @@ -25,8 +25,8 @@ class HIncludeFragmentRenderer extends RoutableFragmentRenderer { private ?string $globalDefaultTemplate; - private ?UriSigner $signer; - private ?Environment $twig; + private $signer; + private $twig; private string $charset; /** diff --git a/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php index 7201da1dd60ad..4749bbe115883 100644 --- a/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php +++ b/src/Symfony/Component/HttpKernel/Fragment/InlineFragmentRenderer.php @@ -27,8 +27,8 @@ */ class InlineFragmentRenderer extends RoutableFragmentRenderer { - private HttpKernelInterface $kernel; - private ?EventDispatcherInterface $dispatcher; + private $kernel; + private $dispatcher; public function __construct(HttpKernelInterface $kernel, EventDispatcherInterface $dispatcher = null) { diff --git a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php index 8e7b80a9099fa..eeec55593fb74 100644 --- a/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php +++ b/src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php @@ -29,11 +29,11 @@ */ class HttpCache implements HttpKernelInterface, TerminableInterface { - private HttpKernelInterface $kernel; - private StoreInterface $store; - private Request $request; - private ?SurrogateInterface $surrogate; - private ?ResponseCacheStrategyInterface $surrogateCacheStrategy = null; + private $kernel; + private $store; + private $request; + private $surrogate; + private $surrogateCacheStrategy = null; private array $options = []; private array $traces = []; diff --git a/src/Symfony/Component/HttpKernel/HttpClientKernel.php b/src/Symfony/Component/HttpKernel/HttpClientKernel.php index 1d8c30278108a..58ca82e5a8105 100644 --- a/src/Symfony/Component/HttpKernel/HttpClientKernel.php +++ b/src/Symfony/Component/HttpKernel/HttpClientKernel.php @@ -31,7 +31,7 @@ class_exists(ResponseHeaderBag::class); */ final class HttpClientKernel implements HttpKernelInterface { - private HttpClientInterface $client; + private $client; public function __construct(HttpClientInterface $client = null) { diff --git a/src/Symfony/Component/HttpKernel/HttpKernel.php b/src/Symfony/Component/HttpKernel/HttpKernel.php index 4f04bde22eace..684409a9b84b0 100644 --- a/src/Symfony/Component/HttpKernel/HttpKernel.php +++ b/src/Symfony/Component/HttpKernel/HttpKernel.php @@ -53,7 +53,7 @@ class HttpKernel implements HttpKernelInterface, TerminableInterface protected $dispatcher; protected $resolver; protected $requestStack; - private ArgumentResolverInterface $argumentResolver; + private $argumentResolver; public function __construct(EventDispatcherInterface $dispatcher, ControllerResolverInterface $resolver, RequestStack $requestStack = null, ArgumentResolverInterface $argumentResolver = null) { diff --git a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php index b571322f6f8c4..680b877faf008 100644 --- a/src/Symfony/Component/HttpKernel/Profiler/Profiler.php +++ b/src/Symfony/Component/HttpKernel/Profiler/Profiler.php @@ -26,14 +26,14 @@ */ class Profiler implements ResetInterface { - private ProfilerStorageInterface $storage; + private $storage; /** * @var DataCollectorInterface[] */ private array $collectors = []; - private ?LoggerInterface $logger; + private $logger; private bool $initiallyEnabled = true; private bool $enabled = true; diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php index c6a51839b3758..de434aa75a61a 100644 --- a/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php @@ -14,7 +14,6 @@ use PHPUnit\Framework\TestCase; use Psr\Log\LoggerInterface; use Symfony\Component\DependencyInjection\Container; -use Symfony\Component\DependencyInjection\ServiceLocator; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\RequestStack; use Symfony\Component\HttpFoundation\Response; @@ -22,7 +21,6 @@ use Symfony\Component\HttpFoundation\Session\SessionFactory; use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage; use Symfony\Component\HttpKernel\DataCollector\RequestDataCollector; -use Symfony\Component\HttpKernel\Event\FinishRequestEvent; use Symfony\Component\HttpKernel\Event\RequestEvent; use Symfony\Component\HttpKernel\Event\ResponseEvent; use Symfony\Component\HttpKernel\EventListener\AbstractSessionListener; diff --git a/src/Symfony/Component/Intl/Data/Bundle/Reader/BufferedBundleReader.php b/src/Symfony/Component/Intl/Data/Bundle/Reader/BufferedBundleReader.php index bb595f8bd6eb7..bbd568cb7ff98 100644 --- a/src/Symfony/Component/Intl/Data/Bundle/Reader/BufferedBundleReader.php +++ b/src/Symfony/Component/Intl/Data/Bundle/Reader/BufferedBundleReader.php @@ -20,9 +20,9 @@ */ class BufferedBundleReader implements BundleReaderInterface { - private BundleReaderInterface $reader; + private $reader; /** @var RingBuffer */ - private RingBuffer $buffer; + private $buffer; public function __construct(BundleReaderInterface $reader, int $bufferSize) { diff --git a/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReader.php b/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReader.php index 81ec4f65086cd..3efb35709a811 100644 --- a/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReader.php +++ b/src/Symfony/Component/Intl/Data/Bundle/Reader/BundleEntryReader.php @@ -28,7 +28,7 @@ */ class BundleEntryReader implements BundleEntryReaderInterface { - private BundleReaderInterface $reader; + private $reader; /** * A mapping of locale aliases to locales. diff --git a/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php index 2650aa05d9ab3..c1eff8153b8b7 100644 --- a/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php +++ b/src/Symfony/Component/Intl/Data/Generator/AbstractDataGenerator.php @@ -27,7 +27,7 @@ */ abstract class AbstractDataGenerator { - private BundleCompilerInterface $compiler; + private $compiler; private string $dirName; public function __construct(BundleCompilerInterface $compiler, string $dirName) diff --git a/src/Symfony/Component/Intl/Data/Util/ArrayAccessibleResourceBundle.php b/src/Symfony/Component/Intl/Data/Util/ArrayAccessibleResourceBundle.php index e8e3bf4ba2415..a525b53837509 100644 --- a/src/Symfony/Component/Intl/Data/Util/ArrayAccessibleResourceBundle.php +++ b/src/Symfony/Component/Intl/Data/Util/ArrayAccessibleResourceBundle.php @@ -25,7 +25,7 @@ */ class ArrayAccessibleResourceBundle implements \ArrayAccess, \IteratorAggregate, \Countable { - private \ResourceBundle $bundleImpl; + private $bundleImpl; public function __construct(\ResourceBundle $bundleImpl) { diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Adapter.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Adapter.php index a555c81a8fef7..1b15b31cb9a92 100644 --- a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Adapter.php +++ b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Adapter.php @@ -23,8 +23,8 @@ class Adapter implements AdapterInterface { private array $config; - private ConnectionInterface $connection; - private EntryManagerInterface $entryManager; + private $connection; + private $entryManager; public function __construct(array $config = []) { diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Collection.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Collection.php index 9cf809fd4daa3..9d9378227c16f 100644 --- a/src/Symfony/Component/Ldap/Adapter/ExtLdap/Collection.php +++ b/src/Symfony/Component/Ldap/Adapter/ExtLdap/Collection.php @@ -20,8 +20,8 @@ */ class Collection implements CollectionInterface { - private Connection $connection; - private Query $search; + private $connection; + private $search; /** @var list */ private array $entries; diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php index 5a9d53c3533f6..41b35dd52ac9a 100644 --- a/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php +++ b/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php @@ -23,7 +23,7 @@ */ class EntryManager implements EntryManagerInterface { - private Connection $connection; + private $connection; public function __construct(Connection $connection) { diff --git a/src/Symfony/Component/Ldap/Ldap.php b/src/Symfony/Component/Ldap/Ldap.php index 9c717ce11bacb..e3c6ace140f29 100644 --- a/src/Symfony/Component/Ldap/Ldap.php +++ b/src/Symfony/Component/Ldap/Ldap.php @@ -22,7 +22,7 @@ */ final class Ldap implements LdapInterface { - private AdapterInterface $adapter; + private $adapter; public function __construct(AdapterInterface $adapter) { diff --git a/src/Symfony/Component/Ldap/Security/CheckLdapCredentialsListener.php b/src/Symfony/Component/Ldap/Security/CheckLdapCredentialsListener.php index 1980e7726a493..99b965c4d05c0 100644 --- a/src/Symfony/Component/Ldap/Security/CheckLdapCredentialsListener.php +++ b/src/Symfony/Component/Ldap/Security/CheckLdapCredentialsListener.php @@ -28,7 +28,7 @@ */ class CheckLdapCredentialsListener implements EventSubscriberInterface { - private ContainerInterface $ldapLocator; + private $ldapLocator; public function __construct(ContainerInterface $ldapLocator) { diff --git a/src/Symfony/Component/Ldap/Security/LdapAuthenticator.php b/src/Symfony/Component/Ldap/Security/LdapAuthenticator.php index a14446493bf77..f811b6a2ce8fe 100644 --- a/src/Symfony/Component/Ldap/Security/LdapAuthenticator.php +++ b/src/Symfony/Component/Ldap/Security/LdapAuthenticator.php @@ -34,7 +34,7 @@ */ class LdapAuthenticator implements AuthenticationEntryPointInterface, InteractiveAuthenticatorInterface { - private AuthenticatorInterface $authenticator; + private $authenticator; private string $ldapServiceId; private string $dnString; private string $searchDn; diff --git a/src/Symfony/Component/Ldap/Security/LdapUser.php b/src/Symfony/Component/Ldap/Security/LdapUser.php index c5f4e6a7f8901..8ec45fadaa6b0 100644 --- a/src/Symfony/Component/Ldap/Security/LdapUser.php +++ b/src/Symfony/Component/Ldap/Security/LdapUser.php @@ -23,7 +23,7 @@ */ class LdapUser implements UserInterface, PasswordAuthenticatedUserInterface, EquatableInterface { - private Entry $entry; + private $entry; private string $username; private ?string $password; private array $roles; diff --git a/src/Symfony/Component/Ldap/Security/LdapUserProvider.php b/src/Symfony/Component/Ldap/Security/LdapUserProvider.php index 01e4505199cdc..2e8651b220abe 100644 --- a/src/Symfony/Component/Ldap/Security/LdapUserProvider.php +++ b/src/Symfony/Component/Ldap/Security/LdapUserProvider.php @@ -32,7 +32,7 @@ */ class LdapUserProvider implements UserProviderInterface, PasswordUpgraderInterface { - private LdapInterface $ldap; + private $ldap; private string $baseDn; private ?string $searchDn; private ?string $searchPassword; diff --git a/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/LdapManagerTest.php b/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/LdapManagerTest.php index 3d6cbb97265be..e43373dd580e5 100644 --- a/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/LdapManagerTest.php +++ b/src/Symfony/Component/Ldap/Tests/Adapter/ExtLdap/LdapManagerTest.php @@ -13,7 +13,6 @@ use Symfony\Component\Ldap\Adapter\CollectionInterface; use Symfony\Component\Ldap\Adapter\ExtLdap\Adapter; -use Symfony\Component\Ldap\Adapter\ExtLdap\Collection; use Symfony\Component\Ldap\Adapter\ExtLdap\UpdateOperation; use Symfony\Component\Ldap\Entry; use Symfony\Component\Ldap\Exception\LdapException; diff --git a/src/Symfony/Component/Lock/Lock.php b/src/Symfony/Component/Lock/Lock.php index ed85123a522ba..5c89d0bfac1c1 100644 --- a/src/Symfony/Component/Lock/Lock.php +++ b/src/Symfony/Component/Lock/Lock.php @@ -29,8 +29,8 @@ final class Lock implements SharedLockInterface, LoggerAwareInterface { use LoggerAwareTrait; - private PersistingStoreInterface $store; - private Key $key; + private $store; + private $key; private ?float $ttl; private bool $autoRelease; private bool $dirty = false; diff --git a/src/Symfony/Component/Lock/LockFactory.php b/src/Symfony/Component/Lock/LockFactory.php index 120c144f76de8..11e3bd2ec8fb3 100644 --- a/src/Symfony/Component/Lock/LockFactory.php +++ b/src/Symfony/Component/Lock/LockFactory.php @@ -25,7 +25,7 @@ class LockFactory implements LoggerAwareInterface { use LoggerAwareTrait; - private PersistingStoreInterface $store; + private $store; public function __construct(PersistingStoreInterface $store) { diff --git a/src/Symfony/Component/Lock/Store/CombinedStore.php b/src/Symfony/Component/Lock/Store/CombinedStore.php index 76a32e3dd2840..99ccd4c096e24 100644 --- a/src/Symfony/Component/Lock/Store/CombinedStore.php +++ b/src/Symfony/Component/Lock/Store/CombinedStore.php @@ -33,7 +33,7 @@ class CombinedStore implements SharedLockStoreInterface, LoggerAwareInterface /** @var PersistingStoreInterface[] */ private array $stores; - private StrategyInterface $strategy; + private $strategy; /** * @param PersistingStoreInterface[] $stores The list of synchronized stores diff --git a/src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php b/src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php index 8f3249177af26..a7bd280c153e9 100644 --- a/src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php +++ b/src/Symfony/Component/Lock/Store/DoctrineDbalPostgreSqlStore.php @@ -29,7 +29,7 @@ */ class DoctrineDbalPostgreSqlStore implements BlockingSharedLockStoreInterface, BlockingStoreInterface { - private Connection $conn; + private $conn; private static $storeRegistry = []; /** diff --git a/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php b/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php index 22fb9e7778705..40711262c9d6b 100644 --- a/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php +++ b/src/Symfony/Component/Lock/Store/DoctrineDbalStore.php @@ -41,7 +41,7 @@ class DoctrineDbalStore implements PersistingStoreInterface use DatabaseTableTrait; use ExpiringStoreTrait; - private Connection $conn; + private $conn; /** * List of available options: diff --git a/src/Symfony/Component/Lock/Store/MemcachedStore.php b/src/Symfony/Component/Lock/Store/MemcachedStore.php index fc7de07adced8..bb0db5b6b6bfe 100644 --- a/src/Symfony/Component/Lock/Store/MemcachedStore.php +++ b/src/Symfony/Component/Lock/Store/MemcachedStore.php @@ -26,7 +26,7 @@ class MemcachedStore implements PersistingStoreInterface { use ExpiringStoreTrait; - private \Memcached $memcached; + private $memcached; private int $initialTtl; private bool $useExtendedReturn; diff --git a/src/Symfony/Component/Lock/Store/MongoDbStore.php b/src/Symfony/Component/Lock/Store/MongoDbStore.php index 7dd8055d56fad..49f7bda25a9e4 100644 --- a/src/Symfony/Component/Lock/Store/MongoDbStore.php +++ b/src/Symfony/Component/Lock/Store/MongoDbStore.php @@ -49,8 +49,8 @@ class MongoDbStore implements PersistingStoreInterface { use ExpiringStoreTrait; - private Collection $collection; - private Client $client; + private $collection; + private $client; private string $uri; private array $options; private float $initialTtl; diff --git a/src/Symfony/Component/Lock/Store/PdoStore.php b/src/Symfony/Component/Lock/Store/PdoStore.php index da91e1a77637b..afbd4c4beb819 100644 --- a/src/Symfony/Component/Lock/Store/PdoStore.php +++ b/src/Symfony/Component/Lock/Store/PdoStore.php @@ -35,7 +35,7 @@ class PdoStore implements PersistingStoreInterface use DatabaseTableTrait; use ExpiringStoreTrait; - private \PDO $conn; + private $conn; private string $dsn; private string $driver; private string $username = ''; diff --git a/src/Symfony/Component/Lock/Store/PostgreSqlStore.php b/src/Symfony/Component/Lock/Store/PostgreSqlStore.php index e73a4f883119b..660df95744fa7 100644 --- a/src/Symfony/Component/Lock/Store/PostgreSqlStore.php +++ b/src/Symfony/Component/Lock/Store/PostgreSqlStore.php @@ -26,7 +26,7 @@ */ class PostgreSqlStore implements BlockingSharedLockStoreInterface, BlockingStoreInterface { - private \PDO $conn; + private $conn; private string $dsn; private string $username = ''; private string $password = ''; diff --git a/src/Symfony/Component/Lock/Store/RedisStore.php b/src/Symfony/Component/Lock/Store/RedisStore.php index e03d3b7113a98..918a8004ec9a7 100644 --- a/src/Symfony/Component/Lock/Store/RedisStore.php +++ b/src/Symfony/Component/Lock/Store/RedisStore.php @@ -31,7 +31,7 @@ class RedisStore implements SharedLockStoreInterface { use ExpiringStoreTrait; - private \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|RedisProxy|RedisClusterProxy $redis; + private $redis; private float $initialTtl; private bool $supportTime; diff --git a/src/Symfony/Component/Lock/Store/ZookeeperStore.php b/src/Symfony/Component/Lock/Store/ZookeeperStore.php index 57cfe87a69c00..d1f3de971b0f8 100644 --- a/src/Symfony/Component/Lock/Store/ZookeeperStore.php +++ b/src/Symfony/Component/Lock/Store/ZookeeperStore.php @@ -27,7 +27,7 @@ class ZookeeperStore implements PersistingStoreInterface { use ExpiringStoreTrait; - private \Zookeeper $zookeeper; + private $zookeeper; public function __construct(\Zookeeper $zookeeper) { diff --git a/src/Symfony/Component/Mailer/DataCollector/MessageDataCollector.php b/src/Symfony/Component/Mailer/DataCollector/MessageDataCollector.php index ba1c3f81d725c..07f77b27b0d3d 100644 --- a/src/Symfony/Component/Mailer/DataCollector/MessageDataCollector.php +++ b/src/Symfony/Component/Mailer/DataCollector/MessageDataCollector.php @@ -22,7 +22,7 @@ */ final class MessageDataCollector extends DataCollector { - private MessageEvents $events; + private $events; public function __construct(MessageLoggerListener $logger) { diff --git a/src/Symfony/Component/Mailer/DelayedEnvelope.php b/src/Symfony/Component/Mailer/DelayedEnvelope.php index e1031e81ba1e6..a57a9313b23a5 100644 --- a/src/Symfony/Component/Mailer/DelayedEnvelope.php +++ b/src/Symfony/Component/Mailer/DelayedEnvelope.php @@ -25,7 +25,7 @@ final class DelayedEnvelope extends Envelope { private bool $senderSet = false; private bool $recipientsSet = false; - private Message $message; + private $message; public function __construct(Message $message) { diff --git a/src/Symfony/Component/Mailer/Envelope.php b/src/Symfony/Component/Mailer/Envelope.php index f35f25f3652eb..8c8c61b6d8c6f 100644 --- a/src/Symfony/Component/Mailer/Envelope.php +++ b/src/Symfony/Component/Mailer/Envelope.php @@ -21,7 +21,7 @@ */ class Envelope { - private Address $sender; + private $sender; private array $recipients = []; /** diff --git a/src/Symfony/Component/Mailer/Event/MessageEvent.php b/src/Symfony/Component/Mailer/Event/MessageEvent.php index b068f7e78d641..0e6c3bfafecde 100644 --- a/src/Symfony/Component/Mailer/Event/MessageEvent.php +++ b/src/Symfony/Component/Mailer/Event/MessageEvent.php @@ -22,8 +22,8 @@ */ final class MessageEvent extends Event { - private RawMessage $message; - private Envelope $envelope; + private $message; + private $envelope; private string $transport; private bool $queued; diff --git a/src/Symfony/Component/Mailer/EventListener/EnvelopeListener.php b/src/Symfony/Component/Mailer/EventListener/EnvelopeListener.php index a5516f4530153..40de23f18d601 100644 --- a/src/Symfony/Component/Mailer/EventListener/EnvelopeListener.php +++ b/src/Symfony/Component/Mailer/EventListener/EnvelopeListener.php @@ -23,7 +23,7 @@ */ class EnvelopeListener implements EventSubscriberInterface { - private ?Address $sender = null; + private $sender = null; /** * @var Address[]|null diff --git a/src/Symfony/Component/Mailer/EventListener/MessageListener.php b/src/Symfony/Component/Mailer/EventListener/MessageListener.php index 951b5a4d81aba..3299f306d7790 100644 --- a/src/Symfony/Component/Mailer/EventListener/MessageListener.php +++ b/src/Symfony/Component/Mailer/EventListener/MessageListener.php @@ -39,9 +39,9 @@ class MessageListener implements EventSubscriberInterface 'bcc' => self::HEADER_ADD, ]; - private ?Headers $headers; + private $headers; private array $headerRules = []; - private ?BodyRendererInterface $renderer; + private $renderer; public function __construct(Headers $headers = null, BodyRendererInterface $renderer = null, array $headerRules = self::DEFAULT_RULES) { diff --git a/src/Symfony/Component/Mailer/EventListener/MessageLoggerListener.php b/src/Symfony/Component/Mailer/EventListener/MessageLoggerListener.php index c163f6c99cfa9..d75dde909a4ea 100644 --- a/src/Symfony/Component/Mailer/EventListener/MessageLoggerListener.php +++ b/src/Symfony/Component/Mailer/EventListener/MessageLoggerListener.php @@ -23,7 +23,7 @@ */ class MessageLoggerListener implements EventSubscriberInterface, ResetInterface { - private MessageEvents $events; + private $events; public function __construct() { diff --git a/src/Symfony/Component/Mailer/Exception/HttpTransportException.php b/src/Symfony/Component/Mailer/Exception/HttpTransportException.php index 4c97211db397c..01650f0344e80 100644 --- a/src/Symfony/Component/Mailer/Exception/HttpTransportException.php +++ b/src/Symfony/Component/Mailer/Exception/HttpTransportException.php @@ -18,7 +18,7 @@ */ class HttpTransportException extends TransportException { - private ResponseInterface $response; + private $response; public function __construct(string $message, ResponseInterface $response, int $code = 0, \Throwable $previous = null) { diff --git a/src/Symfony/Component/Mailer/Mailer.php b/src/Symfony/Component/Mailer/Mailer.php index dca3694a6fc33..d60b2c0e6d823 100644 --- a/src/Symfony/Component/Mailer/Mailer.php +++ b/src/Symfony/Component/Mailer/Mailer.php @@ -23,9 +23,9 @@ */ final class Mailer implements MailerInterface { - private TransportInterface $transport; - private ?MessageBusInterface $bus; - private ?EventDispatcherInterface $dispatcher; + private $transport; + private $bus; + private $dispatcher; public function __construct(TransportInterface $transport, MessageBusInterface $bus = null, EventDispatcherInterface $dispatcher = null) { diff --git a/src/Symfony/Component/Mailer/Messenger/MessageHandler.php b/src/Symfony/Component/Mailer/Messenger/MessageHandler.php index f8fb14fce8809..fefae9d0ce791 100644 --- a/src/Symfony/Component/Mailer/Messenger/MessageHandler.php +++ b/src/Symfony/Component/Mailer/Messenger/MessageHandler.php @@ -19,7 +19,7 @@ */ class MessageHandler { - private TransportInterface $transport; + private $transport; public function __construct(TransportInterface $transport) { diff --git a/src/Symfony/Component/Mailer/Messenger/SendEmailMessage.php b/src/Symfony/Component/Mailer/Messenger/SendEmailMessage.php index 1af5c7b3c728b..b06ac839c64f7 100644 --- a/src/Symfony/Component/Mailer/Messenger/SendEmailMessage.php +++ b/src/Symfony/Component/Mailer/Messenger/SendEmailMessage.php @@ -19,8 +19,8 @@ */ class SendEmailMessage { - private RawMessage $message; - private ?Envelope $envelope; + private $message; + private $envelope; public function __construct(RawMessage $message, Envelope $envelope = null) { diff --git a/src/Symfony/Component/Mailer/SentMessage.php b/src/Symfony/Component/Mailer/SentMessage.php index be84711804d18..2f3420a831293 100644 --- a/src/Symfony/Component/Mailer/SentMessage.php +++ b/src/Symfony/Component/Mailer/SentMessage.php @@ -19,9 +19,9 @@ */ class SentMessage { - private RawMessage $original; - private RawMessage $raw; - private Envelope $envelope; + private $original; + private $raw; + private $envelope; private string $messageId; private string $debug = ''; diff --git a/src/Symfony/Component/Mailer/Transport/AbstractTransport.php b/src/Symfony/Component/Mailer/Transport/AbstractTransport.php index 8ad8468d8d9f7..9fce6c9086846 100644 --- a/src/Symfony/Component/Mailer/Transport/AbstractTransport.php +++ b/src/Symfony/Component/Mailer/Transport/AbstractTransport.php @@ -25,8 +25,8 @@ */ abstract class AbstractTransport implements TransportInterface { - private ?EventDispatcherInterface $dispatcher; - private LoggerInterface $logger; + private $dispatcher; + private $logger; private float $rate = 0; private float $lastSent = 0; diff --git a/src/Symfony/Component/Mailer/Transport/FailoverTransport.php b/src/Symfony/Component/Mailer/Transport/FailoverTransport.php index d6a747730a2fc..f2819d0e6d1f0 100644 --- a/src/Symfony/Component/Mailer/Transport/FailoverTransport.php +++ b/src/Symfony/Component/Mailer/Transport/FailoverTransport.php @@ -18,7 +18,7 @@ */ class FailoverTransport extends RoundRobinTransport { - private ?TransportInterface $currentTransport = null; + private $currentTransport = null; protected function getNextTransport(): ?TransportInterface { diff --git a/src/Symfony/Component/Mailer/Transport/SendmailTransport.php b/src/Symfony/Component/Mailer/Transport/SendmailTransport.php index efdde70495c15..e0940fa48355e 100644 --- a/src/Symfony/Component/Mailer/Transport/SendmailTransport.php +++ b/src/Symfony/Component/Mailer/Transport/SendmailTransport.php @@ -38,8 +38,8 @@ class SendmailTransport extends AbstractTransport { private string $command = '/usr/sbin/sendmail -bs'; - private ProcessStream $stream; - private ?SmtpTransport $transport = null; + private $stream; + private $transport = null; /** * Constructor. diff --git a/src/Symfony/Component/Mailer/Transport/Smtp/SmtpTransport.php b/src/Symfony/Component/Mailer/Transport/Smtp/SmtpTransport.php index a1e84781201cf..6fcb20044254c 100644 --- a/src/Symfony/Component/Mailer/Transport/Smtp/SmtpTransport.php +++ b/src/Symfony/Component/Mailer/Transport/Smtp/SmtpTransport.php @@ -37,7 +37,7 @@ class SmtpTransport extends AbstractTransport private int $restartCounter = 0; private int $pingThreshold = 100; private float $lastMessageTime = 0; - private AbstractStream $stream; + private $stream; private string $domain = '[127.0.0.1]'; public function __construct(AbstractStream $stream = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null) diff --git a/src/Symfony/Component/Mailer/Transport/Transports.php b/src/Symfony/Component/Mailer/Transport/Transports.php index 2a04c1cd1e108..852d52d5f5687 100644 --- a/src/Symfony/Component/Mailer/Transport/Transports.php +++ b/src/Symfony/Component/Mailer/Transport/Transports.php @@ -27,7 +27,7 @@ final class Transports implements TransportInterface * @var array */ private array $transports = []; - private TransportInterface $default; + private $default; /** * @param iterable $transports diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsReceiver.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsReceiver.php index 5edefd4d05ca9..89dcf0627cd5f 100644 --- a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsReceiver.php +++ b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsReceiver.php @@ -26,8 +26,8 @@ */ class AmazonSqsReceiver implements ReceiverInterface, MessageCountAwareInterface { - private Connection $connection; - private SerializerInterface $serializer; + private $connection; + private $serializer; public function __construct(Connection $connection, SerializerInterface $serializer = null) { diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsSender.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsSender.php index 978a3a237b58f..1994313720e0d 100644 --- a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsSender.php +++ b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsSender.php @@ -23,8 +23,8 @@ */ class AmazonSqsSender implements SenderInterface { - private Connection $connection; - private SerializerInterface $serializer; + private $connection; + private $serializer; public function __construct(Connection $connection, SerializerInterface $serializer) { diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsTransport.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsTransport.php index f6e440d49e438..50c7b8ff9a7d2 100644 --- a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsTransport.php +++ b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsTransport.php @@ -28,10 +28,10 @@ */ class AmazonSqsTransport implements TransportInterface, SetupableTransportInterface, MessageCountAwareInterface, ResetInterface { - private SerializerInterface $serializer; - private Connection $connection; - private ?ReceiverInterface $receiver; - private ?SenderInterface $sender; + private $serializer; + private $connection; + private $receiver; + private $sender; public function __construct(Connection $connection, SerializerInterface $serializer = null, ReceiverInterface $receiver = null, SenderInterface $sender = null) { diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsTransportFactory.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsTransportFactory.php index 578d5c5d40f92..0673966ba0cf5 100644 --- a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsTransportFactory.php +++ b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsTransportFactory.php @@ -21,7 +21,7 @@ */ class AmazonSqsTransportFactory implements TransportFactoryInterface { - private ?LoggerInterface $logger; + private $logger; public function __construct(LoggerInterface $logger = null) { diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/Connection.php index 6198f10756d8a..d0727ab20dbaf 100644 --- a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/Connection.php +++ b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/Connection.php @@ -13,7 +13,6 @@ use AsyncAws\Sqs\Enum\MessageSystemAttributeName; use AsyncAws\Sqs\Enum\QueueAttributeName; -use AsyncAws\Sqs\Result\ReceiveMessageResult; use AsyncAws\Sqs\SqsClient; use AsyncAws\Sqs\ValueObject\MessageAttributeValue; use AsyncAws\Sqs\ValueObject\MessageSystemAttributeValue; @@ -50,8 +49,8 @@ class Connection ]; private array $configuration; - private SqsClient $client; - private ?ReceiveMessageResult $currentResponse = null; + private $client; + private $currentResponse = null; /** @var array[] */ private array $buffer = []; private ?string $queueUrl; diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpReceivedStamp.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpReceivedStamp.php index 013443da3a0ce..d99c182da5b8e 100644 --- a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpReceivedStamp.php +++ b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpReceivedStamp.php @@ -18,7 +18,7 @@ */ class AmqpReceivedStamp implements NonSendableStampInterface { - private \AMQPEnvelope $amqpEnvelope; + private $amqpEnvelope; private string $queueName; public function __construct(\AMQPEnvelope $amqpEnvelope, string $queueName) diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpReceiver.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpReceiver.php index 97ce067465c4d..141ab8cdce5e6 100644 --- a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpReceiver.php +++ b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpReceiver.php @@ -27,8 +27,8 @@ */ class AmqpReceiver implements QueueReceiverInterface, MessageCountAwareInterface { - private SerializerInterface $serializer; - private Connection $connection; + private $serializer; + private $connection; public function __construct(Connection $connection, SerializerInterface $serializer = null) { diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpSender.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpSender.php index 27d5af2765b69..5fdfdffaf15f6 100644 --- a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpSender.php +++ b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpSender.php @@ -26,8 +26,8 @@ */ class AmqpSender implements SenderInterface { - private SerializerInterface $serializer; - private Connection $connection; + private $serializer; + private $connection; public function __construct(Connection $connection, SerializerInterface $serializer = null) { diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpTransport.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpTransport.php index d00f838202bdb..9ffda47cee42c 100644 --- a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpTransport.php +++ b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/AmqpTransport.php @@ -24,10 +24,10 @@ */ class AmqpTransport implements QueueReceiverInterface, TransportInterface, SetupableTransportInterface, MessageCountAwareInterface { - private SerializerInterface $serializer; - private Connection $connection; - private AmqpReceiver $receiver; - private AmqpSender $sender; + private $serializer; + private $connection; + private $receiver; + private $sender; public function __construct(Connection $connection, SerializerInterface $serializer = null) { diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php index fb255180db328..7b742ce7198cc 100644 --- a/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php +++ b/src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php @@ -77,18 +77,18 @@ class Connection private array $connectionOptions; private array $exchangeOptions; private array $queuesOptions; - private AmqpFactory $amqpFactory; + private $amqpFactory; private mixed $autoSetupExchange; private mixed $autoSetupDelayExchange; - private \AMQPChannel $amqpChannel; - private \AMQPExchange $amqpExchange; + private $amqpChannel; + private $amqpExchange; /** * @var \AMQPQueue[] */ private array $amqpQueues = []; - private \AMQPExchange $amqpDelayExchange; + private $amqpDelayExchange; public function __construct(array $connectionOptions, array $exchangeOptions, array $queuesOptions, AmqpFactory $amqpFactory = null) { diff --git a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/BeanstalkdReceiver.php b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/BeanstalkdReceiver.php index 0ad4c600659b8..0a5ca05525403 100644 --- a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/BeanstalkdReceiver.php +++ b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/BeanstalkdReceiver.php @@ -24,8 +24,8 @@ */ class BeanstalkdReceiver implements ReceiverInterface, MessageCountAwareInterface { - private Connection $connection; - private SerializerInterface $serializer; + private $connection; + private $serializer; public function __construct(Connection $connection, SerializerInterface $serializer = null) { diff --git a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/BeanstalkdSender.php b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/BeanstalkdSender.php index a8dd7beaa11a8..58f02dcca038d 100644 --- a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/BeanstalkdSender.php +++ b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/BeanstalkdSender.php @@ -22,8 +22,8 @@ */ class BeanstalkdSender implements SenderInterface { - private Connection $connection; - private SerializerInterface $serializer; + private $connection; + private $serializer; public function __construct(Connection $connection, SerializerInterface $serializer = null) { diff --git a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/BeanstalkdTransport.php b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/BeanstalkdTransport.php index a67df46800a7e..480d6e37f3d25 100644 --- a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/BeanstalkdTransport.php +++ b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/BeanstalkdTransport.php @@ -22,10 +22,10 @@ */ class BeanstalkdTransport implements TransportInterface, MessageCountAwareInterface { - private Connection $connection; - private SerializerInterface $serializer; - private BeanstalkdReceiver $receiver; - private BeanstalkdSender $sender; + private $connection; + private $serializer; + private $receiver; + private $sender; public function __construct(Connection $connection, SerializerInterface $serializer = null) { diff --git a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/Connection.php index 1957a458d7939..b23254af5b0b8 100644 --- a/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/Connection.php +++ b/src/Symfony/Component/Messenger/Bridge/Beanstalkd/Transport/Connection.php @@ -41,7 +41,7 @@ class Connection * * ttr: the message time to run before it is put back in the ready queue (in seconds) */ private array $configuration; - private PheanstalkInterface $client; + private $client; private string $tube; private int $timeout; private int $ttr; diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php index e56f28744f6cc..c78006a09cebd 100644 --- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php +++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/Connection.php @@ -60,7 +60,7 @@ class Connection implements ResetInterface protected $configuration = []; protected $driverConnection; protected $queueEmptiedAt; - private ?SchemaSynchronizer $schemaSynchronizer; + private $schemaSynchronizer; private bool $autoSetup; public function __construct(array $configuration, DBALConnection $driverConnection, SchemaSynchronizer $schemaSynchronizer = null) diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineReceiver.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineReceiver.php index ec743e12f1819..fa62dc39e68ff 100644 --- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineReceiver.php +++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineReceiver.php @@ -31,8 +31,8 @@ class DoctrineReceiver implements ReceiverInterface, MessageCountAwareInterface, { private const MAX_RETRIES = 3; private int $retryingSafetyCounter = 0; - private Connection $connection; - private SerializerInterface $serializer; + private $connection; + private $serializer; public function __construct(Connection $connection, SerializerInterface $serializer = null) { diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineSender.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineSender.php index ac0f9685e7884..6e5aa608528c9 100644 --- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineSender.php +++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineSender.php @@ -25,8 +25,8 @@ */ class DoctrineSender implements SenderInterface { - private Connection $connection; - private SerializerInterface $serializer; + private $connection; + private $serializer; public function __construct(Connection $connection, SerializerInterface $serializer = null) { diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransport.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransport.php index c29f529b6fe6d..997ea10797da2 100644 --- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransport.php +++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransport.php @@ -26,10 +26,10 @@ */ class DoctrineTransport implements TransportInterface, SetupableTransportInterface, MessageCountAwareInterface, ListableReceiverInterface { - private Connection $connection; - private SerializerInterface $serializer; - private DoctrineReceiver $receiver; - private DoctrineSender $sender; + private $connection; + private $serializer; + private $receiver; + private $sender; public function __construct(Connection $connection, SerializerInterface $serializer) { diff --git a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransportFactory.php b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransportFactory.php index ccbc92d895944..b712da7475713 100644 --- a/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransportFactory.php +++ b/src/Symfony/Component/Messenger/Bridge/Doctrine/Transport/DoctrineTransportFactory.php @@ -23,7 +23,7 @@ */ class DoctrineTransportFactory implements TransportFactoryInterface { - private ConnectionRegistry $registry; + private $registry; public function __construct(ConnectionRegistry $registry) { diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php index 755723e974928..387695c5202bb 100644 --- a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php +++ b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php @@ -43,7 +43,7 @@ class Connection 'serializer' => \Redis::SERIALIZER_PHP, ]; - private \Redis|\RedisCluster|RedisProxy|RedisClusterProxy $connection; + private $connection; private string $stream; private string $queue; private string $group; diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisClusterProxy.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisClusterProxy.php index e87fb9008fc0d..0b77b273aa7eb 100644 --- a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisClusterProxy.php +++ b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisClusterProxy.php @@ -20,7 +20,7 @@ */ class RedisClusterProxy { - private ?\RedisCluster $redis; + private $redis; private \Closure $initializer; private bool $ready = false; diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisProxy.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisProxy.php index 857c3cc7da700..c944e772f8cda 100644 --- a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisProxy.php +++ b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisProxy.php @@ -21,7 +21,7 @@ */ class RedisProxy { - private \Redis $redis; + private $redis; private \Closure $initializer; private bool $ready = false; diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisReceiver.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisReceiver.php index 0d3465ce1142b..ab004b929abe9 100644 --- a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisReceiver.php +++ b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisReceiver.php @@ -24,8 +24,8 @@ */ class RedisReceiver implements ReceiverInterface { - private Connection $connection; - private SerializerInterface $serializer; + private $connection; + private $serializer; public function __construct(Connection $connection, SerializerInterface $serializer = null) { diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisSender.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisSender.php index 79212a88e69c8..433cfe924105c 100644 --- a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisSender.php +++ b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisSender.php @@ -22,8 +22,8 @@ */ class RedisSender implements SenderInterface { - private Connection $connection; - private SerializerInterface $serializer; + private $connection; + private $serializer; public function __construct(Connection $connection, SerializerInterface $serializer) { diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisTransport.php b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisTransport.php index 8fa5c61fabf65..88daa22c5366f 100644 --- a/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisTransport.php +++ b/src/Symfony/Component/Messenger/Bridge/Redis/Transport/RedisTransport.php @@ -23,10 +23,10 @@ */ class RedisTransport implements TransportInterface, SetupableTransportInterface { - private SerializerInterface $serializer; - private Connection $connection; - private RedisReceiver $receiver; - private RedisSender $sender; + private $serializer; + private $connection; + private $receiver; + private $sender; public function __construct(Connection $connection, SerializerInterface $serializer = null) { diff --git a/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php b/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php index 4fe905df7dbf8..f97e2c1c49835 100644 --- a/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php +++ b/src/Symfony/Component/Messenger/Command/ConsumeMessagesCommand.php @@ -40,12 +40,12 @@ #[AsCommand(name: 'messenger:consume', description: 'Consume messages')] class ConsumeMessagesCommand extends Command { - private RoutableMessageBus $routableBus; - private ContainerInterface $receiverLocator; - private EventDispatcherInterface $eventDispatcher; - private ?LoggerInterface $logger; + private $routableBus; + private $receiverLocator; + private $eventDispatcher; + private $logger; private array $receiverNames; - private ?ResetServicesListener $resetServicesListener; + private $resetServicesListener; private array $busIds; public function __construct(RoutableMessageBus $routableBus, ContainerInterface $receiverLocator, EventDispatcherInterface $eventDispatcher, LoggerInterface $logger = null, array $receiverNames = [], ResetServicesListener $resetServicesListener = null, array $busIds = []) diff --git a/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php b/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php index 93c6e87efee5f..1628c02c5758b 100644 --- a/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php +++ b/src/Symfony/Component/Messenger/Command/FailedMessagesRetryCommand.php @@ -37,9 +37,9 @@ #[AsCommand(name: 'messenger:failed:retry', description: 'Retry one or more messages from the failure transport')] class FailedMessagesRetryCommand extends AbstractFailedMessagesCommand { - private EventDispatcherInterface $eventDispatcher; - private MessageBusInterface $messageBus; - private ?LoggerInterface $logger; + private $eventDispatcher; + private $messageBus; + private $logger; public function __construct(?string $globalReceiverName, ServiceProviderInterface $failureTransports, MessageBusInterface $messageBus, EventDispatcherInterface $eventDispatcher, LoggerInterface $logger = null) { diff --git a/src/Symfony/Component/Messenger/Command/SetupTransportsCommand.php b/src/Symfony/Component/Messenger/Command/SetupTransportsCommand.php index 98dcfd9e9936a..f15a068e08f2f 100644 --- a/src/Symfony/Component/Messenger/Command/SetupTransportsCommand.php +++ b/src/Symfony/Component/Messenger/Command/SetupTransportsCommand.php @@ -28,7 +28,7 @@ #[AsCommand(name: 'messenger:setup-transports', description: 'Prepare the required infrastructure for the transport')] class SetupTransportsCommand extends Command { - private ContainerInterface $transportLocator; + private $transportLocator; private array $transportNames; public function __construct(ContainerInterface $transportLocator, array $transportNames = []) diff --git a/src/Symfony/Component/Messenger/Command/StopWorkersCommand.php b/src/Symfony/Component/Messenger/Command/StopWorkersCommand.php index 13a47540894d7..f3aa44415af6f 100644 --- a/src/Symfony/Component/Messenger/Command/StopWorkersCommand.php +++ b/src/Symfony/Component/Messenger/Command/StopWorkersCommand.php @@ -26,7 +26,7 @@ #[AsCommand(name: 'messenger:stop-workers', description: 'Stop workers after their current message')] class StopWorkersCommand extends Command { - private CacheItemPoolInterface $restartSignalCachePool; + private $restartSignalCachePool; public function __construct(CacheItemPoolInterface $restartSignalCachePool) { diff --git a/src/Symfony/Component/Messenger/Event/AbstractWorkerMessageEvent.php b/src/Symfony/Component/Messenger/Event/AbstractWorkerMessageEvent.php index 3cd5831b4fa0d..08e92ee4b521a 100644 --- a/src/Symfony/Component/Messenger/Event/AbstractWorkerMessageEvent.php +++ b/src/Symfony/Component/Messenger/Event/AbstractWorkerMessageEvent.php @@ -16,7 +16,7 @@ abstract class AbstractWorkerMessageEvent { - private Envelope $envelope; + private $envelope; private string $receiverName; public function __construct(Envelope $envelope, string $receiverName) diff --git a/src/Symfony/Component/Messenger/Event/SendMessageToTransportsEvent.php b/src/Symfony/Component/Messenger/Event/SendMessageToTransportsEvent.php index 454cca700e36f..5fd5fd8d91f20 100644 --- a/src/Symfony/Component/Messenger/Event/SendMessageToTransportsEvent.php +++ b/src/Symfony/Component/Messenger/Event/SendMessageToTransportsEvent.php @@ -26,7 +26,7 @@ */ final class SendMessageToTransportsEvent { - private Envelope $envelope; + private $envelope; public function __construct(Envelope $envelope) { diff --git a/src/Symfony/Component/Messenger/Event/WorkerRunningEvent.php b/src/Symfony/Component/Messenger/Event/WorkerRunningEvent.php index 14be2ab0be780..d7f3040266fe0 100644 --- a/src/Symfony/Component/Messenger/Event/WorkerRunningEvent.php +++ b/src/Symfony/Component/Messenger/Event/WorkerRunningEvent.php @@ -20,7 +20,7 @@ */ final class WorkerRunningEvent { - private Worker $worker; + private $worker; private bool $isWorkerIdle; public function __construct(Worker $worker, bool $isWorkerIdle) diff --git a/src/Symfony/Component/Messenger/Event/WorkerStartedEvent.php b/src/Symfony/Component/Messenger/Event/WorkerStartedEvent.php index 5198c9c8ad4ee..9d37d8ddde934 100644 --- a/src/Symfony/Component/Messenger/Event/WorkerStartedEvent.php +++ b/src/Symfony/Component/Messenger/Event/WorkerStartedEvent.php @@ -20,7 +20,7 @@ */ final class WorkerStartedEvent { - private Worker $worker; + private $worker; public function __construct(Worker $worker) { diff --git a/src/Symfony/Component/Messenger/Event/WorkerStoppedEvent.php b/src/Symfony/Component/Messenger/Event/WorkerStoppedEvent.php index 758b610b8c21a..e0d46100a2f75 100644 --- a/src/Symfony/Component/Messenger/Event/WorkerStoppedEvent.php +++ b/src/Symfony/Component/Messenger/Event/WorkerStoppedEvent.php @@ -20,7 +20,7 @@ */ final class WorkerStoppedEvent { - private Worker $worker; + private $worker; public function __construct(Worker $worker) { diff --git a/src/Symfony/Component/Messenger/EventListener/ResetServicesListener.php b/src/Symfony/Component/Messenger/EventListener/ResetServicesListener.php index 091b170e596eb..b57ee728981b6 100644 --- a/src/Symfony/Component/Messenger/EventListener/ResetServicesListener.php +++ b/src/Symfony/Component/Messenger/EventListener/ResetServicesListener.php @@ -20,7 +20,7 @@ */ class ResetServicesListener implements EventSubscriberInterface { - private ServicesResetter $servicesResetter; + private $servicesResetter; public function __construct(ServicesResetter $servicesResetter) { diff --git a/src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php b/src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php index 7b92aaa5461d1..20af8f0b906d8 100644 --- a/src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php +++ b/src/Symfony/Component/Messenger/EventListener/SendFailedMessageForRetryListener.php @@ -32,10 +32,10 @@ */ class SendFailedMessageForRetryListener implements EventSubscriberInterface { - private ContainerInterface $sendersLocator; - private ContainerInterface $retryStrategyLocator; - private ?LoggerInterface $logger; - private ?EventDispatcherInterface $eventDispatcher; + private $sendersLocator; + private $retryStrategyLocator; + private $logger; + private $eventDispatcher; private int $historySize; public function __construct(ContainerInterface $sendersLocator, ContainerInterface $retryStrategyLocator, LoggerInterface $logger = null, EventDispatcherInterface $eventDispatcher = null, int $historySize = 10) diff --git a/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php b/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php index 5beeaf6bc7ddd..f781351da0c42 100644 --- a/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php +++ b/src/Symfony/Component/Messenger/EventListener/SendFailedMessageToFailureTransportListener.php @@ -25,8 +25,8 @@ */ class SendFailedMessageToFailureTransportListener implements EventSubscriberInterface { - private ContainerInterface $failureSenders; - private ?LoggerInterface $logger; + private $failureSenders; + private $logger; public function __construct(ContainerInterface $failureSenders, LoggerInterface $logger = null) { diff --git a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnFailureLimitListener.php b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnFailureLimitListener.php index 0286b481d18aa..316aacd364543 100644 --- a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnFailureLimitListener.php +++ b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnFailureLimitListener.php @@ -23,7 +23,7 @@ class StopWorkerOnFailureLimitListener implements EventSubscriberInterface { private int $maximumNumberOfFailures; - private ?LoggerInterface $logger; + private $logger; private int $failedMessages = 0; public function __construct(int $maximumNumberOfFailures, LoggerInterface $logger = null) diff --git a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnMemoryLimitListener.php b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnMemoryLimitListener.php index 1b246ca0cad95..aec96c04165cd 100644 --- a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnMemoryLimitListener.php +++ b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnMemoryLimitListener.php @@ -22,7 +22,7 @@ class StopWorkerOnMemoryLimitListener implements EventSubscriberInterface { private int $memoryLimit; - private ?LoggerInterface $logger; + private $logger; private \Closure $memoryResolver; public function __construct(int $memoryLimit, LoggerInterface $logger = null, callable $memoryResolver = null) diff --git a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnMessageLimitListener.php b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnMessageLimitListener.php index a43f03381c86b..20485b718a2ca 100644 --- a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnMessageLimitListener.php +++ b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnMessageLimitListener.php @@ -23,7 +23,7 @@ class StopWorkerOnMessageLimitListener implements EventSubscriberInterface { private int $maximumNumberOfMessages; - private ?LoggerInterface $logger; + private $logger; private int $receivedMessages = 0; public function __construct(int $maximumNumberOfMessages, LoggerInterface $logger = null) diff --git a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnRestartSignalListener.php b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnRestartSignalListener.php index 53b1f625204e4..019366c6cf97a 100644 --- a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnRestartSignalListener.php +++ b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnRestartSignalListener.php @@ -24,8 +24,8 @@ class StopWorkerOnRestartSignalListener implements EventSubscriberInterface { public const RESTART_REQUESTED_TIMESTAMP_KEY = 'workers.restart_requested_timestamp'; - private CacheItemPoolInterface $cachePool; - private ?LoggerInterface $logger; + private $cachePool; + private $logger; private float $workerStartedAt = 0; public function __construct(CacheItemPoolInterface $cachePool, LoggerInterface $logger = null) diff --git a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnSigtermSignalListener.php b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnSigtermSignalListener.php index 52a787229fc20..9f18416c89412 100644 --- a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnSigtermSignalListener.php +++ b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnSigtermSignalListener.php @@ -20,7 +20,7 @@ */ class StopWorkerOnSigtermSignalListener implements EventSubscriberInterface { - private ?LoggerInterface $logger; + private $logger; public function __construct(LoggerInterface $logger = null) { diff --git a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnTimeLimitListener.php b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnTimeLimitListener.php index 3730a6b86d2ad..243f384ee4645 100644 --- a/src/Symfony/Component/Messenger/EventListener/StopWorkerOnTimeLimitListener.php +++ b/src/Symfony/Component/Messenger/EventListener/StopWorkerOnTimeLimitListener.php @@ -23,7 +23,7 @@ class StopWorkerOnTimeLimitListener implements EventSubscriberInterface { private int $timeLimitInSeconds; - private ?LoggerInterface $logger; + private $logger; private float $endTime = 0; public function __construct(int $timeLimitInSeconds, LoggerInterface $logger = null) diff --git a/src/Symfony/Component/Messenger/Exception/HandlerFailedException.php b/src/Symfony/Component/Messenger/Exception/HandlerFailedException.php index ddb66f31eb673..3a08973b4f878 100644 --- a/src/Symfony/Component/Messenger/Exception/HandlerFailedException.php +++ b/src/Symfony/Component/Messenger/Exception/HandlerFailedException.php @@ -16,7 +16,7 @@ class HandlerFailedException extends RuntimeException { private array $exceptions; - private Envelope $envelope; + private $envelope; /** * @param \Throwable[] $exceptions diff --git a/src/Symfony/Component/Messenger/Exception/ValidationFailedException.php b/src/Symfony/Component/Messenger/Exception/ValidationFailedException.php index 3e159117b2102..b202fda1c8c2c 100644 --- a/src/Symfony/Component/Messenger/Exception/ValidationFailedException.php +++ b/src/Symfony/Component/Messenger/Exception/ValidationFailedException.php @@ -18,7 +18,7 @@ */ class ValidationFailedException extends RuntimeException { - private ConstraintViolationListInterface $violations; + private $violations; private object $violatingMessage; public function __construct(object $violatingMessage, ConstraintViolationListInterface $violations) diff --git a/src/Symfony/Component/Messenger/HandleTrait.php b/src/Symfony/Component/Messenger/HandleTrait.php index b3cbb0982b81c..75b74479d4b6e 100644 --- a/src/Symfony/Component/Messenger/HandleTrait.php +++ b/src/Symfony/Component/Messenger/HandleTrait.php @@ -21,7 +21,7 @@ */ trait HandleTrait { - private MessageBusInterface $messageBus; + private $messageBus; /** * Dispatches the given message, expecting to be handled by a single handler diff --git a/src/Symfony/Component/Messenger/Handler/HandlerDescriptor.php b/src/Symfony/Component/Messenger/Handler/HandlerDescriptor.php index 4944c8b68a799..d6d94ac5269e0 100644 --- a/src/Symfony/Component/Messenger/Handler/HandlerDescriptor.php +++ b/src/Symfony/Component/Messenger/Handler/HandlerDescriptor.php @@ -20,7 +20,7 @@ final class HandlerDescriptor { private \Closure $handler; private string $name; - private ?BatchHandlerInterface $batchHandler = null; + private $batchHandler = null; private array $options; public function __construct(callable $handler, array $options = []) diff --git a/src/Symfony/Component/Messenger/Middleware/ActivationMiddleware.php b/src/Symfony/Component/Messenger/Middleware/ActivationMiddleware.php index dcad8bc2b274d..847fe13434666 100644 --- a/src/Symfony/Component/Messenger/Middleware/ActivationMiddleware.php +++ b/src/Symfony/Component/Messenger/Middleware/ActivationMiddleware.php @@ -20,7 +20,7 @@ */ class ActivationMiddleware implements MiddlewareInterface { - private MiddlewareInterface $inner; + private $inner; private \Closure|bool $activated; public function __construct(MiddlewareInterface $inner, bool|callable $activated) diff --git a/src/Symfony/Component/Messenger/Middleware/DispatchAfterCurrentBusMiddleware.php b/src/Symfony/Component/Messenger/Middleware/DispatchAfterCurrentBusMiddleware.php index bc5618af8d2a4..426c8703a5434 100644 --- a/src/Symfony/Component/Messenger/Middleware/DispatchAfterCurrentBusMiddleware.php +++ b/src/Symfony/Component/Messenger/Middleware/DispatchAfterCurrentBusMiddleware.php @@ -109,8 +109,8 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope */ final class QueuedEnvelope { - private Envelope $envelope; - private StackInterface $stack; + private $envelope; + private $stack; public function __construct(Envelope $envelope, StackInterface $stack) { diff --git a/src/Symfony/Component/Messenger/Middleware/HandleMessageMiddleware.php b/src/Symfony/Component/Messenger/Middleware/HandleMessageMiddleware.php index b6499b8f9ddc5..b396c3f64b059 100644 --- a/src/Symfony/Component/Messenger/Middleware/HandleMessageMiddleware.php +++ b/src/Symfony/Component/Messenger/Middleware/HandleMessageMiddleware.php @@ -32,7 +32,7 @@ class HandleMessageMiddleware implements MiddlewareInterface { use LoggerAwareTrait; - private HandlersLocatorInterface $handlersLocator; + private $handlersLocator; private bool $allowNoHandlers; public function __construct(HandlersLocatorInterface $handlersLocator, bool $allowNoHandlers = false) diff --git a/src/Symfony/Component/Messenger/Middleware/RouterContextMiddleware.php b/src/Symfony/Component/Messenger/Middleware/RouterContextMiddleware.php index 742ef30b4d397..62bd1d7e5b8d2 100644 --- a/src/Symfony/Component/Messenger/Middleware/RouterContextMiddleware.php +++ b/src/Symfony/Component/Messenger/Middleware/RouterContextMiddleware.php @@ -23,7 +23,7 @@ */ class RouterContextMiddleware implements MiddlewareInterface { - private RequestContextAwareInterface $router; + private $router; public function __construct(RequestContextAwareInterface $router) { diff --git a/src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php b/src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php index dd921cd565780..23ec1723c59e3 100644 --- a/src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php +++ b/src/Symfony/Component/Messenger/Middleware/SendMessageMiddleware.php @@ -28,8 +28,8 @@ class SendMessageMiddleware implements MiddlewareInterface { use LoggerAwareTrait; - private SendersLocatorInterface $sendersLocator; - private ?EventDispatcherInterface $eventDispatcher; + private $sendersLocator; + private $eventDispatcher; public function __construct(SendersLocatorInterface $sendersLocator, EventDispatcherInterface $eventDispatcher = null) { diff --git a/src/Symfony/Component/Messenger/Middleware/StackMiddleware.php b/src/Symfony/Component/Messenger/Middleware/StackMiddleware.php index 30195de65e935..7cb078de6037c 100644 --- a/src/Symfony/Component/Messenger/Middleware/StackMiddleware.php +++ b/src/Symfony/Component/Messenger/Middleware/StackMiddleware.php @@ -18,7 +18,7 @@ */ class StackMiddleware implements MiddlewareInterface, StackInterface { - private MiddlewareStack $stack; + private $stack; private int $offset = 0; /** diff --git a/src/Symfony/Component/Messenger/Middleware/TraceableMiddleware.php b/src/Symfony/Component/Messenger/Middleware/TraceableMiddleware.php index c09ebffc28178..a6881d3357905 100644 --- a/src/Symfony/Component/Messenger/Middleware/TraceableMiddleware.php +++ b/src/Symfony/Component/Messenger/Middleware/TraceableMiddleware.php @@ -21,7 +21,7 @@ */ class TraceableMiddleware implements MiddlewareInterface { - private Stopwatch $stopwatch; + private $stopwatch; private string $busName; private string $eventCategory; @@ -52,8 +52,8 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope */ class TraceableStack implements StackInterface { - private StackInterface $stack; - private Stopwatch $stopwatch; + private $stack; + private $stopwatch; private string $busName; private string $eventCategory; private ?string $currentEvent = null; diff --git a/src/Symfony/Component/Messenger/Middleware/ValidationMiddleware.php b/src/Symfony/Component/Messenger/Middleware/ValidationMiddleware.php index 750ac603d4586..fb199dd082cd4 100644 --- a/src/Symfony/Component/Messenger/Middleware/ValidationMiddleware.php +++ b/src/Symfony/Component/Messenger/Middleware/ValidationMiddleware.php @@ -21,7 +21,7 @@ */ class ValidationMiddleware implements MiddlewareInterface { - private ValidatorInterface $validator; + private $validator; public function __construct(ValidatorInterface $validator) { diff --git a/src/Symfony/Component/Messenger/RoutableMessageBus.php b/src/Symfony/Component/Messenger/RoutableMessageBus.php index 08f0d7882a820..ece1478892698 100644 --- a/src/Symfony/Component/Messenger/RoutableMessageBus.php +++ b/src/Symfony/Component/Messenger/RoutableMessageBus.php @@ -25,8 +25,8 @@ */ class RoutableMessageBus implements MessageBusInterface { - private ContainerInterface $busLocator; - private ?MessageBusInterface $fallbackBus; + private $busLocator; + private $fallbackBus; public function __construct(ContainerInterface $busLocator, MessageBusInterface $fallbackBus = null) { diff --git a/src/Symfony/Component/Messenger/Stamp/ErrorDetailsStamp.php b/src/Symfony/Component/Messenger/Stamp/ErrorDetailsStamp.php index 41b2190560d6f..da40b117390f9 100644 --- a/src/Symfony/Component/Messenger/Stamp/ErrorDetailsStamp.php +++ b/src/Symfony/Component/Messenger/Stamp/ErrorDetailsStamp.php @@ -23,7 +23,7 @@ final class ErrorDetailsStamp implements StampInterface private string $exceptionClass; private int|string $exceptionCode; private string $exceptionMessage; - private ?FlattenException $flattenException; + private $flattenException; public function __construct(string $exceptionClass, int|string $exceptionCode, string $exceptionMessage, FlattenException $flattenException = null) { diff --git a/src/Symfony/Component/Messenger/TraceableMessageBus.php b/src/Symfony/Component/Messenger/TraceableMessageBus.php index 16c0d529d027e..dfba3e299c4f2 100644 --- a/src/Symfony/Component/Messenger/TraceableMessageBus.php +++ b/src/Symfony/Component/Messenger/TraceableMessageBus.php @@ -16,7 +16,7 @@ */ class TraceableMessageBus implements MessageBusInterface { - private MessageBusInterface $decoratedBus; + private $decoratedBus; private array $dispatchedMessages = []; public function __construct(MessageBusInterface $decoratedBus) diff --git a/src/Symfony/Component/Messenger/Transport/InMemoryTransport.php b/src/Symfony/Component/Messenger/Transport/InMemoryTransport.php index 217454d56a065..964ce224c867c 100644 --- a/src/Symfony/Component/Messenger/Transport/InMemoryTransport.php +++ b/src/Symfony/Component/Messenger/Transport/InMemoryTransport.php @@ -45,7 +45,7 @@ class InMemoryTransport implements TransportInterface, ResetInterface private array $queue = []; private int $nextId = 1; - private ?SerializerInterface $serializer; + private $serializer; public function __construct(SerializerInterface $serializer = null) { diff --git a/src/Symfony/Component/Messenger/Transport/Receiver/SingleMessageReceiver.php b/src/Symfony/Component/Messenger/Transport/Receiver/SingleMessageReceiver.php index 027bb0f72e284..d4aa655d1a0c9 100644 --- a/src/Symfony/Component/Messenger/Transport/Receiver/SingleMessageReceiver.php +++ b/src/Symfony/Component/Messenger/Transport/Receiver/SingleMessageReceiver.php @@ -22,8 +22,8 @@ */ class SingleMessageReceiver implements ReceiverInterface { - private ReceiverInterface $receiver; - private Envelope $envelope; + private $receiver; + private $envelope; private bool $hasReceived = false; public function __construct(ReceiverInterface $receiver, Envelope $envelope) diff --git a/src/Symfony/Component/Messenger/Transport/Sender/SendersLocator.php b/src/Symfony/Component/Messenger/Transport/Sender/SendersLocator.php index cda20008c8768..ff1b6295bd732 100644 --- a/src/Symfony/Component/Messenger/Transport/Sender/SendersLocator.php +++ b/src/Symfony/Component/Messenger/Transport/Sender/SendersLocator.php @@ -24,7 +24,7 @@ class SendersLocator implements SendersLocatorInterface { private array $sendersMap; - private ContainerInterface $sendersLocator; + private $sendersLocator; /** * @param array> $sendersMap An array, keyed by "type", set to an array of sender aliases diff --git a/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php b/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php index 30540321f639d..6952abcb9307e 100644 --- a/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php +++ b/src/Symfony/Component/Messenger/Transport/Serialization/Serializer.php @@ -33,7 +33,7 @@ class Serializer implements SerializerInterface public const MESSENGER_SERIALIZATION_CONTEXT = 'messenger_serialization'; private const STAMP_HEADER_PREFIX = 'X-Message-Stamp-'; - private SymfonySerializerInterface $serializer; + private $serializer; private string $format; private array $context; diff --git a/src/Symfony/Component/Messenger/Transport/Sync/SyncTransport.php b/src/Symfony/Component/Messenger/Transport/Sync/SyncTransport.php index 07dddff32ec13..67af9039139db 100644 --- a/src/Symfony/Component/Messenger/Transport/Sync/SyncTransport.php +++ b/src/Symfony/Component/Messenger/Transport/Sync/SyncTransport.php @@ -25,7 +25,7 @@ */ class SyncTransport implements TransportInterface { - private MessageBusInterface $messageBus; + private $messageBus; public function __construct(MessageBusInterface $messageBus) { diff --git a/src/Symfony/Component/Messenger/Transport/Sync/SyncTransportFactory.php b/src/Symfony/Component/Messenger/Transport/Sync/SyncTransportFactory.php index e3af38340c222..d30c49ccdf028 100644 --- a/src/Symfony/Component/Messenger/Transport/Sync/SyncTransportFactory.php +++ b/src/Symfony/Component/Messenger/Transport/Sync/SyncTransportFactory.php @@ -21,7 +21,7 @@ */ class SyncTransportFactory implements TransportFactoryInterface { - private MessageBusInterface $messageBus; + private $messageBus; public function __construct(MessageBusInterface $messageBus) { diff --git a/src/Symfony/Component/Messenger/Worker.php b/src/Symfony/Component/Messenger/Worker.php index 247a0eadf25ec..c4b021a66a70b 100644 --- a/src/Symfony/Component/Messenger/Worker.php +++ b/src/Symfony/Component/Messenger/Worker.php @@ -39,11 +39,11 @@ class Worker { private array $receivers; - private MessageBusInterface $bus; - private ?EventDispatcherInterface $eventDispatcher; - private ?LoggerInterface $logger; + private $bus; + private $eventDispatcher; + private $logger; private bool $shouldStop = false; - private WorkerMetadata $metadata; + private $metadata; private array $acks = []; private \SplObjectStorage $unacks; diff --git a/src/Symfony/Component/Mime/Crypto/DkimSigner.php b/src/Symfony/Component/Mime/Crypto/DkimSigner.php index ef3ee88524aec..4bda946c5417c 100644 --- a/src/Symfony/Component/Mime/Crypto/DkimSigner.php +++ b/src/Symfony/Component/Mime/Crypto/DkimSigner.php @@ -30,7 +30,7 @@ final class DkimSigner public const ALGO_SHA256 = 'rsa-sha256'; public const ALGO_ED25519 = 'ed25519-sha256'; // RFC 8463 - private \OpenSSLAsymmetricKey $key; + private $key; private string $domainName; private string $selector; private array $defaultOptions; diff --git a/src/Symfony/Component/Mime/Header/MailboxHeader.php b/src/Symfony/Component/Mime/Header/MailboxHeader.php index e79761a5bed65..877e72e358de4 100644 --- a/src/Symfony/Component/Mime/Header/MailboxHeader.php +++ b/src/Symfony/Component/Mime/Header/MailboxHeader.php @@ -21,7 +21,7 @@ */ final class MailboxHeader extends AbstractHeader { - private Address $address; + private $address; public function __construct(string $name, Address $address) { diff --git a/src/Symfony/Component/Mime/Header/ParameterizedHeader.php b/src/Symfony/Component/Mime/Header/ParameterizedHeader.php index 0219e712cd101..bb1f1d78b4f9e 100644 --- a/src/Symfony/Component/Mime/Header/ParameterizedHeader.php +++ b/src/Symfony/Component/Mime/Header/ParameterizedHeader.php @@ -25,7 +25,7 @@ final class ParameterizedHeader extends UnstructuredHeader */ public const TOKEN_REGEX = '(?:[\x21\x23-\x27\x2A\x2B\x2D\x2E\x30-\x39\x41-\x5A\x5E-\x7E]+)'; - private ?Rfc2231Encoder $encoder = null; + private $encoder = null; private array $parameters = []; public function __construct(string $name, string $value, array $parameters = []) diff --git a/src/Symfony/Component/Mime/Header/PathHeader.php b/src/Symfony/Component/Mime/Header/PathHeader.php index 4c6e6908fd56a..af267bb10289e 100644 --- a/src/Symfony/Component/Mime/Header/PathHeader.php +++ b/src/Symfony/Component/Mime/Header/PathHeader.php @@ -21,7 +21,7 @@ */ final class PathHeader extends AbstractHeader { - private Address $address; + private $address; public function __construct(string $name, Address $address) { diff --git a/src/Symfony/Component/Mime/Message.php b/src/Symfony/Component/Mime/Message.php index 9205f45025814..a60d0f5273d09 100644 --- a/src/Symfony/Component/Mime/Message.php +++ b/src/Symfony/Component/Mime/Message.php @@ -21,8 +21,8 @@ */ class Message extends RawMessage { - private Headers $headers; - private ?AbstractPart $body; + private $headers; + private $body; public function __construct(Headers $headers = null, AbstractPart $body = null) { diff --git a/src/Symfony/Component/Notifier/Bridge/AmazonSns/AmazonSnsTransport.php b/src/Symfony/Component/Notifier/Bridge/AmazonSns/AmazonSnsTransport.php index 810ff8c310d3b..5743a51424f63 100644 --- a/src/Symfony/Component/Notifier/Bridge/AmazonSns/AmazonSnsTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/AmazonSns/AmazonSnsTransport.php @@ -27,7 +27,7 @@ */ final class AmazonSnsTransport extends AbstractTransport { - private SnsClient $snsClient; + private $snsClient; public function __construct(SnsClient $snsClient, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) { diff --git a/src/Symfony/Component/Notifier/Bridge/Clickatell/Tests/ClickatellTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Clickatell/Tests/ClickatellTransportTest.php index 100c979008c4c..01ea12773bd1a 100644 --- a/src/Symfony/Component/Notifier/Bridge/Clickatell/Tests/ClickatellTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Clickatell/Tests/ClickatellTransportTest.php @@ -10,7 +10,6 @@ use Symfony\Component\Notifier\Message\MessageInterface; use Symfony\Component\Notifier\Message\SmsMessage; use Symfony\Component\Notifier\Test\TransportTestCase; -use Symfony\Component\Notifier\Transport\TransportInterface; use Symfony\Contracts\HttpClient\HttpClientInterface; use Symfony\Contracts\HttpClient\ResponseInterface; diff --git a/src/Symfony/Component/Notifier/Bridge/FakeChat/FakeChatEmailTransport.php b/src/Symfony/Component/Notifier/Bridge/FakeChat/FakeChatEmailTransport.php index 6728716b1adf2..6f65f5ad3d2ba 100644 --- a/src/Symfony/Component/Notifier/Bridge/FakeChat/FakeChatEmailTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/FakeChat/FakeChatEmailTransport.php @@ -29,7 +29,7 @@ final class FakeChatEmailTransport extends AbstractTransport { protected const HOST = 'default'; - private MailerInterface $mailer; + private $mailer; private string $to; private string $from; diff --git a/src/Symfony/Component/Notifier/Bridge/FakeChat/FakeChatLoggerTransport.php b/src/Symfony/Component/Notifier/Bridge/FakeChat/FakeChatLoggerTransport.php index c7dd020a7eb9a..e0448900d0565 100644 --- a/src/Symfony/Component/Notifier/Bridge/FakeChat/FakeChatLoggerTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/FakeChat/FakeChatLoggerTransport.php @@ -27,7 +27,7 @@ final class FakeChatLoggerTransport extends AbstractTransport { protected const HOST = 'default'; - private LoggerInterface $logger; + private $logger; public function __construct(LoggerInterface $logger, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) { diff --git a/src/Symfony/Component/Notifier/Bridge/FakeChat/FakeChatTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/FakeChat/FakeChatTransportFactory.php index ae74ee689b9af..4dc555adf6ef6 100644 --- a/src/Symfony/Component/Notifier/Bridge/FakeChat/FakeChatTransportFactory.php +++ b/src/Symfony/Component/Notifier/Bridge/FakeChat/FakeChatTransportFactory.php @@ -23,8 +23,8 @@ */ final class FakeChatTransportFactory extends AbstractTransportFactory { - private MailerInterface $mailer; - private LoggerInterface $logger; + private $mailer; + private $logger; public function __construct(MailerInterface $mailer, LoggerInterface $logger) { diff --git a/src/Symfony/Component/Notifier/Bridge/FakeSms/FakeSmsEmailTransport.php b/src/Symfony/Component/Notifier/Bridge/FakeSms/FakeSmsEmailTransport.php index 1c4c883e02774..0e5d00e8d3786 100644 --- a/src/Symfony/Component/Notifier/Bridge/FakeSms/FakeSmsEmailTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/FakeSms/FakeSmsEmailTransport.php @@ -30,7 +30,7 @@ final class FakeSmsEmailTransport extends AbstractTransport { protected const HOST = 'default'; - private MailerInterface $mailer; + private $mailer; private string $to; private string $from; diff --git a/src/Symfony/Component/Notifier/Bridge/FakeSms/FakeSmsLoggerTransport.php b/src/Symfony/Component/Notifier/Bridge/FakeSms/FakeSmsLoggerTransport.php index 77ad495318275..e63510b384ef7 100644 --- a/src/Symfony/Component/Notifier/Bridge/FakeSms/FakeSmsLoggerTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/FakeSms/FakeSmsLoggerTransport.php @@ -27,7 +27,7 @@ final class FakeSmsLoggerTransport extends AbstractTransport { protected const HOST = 'default'; - private LoggerInterface $logger; + private $logger; public function __construct(LoggerInterface $logger, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null) { diff --git a/src/Symfony/Component/Notifier/Bridge/FakeSms/FakeSmsTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/FakeSms/FakeSmsTransportFactory.php index 9a2fa84d93075..67ec5c1d470b9 100644 --- a/src/Symfony/Component/Notifier/Bridge/FakeSms/FakeSmsTransportFactory.php +++ b/src/Symfony/Component/Notifier/Bridge/FakeSms/FakeSmsTransportFactory.php @@ -24,8 +24,8 @@ */ final class FakeSmsTransportFactory extends AbstractTransportFactory { - private MailerInterface $mailer; - private LoggerInterface $logger; + private $mailer; + private $logger; public function __construct(MailerInterface $mailer, LoggerInterface $logger) { diff --git a/src/Symfony/Component/Notifier/Bridge/Mercure/MercureTransport.php b/src/Symfony/Component/Notifier/Bridge/Mercure/MercureTransport.php index 08850d890ed85..ca1c3ad6855f3 100644 --- a/src/Symfony/Component/Notifier/Bridge/Mercure/MercureTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Mercure/MercureTransport.php @@ -30,7 +30,7 @@ */ final class MercureTransport extends AbstractTransport { - private HubInterface $hub; + private $hub; private string $hubId; private string|array $topics; diff --git a/src/Symfony/Component/Notifier/Bridge/Mercure/MercureTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/Mercure/MercureTransportFactory.php index 70be2ccd67e2e..5403fee1cc818 100644 --- a/src/Symfony/Component/Notifier/Bridge/Mercure/MercureTransportFactory.php +++ b/src/Symfony/Component/Notifier/Bridge/Mercure/MercureTransportFactory.php @@ -23,7 +23,7 @@ */ final class MercureTransportFactory extends AbstractTransportFactory { - private HubRegistry $registry; + private $registry; public function __construct(HubRegistry $registry) { diff --git a/src/Symfony/Component/Notifier/Bridge/OneSignal/OneSignalTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/OneSignal/OneSignalTransportFactory.php index 63ba5e94ebe11..437f5092cbf53 100644 --- a/src/Symfony/Component/Notifier/Bridge/OneSignal/OneSignalTransportFactory.php +++ b/src/Symfony/Component/Notifier/Bridge/OneSignal/OneSignalTransportFactory.php @@ -14,7 +14,6 @@ use Symfony\Component\Notifier\Exception\UnsupportedSchemeException; use Symfony\Component\Notifier\Transport\AbstractTransportFactory; use Symfony\Component\Notifier\Transport\Dsn; -use Symfony\Component\Notifier\Transport\TransportInterface; /** * @author Tomas Norkūnas diff --git a/src/Symfony/Component/Notifier/Bridge/OneSignal/Tests/OneSignalTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/OneSignal/Tests/OneSignalTransportFactoryTest.php index e8fd5f3132cda..48cdebe13343e 100644 --- a/src/Symfony/Component/Notifier/Bridge/OneSignal/Tests/OneSignalTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/OneSignal/Tests/OneSignalTransportFactoryTest.php @@ -13,7 +13,6 @@ use Symfony\Component\Notifier\Bridge\OneSignal\OneSignalTransportFactory; use Symfony\Component\Notifier\Test\TransportFactoryTestCase; -use Symfony\Component\Notifier\Transport\TransportFactoryInterface; /** * @author Tomas Norkūnas diff --git a/src/Symfony/Component/Notifier/Bridge/OneSignal/Tests/OneSignalTransportTest.php b/src/Symfony/Component/Notifier/Bridge/OneSignal/Tests/OneSignalTransportTest.php index 64ab8745cd0b5..90c5ebb22e27e 100644 --- a/src/Symfony/Component/Notifier/Bridge/OneSignal/Tests/OneSignalTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/OneSignal/Tests/OneSignalTransportTest.php @@ -21,7 +21,6 @@ use Symfony\Component\Notifier\Message\PushMessage; use Symfony\Component\Notifier\Message\SmsMessage; use Symfony\Component\Notifier\Test\TransportTestCase; -use Symfony\Component\Notifier\Transport\TransportInterface; use Symfony\Contracts\HttpClient\HttpClientInterface; use Symfony\Contracts\HttpClient\ResponseInterface; diff --git a/src/Symfony/Component/Notifier/Bridge/Sms77/Sms77TransportFactory.php b/src/Symfony/Component/Notifier/Bridge/Sms77/Sms77TransportFactory.php index 2cb02d3120cb5..5058d3ad7b0c6 100644 --- a/src/Symfony/Component/Notifier/Bridge/Sms77/Sms77TransportFactory.php +++ b/src/Symfony/Component/Notifier/Bridge/Sms77/Sms77TransportFactory.php @@ -14,7 +14,6 @@ use Symfony\Component\Notifier\Exception\UnsupportedSchemeException; use Symfony\Component\Notifier\Transport\AbstractTransportFactory; use Symfony\Component\Notifier\Transport\Dsn; -use Symfony\Component\Notifier\Transport\TransportInterface; /** * @author André Matthies diff --git a/src/Symfony/Component/Notifier/Bridge/Sms77/Tests/Sms77TransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Sms77/Tests/Sms77TransportFactoryTest.php index 4a06d9012af5d..0aea21bbb6ea9 100644 --- a/src/Symfony/Component/Notifier/Bridge/Sms77/Tests/Sms77TransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Sms77/Tests/Sms77TransportFactoryTest.php @@ -13,7 +13,6 @@ use Symfony\Component\Notifier\Bridge\Sms77\Sms77TransportFactory; use Symfony\Component\Notifier\Test\TransportFactoryTestCase; -use Symfony\Component\Notifier\Transport\TransportFactoryInterface; final class Sms77TransportFactoryTest extends TransportFactoryTestCase { diff --git a/src/Symfony/Component/Notifier/Bridge/Sms77/Tests/Sms77TransportTest.php b/src/Symfony/Component/Notifier/Bridge/Sms77/Tests/Sms77TransportTest.php index 1c574ed7e4e8e..0c3cd56f2e550 100644 --- a/src/Symfony/Component/Notifier/Bridge/Sms77/Tests/Sms77TransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Sms77/Tests/Sms77TransportTest.php @@ -16,7 +16,6 @@ use Symfony\Component\Notifier\Message\MessageInterface; use Symfony\Component\Notifier\Message\SmsMessage; use Symfony\Component\Notifier\Test\TransportTestCase; -use Symfony\Component\Notifier\Transport\TransportInterface; use Symfony\Contracts\HttpClient\HttpClientInterface; final class Sms77TransportTest extends TransportTestCase diff --git a/src/Symfony/Component/Notifier/Bridge/Vonage/Tests/VonageTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Vonage/Tests/VonageTransportFactoryTest.php index 254978bd26477..74d28f50da479 100644 --- a/src/Symfony/Component/Notifier/Bridge/Vonage/Tests/VonageTransportFactoryTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Vonage/Tests/VonageTransportFactoryTest.php @@ -13,7 +13,6 @@ use Symfony\Component\Notifier\Bridge\Vonage\VonageTransportFactory; use Symfony\Component\Notifier\Test\TransportFactoryTestCase; -use Symfony\Component\Notifier\Transport\TransportFactoryInterface; final class VonageTransportFactoryTest extends TransportFactoryTestCase { diff --git a/src/Symfony/Component/Notifier/Bridge/Vonage/Tests/VonageTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Vonage/Tests/VonageTransportTest.php index 34c7f7e3b4f3a..585e6835c9bbf 100644 --- a/src/Symfony/Component/Notifier/Bridge/Vonage/Tests/VonageTransportTest.php +++ b/src/Symfony/Component/Notifier/Bridge/Vonage/Tests/VonageTransportTest.php @@ -16,7 +16,6 @@ use Symfony\Component\Notifier\Message\MessageInterface; use Symfony\Component\Notifier\Message\SmsMessage; use Symfony\Component\Notifier\Test\TransportTestCase; -use Symfony\Component\Notifier\Transport\TransportInterface; use Symfony\Contracts\HttpClient\HttpClientInterface; final class VonageTransportTest extends TransportTestCase diff --git a/src/Symfony/Component/Notifier/Bridge/Vonage/VonageTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/Vonage/VonageTransportFactory.php index a54a519687a77..426f933c74c8e 100644 --- a/src/Symfony/Component/Notifier/Bridge/Vonage/VonageTransportFactory.php +++ b/src/Symfony/Component/Notifier/Bridge/Vonage/VonageTransportFactory.php @@ -14,7 +14,6 @@ use Symfony\Component\Notifier\Exception\UnsupportedSchemeException; use Symfony\Component\Notifier\Transport\AbstractTransportFactory; use Symfony\Component\Notifier\Transport\Dsn; -use Symfony\Component\Notifier\Transport\TransportInterface; /** * @author Fabien Potencier diff --git a/src/Symfony/Component/Notifier/Channel/BrowserChannel.php b/src/Symfony/Component/Notifier/Channel/BrowserChannel.php index b4a7c52442634..0201e0f1382b0 100644 --- a/src/Symfony/Component/Notifier/Channel/BrowserChannel.php +++ b/src/Symfony/Component/Notifier/Channel/BrowserChannel.php @@ -20,7 +20,7 @@ */ final class BrowserChannel implements ChannelInterface { - private RequestStack $stack; + private $stack; public function __construct(RequestStack $stack) { diff --git a/src/Symfony/Component/Notifier/Channel/EmailChannel.php b/src/Symfony/Component/Notifier/Channel/EmailChannel.php index 474b38142c27b..928dd735cf8a1 100644 --- a/src/Symfony/Component/Notifier/Channel/EmailChannel.php +++ b/src/Symfony/Component/Notifier/Channel/EmailChannel.php @@ -29,10 +29,10 @@ */ class EmailChannel implements ChannelInterface { - private ?TransportInterface $transport; - private ?MessageBusInterface $bus; + private $transport; + private $bus; private string|Address|null $from; - private ?Envelope $envelope; + private $envelope; public function __construct(TransportInterface $transport = null, MessageBusInterface $bus = null, string $from = null, Envelope $envelope = null) { diff --git a/src/Symfony/Component/Notifier/Chatter.php b/src/Symfony/Component/Notifier/Chatter.php index f5f90523af8c5..b016a421c2a58 100644 --- a/src/Symfony/Component/Notifier/Chatter.php +++ b/src/Symfony/Component/Notifier/Chatter.php @@ -23,9 +23,9 @@ */ final class Chatter implements ChatterInterface { - private TransportInterface $transport; - private ?MessageBusInterface $bus; - private ?EventDispatcherInterface $dispatcher; + private $transport; + private $bus; + private $dispatcher; public function __construct(TransportInterface $transport, MessageBusInterface $bus = null, EventDispatcherInterface $dispatcher = null) { diff --git a/src/Symfony/Component/Notifier/DataCollector/NotificationDataCollector.php b/src/Symfony/Component/Notifier/DataCollector/NotificationDataCollector.php index a2a7079a379e8..0a0a70c990d69 100644 --- a/src/Symfony/Component/Notifier/DataCollector/NotificationDataCollector.php +++ b/src/Symfony/Component/Notifier/DataCollector/NotificationDataCollector.php @@ -22,7 +22,7 @@ */ final class NotificationDataCollector extends DataCollector { - private NotificationLoggerListener $logger; + private $logger; public function __construct(NotificationLoggerListener $logger) { diff --git a/src/Symfony/Component/Notifier/Event/FailedMessageEvent.php b/src/Symfony/Component/Notifier/Event/FailedMessageEvent.php index 728ea73eb4c2a..32f826958250a 100644 --- a/src/Symfony/Component/Notifier/Event/FailedMessageEvent.php +++ b/src/Symfony/Component/Notifier/Event/FailedMessageEvent.php @@ -19,7 +19,7 @@ */ final class FailedMessageEvent extends Event { - private MessageInterface $message; + private $message; private \Throwable $error; public function __construct(MessageInterface $message, \Throwable $error) diff --git a/src/Symfony/Component/Notifier/Event/MessageEvent.php b/src/Symfony/Component/Notifier/Event/MessageEvent.php index 7fbc171fb7efb..d97df7b2ee6e7 100644 --- a/src/Symfony/Component/Notifier/Event/MessageEvent.php +++ b/src/Symfony/Component/Notifier/Event/MessageEvent.php @@ -19,7 +19,7 @@ */ final class MessageEvent extends Event { - private MessageInterface $message; + private $message; private bool $queued; public function __construct(MessageInterface $message, bool $queued = false) diff --git a/src/Symfony/Component/Notifier/Event/SentMessageEvent.php b/src/Symfony/Component/Notifier/Event/SentMessageEvent.php index b6ecd9f8e2d16..de039a9229d0f 100644 --- a/src/Symfony/Component/Notifier/Event/SentMessageEvent.php +++ b/src/Symfony/Component/Notifier/Event/SentMessageEvent.php @@ -19,7 +19,7 @@ */ final class SentMessageEvent extends Event { - private SentMessage $message; + private $message; public function __construct(SentMessage $message) { diff --git a/src/Symfony/Component/Notifier/EventListener/NotificationLoggerListener.php b/src/Symfony/Component/Notifier/EventListener/NotificationLoggerListener.php index 063f2425b16c7..56b3e594d200a 100644 --- a/src/Symfony/Component/Notifier/EventListener/NotificationLoggerListener.php +++ b/src/Symfony/Component/Notifier/EventListener/NotificationLoggerListener.php @@ -21,7 +21,7 @@ */ class NotificationLoggerListener implements EventSubscriberInterface, ResetInterface { - private NotificationEvents $events; + private $events; public function __construct() { diff --git a/src/Symfony/Component/Notifier/EventListener/SendFailedMessageToNotifierListener.php b/src/Symfony/Component/Notifier/EventListener/SendFailedMessageToNotifierListener.php index f088ddf5dfe1f..fbd31f5304192 100644 --- a/src/Symfony/Component/Notifier/EventListener/SendFailedMessageToNotifierListener.php +++ b/src/Symfony/Component/Notifier/EventListener/SendFailedMessageToNotifierListener.php @@ -23,7 +23,7 @@ */ class SendFailedMessageToNotifierListener implements EventSubscriberInterface { - private Notifier $notifier; + private $notifier; public function __construct(Notifier $notifier) { diff --git a/src/Symfony/Component/Notifier/Exception/TransportException.php b/src/Symfony/Component/Notifier/Exception/TransportException.php index 8db70a1e0cd41..c138f38f96f3e 100644 --- a/src/Symfony/Component/Notifier/Exception/TransportException.php +++ b/src/Symfony/Component/Notifier/Exception/TransportException.php @@ -18,7 +18,7 @@ */ class TransportException extends RuntimeException implements TransportExceptionInterface { - private ResponseInterface $response; + private $response; private string $debug = ''; public function __construct(string $message, ResponseInterface $response, int $code = 0, \Throwable $previous = null) diff --git a/src/Symfony/Component/Notifier/Message/ChatMessage.php b/src/Symfony/Component/Notifier/Message/ChatMessage.php index 75a6f190647f1..b1b6a2f6e07b9 100644 --- a/src/Symfony/Component/Notifier/Message/ChatMessage.php +++ b/src/Symfony/Component/Notifier/Message/ChatMessage.php @@ -20,8 +20,8 @@ final class ChatMessage implements MessageInterface { private ?string $transport = null; private string $subject; - private ?MessageOptionsInterface $options; - private ?Notification $notification = null; + private $options; + private $notification = null; public function __construct(string $subject, MessageOptionsInterface $options = null) { diff --git a/src/Symfony/Component/Notifier/Message/EmailMessage.php b/src/Symfony/Component/Notifier/Message/EmailMessage.php index 7ae4ba05e5854..a5e0a6d93ea8f 100644 --- a/src/Symfony/Component/Notifier/Message/EmailMessage.php +++ b/src/Symfony/Component/Notifier/Message/EmailMessage.php @@ -25,8 +25,8 @@ */ final class EmailMessage implements MessageInterface { - private RawMessage $message; - private ?Envelope $envelope; + private $message; + private $envelope; public function __construct(RawMessage $message, Envelope $envelope = null) { diff --git a/src/Symfony/Component/Notifier/Message/NullMessage.php b/src/Symfony/Component/Notifier/Message/NullMessage.php index 38a8c6b2af36d..b6fd6696d1aa8 100644 --- a/src/Symfony/Component/Notifier/Message/NullMessage.php +++ b/src/Symfony/Component/Notifier/Message/NullMessage.php @@ -16,7 +16,7 @@ */ final class NullMessage implements MessageInterface { - private MessageInterface $decoratedMessage; + private $decoratedMessage; public function __construct(MessageInterface $message) { diff --git a/src/Symfony/Component/Notifier/Message/SentMessage.php b/src/Symfony/Component/Notifier/Message/SentMessage.php index 4c4fb18a11cac..2508fd39cc50f 100644 --- a/src/Symfony/Component/Notifier/Message/SentMessage.php +++ b/src/Symfony/Component/Notifier/Message/SentMessage.php @@ -16,7 +16,7 @@ */ final class SentMessage { - private MessageInterface $original; + private $original; private string $transport; private ?string $messageId = null; diff --git a/src/Symfony/Component/Notifier/Messenger/MessageHandler.php b/src/Symfony/Component/Notifier/Messenger/MessageHandler.php index 88bfd9f64d143..e7c8d12068b2b 100644 --- a/src/Symfony/Component/Notifier/Messenger/MessageHandler.php +++ b/src/Symfony/Component/Notifier/Messenger/MessageHandler.php @@ -20,7 +20,7 @@ */ final class MessageHandler { - private TransportInterface $transport; + private $transport; public function __construct(TransportInterface $transport) { diff --git a/src/Symfony/Component/Notifier/Notification/Notification.php b/src/Symfony/Component/Notifier/Notification/Notification.php index e320f155035fa..ae978b20a991d 100644 --- a/src/Symfony/Component/Notifier/Notification/Notification.php +++ b/src/Symfony/Component/Notifier/Notification/Notification.php @@ -40,7 +40,7 @@ class Notification private string $subject = ''; private string $content = ''; private string $emoji = ''; - private ?FlattenException $exception = null; + private $exception = null; private string $exceptionAsString = ''; private string $importance = self::IMPORTANCE_HIGH; diff --git a/src/Symfony/Component/Notifier/Notifier.php b/src/Symfony/Component/Notifier/Notifier.php index b40eb8b461e3d..9eac4d7910f70 100644 --- a/src/Symfony/Component/Notifier/Notifier.php +++ b/src/Symfony/Component/Notifier/Notifier.php @@ -28,7 +28,7 @@ final class Notifier implements NotifierInterface { private array $adminRecipients = []; private array|ContainerInterface $channels; - private ?ChannelPolicyInterface $policy; + private $policy; /** * @param ChannelInterface[]|ContainerInterface $channels diff --git a/src/Symfony/Component/Notifier/Texter.php b/src/Symfony/Component/Notifier/Texter.php index f8b3ed6482cfe..fd0490dd1212d 100644 --- a/src/Symfony/Component/Notifier/Texter.php +++ b/src/Symfony/Component/Notifier/Texter.php @@ -23,9 +23,9 @@ */ final class Texter implements TexterInterface { - private TransportInterface $transport; - private ?MessageBusInterface $bus; - private ?EventDispatcherInterface $dispatcher; + private $transport; + private $bus; + private $dispatcher; public function __construct(TransportInterface $transport, MessageBusInterface $bus = null, EventDispatcherInterface $dispatcher = null) { diff --git a/src/Symfony/Component/Notifier/Transport/AbstractTransport.php b/src/Symfony/Component/Notifier/Transport/AbstractTransport.php index 7c73c5b3f5f7b..6de26f82d585d 100644 --- a/src/Symfony/Component/Notifier/Transport/AbstractTransport.php +++ b/src/Symfony/Component/Notifier/Transport/AbstractTransport.php @@ -28,7 +28,7 @@ abstract class AbstractTransport implements TransportInterface { protected const HOST = 'localhost'; - private ?EventDispatcherInterface $dispatcher; + private $dispatcher; protected $client; protected $host; diff --git a/src/Symfony/Component/Notifier/Transport/FailoverTransport.php b/src/Symfony/Component/Notifier/Transport/FailoverTransport.php index bf75cdec0f2f3..3d059282bf152 100644 --- a/src/Symfony/Component/Notifier/Transport/FailoverTransport.php +++ b/src/Symfony/Component/Notifier/Transport/FailoverTransport.php @@ -20,7 +20,7 @@ */ class FailoverTransport extends RoundRobinTransport { - private ?TransportInterface $currentTransport = null; + private $currentTransport = null; protected function getNextTransport(MessageInterface $message): ?TransportInterface { diff --git a/src/Symfony/Component/Notifier/Transport/NullTransport.php b/src/Symfony/Component/Notifier/Transport/NullTransport.php index f1cf481d18974..2aa91c404bb89 100644 --- a/src/Symfony/Component/Notifier/Transport/NullTransport.php +++ b/src/Symfony/Component/Notifier/Transport/NullTransport.php @@ -23,7 +23,7 @@ */ class NullTransport implements TransportInterface { - private ?EventDispatcherInterface $dispatcher; + private $dispatcher; public function __construct(EventDispatcherInterface $dispatcher = null) { diff --git a/src/Symfony/Component/PasswordHasher/Command/UserPasswordHashCommand.php b/src/Symfony/Component/PasswordHasher/Command/UserPasswordHashCommand.php index 02e1dc5d49ac8..d79097c38dc0c 100644 --- a/src/Symfony/Component/PasswordHasher/Command/UserPasswordHashCommand.php +++ b/src/Symfony/Component/PasswordHasher/Command/UserPasswordHashCommand.php @@ -38,7 +38,7 @@ #[AsCommand(name: 'security:hash-password', description: 'Hash a user password')] class UserPasswordHashCommand extends Command { - private PasswordHasherFactoryInterface $hasherFactory; + private $hasherFactory; private array $userClasses; public function __construct(PasswordHasherFactoryInterface $hasherFactory, array $userClasses = []) diff --git a/src/Symfony/Component/PasswordHasher/Hasher/MigratingPasswordHasher.php b/src/Symfony/Component/PasswordHasher/Hasher/MigratingPasswordHasher.php index 7a8dc3e742161..a9a088c6bd308 100644 --- a/src/Symfony/Component/PasswordHasher/Hasher/MigratingPasswordHasher.php +++ b/src/Symfony/Component/PasswordHasher/Hasher/MigratingPasswordHasher.php @@ -24,7 +24,7 @@ */ final class MigratingPasswordHasher implements PasswordHasherInterface { - private PasswordHasherInterface $bestHasher; + private $bestHasher; private array $extraHashers; public function __construct(PasswordHasherInterface $bestHasher, PasswordHasherInterface ...$extraHashers) diff --git a/src/Symfony/Component/PasswordHasher/Hasher/UserPasswordHasher.php b/src/Symfony/Component/PasswordHasher/Hasher/UserPasswordHasher.php index be1a9b6682cfc..4883d91db57f5 100644 --- a/src/Symfony/Component/PasswordHasher/Hasher/UserPasswordHasher.php +++ b/src/Symfony/Component/PasswordHasher/Hasher/UserPasswordHasher.php @@ -23,7 +23,7 @@ */ class UserPasswordHasher implements UserPasswordHasherInterface { - private PasswordHasherFactoryInterface $hasherFactory; + private $hasherFactory; public function __construct(PasswordHasherFactoryInterface $hasherFactory) { diff --git a/src/Symfony/Component/RateLimiter/Exception/MaxWaitDurationExceededException.php b/src/Symfony/Component/RateLimiter/Exception/MaxWaitDurationExceededException.php index 53029acefe850..4c18f6e81e726 100644 --- a/src/Symfony/Component/RateLimiter/Exception/MaxWaitDurationExceededException.php +++ b/src/Symfony/Component/RateLimiter/Exception/MaxWaitDurationExceededException.php @@ -18,7 +18,7 @@ */ class MaxWaitDurationExceededException extends \RuntimeException { - private RateLimit $rateLimit; + private $rateLimit; public function __construct(string $message, RateLimit $rateLimit, int $code = 0, \Throwable $previous = null) { diff --git a/src/Symfony/Component/RateLimiter/Exception/RateLimitExceededException.php b/src/Symfony/Component/RateLimiter/Exception/RateLimitExceededException.php index adbe576610b94..7bf39beeca302 100644 --- a/src/Symfony/Component/RateLimiter/Exception/RateLimitExceededException.php +++ b/src/Symfony/Component/RateLimiter/Exception/RateLimitExceededException.php @@ -18,7 +18,7 @@ */ class RateLimitExceededException extends \RuntimeException { - private RateLimit $rateLimit; + private $rateLimit; public function __construct(RateLimit $rateLimit, int $code = 0, \Throwable $previous = null) { diff --git a/src/Symfony/Component/RateLimiter/Policy/ResetLimiterTrait.php b/src/Symfony/Component/RateLimiter/Policy/ResetLimiterTrait.php index e060d738972d6..0f236e9e096cc 100644 --- a/src/Symfony/Component/RateLimiter/Policy/ResetLimiterTrait.php +++ b/src/Symfony/Component/RateLimiter/Policy/ResetLimiterTrait.php @@ -11,13 +11,11 @@ namespace Symfony\Component\RateLimiter\Policy; -use Symfony\Component\Lock\LockInterface; -use Symfony\Component\RateLimiter\Storage\StorageInterface; trait ResetLimiterTrait { - private LockInterface $lock; - private StorageInterface $storage; + private $lock; + private $storage; private string $id; /** diff --git a/src/Symfony/Component/RateLimiter/Policy/TokenBucket.php b/src/Symfony/Component/RateLimiter/Policy/TokenBucket.php index 21fe401d5a82b..678cd76b254bb 100644 --- a/src/Symfony/Component/RateLimiter/Policy/TokenBucket.php +++ b/src/Symfony/Component/RateLimiter/Policy/TokenBucket.php @@ -22,7 +22,7 @@ final class TokenBucket implements LimiterStateInterface { private string $stringRate; private string $id; - private Rate $rate; + private $rate; private int $tokens; private int $burstSize; private float $timer; diff --git a/src/Symfony/Component/RateLimiter/Policy/TokenBucketLimiter.php b/src/Symfony/Component/RateLimiter/Policy/TokenBucketLimiter.php index b5fbb223db200..60f929c1c0909 100644 --- a/src/Symfony/Component/RateLimiter/Policy/TokenBucketLimiter.php +++ b/src/Symfony/Component/RateLimiter/Policy/TokenBucketLimiter.php @@ -27,7 +27,7 @@ final class TokenBucketLimiter implements LimiterInterface use ResetLimiterTrait; private int $maxBurst; - private Rate $rate; + private $rate; public function __construct(string $id, int $maxBurst, Rate $rate, StorageInterface $storage, LockInterface $lock = null) { diff --git a/src/Symfony/Component/RateLimiter/RateLimiterFactory.php b/src/Symfony/Component/RateLimiter/RateLimiterFactory.php index 4fcb25e98c257..ec6d9fde094d3 100644 --- a/src/Symfony/Component/RateLimiter/RateLimiterFactory.php +++ b/src/Symfony/Component/RateLimiter/RateLimiterFactory.php @@ -28,8 +28,8 @@ final class RateLimiterFactory { private array $config; - private StorageInterface $storage; - private ?LockFactory $lockFactory; + private $storage; + private $lockFactory; public function __construct(array $config, StorageInterface $storage, LockFactory $lockFactory = null) { diff --git a/src/Symfony/Component/RateLimiter/Reservation.php b/src/Symfony/Component/RateLimiter/Reservation.php index 9e6029aa01251..d3336eefa5d27 100644 --- a/src/Symfony/Component/RateLimiter/Reservation.php +++ b/src/Symfony/Component/RateLimiter/Reservation.php @@ -17,7 +17,7 @@ final class Reservation { private float $timeToAct; - private RateLimit $rateLimit; + private $rateLimit; /** * @param float $timeToAct Unix timestamp in seconds when this reservation should act diff --git a/src/Symfony/Component/RateLimiter/Storage/CacheStorage.php b/src/Symfony/Component/RateLimiter/Storage/CacheStorage.php index 60396c817c498..e822878e5434c 100644 --- a/src/Symfony/Component/RateLimiter/Storage/CacheStorage.php +++ b/src/Symfony/Component/RateLimiter/Storage/CacheStorage.php @@ -19,7 +19,7 @@ */ class CacheStorage implements StorageInterface { - private CacheItemPoolInterface $pool; + private $pool; public function __construct(CacheItemPoolInterface $pool) { diff --git a/src/Symfony/Component/Routing/Generator/Dumper/GeneratorDumper.php b/src/Symfony/Component/Routing/Generator/Dumper/GeneratorDumper.php index b00d35a33b64d..e15a985df03c8 100644 --- a/src/Symfony/Component/Routing/Generator/Dumper/GeneratorDumper.php +++ b/src/Symfony/Component/Routing/Generator/Dumper/GeneratorDumper.php @@ -20,7 +20,7 @@ */ abstract class GeneratorDumper implements GeneratorDumperInterface { - private RouteCollection $routes; + private $routes; public function __construct(RouteCollection $routes) { diff --git a/src/Symfony/Component/Routing/Loader/Configurator/AliasConfigurator.php b/src/Symfony/Component/Routing/Loader/Configurator/AliasConfigurator.php index c908456e4983d..2d85b99af4a37 100644 --- a/src/Symfony/Component/Routing/Loader/Configurator/AliasConfigurator.php +++ b/src/Symfony/Component/Routing/Loader/Configurator/AliasConfigurator.php @@ -16,7 +16,7 @@ class AliasConfigurator { - private Alias $alias; + private $alias; public function __construct(Alias $alias) { diff --git a/src/Symfony/Component/Routing/Loader/Configurator/CollectionConfigurator.php b/src/Symfony/Component/Routing/Loader/Configurator/CollectionConfigurator.php index e29dcb2b35f01..87b2af0ed5031 100644 --- a/src/Symfony/Component/Routing/Loader/Configurator/CollectionConfigurator.php +++ b/src/Symfony/Component/Routing/Loader/Configurator/CollectionConfigurator.php @@ -23,8 +23,8 @@ class CollectionConfigurator use Traits\HostTrait; use Traits\RouteTrait; - private RouteCollection $parent; - private ?CollectionConfigurator $parentConfigurator; + private $parent; + private $parentConfigurator; private ?array $parentPrefixes; private string|array|null $host = null; diff --git a/src/Symfony/Component/Routing/Loader/Configurator/ImportConfigurator.php b/src/Symfony/Component/Routing/Loader/Configurator/ImportConfigurator.php index c1c7d77f6689b..ee8eb6c016204 100644 --- a/src/Symfony/Component/Routing/Loader/Configurator/ImportConfigurator.php +++ b/src/Symfony/Component/Routing/Loader/Configurator/ImportConfigurator.php @@ -22,7 +22,7 @@ class ImportConfigurator use Traits\PrefixTrait; use Traits\RouteTrait; - private RouteCollection $parent; + private $parent; public function __construct(RouteCollection $parent, RouteCollection $route) { diff --git a/src/Symfony/Component/Routing/Loader/Configurator/RoutingConfigurator.php b/src/Symfony/Component/Routing/Loader/Configurator/RoutingConfigurator.php index 80f9330d5b98f..282c716b0f11c 100644 --- a/src/Symfony/Component/Routing/Loader/Configurator/RoutingConfigurator.php +++ b/src/Symfony/Component/Routing/Loader/Configurator/RoutingConfigurator.php @@ -21,7 +21,7 @@ class RoutingConfigurator { use Traits\AddTrait; - private PhpFileLoader $loader; + private $loader; private string $path; private string $file; private ?string $env; diff --git a/src/Symfony/Component/Routing/Loader/ContainerLoader.php b/src/Symfony/Component/Routing/Loader/ContainerLoader.php index a4afdf3d46a89..2476ec1e2f878 100644 --- a/src/Symfony/Component/Routing/Loader/ContainerLoader.php +++ b/src/Symfony/Component/Routing/Loader/ContainerLoader.php @@ -20,7 +20,7 @@ */ class ContainerLoader extends ObjectLoader { - private ContainerInterface $container; + private $container; public function __construct(ContainerInterface $container, string $env = null) { diff --git a/src/Symfony/Component/Routing/Loader/YamlFileLoader.php b/src/Symfony/Component/Routing/Loader/YamlFileLoader.php index c88b4c209cbd5..9d0461039c799 100644 --- a/src/Symfony/Component/Routing/Loader/YamlFileLoader.php +++ b/src/Symfony/Component/Routing/Loader/YamlFileLoader.php @@ -36,7 +36,7 @@ class YamlFileLoader extends FileLoader private const AVAILABLE_KEYS = [ 'resource', 'type', 'prefix', 'path', 'host', 'schemes', 'methods', 'defaults', 'requirements', 'options', 'condition', 'controller', 'name_prefix', 'trailing_slash_on_root', 'locale', 'format', 'utf8', 'exclude', 'stateless', ]; - private YamlParser $yamlParser; + private $yamlParser; /** * @throws \InvalidArgumentException When a route can't be parsed because YAML is invalid diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php index 10631dfa9de40..8796fad5d28aa 100644 --- a/src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php +++ b/src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php @@ -26,7 +26,7 @@ */ class CompiledUrlMatcherDumper extends MatcherDumper { - private ExpressionLanguage $expressionLanguage; + private $expressionLanguage; private ?\Exception $signalingException = null; /** diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/MatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/MatcherDumper.php index f1c2e3769c737..fa1e6244c237e 100644 --- a/src/Symfony/Component/Routing/Matcher/Dumper/MatcherDumper.php +++ b/src/Symfony/Component/Routing/Matcher/Dumper/MatcherDumper.php @@ -20,7 +20,7 @@ */ abstract class MatcherDumper implements MatcherDumperInterface { - private RouteCollection $routes; + private $routes; public function __construct(RouteCollection $routes) { diff --git a/src/Symfony/Component/Routing/Matcher/ExpressionLanguageProvider.php b/src/Symfony/Component/Routing/Matcher/ExpressionLanguageProvider.php index 0d89a07b03c7e..c9703d236fd27 100644 --- a/src/Symfony/Component/Routing/Matcher/ExpressionLanguageProvider.php +++ b/src/Symfony/Component/Routing/Matcher/ExpressionLanguageProvider.php @@ -22,7 +22,7 @@ */ class ExpressionLanguageProvider implements ExpressionFunctionProviderInterface { - private ServiceProviderInterface $functions; + private $functions; public function __construct(ServiceProviderInterface $functions) { diff --git a/src/Symfony/Component/Routing/Route.php b/src/Symfony/Component/Routing/Route.php index 63b0ff8056cd1..b2691333c9597 100644 --- a/src/Symfony/Component/Routing/Route.php +++ b/src/Symfony/Component/Routing/Route.php @@ -27,7 +27,7 @@ class Route implements \Serializable private array $requirements = []; private array $options = []; private string $condition = ''; - private ?CompiledRoute $compiled = null; + private $compiled = null; /** * Constructor. diff --git a/src/Symfony/Component/Routing/Router.php b/src/Symfony/Component/Routing/Router.php index 83c10427a1059..be653e4f0073a 100644 --- a/src/Symfony/Component/Routing/Router.php +++ b/src/Symfony/Component/Routing/Router.php @@ -82,7 +82,7 @@ class Router implements RouterInterface, RequestMatcherInterface */ protected $defaultLocale; - private ConfigCacheFactoryInterface $configCacheFactory; + private $configCacheFactory; /** * @var ExpressionFunctionProviderInterface[] diff --git a/src/Symfony/Component/Security/Core/Authentication/RememberMe/CacheTokenVerifier.php b/src/Symfony/Component/Security/Core/Authentication/RememberMe/CacheTokenVerifier.php index 55cbdcf4614f7..83c21ea4e484a 100644 --- a/src/Symfony/Component/Security/Core/Authentication/RememberMe/CacheTokenVerifier.php +++ b/src/Symfony/Component/Security/Core/Authentication/RememberMe/CacheTokenVerifier.php @@ -18,7 +18,7 @@ */ class CacheTokenVerifier implements TokenVerifierInterface { - private CacheItemPoolInterface $cache; + private $cache; private int $outdatedTokenTtl; private string $cacheKeyPrefix; diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php index e589c0f140f7a..4bd4ffdeb2a14 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/AbstractToken.php @@ -21,7 +21,7 @@ */ abstract class AbstractToken implements TokenInterface, \Serializable { - private ?UserInterface $user = null; + private $user = null; private array $roleNames = []; private array $attributes = []; diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php b/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php index fec307d9f7faf..55616c2bb1566 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/Storage/TokenStorage.php @@ -24,7 +24,7 @@ */ class TokenStorage implements TokenStorageInterface, ResetInterface { - private ?TokenInterface $token = null; + private $token = null; private ?\Closure $initializer = null; /** diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/Storage/UsageTrackingTokenStorage.php b/src/Symfony/Component/Security/Core/Authentication/Token/Storage/UsageTrackingTokenStorage.php index 46f6c96e1f006..efb7faefb6484 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/Storage/UsageTrackingTokenStorage.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/Storage/UsageTrackingTokenStorage.php @@ -24,8 +24,8 @@ */ final class UsageTrackingTokenStorage implements TokenStorageInterface, ServiceSubscriberInterface { - private TokenStorageInterface $storage; - private ContainerInterface $container; + private $storage; + private $container; private bool $enableUsageTracking = false; public function __construct(TokenStorageInterface $storage, ContainerInterface $container) diff --git a/src/Symfony/Component/Security/Core/Authentication/Token/SwitchUserToken.php b/src/Symfony/Component/Security/Core/Authentication/Token/SwitchUserToken.php index feb8c297333e7..636be4cad22b9 100644 --- a/src/Symfony/Component/Security/Core/Authentication/Token/SwitchUserToken.php +++ b/src/Symfony/Component/Security/Core/Authentication/Token/SwitchUserToken.php @@ -20,7 +20,7 @@ */ class SwitchUserToken extends UsernamePasswordToken { - private TokenInterface $originalToken; + private $originalToken; private ?string $originatedFromUri = null; /** diff --git a/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php b/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php index eccbec9b1a13a..1ecb390f458b4 100644 --- a/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php +++ b/src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php @@ -35,7 +35,7 @@ final class AccessDecisionManager implements AccessDecisionManagerInterface private iterable $voters; private array $votersCacheAttributes = []; private array $votersCacheObject = []; - private AccessDecisionStrategyInterface $strategy; + private $strategy; /** * @param iterable $voters An array or an iterator of VoterInterface instances diff --git a/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php b/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php index 19cebceb3b005..23a015856e6ce 100644 --- a/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php +++ b/src/Symfony/Component/Security/Core/Authorization/AuthorizationChecker.php @@ -25,8 +25,8 @@ */ class AuthorizationChecker implements AuthorizationCheckerInterface { - private TokenStorageInterface $tokenStorage; - private AccessDecisionManagerInterface $accessDecisionManager; + private $tokenStorage; + private $accessDecisionManager; public function __construct(TokenStorageInterface $tokenStorage, AccessDecisionManagerInterface $accessDecisionManager, bool $exceptionOnNoToken = false) { diff --git a/src/Symfony/Component/Security/Core/Authorization/TraceableAccessDecisionManager.php b/src/Symfony/Component/Security/Core/Authorization/TraceableAccessDecisionManager.php index a044ae7485860..7a85198dbbf8e 100644 --- a/src/Symfony/Component/Security/Core/Authorization/TraceableAccessDecisionManager.php +++ b/src/Symfony/Component/Security/Core/Authorization/TraceableAccessDecisionManager.php @@ -12,7 +12,6 @@ namespace Symfony\Component\Security\Core\Authorization; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; -use Symfony\Component\Security\Core\Authorization\Strategy\AccessDecisionStrategyInterface; use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface; /** @@ -25,8 +24,8 @@ */ class TraceableAccessDecisionManager implements AccessDecisionManagerInterface { - private AccessDecisionManagerInterface $manager; - private AccessDecisionStrategyInterface $strategy; + private $manager; + private $strategy; /** @var iterable */ private iterable $voters = []; private array $decisionLog = []; // All decision logs diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/AuthenticatedVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/AuthenticatedVoter.php index bc72bb811b53c..1f04b91103476 100644 --- a/src/Symfony/Component/Security/Core/Authorization/Voter/AuthenticatedVoter.php +++ b/src/Symfony/Component/Security/Core/Authorization/Voter/AuthenticatedVoter.php @@ -33,7 +33,7 @@ class AuthenticatedVoter implements CacheableVoterInterface public const IS_REMEMBERED = 'IS_REMEMBERED'; public const PUBLIC_ACCESS = 'PUBLIC_ACCESS'; - private AuthenticationTrustResolverInterface $authenticationTrustResolver; + private $authenticationTrustResolver; public function __construct(AuthenticationTrustResolverInterface $authenticationTrustResolver) { diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php index 3f50dccca47ac..84c2d76b4dcbc 100644 --- a/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php +++ b/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php @@ -26,10 +26,10 @@ */ class ExpressionVoter implements CacheableVoterInterface { - private ExpressionLanguage $expressionLanguage; - private AuthenticationTrustResolverInterface $trustResolver; - private AuthorizationCheckerInterface $authChecker; - private ?RoleHierarchyInterface $roleHierarchy; + private $expressionLanguage; + private $trustResolver; + private $authChecker; + private $roleHierarchy; public function __construct(ExpressionLanguage $expressionLanguage, AuthenticationTrustResolverInterface $trustResolver, AuthorizationCheckerInterface $authChecker, RoleHierarchyInterface $roleHierarchy = null) { diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/RoleHierarchyVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/RoleHierarchyVoter.php index 11c44138c81bb..d8f2b34c94aad 100644 --- a/src/Symfony/Component/Security/Core/Authorization/Voter/RoleHierarchyVoter.php +++ b/src/Symfony/Component/Security/Core/Authorization/Voter/RoleHierarchyVoter.php @@ -22,7 +22,7 @@ */ class RoleHierarchyVoter extends RoleVoter { - private RoleHierarchyInterface $roleHierarchy; + private $roleHierarchy; public function __construct(RoleHierarchyInterface $roleHierarchy, string $prefix = 'ROLE_') { diff --git a/src/Symfony/Component/Security/Core/Authorization/Voter/TraceableVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/TraceableVoter.php index 412bb9760bfec..0ce25ef2f8144 100644 --- a/src/Symfony/Component/Security/Core/Authorization/Voter/TraceableVoter.php +++ b/src/Symfony/Component/Security/Core/Authorization/Voter/TraceableVoter.php @@ -24,8 +24,8 @@ */ class TraceableVoter implements CacheableVoterInterface { - private VoterInterface $voter; - private EventDispatcherInterface $eventDispatcher; + private $voter; + private $eventDispatcher; public function __construct(VoterInterface $voter, EventDispatcherInterface $eventDispatcher) { diff --git a/src/Symfony/Component/Security/Core/Event/AuthenticationEvent.php b/src/Symfony/Component/Security/Core/Event/AuthenticationEvent.php index 1b9269fe58c52..4fc151960b296 100644 --- a/src/Symfony/Component/Security/Core/Event/AuthenticationEvent.php +++ b/src/Symfony/Component/Security/Core/Event/AuthenticationEvent.php @@ -21,7 +21,7 @@ */ class AuthenticationEvent extends Event { - private TokenInterface $authenticationToken; + private $authenticationToken; public function __construct(TokenInterface $token) { diff --git a/src/Symfony/Component/Security/Core/Event/VoteEvent.php b/src/Symfony/Component/Security/Core/Event/VoteEvent.php index 1b1d6a336d6a1..82bda499c5025 100644 --- a/src/Symfony/Component/Security/Core/Event/VoteEvent.php +++ b/src/Symfony/Component/Security/Core/Event/VoteEvent.php @@ -23,7 +23,7 @@ */ final class VoteEvent extends Event { - private VoterInterface $voter; + private $voter; private mixed $subject; private array $attributes; private int $vote; diff --git a/src/Symfony/Component/Security/Core/Exception/AccountStatusException.php b/src/Symfony/Component/Security/Core/Exception/AccountStatusException.php index 0492c5542b724..919dce169c701 100644 --- a/src/Symfony/Component/Security/Core/Exception/AccountStatusException.php +++ b/src/Symfony/Component/Security/Core/Exception/AccountStatusException.php @@ -22,7 +22,7 @@ */ abstract class AccountStatusException extends AuthenticationException { - private UserInterface $user; + private $user; /** * Get the user. diff --git a/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php b/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php index 298bc78cd9b3f..9e2b02b6030c5 100644 --- a/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php +++ b/src/Symfony/Component/Security/Core/Exception/AuthenticationException.php @@ -24,7 +24,7 @@ class AuthenticationException extends RuntimeException /** @internal */ protected $serialized; - private ?TokenInterface $token = null; + private $token = null; public function __construct(string $message = '', int $code = 0, \Throwable $previous = null) { diff --git a/src/Symfony/Component/Security/Core/Exception/LazyResponseException.php b/src/Symfony/Component/Security/Core/Exception/LazyResponseException.php index e26a3347c6f6b..8edc248a0415d 100644 --- a/src/Symfony/Component/Security/Core/Exception/LazyResponseException.php +++ b/src/Symfony/Component/Security/Core/Exception/LazyResponseException.php @@ -20,7 +20,7 @@ */ class LazyResponseException extends \Exception implements ExceptionInterface { - private Response $response; + private $response; public function __construct(Response $response) { diff --git a/src/Symfony/Component/Security/Core/Security.php b/src/Symfony/Component/Security/Core/Security.php index 3c7c9473877c1..ccd42813ae7e4 100644 --- a/src/Symfony/Component/Security/Core/Security.php +++ b/src/Symfony/Component/Security/Core/Security.php @@ -28,7 +28,7 @@ class Security implements AuthorizationCheckerInterface public const LAST_USERNAME = '_security.last_username'; public const MAX_USERNAME_LENGTH = 4096; - private ContainerInterface $container; + private $container; public function __construct(ContainerInterface $container) { diff --git a/src/Symfony/Component/Security/Core/Signature/ExpiredSignatureStorage.php b/src/Symfony/Component/Security/Core/Signature/ExpiredSignatureStorage.php index 402092f6cb60e..593be77cf729b 100644 --- a/src/Symfony/Component/Security/Core/Signature/ExpiredSignatureStorage.php +++ b/src/Symfony/Component/Security/Core/Signature/ExpiredSignatureStorage.php @@ -20,7 +20,7 @@ */ final class ExpiredSignatureStorage { - private CacheItemPoolInterface $cache; + private $cache; private int $lifetime; public function __construct(CacheItemPoolInterface $cache, int $lifetime) diff --git a/src/Symfony/Component/Security/Core/Signature/SignatureHasher.php b/src/Symfony/Component/Security/Core/Signature/SignatureHasher.php index 826286ddf7833..87d653d9d9f46 100644 --- a/src/Symfony/Component/Security/Core/Signature/SignatureHasher.php +++ b/src/Symfony/Component/Security/Core/Signature/SignatureHasher.php @@ -24,10 +24,10 @@ */ class SignatureHasher { - private PropertyAccessorInterface $propertyAccessor; + private $propertyAccessor; private array $signatureProperties; private string $secret; - private ?ExpiredSignatureStorage $expiredSignaturesStorage; + private $expiredSignaturesStorage; private ?int $maxUses; /** diff --git a/src/Symfony/Component/Security/Core/Validator/Constraints/UserPasswordValidator.php b/src/Symfony/Component/Security/Core/Validator/Constraints/UserPasswordValidator.php index 178cf771aa6db..42b13921f357f 100644 --- a/src/Symfony/Component/Security/Core/Validator/Constraints/UserPasswordValidator.php +++ b/src/Symfony/Component/Security/Core/Validator/Constraints/UserPasswordValidator.php @@ -22,8 +22,8 @@ class UserPasswordValidator extends ConstraintValidator { - private TokenStorageInterface $tokenStorage; - private PasswordHasherFactoryInterface $hasherFactory; + private $tokenStorage; + private $hasherFactory; public function __construct(TokenStorageInterface $tokenStorage, PasswordHasherFactoryInterface $hasherFactory) { diff --git a/src/Symfony/Component/Security/Csrf/CsrfTokenManager.php b/src/Symfony/Component/Security/Csrf/CsrfTokenManager.php index a20febe2bb756..dba825904b69f 100644 --- a/src/Symfony/Component/Security/Csrf/CsrfTokenManager.php +++ b/src/Symfony/Component/Security/Csrf/CsrfTokenManager.php @@ -26,8 +26,8 @@ */ class CsrfTokenManager implements CsrfTokenManagerInterface { - private TokenGeneratorInterface $generator; - private TokenStorageInterface $storage; + private $generator; + private $storage; private \Closure|string $namespace; /** diff --git a/src/Symfony/Component/Security/Csrf/TokenStorage/SessionTokenStorage.php b/src/Symfony/Component/Security/Csrf/TokenStorage/SessionTokenStorage.php index a2e4ea86ab126..f2c68224c8bf3 100644 --- a/src/Symfony/Component/Security/Csrf/TokenStorage/SessionTokenStorage.php +++ b/src/Symfony/Component/Security/Csrf/TokenStorage/SessionTokenStorage.php @@ -28,7 +28,7 @@ class SessionTokenStorage implements ClearableTokenStorageInterface */ public const SESSION_NAMESPACE = '_csrf'; - private RequestStack $requestStack; + private $requestStack; private string $namespace; /** diff --git a/src/Symfony/Component/Security/Http/Authentication/AuthenticationUtils.php b/src/Symfony/Component/Security/Http/Authentication/AuthenticationUtils.php index 69b07d0efed83..bd0f39139216c 100644 --- a/src/Symfony/Component/Security/Http/Authentication/AuthenticationUtils.php +++ b/src/Symfony/Component/Security/Http/Authentication/AuthenticationUtils.php @@ -23,7 +23,7 @@ */ class AuthenticationUtils { - private RequestStack $requestStack; + private $requestStack; public function __construct(RequestStack $requestStack) { diff --git a/src/Symfony/Component/Security/Http/Authentication/AuthenticatorManager.php b/src/Symfony/Component/Security/Http/Authentication/AuthenticatorManager.php index ea310b6379e26..812d9c32fa0b8 100644 --- a/src/Symfony/Component/Security/Http/Authentication/AuthenticatorManager.php +++ b/src/Symfony/Component/Security/Http/Authentication/AuthenticatorManager.php @@ -46,10 +46,10 @@ class AuthenticatorManager implements AuthenticatorManagerInterface, UserAuthenticatorInterface { private iterable $authenticators; - private TokenStorageInterface $tokenStorage; - private EventDispatcherInterface $eventDispatcher; + private $tokenStorage; + private $eventDispatcher; private bool $eraseCredentials; - private ?LoggerInterface $logger; + private $logger; private string $firewallName; private bool $hideUserNotFoundExceptions; private array $requiredBadges; diff --git a/src/Symfony/Component/Security/Http/Authentication/CustomAuthenticationFailureHandler.php b/src/Symfony/Component/Security/Http/Authentication/CustomAuthenticationFailureHandler.php index 7046acda1214f..265e130da0a97 100644 --- a/src/Symfony/Component/Security/Http/Authentication/CustomAuthenticationFailureHandler.php +++ b/src/Symfony/Component/Security/Http/Authentication/CustomAuthenticationFailureHandler.php @@ -20,7 +20,7 @@ */ class CustomAuthenticationFailureHandler implements AuthenticationFailureHandlerInterface { - private AuthenticationFailureHandlerInterface $handler; + private $handler; /** * @param array $options Options for processing a successful authentication attempt diff --git a/src/Symfony/Component/Security/Http/Authentication/CustomAuthenticationSuccessHandler.php b/src/Symfony/Component/Security/Http/Authentication/CustomAuthenticationSuccessHandler.php index 86d32efe694ab..08b205fb25d62 100644 --- a/src/Symfony/Component/Security/Http/Authentication/CustomAuthenticationSuccessHandler.php +++ b/src/Symfony/Component/Security/Http/Authentication/CustomAuthenticationSuccessHandler.php @@ -20,7 +20,7 @@ */ class CustomAuthenticationSuccessHandler implements AuthenticationSuccessHandlerInterface { - private AuthenticationSuccessHandlerInterface $handler; + private $handler; /** * @param array $options Options for processing a successful authentication attempt diff --git a/src/Symfony/Component/Security/Http/Authenticator/AbstractPreAuthenticatedAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/AbstractPreAuthenticatedAuthenticator.php index 0d90ec3d8b182..24398910af392 100644 --- a/src/Symfony/Component/Security/Http/Authenticator/AbstractPreAuthenticatedAuthenticator.php +++ b/src/Symfony/Component/Security/Http/Authenticator/AbstractPreAuthenticatedAuthenticator.php @@ -36,10 +36,10 @@ */ abstract class AbstractPreAuthenticatedAuthenticator implements InteractiveAuthenticatorInterface { - private UserProviderInterface $userProvider; - private TokenStorageInterface $tokenStorage; + private $userProvider; + private $tokenStorage; private string $firewallName; - private ?LoggerInterface $logger; + private $logger; public function __construct(UserProviderInterface $userProvider, TokenStorageInterface $tokenStorage, string $firewallName, LoggerInterface $logger = null) { diff --git a/src/Symfony/Component/Security/Http/Authenticator/Debug/TraceableAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/Debug/TraceableAuthenticator.php index 6e536b3784948..426849c9f5558 100644 --- a/src/Symfony/Component/Security/Http/Authenticator/Debug/TraceableAuthenticator.php +++ b/src/Symfony/Component/Security/Http/Authenticator/Debug/TraceableAuthenticator.php @@ -29,10 +29,10 @@ */ final class TraceableAuthenticator implements AuthenticatorInterface, InteractiveAuthenticatorInterface, AuthenticationEntryPointInterface { - private AuthenticatorInterface $authenticator; - private ?Passport $passport = null; + private $authenticator; + private $passport = null; private ?float $duration = null; - private ClassStub|string $stub; + private $stub; public function __construct(AuthenticatorInterface $authenticator) { diff --git a/src/Symfony/Component/Security/Http/Authenticator/Debug/TraceableAuthenticatorManagerListener.php b/src/Symfony/Component/Security/Http/Authenticator/Debug/TraceableAuthenticatorManagerListener.php index a5bc1c57799fb..aed82580da9d9 100644 --- a/src/Symfony/Component/Security/Http/Authenticator/Debug/TraceableAuthenticatorManagerListener.php +++ b/src/Symfony/Component/Security/Http/Authenticator/Debug/TraceableAuthenticatorManagerListener.php @@ -24,7 +24,7 @@ */ final class TraceableAuthenticatorManagerListener extends AbstractListener { - private AuthenticatorManagerListener $authenticationManagerListener; + private $authenticationManagerListener; private array $authenticatorsInfo = []; private bool $hasVardumper; diff --git a/src/Symfony/Component/Security/Http/Authenticator/FormLoginAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/FormLoginAuthenticator.php index a92f055cfb2ba..0d4d2c5580090 100644 --- a/src/Symfony/Component/Security/Http/Authenticator/FormLoginAuthenticator.php +++ b/src/Symfony/Component/Security/Http/Authenticator/FormLoginAuthenticator.php @@ -41,12 +41,12 @@ */ class FormLoginAuthenticator extends AbstractLoginFormAuthenticator { - private HttpUtils $httpUtils; - private UserProviderInterface $userProvider; - private AuthenticationSuccessHandlerInterface $successHandler; - private AuthenticationFailureHandlerInterface $failureHandler; + private $httpUtils; + private $userProvider; + private $successHandler; + private $failureHandler; private array $options; - private HttpKernelInterface $httpKernel; + private $httpKernel; public function __construct(HttpUtils $httpUtils, UserProviderInterface $userProvider, AuthenticationSuccessHandlerInterface $successHandler, AuthenticationFailureHandlerInterface $failureHandler, array $options) { diff --git a/src/Symfony/Component/Security/Http/Authenticator/HttpBasicAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/HttpBasicAuthenticator.php index f7c2939079c74..87315fa837369 100644 --- a/src/Symfony/Component/Security/Http/Authenticator/HttpBasicAuthenticator.php +++ b/src/Symfony/Component/Security/Http/Authenticator/HttpBasicAuthenticator.php @@ -34,8 +34,8 @@ class HttpBasicAuthenticator implements AuthenticatorInterface, AuthenticationEntryPointInterface { private string $realmName; - private UserProviderInterface $userProvider; - private ?LoggerInterface $logger; + private $userProvider; + private $logger; public function __construct(string $realmName, UserProviderInterface $userProvider, LoggerInterface $logger = null) { diff --git a/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php index eca5e9c60c8d8..a72ee6c81ecab 100644 --- a/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php +++ b/src/Symfony/Component/Security/Http/Authenticator/JsonLoginAuthenticator.php @@ -46,12 +46,12 @@ class JsonLoginAuthenticator implements InteractiveAuthenticatorInterface { private array $options; - private HttpUtils $httpUtils; - private UserProviderInterface $userProvider; - private PropertyAccessorInterface $propertyAccessor; - private ?AuthenticationSuccessHandlerInterface $successHandler; - private ?AuthenticationFailureHandlerInterface $failureHandler; - private ?TranslatorInterface $translator = null; + private $httpUtils; + private $userProvider; + private $propertyAccessor; + private $successHandler; + private $failureHandler; + private $translator = null; public function __construct(HttpUtils $httpUtils, UserProviderInterface $userProvider, AuthenticationSuccessHandlerInterface $successHandler = null, AuthenticationFailureHandlerInterface $failureHandler = null, array $options = [], PropertyAccessorInterface $propertyAccessor = null) { diff --git a/src/Symfony/Component/Security/Http/Authenticator/LoginLinkAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/LoginLinkAuthenticator.php index 286990183e3ae..e4f5a5f10f5cd 100644 --- a/src/Symfony/Component/Security/Http/Authenticator/LoginLinkAuthenticator.php +++ b/src/Symfony/Component/Security/Http/Authenticator/LoginLinkAuthenticator.php @@ -31,10 +31,10 @@ */ final class LoginLinkAuthenticator extends AbstractAuthenticator implements InteractiveAuthenticatorInterface { - private LoginLinkHandlerInterface $loginLinkHandler; - private HttpUtils $httpUtils; - private AuthenticationSuccessHandlerInterface $successHandler; - private AuthenticationFailureHandlerInterface $failureHandler; + private $loginLinkHandler; + private $httpUtils; + private $successHandler; + private $failureHandler; private array $options; public function __construct(LoginLinkHandlerInterface $loginLinkHandler, HttpUtils $httpUtils, AuthenticationSuccessHandlerInterface $successHandler, AuthenticationFailureHandlerInterface $failureHandler, array $options) diff --git a/src/Symfony/Component/Security/Http/Authenticator/Passport/Badge/PasswordUpgradeBadge.php b/src/Symfony/Component/Security/Http/Authenticator/Passport/Badge/PasswordUpgradeBadge.php index 992b50d0811c1..36da9e3aafb92 100644 --- a/src/Symfony/Component/Security/Http/Authenticator/Passport/Badge/PasswordUpgradeBadge.php +++ b/src/Symfony/Component/Security/Http/Authenticator/Passport/Badge/PasswordUpgradeBadge.php @@ -26,7 +26,7 @@ class PasswordUpgradeBadge implements BadgeInterface { private ?string $plaintextPassword = null; - private ?PasswordUpgraderInterface $passwordUpgrader; + private $passwordUpgrader; /** * @param string $plaintextPassword The presented password, used in the rehash diff --git a/src/Symfony/Component/Security/Http/Authenticator/Passport/Badge/UserBadge.php b/src/Symfony/Component/Security/Http/Authenticator/Passport/Badge/UserBadge.php index edaea5d9f2969..95fe8139bdb26 100644 --- a/src/Symfony/Component/Security/Http/Authenticator/Passport/Badge/UserBadge.php +++ b/src/Symfony/Component/Security/Http/Authenticator/Passport/Badge/UserBadge.php @@ -29,7 +29,7 @@ class UserBadge implements BadgeInterface private string $userIdentifier; /** @var callable|null */ private $userLoader; - private UserInterface $user; + private $user; /** * Initializes the user badge. diff --git a/src/Symfony/Component/Security/Http/Authenticator/RememberMeAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/RememberMeAuthenticator.php index 67422f55d14f5..d1e3c9ccd12d9 100644 --- a/src/Symfony/Component/Security/Http/Authenticator/RememberMeAuthenticator.php +++ b/src/Symfony/Component/Security/Http/Authenticator/RememberMeAuthenticator.php @@ -43,11 +43,11 @@ */ class RememberMeAuthenticator implements InteractiveAuthenticatorInterface { - private RememberMeHandlerInterface $rememberMeHandler; + private $rememberMeHandler; private string $secret; - private TokenStorageInterface $tokenStorage; + private $tokenStorage; private string $cookieName; - private ?LoggerInterface $logger; + private $logger; public function __construct(RememberMeHandlerInterface $rememberMeHandler, string $secret, TokenStorageInterface $tokenStorage, string $cookieName, LoggerInterface $logger = null) { diff --git a/src/Symfony/Component/Security/Http/Controller/UserValueResolver.php b/src/Symfony/Component/Security/Http/Controller/UserValueResolver.php index 0c24f8cbacd3a..dbcdd3067d8aa 100644 --- a/src/Symfony/Component/Security/Http/Controller/UserValueResolver.php +++ b/src/Symfony/Component/Security/Http/Controller/UserValueResolver.php @@ -26,7 +26,7 @@ */ final class UserValueResolver implements ArgumentValueResolverInterface { - private TokenStorageInterface $tokenStorage; + private $tokenStorage; public function __construct(TokenStorageInterface $tokenStorage) { diff --git a/src/Symfony/Component/Security/Http/Event/AuthenticationTokenCreatedEvent.php b/src/Symfony/Component/Security/Http/Event/AuthenticationTokenCreatedEvent.php index bf16af0b15435..e9ed8aa49e176 100644 --- a/src/Symfony/Component/Security/Http/Event/AuthenticationTokenCreatedEvent.php +++ b/src/Symfony/Component/Security/Http/Event/AuthenticationTokenCreatedEvent.php @@ -22,8 +22,8 @@ */ class AuthenticationTokenCreatedEvent extends Event { - private TokenInterface $authenticatedToken; - private Passport $passport; + private $authenticatedToken; + private $passport; public function __construct(TokenInterface $token, Passport $passport) { diff --git a/src/Symfony/Component/Security/Http/Event/CheckPassportEvent.php b/src/Symfony/Component/Security/Http/Event/CheckPassportEvent.php index 18f540cba949b..b207552f5b955 100644 --- a/src/Symfony/Component/Security/Http/Event/CheckPassportEvent.php +++ b/src/Symfony/Component/Security/Http/Event/CheckPassportEvent.php @@ -26,8 +26,8 @@ */ class CheckPassportEvent extends Event { - private AuthenticatorInterface $authenticator; - private Passport $passport; + private $authenticator; + private $passport; public function __construct(AuthenticatorInterface $authenticator, Passport $passport) { diff --git a/src/Symfony/Component/Security/Http/Event/InteractiveLoginEvent.php b/src/Symfony/Component/Security/Http/Event/InteractiveLoginEvent.php index cb96c7319c416..3ba98634e7b7d 100644 --- a/src/Symfony/Component/Security/Http/Event/InteractiveLoginEvent.php +++ b/src/Symfony/Component/Security/Http/Event/InteractiveLoginEvent.php @@ -20,8 +20,8 @@ */ final class InteractiveLoginEvent extends Event { - private Request $request; - private TokenInterface $authenticationToken; + private $request; + private $authenticationToken; public function __construct(Request $request, TokenInterface $authenticationToken) { diff --git a/src/Symfony/Component/Security/Http/Event/LoginFailureEvent.php b/src/Symfony/Component/Security/Http/Event/LoginFailureEvent.php index d3427c687d49d..d621ae99e487a 100644 --- a/src/Symfony/Component/Security/Http/Event/LoginFailureEvent.php +++ b/src/Symfony/Component/Security/Http/Event/LoginFailureEvent.php @@ -28,12 +28,12 @@ */ class LoginFailureEvent extends Event { - private AuthenticationException $exception; - private AuthenticatorInterface $authenticator; - private Request $request; - private ?Response $response; + private $exception; + private $authenticator; + private $request; + private $response; private string $firewallName; - private ?Passport $passport; + private $passport; public function __construct(AuthenticationException $exception, AuthenticatorInterface $authenticator, Request $request, ?Response $response, string $firewallName, Passport $passport = null) { diff --git a/src/Symfony/Component/Security/Http/Event/LoginSuccessEvent.php b/src/Symfony/Component/Security/Http/Event/LoginSuccessEvent.php index 581ec9c7d45eb..2e84677663ba3 100644 --- a/src/Symfony/Component/Security/Http/Event/LoginSuccessEvent.php +++ b/src/Symfony/Component/Security/Http/Event/LoginSuccessEvent.php @@ -31,11 +31,11 @@ */ class LoginSuccessEvent extends Event { - private AuthenticatorInterface $authenticator; - private Passport $passport; - private TokenInterface $authenticatedToken; - private Request $request; - private ?Response $response; + private $authenticator; + private $passport; + private $authenticatedToken; + private $request; + private $response; private string $firewallName; public function __construct(AuthenticatorInterface $authenticator, Passport $passport, TokenInterface $authenticatedToken, Request $request, ?Response $response, string $firewallName) diff --git a/src/Symfony/Component/Security/Http/Event/LogoutEvent.php b/src/Symfony/Component/Security/Http/Event/LogoutEvent.php index 5b5c156da1ed2..7063dd1c33c79 100644 --- a/src/Symfony/Component/Security/Http/Event/LogoutEvent.php +++ b/src/Symfony/Component/Security/Http/Event/LogoutEvent.php @@ -21,9 +21,9 @@ */ class LogoutEvent extends Event { - private Request $request; - private ?Response $response = null; - private ?TokenInterface $token; + private $request; + private $response = null; + private $token; public function __construct(Request $request, ?TokenInterface $token) { diff --git a/src/Symfony/Component/Security/Http/Event/SwitchUserEvent.php b/src/Symfony/Component/Security/Http/Event/SwitchUserEvent.php index cdfe72b6b0886..1bea6c8528644 100644 --- a/src/Symfony/Component/Security/Http/Event/SwitchUserEvent.php +++ b/src/Symfony/Component/Security/Http/Event/SwitchUserEvent.php @@ -23,9 +23,9 @@ */ final class SwitchUserEvent extends Event { - private Request $request; - private UserInterface $targetUser; - private ?TokenInterface $token; + private $request; + private $targetUser; + private $token; public function __construct(Request $request, UserInterface $targetUser, TokenInterface $token = null) { diff --git a/src/Symfony/Component/Security/Http/Event/TokenDeauthenticatedEvent.php b/src/Symfony/Component/Security/Http/Event/TokenDeauthenticatedEvent.php index b75c60eacaa72..b09f4ec1fcdc6 100644 --- a/src/Symfony/Component/Security/Http/Event/TokenDeauthenticatedEvent.php +++ b/src/Symfony/Component/Security/Http/Event/TokenDeauthenticatedEvent.php @@ -30,8 +30,8 @@ */ final class TokenDeauthenticatedEvent extends Event { - private TokenInterface $originalToken; - private Request $request; + private $originalToken; + private $request; public function __construct(TokenInterface $originalToken, Request $request) { diff --git a/src/Symfony/Component/Security/Http/EventListener/CheckCredentialsListener.php b/src/Symfony/Component/Security/Http/EventListener/CheckCredentialsListener.php index 2276d63ea05eb..c109694607167 100644 --- a/src/Symfony/Component/Security/Http/EventListener/CheckCredentialsListener.php +++ b/src/Symfony/Component/Security/Http/EventListener/CheckCredentialsListener.php @@ -31,7 +31,7 @@ */ class CheckCredentialsListener implements EventSubscriberInterface { - private PasswordHasherFactoryInterface $hasherFactory; + private $hasherFactory; public function __construct(PasswordHasherFactoryInterface $hasherFactory) { diff --git a/src/Symfony/Component/Security/Http/EventListener/CheckRememberMeConditionsListener.php b/src/Symfony/Component/Security/Http/EventListener/CheckRememberMeConditionsListener.php index 2712c90b988fe..be88cd0533544 100644 --- a/src/Symfony/Component/Security/Http/EventListener/CheckRememberMeConditionsListener.php +++ b/src/Symfony/Component/Security/Http/EventListener/CheckRememberMeConditionsListener.php @@ -36,7 +36,7 @@ class CheckRememberMeConditionsListener implements EventSubscriberInterface { private array $options; - private ?LoggerInterface $logger; + private $logger; public function __construct(array $options = [], LoggerInterface $logger = null) { diff --git a/src/Symfony/Component/Security/Http/EventListener/CsrfProtectionListener.php b/src/Symfony/Component/Security/Http/EventListener/CsrfProtectionListener.php index c36ec580a6777..91f46f3697281 100644 --- a/src/Symfony/Component/Security/Http/EventListener/CsrfProtectionListener.php +++ b/src/Symfony/Component/Security/Http/EventListener/CsrfProtectionListener.php @@ -25,7 +25,7 @@ */ class CsrfProtectionListener implements EventSubscriberInterface { - private CsrfTokenManagerInterface $csrfTokenManager; + private $csrfTokenManager; public function __construct(CsrfTokenManagerInterface $csrfTokenManager) { diff --git a/src/Symfony/Component/Security/Http/EventListener/CsrfTokenClearingLogoutListener.php b/src/Symfony/Component/Security/Http/EventListener/CsrfTokenClearingLogoutListener.php index 032821a18b69e..984041ee3c1af 100644 --- a/src/Symfony/Component/Security/Http/EventListener/CsrfTokenClearingLogoutListener.php +++ b/src/Symfony/Component/Security/Http/EventListener/CsrfTokenClearingLogoutListener.php @@ -22,7 +22,7 @@ */ class CsrfTokenClearingLogoutListener implements EventSubscriberInterface { - private ClearableTokenStorageInterface $csrfTokenStorage; + private $csrfTokenStorage; public function __construct(ClearableTokenStorageInterface $csrfTokenStorage) { diff --git a/src/Symfony/Component/Security/Http/EventListener/DefaultLogoutListener.php b/src/Symfony/Component/Security/Http/EventListener/DefaultLogoutListener.php index aa5496e61e4af..c668283ea3d3e 100644 --- a/src/Symfony/Component/Security/Http/EventListener/DefaultLogoutListener.php +++ b/src/Symfony/Component/Security/Http/EventListener/DefaultLogoutListener.php @@ -25,7 +25,7 @@ */ class DefaultLogoutListener implements EventSubscriberInterface { - private HttpUtils $httpUtils; + private $httpUtils; private string $targetUrl; public function __construct(HttpUtils $httpUtils, string $targetUrl = '/') diff --git a/src/Symfony/Component/Security/Http/EventListener/LoginThrottlingListener.php b/src/Symfony/Component/Security/Http/EventListener/LoginThrottlingListener.php index 920137174e556..2284f9321eab1 100644 --- a/src/Symfony/Component/Security/Http/EventListener/LoginThrottlingListener.php +++ b/src/Symfony/Component/Security/Http/EventListener/LoginThrottlingListener.php @@ -25,8 +25,8 @@ */ final class LoginThrottlingListener implements EventSubscriberInterface { - private RequestStack $requestStack; - private RequestRateLimiterInterface $limiter; + private $requestStack; + private $limiter; public function __construct(RequestStack $requestStack, RequestRateLimiterInterface $limiter) { diff --git a/src/Symfony/Component/Security/Http/EventListener/PasswordMigratingListener.php b/src/Symfony/Component/Security/Http/EventListener/PasswordMigratingListener.php index a3caace384860..c63fcd74f1834 100644 --- a/src/Symfony/Component/Security/Http/EventListener/PasswordMigratingListener.php +++ b/src/Symfony/Component/Security/Http/EventListener/PasswordMigratingListener.php @@ -27,7 +27,7 @@ */ class PasswordMigratingListener implements EventSubscriberInterface { - private PasswordHasherFactoryInterface $hasherFactory; + private $hasherFactory; public function __construct(PasswordHasherFactoryInterface $hasherFactory) { diff --git a/src/Symfony/Component/Security/Http/EventListener/RememberMeListener.php b/src/Symfony/Component/Security/Http/EventListener/RememberMeListener.php index c867f6674a2f8..510eca6548749 100644 --- a/src/Symfony/Component/Security/Http/EventListener/RememberMeListener.php +++ b/src/Symfony/Component/Security/Http/EventListener/RememberMeListener.php @@ -34,8 +34,8 @@ */ class RememberMeListener implements EventSubscriberInterface { - private RememberMeHandlerInterface $rememberMeHandler; - private ?LoggerInterface $logger; + private $rememberMeHandler; + private $logger; public function __construct(RememberMeHandlerInterface $rememberMeHandler, LoggerInterface $logger = null) { diff --git a/src/Symfony/Component/Security/Http/EventListener/SessionStrategyListener.php b/src/Symfony/Component/Security/Http/EventListener/SessionStrategyListener.php index 09c20abc51dd1..b1ba2889d614c 100644 --- a/src/Symfony/Component/Security/Http/EventListener/SessionStrategyListener.php +++ b/src/Symfony/Component/Security/Http/EventListener/SessionStrategyListener.php @@ -27,7 +27,7 @@ */ class SessionStrategyListener implements EventSubscriberInterface { - private SessionAuthenticationStrategyInterface $sessionAuthenticationStrategy; + private $sessionAuthenticationStrategy; public function __construct(SessionAuthenticationStrategyInterface $sessionAuthenticationStrategy) { diff --git a/src/Symfony/Component/Security/Http/EventListener/UserCheckerListener.php b/src/Symfony/Component/Security/Http/EventListener/UserCheckerListener.php index 6a1d4c549cd85..0f972890b9c17 100644 --- a/src/Symfony/Component/Security/Http/EventListener/UserCheckerListener.php +++ b/src/Symfony/Component/Security/Http/EventListener/UserCheckerListener.php @@ -25,7 +25,7 @@ */ class UserCheckerListener implements EventSubscriberInterface { - private UserCheckerInterface $userChecker; + private $userChecker; public function __construct(UserCheckerInterface $userChecker) { diff --git a/src/Symfony/Component/Security/Http/EventListener/UserProviderListener.php b/src/Symfony/Component/Security/Http/EventListener/UserProviderListener.php index eb2c3d05ab139..53144cedb5492 100644 --- a/src/Symfony/Component/Security/Http/EventListener/UserProviderListener.php +++ b/src/Symfony/Component/Security/Http/EventListener/UserProviderListener.php @@ -25,7 +25,7 @@ */ class UserProviderListener { - private UserProviderInterface $userProvider; + private $userProvider; public function __construct(UserProviderInterface $userProvider) { diff --git a/src/Symfony/Component/Security/Http/Firewall.php b/src/Symfony/Component/Security/Http/Firewall.php index 0c313f8f09b5e..546b77d22fca2 100644 --- a/src/Symfony/Component/Security/Http/Firewall.php +++ b/src/Symfony/Component/Security/Http/Firewall.php @@ -32,8 +32,8 @@ */ class Firewall implements EventSubscriberInterface { - private FirewallMapInterface $map; - private EventDispatcherInterface $dispatcher; + private $map; + private $dispatcher; /** * @var \SplObjectStorage diff --git a/src/Symfony/Component/Security/Http/Firewall/AccessListener.php b/src/Symfony/Component/Security/Http/Firewall/AccessListener.php index d33f3f265d21c..180222958b0ac 100644 --- a/src/Symfony/Component/Security/Http/Firewall/AccessListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/AccessListener.php @@ -30,9 +30,9 @@ */ class AccessListener extends AbstractListener { - private TokenStorageInterface $tokenStorage; - private AccessDecisionManagerInterface $accessDecisionManager; - private AccessMapInterface $map; + private $tokenStorage; + private $accessDecisionManager; + private $map; public function __construct(TokenStorageInterface $tokenStorage, AccessDecisionManagerInterface $accessDecisionManager, AccessMapInterface $map, bool $exceptionOnNoToken = false) { diff --git a/src/Symfony/Component/Security/Http/Firewall/AuthenticatorManagerListener.php b/src/Symfony/Component/Security/Http/Firewall/AuthenticatorManagerListener.php index 2e77b95e25625..408f80c95a7a4 100644 --- a/src/Symfony/Component/Security/Http/Firewall/AuthenticatorManagerListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/AuthenticatorManagerListener.php @@ -22,7 +22,7 @@ */ class AuthenticatorManagerListener extends AbstractListener { - private AuthenticatorManagerInterface $authenticatorManager; + private $authenticatorManager; public function __construct(AuthenticatorManagerInterface $authenticationManager) { diff --git a/src/Symfony/Component/Security/Http/Firewall/ChannelListener.php b/src/Symfony/Component/Security/Http/Firewall/ChannelListener.php index 48ba8b159cac2..480149494fdab 100644 --- a/src/Symfony/Component/Security/Http/Firewall/ChannelListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/ChannelListener.php @@ -27,8 +27,8 @@ */ class ChannelListener extends AbstractListener { - private AccessMapInterface $map; - private ?LoggerInterface $logger; + private $map; + private $logger; private int $httpPort; private int $httpsPort; diff --git a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php index e7c8e0a25c367..6cb6a4b42c116 100644 --- a/src/Symfony/Component/Security/Http/Firewall/ContextListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/ContextListener.php @@ -43,13 +43,13 @@ */ class ContextListener extends AbstractListener { - private TokenStorageInterface $tokenStorage; + private $tokenStorage; private string $sessionKey; - private ?LoggerInterface $logger; + private $logger; private iterable $userProviders; - private ?EventDispatcherInterface $dispatcher; + private $dispatcher; private bool $registered = false; - private AuthenticationTrustResolverInterface $trustResolver; + private $trustResolver; private ?\Closure $sessionTrackerEnabler; /** diff --git a/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php b/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php index d763106964a3e..bfdb1adbdd4a1 100644 --- a/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php @@ -47,14 +47,14 @@ class ExceptionListener { use TargetPathTrait; - private TokenStorageInterface $tokenStorage; + private $tokenStorage; private string $firewallName; - private ?AccessDeniedHandlerInterface $accessDeniedHandler; - private ?AuthenticationEntryPointInterface $authenticationEntryPoint; - private AuthenticationTrustResolverInterface $authenticationTrustResolver; + private $accessDeniedHandler; + private $authenticationEntryPoint; + private $authenticationTrustResolver; private ?string $errorPage; - private ?LoggerInterface $logger; - private HttpUtils $httpUtils; + private $logger; + private $httpUtils; private bool $stateless; public function __construct(TokenStorageInterface $tokenStorage, AuthenticationTrustResolverInterface $trustResolver, HttpUtils $httpUtils, string $firewallName, AuthenticationEntryPointInterface $authenticationEntryPoint = null, string $errorPage = null, AccessDeniedHandlerInterface $accessDeniedHandler = null, LoggerInterface $logger = null, bool $stateless = false) diff --git a/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php b/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php index f4532c60bb587..e044ac0748bd1 100644 --- a/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php @@ -32,11 +32,11 @@ */ class LogoutListener extends AbstractListener { - private TokenStorageInterface $tokenStorage; + private $tokenStorage; private array $options; - private HttpUtils $httpUtils; - private ?CsrfTokenManagerInterface $csrfTokenManager; - private EventDispatcherInterface $eventDispatcher; + private $httpUtils; + private $csrfTokenManager; + private $eventDispatcher; /** * @param array $options An array of options to process a logout attempt diff --git a/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php b/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php index 080643eed27bd..194f4a9c8b0a7 100644 --- a/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php +++ b/src/Symfony/Component/Security/Http/Firewall/SwitchUserListener.php @@ -41,15 +41,15 @@ class SwitchUserListener extends AbstractListener { public const EXIT_VALUE = '_exit'; - private TokenStorageInterface $tokenStorage; - private UserProviderInterface $provider; - private UserCheckerInterface $userChecker; + private $tokenStorage; + private $provider; + private $userChecker; private string $firewallName; - private AccessDecisionManagerInterface $accessDecisionManager; + private $accessDecisionManager; private string $usernameParameter; private string $role; - private ?LoggerInterface $logger; - private ?EventDispatcherInterface $dispatcher; + private $logger; + private $dispatcher; private bool $stateless; public function __construct(TokenStorageInterface $tokenStorage, UserProviderInterface $provider, UserCheckerInterface $userChecker, string $firewallName, AccessDecisionManagerInterface $accessDecisionManager, LoggerInterface $logger = null, string $usernameParameter = '_switch_user', string $role = 'ROLE_ALLOWED_TO_SWITCH', EventDispatcherInterface $dispatcher = null, bool $stateless = false) diff --git a/src/Symfony/Component/Security/Http/HttpUtils.php b/src/Symfony/Component/Security/Http/HttpUtils.php index fedbbadd34fb9..42139acb55f1e 100644 --- a/src/Symfony/Component/Security/Http/HttpUtils.php +++ b/src/Symfony/Component/Security/Http/HttpUtils.php @@ -27,8 +27,8 @@ */ class HttpUtils { - private ?UrlGeneratorInterface $urlGenerator; - private UrlMatcherInterface|RequestMatcherInterface|null $urlMatcher; + private $urlGenerator; + private $urlMatcher; private ?string $domainRegexp; private ?string $secureDomainRegexp; diff --git a/src/Symfony/Component/Security/Http/Impersonate/ImpersonateUrlGenerator.php b/src/Symfony/Component/Security/Http/Impersonate/ImpersonateUrlGenerator.php index 8ea7efb9763a8..b560e553a3d1f 100644 --- a/src/Symfony/Component/Security/Http/Impersonate/ImpersonateUrlGenerator.php +++ b/src/Symfony/Component/Security/Http/Impersonate/ImpersonateUrlGenerator.php @@ -25,9 +25,9 @@ */ class ImpersonateUrlGenerator { - private RequestStack $requestStack; - private TokenStorageInterface $tokenStorage; - private FirewallMap $firewallMap; + private $requestStack; + private $tokenStorage; + private $firewallMap; public function __construct(RequestStack $requestStack, FirewallMap $firewallMap, TokenStorageInterface $tokenStorage) { diff --git a/src/Symfony/Component/Security/Http/LoginLink/LoginLinkHandler.php b/src/Symfony/Component/Security/Http/LoginLink/LoginLinkHandler.php index c7b079cd13215..a803811c80ef2 100644 --- a/src/Symfony/Component/Security/Http/LoginLink/LoginLinkHandler.php +++ b/src/Symfony/Component/Security/Http/LoginLink/LoginLinkHandler.php @@ -28,10 +28,10 @@ */ final class LoginLinkHandler implements LoginLinkHandlerInterface { - private UrlGeneratorInterface $urlGenerator; - private UserProviderInterface $userProvider; + private $urlGenerator; + private $userProvider; private array $options; - private SignatureHasher $signatureHashUtil; + private $signatureHashUtil; public function __construct(UrlGeneratorInterface $urlGenerator, UserProviderInterface $userProvider, SignatureHasher $signatureHashUtil, array $options) { diff --git a/src/Symfony/Component/Security/Http/LoginLink/LoginLinkNotification.php b/src/Symfony/Component/Security/Http/LoginLink/LoginLinkNotification.php index 1f20cdf5f943c..85cdd7931bbf3 100644 --- a/src/Symfony/Component/Security/Http/LoginLink/LoginLinkNotification.php +++ b/src/Symfony/Component/Security/Http/LoginLink/LoginLinkNotification.php @@ -28,7 +28,7 @@ */ class LoginLinkNotification extends Notification implements EmailNotificationInterface, SmsNotificationInterface { - private LoginLinkDetails $loginLinkDetails; + private $loginLinkDetails; public function __construct(LoginLinkDetails $loginLinkDetails, string $subject, array $channels = []) { diff --git a/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php b/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php index 66b8df5fcbd7d..2cbeae6a4d1be 100644 --- a/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php +++ b/src/Symfony/Component/Security/Http/Logout/LogoutUrlGenerator.php @@ -24,9 +24,9 @@ */ class LogoutUrlGenerator { - private ?RequestStack $requestStack; - private ?UrlGeneratorInterface $router; - private ?TokenStorageInterface $tokenStorage; + private $requestStack; + private $router; + private $tokenStorage; private array $listeners = []; private ?string $currentFirewallName = null; private ?string $currentFirewallContext = null; diff --git a/src/Symfony/Component/Security/Http/RateLimiter/DefaultLoginRateLimiter.php b/src/Symfony/Component/Security/Http/RateLimiter/DefaultLoginRateLimiter.php index 9f496971d5275..7d6ed106ad7e7 100644 --- a/src/Symfony/Component/Security/Http/RateLimiter/DefaultLoginRateLimiter.php +++ b/src/Symfony/Component/Security/Http/RateLimiter/DefaultLoginRateLimiter.php @@ -26,8 +26,8 @@ */ final class DefaultLoginRateLimiter extends AbstractRequestRateLimiter { - private RateLimiterFactory $globalFactory; - private RateLimiterFactory $localFactory; + private $globalFactory; + private $localFactory; public function __construct(RateLimiterFactory $globalFactory, RateLimiterFactory $localFactory) { diff --git a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeHandler.php b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeHandler.php index cd2e24ca9e735..3b0de2d7e7865 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeHandler.php +++ b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeHandler.php @@ -23,7 +23,7 @@ */ abstract class AbstractRememberMeHandler implements RememberMeHandlerInterface { - private UserProviderInterface $userProvider; + private $userProvider; protected $requestStack; protected $options; protected $logger; diff --git a/src/Symfony/Component/Security/Http/RememberMe/PersistentRememberMeHandler.php b/src/Symfony/Component/Security/Http/RememberMe/PersistentRememberMeHandler.php index 708171e87a11b..213d797a4c203 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/PersistentRememberMeHandler.php +++ b/src/Symfony/Component/Security/Http/RememberMe/PersistentRememberMeHandler.php @@ -32,8 +32,8 @@ */ final class PersistentRememberMeHandler extends AbstractRememberMeHandler { - private TokenProviderInterface $tokenProvider; - private ?TokenVerifierInterface $tokenVerifier; + private $tokenProvider; + private $tokenVerifier; private string $secret; public function __construct(TokenProviderInterface $tokenProvider, string $secret, UserProviderInterface $userProvider, RequestStack $requestStack, array $options, LoggerInterface $logger = null, TokenVerifierInterface $tokenVerifier = null) diff --git a/src/Symfony/Component/Security/Http/RememberMe/SignatureRememberMeHandler.php b/src/Symfony/Component/Security/Http/RememberMe/SignatureRememberMeHandler.php index cab305788a07d..6e783a20ffcc2 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/SignatureRememberMeHandler.php +++ b/src/Symfony/Component/Security/Http/RememberMe/SignatureRememberMeHandler.php @@ -32,7 +32,7 @@ */ final class SignatureRememberMeHandler extends AbstractRememberMeHandler { - private SignatureHasher $signatureHasher; + private $signatureHasher; public function __construct(SignatureHasher $signatureHasher, UserProviderInterface $userProvider, RequestStack $requestStack, array $options, LoggerInterface $logger = null) { diff --git a/src/Symfony/Component/Security/Http/Tests/Authenticator/AbstractAuthenticatorTest.php b/src/Symfony/Component/Security/Http/Tests/Authenticator/AbstractAuthenticatorTest.php index 9562589581b5e..e7af32d226a21 100644 --- a/src/Symfony/Component/Security/Http/Tests/Authenticator/AbstractAuthenticatorTest.php +++ b/src/Symfony/Component/Security/Http/Tests/Authenticator/AbstractAuthenticatorTest.php @@ -20,7 +20,6 @@ use Symfony\Component\Security\Http\Authenticator\AbstractAuthenticator; use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge; use Symfony\Component\Security\Http\Authenticator\Passport\Passport; -use Symfony\Component\Security\Http\Authenticator\Passport\PassportInterface; use Symfony\Component\Security\Http\Authenticator\Passport\SelfValidatingPassport; use Symfony\Component\Security\Http\Authenticator\Token\PostAuthenticationToken; diff --git a/src/Symfony/Component/Security/Http/Tests/Firewall/AccessListenerTest.php b/src/Symfony/Component/Security/Http/Tests/Firewall/AccessListenerTest.php index 9d383f4bbaa5c..1126edade0915 100644 --- a/src/Symfony/Component/Security/Http/Tests/Firewall/AccessListenerTest.php +++ b/src/Symfony/Component/Security/Http/Tests/Firewall/AccessListenerTest.php @@ -19,7 +19,6 @@ use Symfony\Component\Security\Core\Authentication\Token\NullToken; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; -use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken; use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface; use Symfony\Component\Security\Core\Authorization\Voter\AuthenticatedVoter; diff --git a/src/Symfony/Component/String/Resources/WcswidthDataGenerator.php b/src/Symfony/Component/String/Resources/WcswidthDataGenerator.php index 10e68d92f9f04..96d73bf0fbf04 100644 --- a/src/Symfony/Component/String/Resources/WcswidthDataGenerator.php +++ b/src/Symfony/Component/String/Resources/WcswidthDataGenerator.php @@ -14,7 +14,6 @@ use Symfony\Component\HttpClient\HttpClient; use Symfony\Component\String\Exception\RuntimeException; use Symfony\Component\VarExporter\VarExporter; -use Symfony\Contracts\HttpClient\HttpClientInterface; /** * @internal @@ -22,7 +21,7 @@ final class WcswidthDataGenerator { private string $outDir; - private HttpClientInterface $client; + private $client; public function __construct(string $outDir) { diff --git a/src/Symfony/Component/Templating/PhpEngine.php b/src/Symfony/Component/Templating/PhpEngine.php index 79aa1076ebbfd..755da43d088b7 100644 --- a/src/Symfony/Component/Templating/PhpEngine.php +++ b/src/Symfony/Component/Templating/PhpEngine.php @@ -41,7 +41,7 @@ class PhpEngine implements EngineInterface, \ArrayAccess protected $globals = []; protected $parser; - private Storage $evalTemplate; + private $evalTemplate; private array $evalParameters; /** diff --git a/src/Symfony/Component/Translation/Bridge/Crowdin/CrowdinProvider.php b/src/Symfony/Component/Translation/Bridge/Crowdin/CrowdinProvider.php index 1448a625e829e..7de61495fee62 100644 --- a/src/Symfony/Component/Translation/Bridge/Crowdin/CrowdinProvider.php +++ b/src/Symfony/Component/Translation/Bridge/Crowdin/CrowdinProvider.php @@ -31,10 +31,10 @@ */ final class CrowdinProvider implements ProviderInterface { - private HttpClientInterface $client; - private LoaderInterface $loader; - private LoggerInterface $logger; - private XliffFileDumper $xliffFileDumper; + private $client; + private $loader; + private $logger; + private $xliffFileDumper; private string $defaultLocale; private string $endpoint; diff --git a/src/Symfony/Component/Translation/Bridge/Crowdin/CrowdinProviderFactory.php b/src/Symfony/Component/Translation/Bridge/Crowdin/CrowdinProviderFactory.php index 2b038ed19b79e..d31f121ebb9fb 100644 --- a/src/Symfony/Component/Translation/Bridge/Crowdin/CrowdinProviderFactory.php +++ b/src/Symfony/Component/Translation/Bridge/Crowdin/CrowdinProviderFactory.php @@ -27,11 +27,11 @@ final class CrowdinProviderFactory extends AbstractProviderFactory { private const HOST = 'api.crowdin.com'; - private LoaderInterface $loader; - private HttpClientInterface $client; - private LoggerInterface $logger; + private $loader; + private $client; + private $logger; private string $defaultLocale; - private XliffFileDumper $xliffFileDumper; + private $xliffFileDumper; public function __construct(HttpClientInterface $client, LoggerInterface $logger, string $defaultLocale, LoaderInterface $loader, XliffFileDumper $xliffFileDumper) { diff --git a/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php b/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php index 43ab1589da911..dec67ac41d428 100644 --- a/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php +++ b/src/Symfony/Component/Translation/Bridge/Loco/LocoProvider.php @@ -30,9 +30,9 @@ */ final class LocoProvider implements ProviderInterface { - private HttpClientInterface $client; - private LoaderInterface $loader; - private LoggerInterface $logger; + private $client; + private $loader; + private $logger; private string $defaultLocale; private string $endpoint; diff --git a/src/Symfony/Component/Translation/Bridge/Loco/LocoProviderFactory.php b/src/Symfony/Component/Translation/Bridge/Loco/LocoProviderFactory.php index b80d0696aacf9..784f57886ab84 100644 --- a/src/Symfony/Component/Translation/Bridge/Loco/LocoProviderFactory.php +++ b/src/Symfony/Component/Translation/Bridge/Loco/LocoProviderFactory.php @@ -25,10 +25,10 @@ final class LocoProviderFactory extends AbstractProviderFactory { private const HOST = 'localise.biz'; - private HttpClientInterface $client; - private LoggerInterface $logger; + private $client; + private $logger; private string $defaultLocale; - private LoaderInterface $loader; + private $loader; public function __construct(HttpClientInterface $client, LoggerInterface $logger, string $defaultLocale, LoaderInterface $loader) { diff --git a/src/Symfony/Component/Translation/Bridge/Lokalise/LokaliseProvider.php b/src/Symfony/Component/Translation/Bridge/Lokalise/LokaliseProvider.php index a27d73d3b66e1..a882059ba244a 100644 --- a/src/Symfony/Component/Translation/Bridge/Lokalise/LokaliseProvider.php +++ b/src/Symfony/Component/Translation/Bridge/Lokalise/LokaliseProvider.php @@ -30,9 +30,9 @@ */ final class LokaliseProvider implements ProviderInterface { - private HttpClientInterface $client; - private LoaderInterface $loader; - private LoggerInterface $logger; + private $client; + private $loader; + private $logger; private string $defaultLocale; private string $endpoint; diff --git a/src/Symfony/Component/Translation/Bridge/Lokalise/LokaliseProviderFactory.php b/src/Symfony/Component/Translation/Bridge/Lokalise/LokaliseProviderFactory.php index 0b8c3d7c00aa3..d9b24a257335e 100644 --- a/src/Symfony/Component/Translation/Bridge/Lokalise/LokaliseProviderFactory.php +++ b/src/Symfony/Component/Translation/Bridge/Lokalise/LokaliseProviderFactory.php @@ -25,10 +25,10 @@ final class LokaliseProviderFactory extends AbstractProviderFactory { private const HOST = 'api.lokalise.com'; - private HttpClientInterface $client; - private LoggerInterface $logger; + private $client; + private $logger; private string $defaultLocale; - private LoaderInterface $loader; + private $loader; public function __construct(HttpClientInterface $client, LoggerInterface $logger, string $defaultLocale, LoaderInterface $loader) { diff --git a/src/Symfony/Component/Translation/Command/TranslationPullCommand.php b/src/Symfony/Component/Translation/Command/TranslationPullCommand.php index 0e055b45a60f7..7d9da1c0e837a 100644 --- a/src/Symfony/Component/Translation/Command/TranslationPullCommand.php +++ b/src/Symfony/Component/Translation/Command/TranslationPullCommand.php @@ -34,9 +34,9 @@ final class TranslationPullCommand extends Command { use TranslationTrait; - private TranslationProviderCollection $providerCollection; - private TranslationWriterInterface $writer; - private TranslationReaderInterface $reader; + private $providerCollection; + private $writer; + private $reader; private string $defaultLocale; private array $transPaths; private array $enabledLocales; diff --git a/src/Symfony/Component/Translation/Command/TranslationPushCommand.php b/src/Symfony/Component/Translation/Command/TranslationPushCommand.php index 489040906d7ae..9654ec6a48e28 100644 --- a/src/Symfony/Component/Translation/Command/TranslationPushCommand.php +++ b/src/Symfony/Component/Translation/Command/TranslationPushCommand.php @@ -33,8 +33,8 @@ final class TranslationPushCommand extends Command { use TranslationTrait; - private TranslationProviderCollection $providers; - private TranslationReaderInterface $reader; + private $providers; + private $reader; private array $transPaths; private array $enabledLocales; diff --git a/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php b/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php index e6676fb4ed14f..a5bc68895c1e6 100644 --- a/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php +++ b/src/Symfony/Component/Translation/DataCollector/TranslationDataCollector.php @@ -25,7 +25,7 @@ */ class TranslationDataCollector extends DataCollector implements LateDataCollectorInterface { - private DataCollectorTranslator $translator; + private $translator; public function __construct(DataCollectorTranslator $translator) { diff --git a/src/Symfony/Component/Translation/DataCollectorTranslator.php b/src/Symfony/Component/Translation/DataCollectorTranslator.php index cab9874608db1..2a08b0960489e 100644 --- a/src/Symfony/Component/Translation/DataCollectorTranslator.php +++ b/src/Symfony/Component/Translation/DataCollectorTranslator.php @@ -25,7 +25,7 @@ class DataCollectorTranslator implements TranslatorInterface, TranslatorBagInter public const MESSAGE_MISSING = 1; public const MESSAGE_EQUALS_FALLBACK = 2; - private TranslatorInterface $translator; + private $translator; private array $messages = []; /** diff --git a/src/Symfony/Component/Translation/Exception/ProviderException.php b/src/Symfony/Component/Translation/Exception/ProviderException.php index 65883f8524f39..331ff7586e023 100644 --- a/src/Symfony/Component/Translation/Exception/ProviderException.php +++ b/src/Symfony/Component/Translation/Exception/ProviderException.php @@ -18,7 +18,7 @@ */ class ProviderException extends RuntimeException implements ProviderExceptionInterface { - private ResponseInterface $response; + private $response; private string $debug; public function __construct(string $message, ResponseInterface $response, int $code = 0, \Exception $previous = null) diff --git a/src/Symfony/Component/Translation/Formatter/MessageFormatter.php b/src/Symfony/Component/Translation/Formatter/MessageFormatter.php index 013ed852b16f6..68821b1d0795e 100644 --- a/src/Symfony/Component/Translation/Formatter/MessageFormatter.php +++ b/src/Symfony/Component/Translation/Formatter/MessageFormatter.php @@ -22,8 +22,8 @@ class_exists(IntlFormatter::class); */ class MessageFormatter implements MessageFormatterInterface, IntlFormatterInterface { - private TranslatorInterface $translator; - private IntlFormatterInterface $intlFormatter; + private $translator; + private $intlFormatter; /** * @param TranslatorInterface|null $translator An identity translator to use as selector for pluralization diff --git a/src/Symfony/Component/Translation/LoggingTranslator.php b/src/Symfony/Component/Translation/LoggingTranslator.php index 8dd8ecf96be29..8c8441cdf711e 100644 --- a/src/Symfony/Component/Translation/LoggingTranslator.php +++ b/src/Symfony/Component/Translation/LoggingTranslator.php @@ -21,8 +21,8 @@ */ class LoggingTranslator implements TranslatorInterface, TranslatorBagInterface, LocaleAwareInterface { - private TranslatorInterface $translator; - private LoggerInterface $logger; + private $translator; + private $logger; /** * @param TranslatorInterface&TranslatorBagInterface&LocaleAwareInterface $translator The translator must implement TranslatorBagInterface diff --git a/src/Symfony/Component/Translation/MessageCatalogue.php b/src/Symfony/Component/Translation/MessageCatalogue.php index 466e2c9e1dd5d..7aa27efdad216 100644 --- a/src/Symfony/Component/Translation/MessageCatalogue.php +++ b/src/Symfony/Component/Translation/MessageCatalogue.php @@ -23,7 +23,7 @@ class MessageCatalogue implements MessageCatalogueInterface, MetadataAwareInterf private array $metadata = []; private array $resources = []; private string $locale; - private ?MessageCatalogueInterface $fallbackCatalogue = null; + private $fallbackCatalogue = null; private ?self $parent = null; /** diff --git a/src/Symfony/Component/Translation/Provider/FilteringProvider.php b/src/Symfony/Component/Translation/Provider/FilteringProvider.php index db02b6adaecc5..a43fedc71ae44 100644 --- a/src/Symfony/Component/Translation/Provider/FilteringProvider.php +++ b/src/Symfony/Component/Translation/Provider/FilteringProvider.php @@ -21,7 +21,7 @@ */ class FilteringProvider implements ProviderInterface { - private ProviderInterface $provider; + private $provider; private array $locales; private array $domains; diff --git a/src/Symfony/Component/Translation/PseudoLocalizationTranslator.php b/src/Symfony/Component/Translation/PseudoLocalizationTranslator.php index 411fcb0c01c87..1d10e0ccb8ed4 100644 --- a/src/Symfony/Component/Translation/PseudoLocalizationTranslator.php +++ b/src/Symfony/Component/Translation/PseudoLocalizationTranslator.php @@ -20,7 +20,7 @@ final class PseudoLocalizationTranslator implements TranslatorInterface { private const EXPANSION_CHARACTER = '~'; - private TranslatorInterface $translator; + private $translator; private bool $accents; private float $expansionFactor; private bool $brackets; diff --git a/src/Symfony/Component/Translation/Test/ProviderFactoryTestCase.php b/src/Symfony/Component/Translation/Test/ProviderFactoryTestCase.php index fe28e7c39c080..d6510e0ddb2c1 100644 --- a/src/Symfony/Component/Translation/Test/ProviderFactoryTestCase.php +++ b/src/Symfony/Component/Translation/Test/ProviderFactoryTestCase.php @@ -31,11 +31,11 @@ */ abstract class ProviderFactoryTestCase extends TestCase { - protected HttpClientInterface $client; - protected LoggerInterface $logger; + protected $client; + protected $logger; protected string $defaultLocale; - protected LoaderInterface $loader; - protected XliffFileDumper $xliffFileDumper; + protected $loader; + protected $xliffFileDumper; abstract public function createFactory(): ProviderFactoryInterface; diff --git a/src/Symfony/Component/Translation/Test/ProviderTestCase.php b/src/Symfony/Component/Translation/Test/ProviderTestCase.php index 3996b5ca3006d..dd72bffb7acbe 100644 --- a/src/Symfony/Component/Translation/Test/ProviderTestCase.php +++ b/src/Symfony/Component/Translation/Test/ProviderTestCase.php @@ -29,11 +29,11 @@ */ abstract class ProviderTestCase extends TestCase { - protected HttpClientInterface $client; - protected LoggerInterface $logger; + protected $client; + protected $logger; protected string $defaultLocale; - protected LoaderInterface $loader; - protected XliffFileDumper $xliffFileDumper; + protected $loader; + protected $xliffFileDumper; abstract public function createProvider(HttpClientInterface $client, LoaderInterface $loader, LoggerInterface $logger, string $defaultLocale, string $endpoint): ProviderInterface; diff --git a/src/Symfony/Component/Translation/Translator.php b/src/Symfony/Component/Translation/Translator.php index ba7126d5d1f82..05e84d0cc049f 100644 --- a/src/Symfony/Component/Translation/Translator.php +++ b/src/Symfony/Component/Translation/Translator.php @@ -51,7 +51,7 @@ class Translator implements TranslatorInterface, TranslatorBagInterface, LocaleA private array $resources = []; - private MessageFormatterInterface $formatter; + private $formatter; private ?string $cacheDir; @@ -59,7 +59,7 @@ class Translator implements TranslatorInterface, TranslatorBagInterface, LocaleA private array $cacheVary; - private ?ConfigCacheFactoryInterface $configCacheFactory; + private $configCacheFactory; private array $parentLocales; diff --git a/src/Symfony/Component/Uid/Command/GenerateUlidCommand.php b/src/Symfony/Component/Uid/Command/GenerateUlidCommand.php index 1b22a0843132d..45002d680f879 100644 --- a/src/Symfony/Component/Uid/Command/GenerateUlidCommand.php +++ b/src/Symfony/Component/Uid/Command/GenerateUlidCommand.php @@ -31,7 +31,7 @@ class GenerateUlidCommand extends Command 'rfc4122', ]; - private UlidFactory $factory; + private $factory; public function __construct(UlidFactory $factory = null) { diff --git a/src/Symfony/Component/Uid/Command/GenerateUuidCommand.php b/src/Symfony/Component/Uid/Command/GenerateUuidCommand.php index fd77b439d6f1d..8cae9a17eaa8f 100644 --- a/src/Symfony/Component/Uid/Command/GenerateUuidCommand.php +++ b/src/Symfony/Component/Uid/Command/GenerateUuidCommand.php @@ -26,7 +26,7 @@ #[AsCommand(name: 'uuid:generate', description: 'Generate a UUID')] class GenerateUuidCommand extends Command { - private UuidFactory $factory; + private $factory; public function __construct(UuidFactory $factory = null) { diff --git a/src/Symfony/Component/Uid/Factory/NameBasedUuidFactory.php b/src/Symfony/Component/Uid/Factory/NameBasedUuidFactory.php index e367d8e26f83e..81a5cf66cf620 100644 --- a/src/Symfony/Component/Uid/Factory/NameBasedUuidFactory.php +++ b/src/Symfony/Component/Uid/Factory/NameBasedUuidFactory.php @@ -18,7 +18,7 @@ class NameBasedUuidFactory { private string $class; - private Uuid $namespace; + private $namespace; public function __construct(string $class, Uuid $namespace) { diff --git a/src/Symfony/Component/Uid/Factory/TimeBasedUuidFactory.php b/src/Symfony/Component/Uid/Factory/TimeBasedUuidFactory.php index 5074dc2ba766b..da712c37d5f09 100644 --- a/src/Symfony/Component/Uid/Factory/TimeBasedUuidFactory.php +++ b/src/Symfony/Component/Uid/Factory/TimeBasedUuidFactory.php @@ -18,7 +18,7 @@ class TimeBasedUuidFactory { private string $class; - private ?Uuid $node; + private $node; public function __construct(string $class, Uuid $node = null) { diff --git a/src/Symfony/Component/Uid/Factory/UuidFactory.php b/src/Symfony/Component/Uid/Factory/UuidFactory.php index 279c0d5ce9bf7..ca92e8e04ad36 100644 --- a/src/Symfony/Component/Uid/Factory/UuidFactory.php +++ b/src/Symfony/Component/Uid/Factory/UuidFactory.php @@ -23,8 +23,8 @@ class UuidFactory private string $timeBasedClass; private string $nameBasedClass; private string $randomBasedClass; - private ?Uuid $timeBasedNode; - private ?Uuid $nameBasedNamespace; + private $timeBasedNode; + private $nameBasedNamespace; public function __construct(string|int $defaultClass = UuidV6::class, string|int $timeBasedClass = UuidV6::class, string|int $nameBasedClass = UuidV5::class, string|int $randomBasedClass = UuidV4::class, Uuid|string $timeBasedNode = null, Uuid|string $nameBasedNamespace = null) { diff --git a/src/Symfony/Component/Validator/Command/DebugCommand.php b/src/Symfony/Component/Validator/Command/DebugCommand.php index 2c7bdc3852ad1..454fb4c27e2b2 100644 --- a/src/Symfony/Component/Validator/Command/DebugCommand.php +++ b/src/Symfony/Component/Validator/Command/DebugCommand.php @@ -34,7 +34,7 @@ #[AsCommand(name: 'debug:validator', description: 'Display validation constraints for classes')] class DebugCommand extends Command { - private MetadataFactoryInterface $validator; + private $validator; public function __construct(MetadataFactoryInterface $validator) { diff --git a/src/Symfony/Component/Validator/ConstraintViolation.php b/src/Symfony/Component/Validator/ConstraintViolation.php index 713248c0f915a..a5ce13f58937b 100644 --- a/src/Symfony/Component/Validator/ConstraintViolation.php +++ b/src/Symfony/Component/Validator/ConstraintViolation.php @@ -25,7 +25,7 @@ class ConstraintViolation implements ConstraintViolationInterface private mixed $root; private ?string $propertyPath; private mixed $invalidValue; - private ?Constraint $constraint; + private $constraint; private ?string $code; private mixed $cause; diff --git a/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php b/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php index 0b06b54a6c6ad..a22263683c8e5 100644 --- a/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php +++ b/src/Symfony/Component/Validator/Constraints/AbstractComparisonValidator.php @@ -27,7 +27,7 @@ */ abstract class AbstractComparisonValidator extends ConstraintValidator { - private ?PropertyAccessorInterface $propertyAccessor; + private $propertyAccessor; public function __construct(PropertyAccessorInterface $propertyAccessor = null) { diff --git a/src/Symfony/Component/Validator/Constraints/BicValidator.php b/src/Symfony/Component/Validator/Constraints/BicValidator.php index 48df39cd22acc..6596fe3c6a9a7 100644 --- a/src/Symfony/Component/Validator/Constraints/BicValidator.php +++ b/src/Symfony/Component/Validator/Constraints/BicValidator.php @@ -48,7 +48,7 @@ class BicValidator extends ConstraintValidator 'VG' => 'GB', // British Virgin Islands ]; - private ?PropertyAccessor $propertyAccessor; + private $propertyAccessor; public function __construct(PropertyAccessor $propertyAccessor = null) { diff --git a/src/Symfony/Component/Validator/Constraints/ExpressionLanguageSyntaxValidator.php b/src/Symfony/Component/Validator/Constraints/ExpressionLanguageSyntaxValidator.php index d3908cd449cc2..70837572748d8 100644 --- a/src/Symfony/Component/Validator/Constraints/ExpressionLanguageSyntaxValidator.php +++ b/src/Symfony/Component/Validator/Constraints/ExpressionLanguageSyntaxValidator.php @@ -23,7 +23,7 @@ */ class ExpressionLanguageSyntaxValidator extends ConstraintValidator { - private ?ExpressionLanguage $expressionLanguage; + private $expressionLanguage; public function __construct(ExpressionLanguage $expressionLanguage = null) { diff --git a/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php b/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php index 472f1d6aecb2f..5a56631a0d1e7 100644 --- a/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php +++ b/src/Symfony/Component/Validator/Constraints/ExpressionValidator.php @@ -22,7 +22,7 @@ */ class ExpressionValidator extends ConstraintValidator { - private ?ExpressionLanguage $expressionLanguage; + private $expressionLanguage; public function __construct(ExpressionLanguage $expressionLanguage = null) { diff --git a/src/Symfony/Component/Validator/Constraints/NotCompromisedPasswordValidator.php b/src/Symfony/Component/Validator/Constraints/NotCompromisedPasswordValidator.php index d0bd8a5566f40..52008de398a3c 100644 --- a/src/Symfony/Component/Validator/Constraints/NotCompromisedPasswordValidator.php +++ b/src/Symfony/Component/Validator/Constraints/NotCompromisedPasswordValidator.php @@ -31,7 +31,7 @@ class NotCompromisedPasswordValidator extends ConstraintValidator { private const DEFAULT_API_ENDPOINT = 'https://api.pwnedpasswords.com/range/%s'; - private HttpClientInterface $httpClient; + private $httpClient; private string $charset; private bool $enabled; private string $endpoint; diff --git a/src/Symfony/Component/Validator/Constraints/RangeValidator.php b/src/Symfony/Component/Validator/Constraints/RangeValidator.php index ce86486d90b38..cfc10a22d38f5 100644 --- a/src/Symfony/Component/Validator/Constraints/RangeValidator.php +++ b/src/Symfony/Component/Validator/Constraints/RangeValidator.php @@ -24,7 +24,7 @@ */ class RangeValidator extends ConstraintValidator { - private ?PropertyAccessorInterface $propertyAccessor; + private $propertyAccessor; public function __construct(PropertyAccessorInterface $propertyAccessor = null) { diff --git a/src/Symfony/Component/Validator/ContainerConstraintValidatorFactory.php b/src/Symfony/Component/Validator/ContainerConstraintValidatorFactory.php index a609f3eb7dfc3..8dc1836dbc007 100644 --- a/src/Symfony/Component/Validator/ContainerConstraintValidatorFactory.php +++ b/src/Symfony/Component/Validator/ContainerConstraintValidatorFactory.php @@ -22,7 +22,7 @@ */ class ContainerConstraintValidatorFactory implements ConstraintValidatorFactoryInterface { - private ContainerInterface $container; + private $container; private array $validators; public function __construct(ContainerInterface $container) diff --git a/src/Symfony/Component/Validator/Context/ExecutionContext.php b/src/Symfony/Component/Validator/Context/ExecutionContext.php index b9cd83822b160..e79b655a4a309 100644 --- a/src/Symfony/Component/Validator/Context/ExecutionContext.php +++ b/src/Symfony/Component/Validator/Context/ExecutionContext.php @@ -37,20 +37,20 @@ */ class ExecutionContext implements ExecutionContextInterface { - private ValidatorInterface $validator; + private $validator; /** * The root value of the validated object graph. */ private mixed $root; - private TranslatorInterface $translator; + private $translator; private ?string $translationDomain; /** * The violations generated in the current context. */ - private ConstraintViolationList $violations; + private $violations; /** * The currently validated value. @@ -70,7 +70,7 @@ class ExecutionContext implements ExecutionContextInterface /** * The current validation metadata. */ - private ?MetadataInterface $metadata = null; + private $metadata = null; /** * The currently validated group. @@ -80,7 +80,7 @@ class ExecutionContext implements ExecutionContextInterface /** * The currently validated constraint. */ - private ?Constraint $constraint = null; + private $constraint = null; /** * Stores which objects have been validated in which group. diff --git a/src/Symfony/Component/Validator/Context/ExecutionContextFactory.php b/src/Symfony/Component/Validator/Context/ExecutionContextFactory.php index 4a20eefb3465c..b307692bc2b18 100644 --- a/src/Symfony/Component/Validator/Context/ExecutionContextFactory.php +++ b/src/Symfony/Component/Validator/Context/ExecutionContextFactory.php @@ -23,7 +23,7 @@ */ class ExecutionContextFactory implements ExecutionContextFactoryInterface { - private TranslatorInterface $translator; + private $translator; private ?string $translationDomain; public function __construct(TranslatorInterface $translator, string $translationDomain = null) diff --git a/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php b/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php index 519cd4cc9437e..2b36267fbec4e 100644 --- a/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php +++ b/src/Symfony/Component/Validator/DataCollector/ValidatorDataCollector.php @@ -29,7 +29,7 @@ */ class ValidatorDataCollector extends DataCollector implements LateDataCollectorInterface { - private TraceableValidator $validator; + private $validator; public function __construct(TraceableValidator $validator) { diff --git a/src/Symfony/Component/Validator/Exception/ValidationFailedException.php b/src/Symfony/Component/Validator/Exception/ValidationFailedException.php index 8d191699e81c6..dbc7d22f58d84 100644 --- a/src/Symfony/Component/Validator/Exception/ValidationFailedException.php +++ b/src/Symfony/Component/Validator/Exception/ValidationFailedException.php @@ -18,7 +18,7 @@ */ class ValidationFailedException extends RuntimeException { - private ConstraintViolationListInterface $violations; + private $violations; private mixed $value; public function __construct(mixed $value, ConstraintViolationListInterface $violations) diff --git a/src/Symfony/Component/Validator/Mapping/Loader/PropertyInfoLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/PropertyInfoLoader.php index 0ace5756c74a0..5c3989162cdff 100644 --- a/src/Symfony/Component/Validator/Mapping/Loader/PropertyInfoLoader.php +++ b/src/Symfony/Component/Validator/Mapping/Loader/PropertyInfoLoader.php @@ -31,9 +31,9 @@ final class PropertyInfoLoader implements LoaderInterface { use AutoMappingTrait; - private PropertyListExtractorInterface $listExtractor; - private PropertyTypeExtractorInterface $typeExtractor; - private PropertyAccessExtractorInterface $accessExtractor; + private $listExtractor; + private $typeExtractor; + private $accessExtractor; private ?string $classValidatorRegexp; public function __construct(PropertyListExtractorInterface $listExtractor, PropertyTypeExtractorInterface $typeExtractor, PropertyAccessExtractorInterface $accessExtractor, string $classValidatorRegexp = null) diff --git a/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php b/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php index df9474efb2ab1..ce46765fa0fd3 100644 --- a/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php +++ b/src/Symfony/Component/Validator/Mapping/Loader/YamlFileLoader.php @@ -34,7 +34,7 @@ class YamlFileLoader extends FileLoader /** * Caches the used YAML parser. */ - private YamlParser $yamlParser; + private $yamlParser; /** * {@inheritdoc} diff --git a/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php b/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php index 9c950a829b10b..7e28e0c9271b1 100644 --- a/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php +++ b/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php @@ -294,7 +294,7 @@ abstract protected function createValidator(); final class ConstraintViolationAssertion { - private ExecutionContextInterface $context; + private $context; /** * @var ConstraintViolationAssertion[] @@ -307,7 +307,7 @@ final class ConstraintViolationAssertion private string $propertyPath = 'property.path'; private ?int $plural = null; private ?string $code = null; - private ?Constraint $constraint; + private $constraint; private mixed $cause = null; /** @@ -451,7 +451,7 @@ private function getViolation(): ConstraintViolation */ class AssertingContextualValidator implements ContextualValidatorInterface { - private ExecutionContextInterface $context; + private $context; private bool $expectNoValidate = false; private int $atPathCalls = -1; private array $expectedAtPath = []; diff --git a/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php b/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php index a4837a22a4297..634db77bb48ca 100644 --- a/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php +++ b/src/Symfony/Component/Validator/Validator/RecursiveContextualValidator.php @@ -44,11 +44,11 @@ */ class RecursiveContextualValidator implements ContextualValidatorInterface { - private ExecutionContextInterface $context; + private $context; private string $defaultPropertyPath; private array $defaultGroups; - private MetadataFactoryInterface $metadataFactory; - private ConstraintValidatorFactoryInterface $validatorFactory; + private $metadataFactory; + private $validatorFactory; private array $objectInitializers; /** diff --git a/src/Symfony/Component/Validator/Validator/TraceableValidator.php b/src/Symfony/Component/Validator/Validator/TraceableValidator.php index c266405e49422..8c1d49f462eaa 100644 --- a/src/Symfony/Component/Validator/Validator/TraceableValidator.php +++ b/src/Symfony/Component/Validator/Validator/TraceableValidator.php @@ -25,7 +25,7 @@ */ class TraceableValidator implements ValidatorInterface, ResetInterface { - private ValidatorInterface $validator; + private $validator; private array $collectedData = []; public function __construct(ValidatorInterface $validator) diff --git a/src/Symfony/Component/Validator/ValidatorBuilder.php b/src/Symfony/Component/Validator/ValidatorBuilder.php index f6dc59976e77b..d6b14f75403da 100644 --- a/src/Symfony/Component/Validator/ValidatorBuilder.php +++ b/src/Symfony/Component/Validator/ValidatorBuilder.php @@ -48,12 +48,12 @@ class ValidatorBuilder private array $xmlMappings = []; private array $yamlMappings = []; private array $methodMappings = []; - private ?Reader $annotationReader = null; + private $annotationReader = null; private bool $enableAnnotationMapping = false; - private ?MetadataFactoryInterface $metadataFactory = null; - private ConstraintValidatorFactoryInterface $validatorFactory; - private ?CacheItemPoolInterface $mappingCache = null; - private ?TranslatorInterface $translator = null; + private $metadataFactory = null; + private $validatorFactory; + private $mappingCache = null; + private $translator = null; private ?string $translationDomain = null; /** diff --git a/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php b/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php index 76c0212bfc7b2..7f286f8d25eb9 100644 --- a/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php +++ b/src/Symfony/Component/Validator/Violation/ConstraintViolationBuilder.php @@ -26,16 +26,16 @@ */ class ConstraintViolationBuilder implements ConstraintViolationBuilderInterface { - private ConstraintViolationList $violations; + private $violations; private string|\Stringable $message; private array $parameters; private mixed $root; private mixed $invalidValue; private string $propertyPath; - private TranslatorInterface $translator; + private $translator; private ?string $translationDomain; private ?int $plural = null; - private ?Constraint $constraint; + private $constraint; private ?string $code = null; private mixed $cause = null; diff --git a/src/Symfony/Component/VarDumper/Command/Descriptor/CliDescriptor.php b/src/Symfony/Component/VarDumper/Command/Descriptor/CliDescriptor.php index 4450fe986cb74..e3d5f1d113c58 100644 --- a/src/Symfony/Component/VarDumper/Command/Descriptor/CliDescriptor.php +++ b/src/Symfony/Component/VarDumper/Command/Descriptor/CliDescriptor.php @@ -26,7 +26,7 @@ */ class CliDescriptor implements DumpDescriptorInterface { - private CliDumper $dumper; + private $dumper; private mixed $lastIdentifier = null; public function __construct(CliDumper $dumper) diff --git a/src/Symfony/Component/VarDumper/Command/Descriptor/HtmlDescriptor.php b/src/Symfony/Component/VarDumper/Command/Descriptor/HtmlDescriptor.php index 98f150a5ea5f3..1c0d80a052885 100644 --- a/src/Symfony/Component/VarDumper/Command/Descriptor/HtmlDescriptor.php +++ b/src/Symfony/Component/VarDumper/Command/Descriptor/HtmlDescriptor.php @@ -24,7 +24,7 @@ */ class HtmlDescriptor implements DumpDescriptorInterface { - private HtmlDumper $dumper; + private $dumper; private bool $initialized = false; public function __construct(HtmlDumper $dumper) diff --git a/src/Symfony/Component/VarDumper/Command/ServerDumpCommand.php b/src/Symfony/Component/VarDumper/Command/ServerDumpCommand.php index 1b06e694f7c05..13dd475b55d45 100644 --- a/src/Symfony/Component/VarDumper/Command/ServerDumpCommand.php +++ b/src/Symfony/Component/VarDumper/Command/ServerDumpCommand.php @@ -38,7 +38,7 @@ #[AsCommand(name: 'server:dump', description: 'Start a dump server that collects and displays dumps in a single place')] class ServerDumpCommand extends Command { - private DumpServer $server; + private $server; /** @var DumpDescriptorInterface[] */ private array $descriptors; diff --git a/src/Symfony/Component/VarDumper/Dumper/ContextProvider/RequestContextProvider.php b/src/Symfony/Component/VarDumper/Dumper/ContextProvider/RequestContextProvider.php index 69dff067bb6db..3684a47535cfc 100644 --- a/src/Symfony/Component/VarDumper/Dumper/ContextProvider/RequestContextProvider.php +++ b/src/Symfony/Component/VarDumper/Dumper/ContextProvider/RequestContextProvider.php @@ -22,8 +22,8 @@ */ final class RequestContextProvider implements ContextProviderInterface { - private RequestStack $requestStack; - private VarCloner $cloner; + private $requestStack; + private $cloner; public function __construct(RequestStack $requestStack) { diff --git a/src/Symfony/Component/VarDumper/Dumper/ContextProvider/SourceContextProvider.php b/src/Symfony/Component/VarDumper/Dumper/ContextProvider/SourceContextProvider.php index d36e8bcf6f3d5..8ef6e360e0a7a 100644 --- a/src/Symfony/Component/VarDumper/Dumper/ContextProvider/SourceContextProvider.php +++ b/src/Symfony/Component/VarDumper/Dumper/ContextProvider/SourceContextProvider.php @@ -28,7 +28,7 @@ final class SourceContextProvider implements ContextProviderInterface private int $limit; private ?string $charset; private ?string $projectDir; - private ?FileLinkFormatter $fileLinkFormatter; + private $fileLinkFormatter; public function __construct(string $charset = null, string $projectDir = null, FileLinkFormatter $fileLinkFormatter = null, int $limit = 9) { diff --git a/src/Symfony/Component/VarDumper/Dumper/ContextualizedDumper.php b/src/Symfony/Component/VarDumper/Dumper/ContextualizedDumper.php index cd2b28f0c40d7..18ab56ebd8fd7 100644 --- a/src/Symfony/Component/VarDumper/Dumper/ContextualizedDumper.php +++ b/src/Symfony/Component/VarDumper/Dumper/ContextualizedDumper.php @@ -19,7 +19,7 @@ */ class ContextualizedDumper implements DataDumperInterface { - private DataDumperInterface $wrappedDumper; + private $wrappedDumper; private array $contextProviders; /** diff --git a/src/Symfony/Component/VarDumper/Dumper/ServerDumper.php b/src/Symfony/Component/VarDumper/Dumper/ServerDumper.php index 2baca3187723d..94795bf6d69dd 100644 --- a/src/Symfony/Component/VarDumper/Dumper/ServerDumper.php +++ b/src/Symfony/Component/VarDumper/Dumper/ServerDumper.php @@ -22,8 +22,8 @@ */ class ServerDumper implements DataDumperInterface { - private Connection $connection; - private ?DataDumperInterface $wrappedDumper; + private $connection; + private $wrappedDumper; /** * @param string $host The server host diff --git a/src/Symfony/Component/VarDumper/Server/DumpServer.php b/src/Symfony/Component/VarDumper/Server/DumpServer.php index 1a4ea646a3d32..6a43c12042b01 100644 --- a/src/Symfony/Component/VarDumper/Server/DumpServer.php +++ b/src/Symfony/Component/VarDumper/Server/DumpServer.php @@ -25,7 +25,7 @@ class DumpServer { private string $host; - private ?LoggerInterface $logger; + private $logger; /** * @var resource|null diff --git a/src/Symfony/Component/VarDumper/Tests/Fixtures/Php81Enums.php b/src/Symfony/Component/VarDumper/Tests/Fixtures/Php81Enums.php index ab5d03a981efa..15ea170895da6 100644 --- a/src/Symfony/Component/VarDumper/Tests/Fixtures/Php81Enums.php +++ b/src/Symfony/Component/VarDumper/Tests/Fixtures/Php81Enums.php @@ -4,8 +4,8 @@ class Php81Enums { - public UnitEnumFixture $e1; - public BackedEnumFixture $e2; + public $e1; + public $e2; public function __construct() { diff --git a/src/Symfony/Component/WebLink/EventListener/AddLinkHeaderListener.php b/src/Symfony/Component/WebLink/EventListener/AddLinkHeaderListener.php index 9a7b4e9cd30ea..fd89db17e30cb 100644 --- a/src/Symfony/Component/WebLink/EventListener/AddLinkHeaderListener.php +++ b/src/Symfony/Component/WebLink/EventListener/AddLinkHeaderListener.php @@ -29,7 +29,7 @@ class_exists(HttpHeaderSerializer::class); */ class AddLinkHeaderListener implements EventSubscriberInterface { - private HttpHeaderSerializer $serializer; + private $serializer; public function __construct() { diff --git a/src/Symfony/Component/Workflow/Definition.php b/src/Symfony/Component/Workflow/Definition.php index 45de623d5a386..8ef23cd192a14 100644 --- a/src/Symfony/Component/Workflow/Definition.php +++ b/src/Symfony/Component/Workflow/Definition.php @@ -25,7 +25,7 @@ final class Definition private array $places = []; private array $transitions = []; private array $initialPlaces = []; - private MetadataStoreInterface $metadataStore; + private $metadataStore; /** * @param string[] $places diff --git a/src/Symfony/Component/Workflow/DefinitionBuilder.php b/src/Symfony/Component/Workflow/DefinitionBuilder.php index 5b7a15bea7c6c..908e2c4ab1555 100644 --- a/src/Symfony/Component/Workflow/DefinitionBuilder.php +++ b/src/Symfony/Component/Workflow/DefinitionBuilder.php @@ -25,7 +25,7 @@ class DefinitionBuilder private array $places = []; private array $transitions = []; private string|array|null $initialPlaces = null; - private ?MetadataStoreInterface $metadataStore = null; + private $metadataStore = null; /** * @param string[] $places diff --git a/src/Symfony/Component/Workflow/Event/Event.php b/src/Symfony/Component/Workflow/Event/Event.php index 53cc3a85017d2..d42abdd9112d1 100644 --- a/src/Symfony/Component/Workflow/Event/Event.php +++ b/src/Symfony/Component/Workflow/Event/Event.php @@ -25,9 +25,9 @@ class Event extends BaseEvent { protected $context; private object $subject; - private Marking $marking; - private ?Transition $transition; - private ?WorkflowInterface $workflow; + private $marking; + private $transition; + private $workflow; public function __construct(object $subject, Marking $marking, Transition $transition = null, WorkflowInterface $workflow = null, array $context = []) { diff --git a/src/Symfony/Component/Workflow/Event/GuardEvent.php b/src/Symfony/Component/Workflow/Event/GuardEvent.php index a3c0521e72427..039d1614c3ada 100644 --- a/src/Symfony/Component/Workflow/Event/GuardEvent.php +++ b/src/Symfony/Component/Workflow/Event/GuardEvent.php @@ -23,7 +23,7 @@ */ final class GuardEvent extends Event { - private TransitionBlockerList $transitionBlockerList; + private $transitionBlockerList; /** * {@inheritdoc} diff --git a/src/Symfony/Component/Workflow/EventListener/AuditTrailListener.php b/src/Symfony/Component/Workflow/EventListener/AuditTrailListener.php index 8a7ea374c90aa..f7a8f66861917 100644 --- a/src/Symfony/Component/Workflow/EventListener/AuditTrailListener.php +++ b/src/Symfony/Component/Workflow/EventListener/AuditTrailListener.php @@ -20,7 +20,7 @@ */ class AuditTrailListener implements EventSubscriberInterface { - private LoggerInterface $logger; + private $logger; public function __construct(LoggerInterface $logger) { diff --git a/src/Symfony/Component/Workflow/EventListener/GuardExpression.php b/src/Symfony/Component/Workflow/EventListener/GuardExpression.php index 9fb152567bff9..4b6d3eb166a8f 100644 --- a/src/Symfony/Component/Workflow/EventListener/GuardExpression.php +++ b/src/Symfony/Component/Workflow/EventListener/GuardExpression.php @@ -15,7 +15,7 @@ class GuardExpression { - private Transition $transition; + private $transition; private string $expression; public function __construct(Transition $transition, string $expression) diff --git a/src/Symfony/Component/Workflow/EventListener/GuardListener.php b/src/Symfony/Component/Workflow/EventListener/GuardListener.php index 5c873d8b99e9e..291602dd524c3 100644 --- a/src/Symfony/Component/Workflow/EventListener/GuardListener.php +++ b/src/Symfony/Component/Workflow/EventListener/GuardListener.php @@ -25,12 +25,12 @@ class GuardListener { private array $configuration; - private ExpressionLanguage $expressionLanguage; - private TokenStorageInterface $tokenStorage; - private AuthorizationCheckerInterface $authorizationChecker; - private AuthenticationTrustResolverInterface $trustResolver; - private ?RoleHierarchyInterface $roleHierarchy; - private ?ValidatorInterface $validator; + private $expressionLanguage; + private $tokenStorage; + private $authorizationChecker; + private $trustResolver; + private $roleHierarchy; + private $validator; public function __construct(array $configuration, ExpressionLanguage $expressionLanguage, TokenStorageInterface $tokenStorage, AuthorizationCheckerInterface $authorizationChecker, AuthenticationTrustResolverInterface $trustResolver, RoleHierarchyInterface $roleHierarchy = null, ValidatorInterface $validator = null) { diff --git a/src/Symfony/Component/Workflow/Exception/NotEnabledTransitionException.php b/src/Symfony/Component/Workflow/Exception/NotEnabledTransitionException.php index 4144caf7a7d73..1771234bf16ee 100644 --- a/src/Symfony/Component/Workflow/Exception/NotEnabledTransitionException.php +++ b/src/Symfony/Component/Workflow/Exception/NotEnabledTransitionException.php @@ -21,7 +21,7 @@ */ class NotEnabledTransitionException extends TransitionException { - private TransitionBlockerList $transitionBlockerList; + private $transitionBlockerList; public function __construct(object $subject, string $transitionName, WorkflowInterface $workflow, TransitionBlockerList $transitionBlockerList, array $context = []) { diff --git a/src/Symfony/Component/Workflow/Exception/TransitionException.php b/src/Symfony/Component/Workflow/Exception/TransitionException.php index d493e22343f39..fad2a9d7ce22b 100644 --- a/src/Symfony/Component/Workflow/Exception/TransitionException.php +++ b/src/Symfony/Component/Workflow/Exception/TransitionException.php @@ -21,7 +21,7 @@ class TransitionException extends LogicException { private object $subject; private string $transitionName; - private WorkflowInterface $workflow; + private $workflow; private array $context; public function __construct(object $subject, string $transitionName, WorkflowInterface $workflow, string $message, array $context = []) diff --git a/src/Symfony/Component/Workflow/Workflow.php b/src/Symfony/Component/Workflow/Workflow.php index 86820151e2407..adef3edd48544 100644 --- a/src/Symfony/Component/Workflow/Workflow.php +++ b/src/Symfony/Component/Workflow/Workflow.php @@ -52,9 +52,9 @@ class Workflow implements WorkflowInterface WorkflowEvents::ANNOUNCE => self::DISABLE_ANNOUNCE_EVENT, ]; - private Definition $definition; - private MarkingStoreInterface $markingStore; - private ?EventDispatcherInterface $dispatcher; + private $definition; + private $markingStore; + private $dispatcher; private string $name; /** diff --git a/src/Symfony/Component/Yaml/Command/LintCommand.php b/src/Symfony/Component/Yaml/Command/LintCommand.php index 95646a9ab3e46..7536d76bc911a 100644 --- a/src/Symfony/Component/Yaml/Command/LintCommand.php +++ b/src/Symfony/Component/Yaml/Command/LintCommand.php @@ -36,7 +36,7 @@ #[AsCommand(name: 'lint:yaml', description: 'Lint a YAML file and outputs encountered errors')] class LintCommand extends Command { - private Parser $parser; + private $parser; private ?string $format = null; private bool $displayCorrectFiles; private ?\Closure $directoryIteratorProvider; From fb3f4e403c91d985267f1e0aa8e9d5d17220619e Mon Sep 17 00:00:00 2001 From: Thomas Calvet Date: Wed, 8 Dec 2021 18:38:27 +0100 Subject: [PATCH 48/52] [CI] Fix package-tests workflow checks for contracts --- .github/get-modified-packages.php | 30 ++++++++++++++++++++++++++--- .github/workflows/package-tests.yml | 11 ++++++++--- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/.github/get-modified-packages.php b/.github/get-modified-packages.php index 9135a1da666e5..a3682af0b9d1a 100644 --- a/.github/get-modified-packages.php +++ b/.github/get-modified-packages.php @@ -17,9 +17,33 @@ return strlen($b) <=> strlen($a) ?: $a <=> $b; }); -function isComponentBridge(string $packageDir): bool +function getPackageType(string $packageDir): string { - return 0 < preg_match('@Symfony/Component/.*/Bridge/@', $packageDir); + if (preg_match('@Symfony/Bridge/@', $packageDir)) { + return 'bridge'; + } + + if (preg_match('@Symfony/Bundle/@', $packageDir)) { + return 'bundle'; + } + + if (preg_match('@Symfony/Component/[^/]+/Bridge/@', $packageDir)) { + return 'component_bridge'; + } + + if (preg_match('@Symfony/Component/@', $packageDir)) { + return 'component'; + } + + if (preg_match('@Symfony/Contracts/@', $packageDir)) { + return 'contract'; + } + + if (preg_match('@Symfony/Contracts$@', $packageDir)) { + return 'contracts'; + } + + throw new \LogicException(); } $newPackage = []; @@ -43,7 +67,7 @@ function isComponentBridge(string $packageDir): bool $output = []; foreach ($modifiedPackages as $directory => $bool) { $name = json_decode(file_get_contents($directory.'/composer.json'), true)['name'] ?? 'unknown'; - $output[] = ['name' => $name, 'directory' => $directory, 'new' => $newPackage[$directory] ?? false, 'component_bridge' => isComponentBridge($directory)]; + $output[] = ['name' => $name, 'directory' => $directory, 'new' => $newPackage[$directory] ?? false, 'type' => getPackageType($directory)]; } echo json_encode($output); diff --git a/.github/workflows/package-tests.yml b/.github/workflows/package-tests.yml index cb66e2d8d3b03..3c0a7c36be89f 100644 --- a/.github/workflows/package-tests.yml +++ b/.github/workflows/package-tests.yml @@ -63,13 +63,18 @@ jobs: DIR=$(_jq '.directory') NAME=$(_jq '.name') echo "::group::$NAME" + TYPE=$(_jq '.type') localExit=0 - _file_exist $DIR/.gitattributes || localExit=1 + if [ $TYPE != 'contract' ] && [ $TYPE != 'contracts' ]; then + _file_exist $DIR/.gitattributes || localExit=1 + fi _file_exist $DIR/.gitignore || localExit=1 _file_exist $DIR/CHANGELOG.md || localExit=1 _file_exist $DIR/LICENSE || localExit=1 - _file_exist $DIR/phpunit.xml.dist || localExit=1 + if [ $TYPE != 'contract' ]; then + _file_exist $DIR/phpunit.xml.dist || localExit=1 + fi _file_exist $DIR/README.md || localExit=1 _file_not_exist $DIR/phpunit.xml || localExit=1 @@ -77,7 +82,7 @@ jobs: echo "Verifying new package" _correct_license_file $DIR/LICENSE || localExit=1 - if [ $(_jq '.component_bridge') == false ]; then + if [ $TYPE == 'component_bridge' ]; then if [ ! $(cat composer.json | jq -e ".replace.\"$NAME\"|test(\"self.version\")") ]; then echo "Composer.json's replace section needs to contain $NAME" localExit=1 From da457d965efd57caa63fe0c32bcfc47cc0c83277 Mon Sep 17 00:00:00 2001 From: Philipp Keck Date: Wed, 8 Dec 2021 21:29:42 +0100 Subject: [PATCH 49/52] Don't access uninitialized typed property ChromePhpHandler::$response Fixes #44513 --- src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php b/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php index 059dc539e1681..1fa698a9390b6 100644 --- a/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php +++ b/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php @@ -59,7 +59,7 @@ protected function sendHeader($header, $content): void return; } - if ($this->response) { + if (isset($this->response)) { $this->response->headers->set($header, $content); } else { $this->headers[$header] = $content; From ef050c2db690cfea38b85529d7333989e30ace8c Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Thu, 9 Dec 2021 12:22:43 +0100 Subject: [PATCH 50/52] Fix polyfill-php73 requirement --- src/Symfony/Component/Console/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/Console/composer.json b/src/Symfony/Component/Console/composer.json index 2a7b429ac1f8b..9a565068cdedd 100644 --- a/src/Symfony/Component/Console/composer.json +++ b/src/Symfony/Component/Console/composer.json @@ -19,7 +19,7 @@ "php": ">=7.2.5", "symfony/deprecation-contracts": "^2.1|^3", "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php73": "^1.8", + "symfony/polyfill-php73": "^1.9", "symfony/polyfill-php80": "^1.16", "symfony/service-contracts": "^1.1|^2|^3", "symfony/string": "^5.1|^6.0" From fe9dccbaa6b2a7cd06bcc5eea154335fdf811def Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 9 Dec 2021 14:42:42 +0100 Subject: [PATCH 51/52] Update CHANGELOG for 6.0.1 --- CHANGELOG-6.0.md | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/CHANGELOG-6.0.md b/CHANGELOG-6.0.md index 05e84492bfeba..da7b96d9d2c06 100644 --- a/CHANGELOG-6.0.md +++ b/CHANGELOG-6.0.md @@ -7,6 +7,33 @@ in 6.0 minor versions. To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v6.0.0...v6.0.1 +* 6.0.1 (2021-12-09) + + * bug #44494 Remove FQCN type hints on properties (fabpot) + * bug #44490 [DependencyInjection][Messenger] Add auto-registration for BatchHandlerInterface (GaryPEGEOT) + * bug #44523 [Console] Fix polyfill-php73 requirement (Seldaek) + * bug #44514 Don't access uninitialized typed property ChromePhpHandler::$response (Philipp91) + * bug #44502 [HttpFoundation] do not call preg_match() on null (xabbuh) + * bug #44475 [Console] Handle alias in completion script (GromNaN) + * bug #44481 [FrameworkBundle] Fix loginUser() causing deprecation (wouterj) + * bug #44416 [Translation] Make http requests synchronous when reading the Loco API (Kocal) + * bug #44437 [HttpKernel] Fix wrong usage of SessionUtils::popSessionCookie (simonchrz) + * bug #44350 [Translation] Fix TranslationTrait (Tomasz Kusy) + * bug #44460 [SecurityBundle] Fix ambiguous deprecation message on missing provider (chalasr) + * bug #44467 [Console] Fix parameter types for `ProcessHelper::mustRun()` (derrabus) + * bug #44427 [FrameworkBundle] Fix compatibility with symfony/security-core 6.x (deps=high tests) (wouterj) + * bug #44424 [SecurityBundle] Don't rely on deprecated strategy constants (derrabus) + * bug #44399 Prevent infinite nesting of lazy `ObjectManager` instances when `ObjectManager` is reset (Ocramius) + * bug #44402 [HttpKernel] Fix using FileLinkFormatter after serialization (derrabus) + * bug #44395 [HttpKernel] fix sending Vary: Accept-Language when appropriate (nicolas-grekas) + * bug #44385 [DependencyInjection] Skip parameter attribute configurators in AttributeAutoconfigurationPass if we can't get the constructor reflector (fancyweb) + * bug #44359 Avoid duplicated session listener registration in tests (alexander-schranz) + * bug #44375 [DoctrineBridge] fix calling get_class on non-object (kbond) + * bug #44378 [HttpFoundation] fix SessionHandlerFactory using connections (dmaicher) + * bug #44365 [SecurityBundle]  Fix invalid reference with `always_authenticate_before_granting` (chalasr) + * bug #44361 [HttpClient] Fix handling error info in MockResponse (fancyweb) + * bug #44370 [Lock] create lock table if it does not exist (martinssipenko) + * 6.0.0 (2021-11-29) * bug #44309 [Messenger] Leverage DBAL's getNativeConnection() method (derrabus) From b74eb1465adee4b7d42dc9eb2f2041386f1288a2 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 9 Dec 2021 14:42:47 +0100 Subject: [PATCH 52/52] Update VERSION for 6.0.1 --- src/Symfony/Component/HttpKernel/Kernel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php index 4b12ac3ff5b36..ecc8dc90792fb 100644 --- a/src/Symfony/Component/HttpKernel/Kernel.php +++ b/src/Symfony/Component/HttpKernel/Kernel.php @@ -78,12 +78,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl */ private static array $freshCache = []; - public const VERSION = '6.0.1-DEV'; + public const VERSION = '6.0.1'; public const VERSION_ID = 60001; public const MAJOR_VERSION = 6; public const MINOR_VERSION = 0; public const RELEASE_VERSION = 1; - public const EXTRA_VERSION = 'DEV'; + public const EXTRA_VERSION = ''; public const END_OF_MAINTENANCE = '07/2022'; public const END_OF_LIFE = '07/2022';