Skip to content

Commit d86d027

Browse files
nicolas-grekasnicolas-grekas
committed
Bump minimum version of PHP to 8.1
1 parent 0c70f5c commit d86d027

File tree

183 files changed

+293
-766
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

183 files changed

+293
-766
lines changed

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

Lines changed: 70 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,11 @@
11
# Run these steps to update this file:
22
sed -i 's/ *"\*\*\/Tests\/"//' composer.json
33
composer u -o
4-
SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.0' php .github/patch-types.php
4+
SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.1' php .github/patch-types.php
55
head=$(sed '/^diff /Q' .github/expected-missing-return-types.diff)
6-
(echo "$head" && echo && git diff -U2 composer.json src/) > .github/expected-missing-return-types.diff
6+
(echo "$head" && echo && git diff -U2 src/) > .github/expected-missing-return-types.diff
77
git checkout composer.json src/
88

9-
diff --git a/composer.json b/composer.json
10-
index c7b7eac4c7..2b60fb6a19 100644
11-
--- a/composer.json
12-
+++ b/composer.json
13-
@@ -180,5 +180,5 @@
14-
],
15-
"exclude-from-classmap": [
16-
- "**/Tests/"
17-
+
18-
]
19-
},
209
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
2110
index d68ae4c8b3..8e980a9e70 100644
2211
--- a/src/Symfony/Bundle/FrameworkBundle/Test/KernelTestCase.php
@@ -60,6 +49,17 @@ index 697e34cb77..9a1e4c5618 100644
6049
+ protected function filterResponse(object $response): Response
6150
{
6251
return $response;
52+
diff --git a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php
53+
index 89d6adb70e..c569992efc 100644
54+
--- a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php
55+
+++ b/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php
56+
@@ -108,5 +108,5 @@ class NodeBuilder implements NodeParentInterface
57+
* @return NodeDefinition&ParentNodeDefinitionInterface
58+
*/
59+
- public function end()
60+
+ public function end(): NodeDefinition&ParentNodeDefinitionInterface
61+
{
62+
return $this->parent;
6363
diff --git a/src/Symfony/Component/Config/Definition/ConfigurationInterface.php b/src/Symfony/Component/Config/Definition/ConfigurationInterface.php
6464
index 7b5d443fe6..d64ae0d024 100644
6565
--- a/src/Symfony/Component/Config/Definition/ConfigurationInterface.php
@@ -156,7 +156,7 @@ index 6b1c6c5fbe..bb80ed461e 100644
156156
+ public function isFresh(ResourceInterface $resource, int $timestamp): bool;
157157
}
158158
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
159-
index 0ed5649b8a..6c814bf82c 100644
159+
index c654b93790..ce744f5c6d 100644
160160
--- a/src/Symfony/Component/Console/Application.php
161161
+++ b/src/Symfony/Component/Console/Application.php
162162
@@ -218,5 +218,5 @@ class Application implements ResetInterface
@@ -209,17 +209,17 @@ index 0ed5649b8a..6c814bf82c 100644
209209
{
210210
foreach ($command->getHelperSet() as $helper) {
211211
diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
212-
index 0bd3426c07..b38caf989e 100644
212+
index e84307207a..bc503462c1 100644
213213
--- a/src/Symfony/Component/Console/Command/Command.php
214214
+++ b/src/Symfony/Component/Console/Command/Command.php
215-
@@ -171,5 +171,5 @@ class Command
215+
@@ -187,5 +187,5 @@ class Command
216216
* @return bool
217217
*/
218218
- public function isEnabled()
219219
+ public function isEnabled(): bool
220220
{
221221
return true;
222-
@@ -197,5 +197,5 @@ class Command
222+
@@ -213,5 +213,5 @@ class Command
223223
* @see setCode()
224224
*/
225225
- protected function execute(InputInterface $input, OutputInterface $output)
@@ -273,7 +273,7 @@ index c2824f4578..032f5c2318 100644
273273
{
274274
if (\is_array($value)) {
275275
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
276-
index b9dd838898..3a8cb63eac 100644
276+
index f9820f5ede..d28a418429 100644
277277
--- a/src/Symfony/Component/DependencyInjection/Container.php
278278
+++ b/src/Symfony/Component/DependencyInjection/Container.php
279279
@@ -108,5 +108,5 @@ class Container implements ContainerInterface, ResetInterface
@@ -284,7 +284,7 @@ index b9dd838898..3a8cb63eac 100644
284284
{
285285
return $this->parameterBag->get($name);
286286
diff --git a/src/Symfony/Component/DependencyInjection/ContainerInterface.php b/src/Symfony/Component/DependencyInjection/ContainerInterface.php
287-
index aa5d6b317e..31ffbca4ef 100644
287+
index cad44026c0..14cd192e07 100644
288288
--- a/src/Symfony/Component/DependencyInjection/ContainerInterface.php
289289
+++ b/src/Symfony/Component/DependencyInjection/ContainerInterface.php
290290
@@ -53,5 +53,5 @@ interface ContainerInterface extends PsrContainerInterface
@@ -611,6 +611,17 @@ index 125b6eae50..ac327e8981 100644
611611
+ public function createLockFromKey(Key $key, ?float $ttl = 300.0, bool $autoRelease = true): SharedLockInterface
612612
{
613613
$lock = new Lock($key, $this->store, $ttl, $autoRelease);
614+
diff --git a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsTransport.php b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsTransport.php
615+
index 297fccbd3f..4c47d95b38 100644
616+
--- a/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsTransport.php
617+
+++ b/src/Symfony/Component/Messenger/Bridge/AmazonSqs/Transport/AmazonSqsTransport.php
618+
@@ -109,5 +109,5 @@ class AmazonSqsTransport implements TransportInterface, SetupableTransportInterf
619+
* @return MessageCountAwareInterface&ReceiverInterface
620+
*/
621+
- private function getReceiver(): ReceiverInterface
622+
+ private function getReceiver(): MessageCountAwareInterface&ReceiverInterface
623+
{
624+
return $this->receiver ??= new AmazonSqsReceiver($this->connection, $this->serializer);
614625
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
615626
index 205c15b4cd..e93e460ed1 100644
616627
--- a/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -696,10 +707,10 @@ index fbb37d9f94..522e0487a9 100644
696707
+ public function isIndex(int $index): bool;
697708
}
698709
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
699-
index cfffdb2f71..3e2261898a 100644
710+
index 972d169caa..0b6dae1abe 100644
700711
--- a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
701712
+++ b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
702-
@@ -725,5 +725,5 @@ class PropertyAccessorTest extends TestCase
713+
@@ -743,5 +743,5 @@ class PropertyAccessorTest extends TestCase
703714
* @return mixed
704715
*/
705716
- public function getFoo()
@@ -899,7 +910,7 @@ index 7f86ed8d78..cf084423ec 100644
899910
{
900911
if (null !== $object = $this->extractObjectToPopulate($class, $context, self::OBJECT_TO_POPULATE)) {
901912
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
902-
index a8943113c4..2983dabd0f 100644
913+
index 1abdb634ce..d2e7f41562 100644
903914
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
904915
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
905916
@@ -138,5 +138,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
@@ -916,35 +927,35 @@ index a8943113c4..2983dabd0f 100644
916927
+ public function normalize(mixed $object, string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null
917928
{
918929
if (!isset($context['cache_key'])) {
919-
@@ -279,5 +279,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
930+
@@ -280,5 +280,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
920931
* {@inheritdoc}
921932
*/
922933
- protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, string $format = null)
923934
+ protected function instantiateObject(array &$data, string $class, array &$context, \ReflectionClass $reflectionClass, array|bool $allowedAttributes, string $format = null): object
924935
{
925936
if ($this->classDiscriminatorResolver && $mapping = $this->classDiscriminatorResolver->getMappingForClass($class)) {
926-
@@ -341,5 +341,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
937+
@@ -342,5 +342,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
927938
* @return string[]
928939
*/
929940
- abstract protected function extractAttributes(object $object, string $format = null, array $context = []);
930941
+ abstract protected function extractAttributes(object $object, string $format = null, array $context = []): array;
931942

932943
/**
933-
@@ -348,5 +348,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
944+
@@ -349,5 +349,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
934945
* @return mixed
935946
*/
936947
- abstract protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []);
937948
+ abstract protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = []): mixed;
938949

939950
/**
940-
@@ -355,5 +355,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
951+
@@ -356,5 +356,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
941952
* @param array $context
942953
*/
943954
- public function supportsDenormalization(mixed $data, string $type, string $format = null /*, array $context = [] */)
944955
+ public function supportsDenormalization(mixed $data, string $type, string $format = null /*, array $context = [] */): bool
945956
{
946957
return class_exists($type) || (interface_exists($type, false) && $this->classDiscriminatorResolver && null !== $this->classDiscriminatorResolver->getMappingForClass($type));
947-
@@ -363,5 +363,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
958+
@@ -364,5 +364,5 @@ abstract class AbstractObjectNormalizer extends AbstractNormalizer
948959
* {@inheritdoc}
949960
*/
950961
- public function denormalize(mixed $data, string $type, string $format = null, array $context = [])
@@ -1012,6 +1023,38 @@ index 4c088b94f9..86107a636d 100644
10121023
- abstract protected function extractFromDirectory(string|array $resource);
10131024
+ abstract protected function extractFromDirectory(string|array $resource): iterable;
10141025
}
1026+
diff --git a/src/Symfony/Component/Translation/Test/ProviderTestCase.php b/src/Symfony/Component/Translation/Test/ProviderTestCase.php
1027+
index a3bd4b99ac..81fb8728e0 100644
1028+
--- a/src/Symfony/Component/Translation/Test/ProviderTestCase.php
1029+
+++ b/src/Symfony/Component/Translation/Test/ProviderTestCase.php
1030+
@@ -61,5 +61,5 @@ abstract class ProviderTestCase extends TestCase
1031+
* @return LoaderInterface&MockObject
1032+
*/
1033+
- protected function getLoader(): LoaderInterface
1034+
+ protected function getLoader(): LoaderInterface&MockObject
1035+
{
1036+
return $this->loader ??= $this->createMock(LoaderInterface::class);
1037+
@@ -69,5 +69,5 @@ abstract class ProviderTestCase extends TestCase
1038+
* @return LoggerInterface&MockObject
1039+
*/
1040+
- protected function getLogger(): LoggerInterface
1041+
+ protected function getLogger(): LoggerInterface&MockObject
1042+
{
1043+
return $this->logger ??= $this->createMock(LoggerInterface::class);
1044+
@@ -82,5 +82,5 @@ abstract class ProviderTestCase extends TestCase
1045+
* @return XliffFileDumper&MockObject
1046+
*/
1047+
- protected function getXliffFileDumper(): XliffFileDumper
1048+
+ protected function getXliffFileDumper(): XliffFileDumper&MockObject
1049+
{
1050+
return $this->xliffFileDumper ??= $this->createMock(XliffFileDumper::class);
1051+
@@ -90,5 +90,5 @@ abstract class ProviderTestCase extends TestCase
1052+
* @return TranslatorBagInterface&MockObject
1053+
*/
1054+
- protected function getTranslatorBag(): TranslatorBagInterface
1055+
+ protected function getTranslatorBag(): TranslatorBagInterface&MockObject
1056+
{
1057+
return $this->translatorBag ??= $this->createMock(TranslatorBagInterface::class);
10151058
diff --git a/src/Symfony/Component/Validator/Constraint.php b/src/Symfony/Component/Validator/Constraint.php
10161059
index 46432f2f4c..47ac39d5e3 100644
10171060
--- a/src/Symfony/Component/Validator/Constraint.php

‎.github/workflows/integration-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
strategy:
1818
matrix:
19-
php: ['8.0']
19+
php: ['8.1']
2020

2121
services:
2222
postgres:
@@ -172,11 +172,11 @@ jobs:
172172
POSTGRES_HOST: localhost
173173

174174
#- name: Run HTTP push tests
175-
# if: matrix.php == '8.0'
175+
# if: matrix.php == '8.1'
176176
# run: |
177177
# [ -d .phpunit ] && mv .phpunit .phpunit.bak
178178
# wget -q https://github.com/symfony/binary-utils/releases/download/v0.1/vulcain_0.1.3_Linux_x86_64.tar.gz -O - | tar xz && mv vulcain /usr/local/bin
179-
# docker run --rm -e COMPOSER_ROOT_VERSION -v $(pwd):/app -v $(which composer):/usr/local/bin/composer -v $(which vulcain):/usr/local/bin/vulcain -w /app php:8.0-alpine ./phpunit src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php --filter testHttp2Push
179+
# docker run --rm -e COMPOSER_ROOT_VERSION -v $(pwd):/app -v $(which composer):/usr/local/bin/composer -v $(which vulcain):/usr/local/bin/vulcain -w /app php:8.1-alpine ./phpunit src/Symfony/Component/HttpClient/Tests/CurlHttpClientTest.php --filter testHttp2Push
180180
# sudo rm -rf .phpunit
181181
# [ -d .phpunit.bak ] && mv .phpunit.bak .phpunit
182182

‎.github/workflows/intl-data-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
coverage: "none"
4343
extensions: "zip,intl-${{env.SYMFONY_ICU_VERSION}}"
4444
ini-values: "memory_limit=-1"
45-
php-version: "8.0"
45+
php-version: "8.1"
4646

4747
- name: Install dependencies
4848
run: |

‎.github/workflows/psalm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup PHP
1717
uses: shivammathur/setup-php@v2
1818
with:
19-
php-version: '8.0'
19+
php-version: '8.1'
2020
extensions: "json,couchbase,memcached,mongodb,redis,xsl,ldap,dom"
2121
ini-values: "memory_limit=-1"
2222
coverage: none

‎.github/workflows/unit-tests.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
matrix:
2121
include:
2222
- php: '8.1'
23-
- php: '8.0'
23+
- php: '8.1'
2424
mode: high-deps
2525
- php: '8.1'
2626
mode: low-deps
@@ -140,8 +140,8 @@ jobs:
140140
patch -sp1 < .github/expected-missing-return-types.diff
141141
git add .
142142
composer install -q --optimize-autoloader
143-
SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.0' php .github/patch-types.php
144-
SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.0' php .github/patch-types.php # ensure the script is idempotent
143+
SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.1' php .github/patch-types.php
144+
SYMFONY_PATCH_TYPE_DECLARATIONS='force=2&php=8.1' php .github/patch-types.php # ensure the script is idempotent
145145
git diff --exit-code
146146
147147
- name: Run tests
@@ -217,13 +217,13 @@ jobs:
217217
run: |
218218
script -e -c './phpunit --group tty' /dev/null
219219
220-
- name: Run tests with SIGCHLD enabled PHP
221-
if: "matrix.php == '8.0' && ! matrix.mode"
222-
run: |
223-
mkdir build
224-
cd build
225-
wget -q https://github.com/symfony/binary-utils/releases/download/v0.1/php-8.0.2-pcntl-sigchild.tar.bz2
226-
tar -xjf php-8.0.2-pcntl-sigchild.tar.bz2
227-
cd ..
228-
229-
./build/php/bin/php ./phpunit --colors=always src/Symfony/Component/Process
220+
#- name: Run tests with SIGCHLD enabled PHP
221+
# if: "matrix.php == '8.0' && ! matrix.mode"
222+
# run: |
223+
# mkdir build
224+
# cd build
225+
# wget -q https://github.com/symfony/binary-utils/releases/download/v0.1/php-8.0.2-pcntl-sigchild.tar.bz2
226+
# tar -xjf php-8.0.2-pcntl-sigchild.tar.bz2
227+
# cd ..
228+
#
229+
# ./build/php/bin/php ./phpunit --colors=always src/Symfony/Component/Process

‎composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"symfony/translation-implementation": "2.3|3.0"
3333
},
3434
"require": {
35-
"php": ">=8.0.2",
35+
"php": ">=8.1",
3636
"composer-runtime-api": ">=2.1",
3737
"ext-xml": "*",
3838
"friendsofphp/proxy-manager-lts": "^1.0.2",
@@ -51,7 +51,6 @@
5151
"symfony/polyfill-intl-idn": "^1.10",
5252
"symfony/polyfill-intl-normalizer": "~1.0",
5353
"symfony/polyfill-mbstring": "~1.0",
54-
"symfony/polyfill-php81": "^1.23",
5554
"symfony/polyfill-uuid": "^1.15"
5655
},
5756
"replace": {

‎src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,10 +1310,7 @@ public function testLoaderCachingWithParameters()
13101310
$this->assertSame($choiceList1, $choiceList3);
13111311
}
13121312

1313-
/**
1314-
* @return MockObject&ManagerRegistry
1315-
*/
1316-
protected function createRegistryMock($name, $em): ManagerRegistry
1313+
protected function createRegistryMock($name, $em): MockObject&ManagerRegistry
13171314
{
13181315
$registry = $this->createMock(ManagerRegistry::class);
13191316
$registry->expects($this->any())

‎src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,6 @@ public function testExtractWithEmbedded()
128128
$this->assertEquals($expectedTypes, $actualTypes);
129129
}
130130

131-
/**
132-
* @requires PHP 8.1
133-
*/
134131
public function testExtractEnum()
135132
{
136133
if (!property_exists(Column::class, 'enumType')) {

‎src/Symfony/Bridge/Doctrine/Tests/Validator/DoctrineLoaderTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,6 @@ public function testLoadClassMetadata()
151151
$this->assertSame(AutoMappingStrategy::DISABLED, $noAutoMappingMetadata[0]->getAutoMappingStrategy());
152152
}
153153

154-
/**
155-
* @requires PHP 8.1
156-
*/
157154
public function testExtractEnum()
158155
{
159156
if (!property_exists(Column::class, 'enumType')) {

‎src/Symfony/Bridge/Doctrine/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
],
1818
"require": {
19-
"php": ">=8.0.2",
19+
"php": ">=8.1",
2020
"doctrine/event-manager": "~1.0",
2121
"doctrine/persistence": "^2",
2222
"symfony/deprecation-contracts": "^2.1|^3",

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy