Skip to content

Commit f933bf9

Browse files
committed
fix(php): removed PHP 8.1 support, minumal supported version is PHP 8.2
1 parent 70fcf22 commit f933bf9

File tree

131 files changed

+533
-488
lines changed

Some content is hidden

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

131 files changed

+533
-488
lines changed

.circleci/config.yml

Lines changed: 4 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ version: 2.1
33
aliases:
44
# Supported lowest PHP version
55
- &coverage-php-version
6-
php-version: [ '8.1' ]
6+
php-version: [ '8.2' ]
77

88
# Supported lowest Swoole versions
99
- &coverage-swooles
1010
swoole: [ 'openswoole-v22.1.2', 'swoole-6.0.0' ]
1111

1212
# Supported PHP versions
1313
- &php-versions
14-
php-version: ['8.1', '8.2', '8.3']
14+
php-version: ['8.2', '8.3']
1515

1616
# Supported Swoole/OpenSwoole versions
1717
- &swooles
@@ -32,22 +32,6 @@ aliases:
3232
symfony-version: [ '^5.4.21', '6.4.*', '7.0.*' ]
3333
composer-build: [ 'std', 'lowest', 'latest' ]
3434
exclude:
35-
- composer-build: 'std'
36-
php-version: '8.1'
37-
swoole: 'openswoole-v22.1.2'
38-
symfony-version: '6.4.*'
39-
- composer-build: 'std'
40-
php-version: '8.1'
41-
swoole: 'swoole-6.0.0'
42-
symfony-version: '6.4.*'
43-
- composer-build: 'std'
44-
php-version: '8.2'
45-
swoole: 'openswoole-v22.1.2'
46-
symfony-version: '^5.4.21'
47-
- composer-build: 'std'
48-
php-version: '8.2'
49-
swoole: 'swoole-6.0.0'
50-
symfony-version: '^5.4.21'
5135
- composer-build: 'std'
5236
php-version: '8.2'
5337
swoole: 'openswoole-v22.1.2'
@@ -72,14 +56,6 @@ aliases:
7256
php-version: '8.3'
7357
swoole: 'swoole-6.0.0'
7458
symfony-version: '6.4.*'
75-
- composer-build: 'std'
76-
php-version: '8.1'
77-
swoole: 'openswoole-v22.1.2'
78-
symfony-version: '7.0.*'
79-
- composer-build: 'std'
80-
php-version: '8.1'
81-
swoole: 'swoole-6.0.0'
82-
symfony-version: '7.0.*'
8359
- composer-build: 'std'
8460
php-version: '8.2'
8561
swoole: 'openswoole-v22.1.2'
@@ -96,22 +72,6 @@ aliases:
9672
php-version: '8.3'
9773
swoole: 'swoole-6.0.0'
9874
symfony-version: '7.0.*'
99-
- composer-build: 'lowest'
100-
php-version: '8.1'
101-
swoole: 'swoole-6.0.0'
102-
symfony-version: '7.0.*'
103-
- composer-build: 'latest'
104-
php-version: '8.1'
105-
swoole: 'swoole-6.0.0'
106-
symfony-version: '7.0.*'
107-
- composer-build: 'lowest'
108-
php-version: '8.1'
109-
swoole: 'openswoole-v22.1.2'
110-
symfony-version: '7.0.*'
111-
- composer-build: 'latest'
112-
php-version: '8.1'
113-
swoole: 'openswoole-v22.1.2'
114-
symfony-version: '7.0.*'
11575

11676
# Remote Docker config
11777
- &docker-remote-version
@@ -235,7 +195,7 @@ jobs:
235195
- run:
236196
name: Docker Buildx Bake all required images
237197
command: |-
238-
if [ "8.1" = "$PHP_VERSION" ]; then
198+
if [ "8.2" = "$PHP_VERSION" ]; then
239199
export MERGE_COVERAGE_TAG="$PHP_VERSION-$CIRCLE_SHA1"
240200
export SERVICES="ci coverage-xdebug coverage-pcov merge-code-coverage"
241201
fi
@@ -449,7 +409,7 @@ jobs:
449409
- codecov/upload:
450410
file: clover.xml
451411
docker:
452-
- image: docker.io/symfonywithswoole/swoole-bundle-merge-code-coverage:8.1-$CIRCLE_SHA1
412+
- image: docker.io/symfonywithswoole/swoole-bundle-merge-code-coverage:8.2-$CIRCLE_SHA1
453413
auth:
454414
username: $DOCKER_HUB_USERNAME
455415
password: $DOCKER_HUB_TOKEN

.php-cs-fixer.dist.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919
return $config->setRules([
2020
'@PER-CS2.0' => true,
21-
'@PHP81Migration' => true,
21+
'@PHP82Migration' => true,
2222
'array_indentation' => true,
2323
'array_syntax' => ['syntax' => 'short'],
2424
'blank_line_before_statement' => true,

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG PHP_TAG="8.1-cli-alpine3.21"
2-
ARG COMPOSER_TAG="2.5.2"
1+
ARG PHP_TAG="8.2-cli-alpine3.21"
2+
ARG COMPOSER_TAG="2.8.5"
33

44
FROM php:$PHP_TAG AS ext-builder
55
RUN apk add --no-cache linux-headers

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Symfony integration with [Open Swoole](https://openswoole.com/) to speed up your
110110
111111
### Current version
112112
113-
- PHP version `>= 8.1 && <= 8.3`
113+
- PHP version `>= 8.2 && <= 8.3`
114114
- Open Swoole PHP Extension `^v22.1.2`
115115
- Swoole PHP Extension `^6.0.0`
116116
- Symfony `^5.4.22 || ^6.4 || ^7.0`

composer.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
}
2727
],
2828
"require": {
29-
"php": "^8.1",
29+
"php": "^8.2",
3030
"ext-json": "*",
3131
"beberlei/assert": "^3.3",
3232
"laminas/laminas-code": "^4.7||^4.8",
@@ -44,7 +44,7 @@
4444
"upscale/ext-swoole": "^6.0.0"
4545
},
4646
"require-dev": {
47-
"ext-ffi": "^8.1",
47+
"ext-ffi": "^8.2",
4848
"ext-intl": "*",
4949
"blackfire/php-sdk": "^1.30",
5050
"doctrine/dbal": "^3.4",
@@ -70,9 +70,10 @@
7070
"phpunit/phpunit": "^10.5",
7171
"pixelfederation/doctrine-resettable-em-bundle": "^7.0|^8.0",
7272
"ramsey/uuid": "^4.7",
73+
"rector/rector": "^2.0",
7374
"slevomat/coding-standard": "^8.14",
7475
"squizlabs/php_codesniffer": "^3.8",
75-
"swoole-bundle/z-engine": "^8.1.1|^8.2.1|^8.3.0",
76+
"swoole-bundle/z-engine": "^8.2.1|^8.3.0",
7677
"swoole/ide-helper": "^6.0.0",
7778
"symfony/debug-bundle": "^5.4.26|^6.4|^7.0",
7879
"symfony/doctrine-messenger": "^5.4.30|^6.4|^7.0",
@@ -167,7 +168,9 @@
167168
"phpunit tests/Unit --colors=always --log-junit phpunit/junit.xml"
168169
],
169170
"grumphp_complete": "grumphp run --testsuite=complete",
170-
"grumphp_tests": "grumphp run --testsuite=tests"
171+
"grumphp_tests": "grumphp run --testsuite=tests",
172+
"phpcs": "phpcs --standard=phpcs.xml --extensions=php --tab-width=4 -sp src tests",
173+
"phpcbf": "phpcbf --standard=phpcs.xml --extensions=php --tab-width=4 -sp src tests"
171174
},
172175
"extra": {
173176
"symfony": {

composer.lock

Lines changed: 69 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docker-bake.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
variable "PHP_VERSION" {
2-
default = "8.1"
2+
default = "8.2"
33
}
44

55
variable "SWOOLE" {

docker-compose.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
x-env-aliases:
22
- &DEFAULT_BUILD_ARGS
3-
PHP_TAG: "${PHP_VERSION:-8.1}-cli-alpine${ALPINE_VERSION:-3.19}"
4-
PHP_API_VERSION: "${PHP_API_VERSION:-20210902}"
3+
PHP_TAG: "${PHP_VERSION:-8.2}-cli-alpine${ALPINE_VERSION:-3.21}"
4+
PHP_API_VERSION: "${PHP_API_VERSION:-20220829}"
55
COMPOSER_ARGS: "${COMPOSER_ARGS:-install}"
66
COMPOSER_AUTH: "${COMPOSER_AUTH:-}"
77
SWOOLE_EXTENSION: "${SWOOLE_EXTENSION:-openswoole}"
88
SWOOLE_VERSION: "${SWOOLE_VERSION:-v22.1.2}"
9-
COMPOSER_TAG: "${COMPOSER_TAG:-2.5.2}"
10-
XDEBUG_TAG: "${XDEBUG_TAG:-3.3.1}"
9+
COMPOSER_TAG: "${COMPOSER_TAG:-2.8.5}"
10+
XDEBUG_TAG: "${XDEBUG_TAG:-3.3.2}"
1111

1212
volumes:
1313
coverage: {}

mutagen.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ sync:
1212
mode: two-way-resolved
1313
swoole-bundle:
1414
alpha: "."
15-
beta: "docker://app@swoole-bundle-cli-81-openswoole-22.1.2/usr/src/app"
15+
beta: "docker://app@swoole-bundle-cli-82-openswoole-22.1.2/usr/src/app"

phpcs.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<arg value="ps"/>
1212

1313
<config name="installed_paths" value="../../slevomat/coding-standard"/>
14-
<config name="testVersion" value="8.1"/>
14+
<config name="testVersion" value="8.2"/>
1515

1616
<rule ref="PSR12">
1717
<exclude name="PSR2.Classes.ClassDeclaration.OpenBraceNewLine"/>
@@ -93,8 +93,8 @@
9393
</rule>
9494

9595
<rule ref="SlevomatCodingStandard.Classes.ClassStructure">
96+
<exclude-pattern>src/*</exclude-pattern>
9697
<exclude-pattern>tests/*</exclude-pattern>
97-
<exclude-pattern>src/*</exclude-pattern><!-- needs to be revisited -->
9898
</rule>
9999

100100
<rule ref="SlevomatCodingStandard.Attributes.AttributesOrder">
@@ -126,5 +126,6 @@
126126
<file>src</file>
127127
<file>tests</file>
128128
<exclude-pattern>/src/Bridge/Monolog/StreamHandler\.php$</exclude-pattern>
129+
<exclude-pattern>/tests/Fixtures/Symfony/app/var/*</exclude-pattern>
129130

130131
</ruleset>

0 commit comments

Comments
 (0)