Skip to content

Commit 46a2b13

Browse files
authored
refactor #874 Remove PHP 8.0 support & not maintained Symfony versions (loic425)
This PR was merged into the 1.11 branch. Discussion ---------- | Q | A | --------------- | ----- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Related tickets | | License | MIT Before the stable release, it could be cool to drop these unmaintained versions. Commits ------- 8b704d4 Remove PHP 8.0 support & not maintained Symfony versions b6fff30 Bump PHP version on Docker 67186cc Add missing dependency on dev requirement
2 parents 5129b8a + 67186cc commit 46a2b13

File tree

5 files changed

+41
-40
lines changed

5 files changed

+41
-40
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919
matrix:
2020
php: ["8.1", "8.2", "8.3"]
2121
pagerfanta: [""]
22-
symfony: ["^5.4", "~6.0.0", "~6.4.0"]
22+
symfony: ["^5.4", "^6.4"]
2323
persistence: ["^2.0", "^3.0"]
2424
collections: ["^1.8", "^2.0"]
2525
include:
26-
- php: "8.0"
26+
- php: "8.1"
2727
pagerfanta: "^3.7"
2828
symfony: "^5.4"
2929
exclude:
@@ -37,7 +37,7 @@ jobs:
3737
collections: "^2.0"
3838
persistence: "^2.0"
3939
- persistence: "^2.0"
40-
symfony: "~6.4.0"
40+
symfony: "^6.4"
4141

4242
steps:
4343
-

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG COMPOSER_VERSION=2.3
2-
ARG PHP_VERSION=8.0
2+
ARG PHP_VERSION=8.3
33

44
FROM composer:${COMPOSER_VERSION} AS composer
55
FROM mlocati/php-extension-installer AS php_extension_installer

composer.json

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
}
2626
],
2727
"require": {
28-
"php": "^8.0",
28+
"php": "^8.1",
2929
"babdev/pagerfanta-bundle": "^3.7 || ^4.0",
3030
"doctrine/annotations": "^2.0",
3131
"doctrine/collections": "^1.8 || ^2.0",
@@ -37,20 +37,20 @@
3737
"gedmo/doctrine-extensions": "^2.4.12 || ^3.0",
3838
"jms/serializer-bundle": "^3.5 || ^4.0 || ^5.0",
3939
"sylius/registry": "^1.2",
40-
"symfony/config": "^5.4 || ^6.0",
40+
"symfony/config": "^5.4 || ^6.4",
4141
"symfony/deprecation-contracts": "^2.1 || ^3.0",
42-
"symfony/expression-language": "^5.4 || ^6.0",
43-
"symfony/form": "^5.4 || ^6.0",
44-
"symfony/framework-bundle": "^5.4 || ^6.0",
45-
"symfony/http-foundation": "^5.4 || ^6.0",
46-
"symfony/intl": "^5.4 || ^6.0",
47-
"symfony/security-core": "^5.4 || ^6.0",
48-
"symfony/security-csrf": "^5.4 || ^6.0",
49-
"symfony/routing": "^5.4 || ^6.0",
50-
"symfony/translation": "^5.4 || ^6.0",
51-
"symfony/twig-bundle": "^5.4 || ^6.0",
52-
"symfony/validator": "^5.4 || ^6.0",
53-
"symfony/yaml": "^5.4 || ^6.0",
42+
"symfony/expression-language": "^5.4 || ^6.4",
43+
"symfony/form": "^5.4 || ^6.4",
44+
"symfony/framework-bundle": "^5.4 || ^6.4",
45+
"symfony/http-foundation": "^5.4 || ^6.4",
46+
"symfony/intl": "^5.4 || ^6.4",
47+
"symfony/security-core": "^5.4 || ^6.4",
48+
"symfony/security-csrf": "^5.4 || ^6.4",
49+
"symfony/routing": "^5.4 || ^6.4",
50+
"symfony/translation": "^5.4 || ^6.4",
51+
"symfony/twig-bundle": "^5.4 || ^6.4",
52+
"symfony/validator": "^5.4 || ^6.4",
53+
"symfony/yaml": "^5.4 || ^6.4",
5454
"webmozart/assert": "^1.8",
5555
"willdurand/hateoas-bundle": "^2.0",
5656
"winzou/state-machine-bundle": "^0.6",
@@ -73,17 +73,18 @@
7373
"phpunit/phpunit": "^9.5",
7474
"sylius-labs/coding-standard": "^4.0",
7575
"sylius/grid-bundle": "^1.7 || v1.12.0-ALPHA.1",
76-
"symfony/dependency-injection": "^5.4 || ^6.0",
77-
"symfony/dotenv": "^5.4 || ^6.0",
78-
"symfony/stopwatch": "^5.4 || ^6.0",
79-
"symfony/uid": "^5.4 || ^6.0",
80-
"symfony/workflow": "^5.4 || ^6.0",
76+
"symfony/console": "^5.4 || ^6.4",
77+
"symfony/dependency-injection": "^5.4 || ^6.4",
78+
"symfony/dotenv": "^5.4 || ^6.4",
79+
"symfony/stopwatch": "^5.4 || ^6.4",
80+
"symfony/uid": "^5.4 || ^6.4",
81+
"symfony/workflow": "^5.4 || ^6.4",
8182
"twig/twig": "^2.12 || ^3.0",
8283
"vimeo/psalm": "^5.20",
8384
"rector/rector": "^0.18.2",
84-
"symfony/messenger": "^5.4 || ^6.0",
85-
"symfony/serializer": "^5.4 || ^6.0",
86-
"symfony/security-bundle": "^5.4 || ^6.0"
85+
"symfony/messenger": "^5.4 || ^6.4",
86+
"symfony/serializer": "^5.4 || ^6.4",
87+
"symfony/security-bundle": "^5.4 || ^6.4"
8788
},
8889
"suggest": {
8990
"doctrine/orm": "^2.5",

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services:
55
target: php
66
args:
77
COMPOSER_VERSION: "2.3"
8-
PHP_VERSION: "8.0"
8+
PHP_VERSION: "8.3"
99
command: ["composer", "test"]
1010
volumes:
1111
- ./:/package:delegate

src/Component/composer.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@
3232
"doctrine/inflector": "^1.4 || ^2.0",
3333
"gedmo/doctrine-extensions": "^2.4.12 || ^3.0",
3434
"pagerfanta/core": "^3.7 || ^4.0",
35-
"symfony/event-dispatcher": "^5.4 || ^6.0",
36-
"symfony/form": "^5.4 || ^6.0",
37-
"symfony/http-foundation": "^5.4 || ^6.0",
38-
"symfony/http-kernel": "^5.4 || ^6.0",
39-
"symfony/property-access": "^5.4 || ^6.0",
40-
"symfony/routing": "^5.4 || ^6.0",
41-
"symfony/security-core": "^5.4 || ^6.0",
42-
"symfony/security-csrf": "^5.4 || ^6.0",
43-
"symfony/string": "^5.4 || ^6.0",
44-
"symfony/translation": "^5.4 || ^6.0",
45-
"symfony/validator": "^5.4 || ^6.0",
35+
"symfony/event-dispatcher": "^5.4 || ^6.4",
36+
"symfony/form": "^5.4 || ^6.4",
37+
"symfony/http-foundation": "^5.4 || ^6.4",
38+
"symfony/http-kernel": "^5.4 || ^6.4",
39+
"symfony/property-access": "^5.4 || ^6.4",
40+
"symfony/routing": "^5.4 || ^6.4",
41+
"symfony/security-core": "^5.4 || ^6.4",
42+
"symfony/security-csrf": "^5.4 || ^6.4",
43+
"symfony/string": "^5.4 || ^6.4",
44+
"symfony/translation": "^5.4 || ^6.4",
45+
"symfony/validator": "^5.4 || ^6.4",
4646
"willdurand/negotiation": "^3.1",
4747
"winzou/state-machine": "^0.4"
4848
},
@@ -54,8 +54,8 @@
5454
"phpspec/prophecy-phpunit": "^2.0",
5555
"phpunit/phpunit": "^9.5",
5656
"sylius/grid": "^1.7 || ^1.12",
57-
"symfony/serializer": "^5.4 || ^6.0",
58-
"symfony/workflow": "^5.4 || ^6.0",
57+
"symfony/serializer": "^5.4 || ^6.4",
58+
"symfony/workflow": "^5.4 || ^6.4",
5959
"twig/twig": "^2.12 || ^3.0"
6060
},
6161
"extra": {

0 commit comments

Comments
 (0)