Skip to content

Commit c97c8e0

Browse files
Steveb-pSteveb-p
authored
IBX-8119: Upgraded minimum PHP version to 8.3
#358
1 parent 669c300 commit c97c8e0

File tree

3 files changed

+75
-83
lines changed

3 files changed

+75
-83
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 25 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ on:
1010
jobs:
1111
cs-fix:
1212
name: Run code style check
13-
runs-on: "ubuntu-20.04"
13+
runs-on: "ubuntu-22.04"
1414
strategy:
1515
matrix:
1616
php:
17-
- '8.0'
17+
- '8.3'
1818
steps:
19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v4
2020

2121
- name: Setup PHP Action
2222
uses: shivammathur/setup-php@v2
@@ -26,28 +26,26 @@ jobs:
2626
extensions: 'pdo_sqlite, gd'
2727
tools: cs2pr
2828

29-
- uses: "ramsey/composer-install@v1"
29+
- uses: ramsey/composer-install@v3
3030
with:
31-
dependency-versions: "highest"
31+
dependency-versions: highest
3232

3333
- name: Run code style check
3434
run: composer run-script check-cs -- --format=checkstyle | cs2pr
3535

3636
tests:
3737
name: Unit tests & SQLite integration tests
38-
runs-on: "ubuntu-20.04"
38+
runs-on: "ubuntu-22.04"
3939
timeout-minutes: 15
4040

4141
strategy:
4242
fail-fast: false
4343
matrix:
4444
php:
45-
- '7.4'
46-
- '8.0'
47-
- '8.1'
45+
- '8.3'
4846

4947
steps:
50-
- uses: actions/checkout@v2
48+
- uses: actions/checkout@v4
5149

5250
- name: Setup PHP Action
5351
uses: shivammathur/setup-php@v2
@@ -57,9 +55,9 @@ jobs:
5755
extensions: pdo_sqlite, gd
5856
tools: cs2pr
5957

60-
- uses: "ramsey/composer-install@v1"
58+
- uses: ramsey/composer-install@v3
6159
with:
62-
dependency-versions: "highest"
60+
dependency-versions: highest
6361

6462
- name: Setup problem matchers for PHPUnit
6563
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
@@ -90,19 +88,17 @@ jobs:
9088
--health-timeout 5s
9189
--health-retries 5
9290
--tmpfs /var/lib/postgres
93-
runs-on: "ubuntu-20.04"
91+
runs-on: "ubuntu-22.04"
9492
timeout-minutes: 60
9593

9694
strategy:
9795
fail-fast: false
9896
matrix:
9997
php:
100-
- '7.4'
101-
- '8.0'
102-
- '8.1'
98+
- '8.3'
10399

104100
steps:
105-
- uses: actions/checkout@v2
101+
- uses: actions/checkout@v4
106102

107103
- name: Setup PHP Action
108104
uses: shivammathur/setup-php@v2
@@ -112,9 +108,9 @@ jobs:
112108
extensions: pdo_pgsql, gd
113109
tools: cs2pr
114110

115-
- uses: "ramsey/composer-install@v1"
111+
- uses: ramsey/composer-install@v3
116112
with:
117-
dependency-versions: "highest"
113+
dependency-versions: highest
118114

119115
- name: Setup problem matchers for PHPUnit
120116
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
@@ -145,19 +141,17 @@ jobs:
145141
--health-timeout=5s
146142
--health-retries=5
147143
--tmpfs=/var/lib/mysql
148-
runs-on: "ubuntu-20.04"
144+
runs-on: "ubuntu-22.04"
149145
timeout-minutes: 60
150146

151147
strategy:
152148
fail-fast: false
153149
matrix:
154150
php:
155-
- '7.4'
156-
- '8.0'
157-
- '8.1'
151+
- '8.3'
158152

159153
steps:
160-
- uses: actions/checkout@v2
154+
- uses: actions/checkout@v4
161155

162156
- name: Setup PHP Action
163157
uses: shivammathur/setup-php@v2
@@ -167,9 +161,9 @@ jobs:
167161
extensions: pdo_mysql, gd, redis
168162
tools: cs2pr
169163

170-
- uses: "ramsey/composer-install@v1"
164+
- uses: ramsey/composer-install@v3
171165
with:
172-
dependency-versions: "highest"
166+
dependency-versions: highest
173167

174168
- name: Setup problem matchers for PHPUnit
175169
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
@@ -182,7 +176,7 @@ jobs:
182176

183177
solr-integration:
184178
name: "Solr integration tests"
185-
runs-on: "ubuntu-20.04"
179+
runs-on: "ubuntu-22.04"
186180
timeout-minutes: 30
187181
permissions:
188182
packages: read
@@ -207,11 +201,9 @@ jobs:
207201
fail-fast: false
208202
matrix:
209203
php:
210-
- '7.4'
211-
- '8.0'
212-
- '8.1'
204+
- '8.3'
213205
steps:
214-
- uses: actions/checkout@v2
206+
- uses: actions/checkout@v4
215207
with:
216208
fetch-depth: 0
217209

@@ -226,9 +218,9 @@ jobs:
226218
VERSION=$(jq -r '.extra | ."branch-alias" | ."dev-main"' < composer.json)
227219
composer require --no-update "ibexa/solr:$VERSION"
228220
229-
- uses: "ramsey/composer-install@v1"
221+
- uses: ramsey/composer-install@v3
230222
with:
231-
dependency-versions: "highest"
223+
dependency-versions: highest
232224

233225
- name: Run integration test suite
234226
run: composer test-integration-solr

‎.github/workflows/gha-docker-solr.yaml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ env:
1515

1616
jobs:
1717
build-and-publish:
18-
runs-on: "ubuntu-20.04"
18+
runs-on: "ubuntu-22.04"
1919
permissions:
2020
packages: write
2121
services:
@@ -50,9 +50,9 @@ jobs:
5050
VERSION=$(jq -r '.extra | ."branch-alias" | ."dev-main"' < composer.json)
5151
composer require --no-update "ibexa/solr:$VERSION"
5252
53-
- uses: "ramsey/composer-install@v2"
53+
- uses: ramsey/composer-install@v3
5454
with:
55-
dependency-versions: "highest"
55+
dependency-versions: highest
5656

5757
- name: Run integration test suite
5858
run: composer test-integration-solr
@@ -71,4 +71,3 @@ jobs:
7171

7272
- name: Push image
7373
run: docker push "$IMAGE_NAME"
74-

‎composer.json‎

Lines changed: 47 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -7,82 +7,82 @@
77
"php-64bit": "For support of more than 30 languages, a 64bit php installation on all involved prod/dev machines is required"
88
},
99
"require": {
10-
"php": "^7.4 || ^8.0",
10+
"php": " >=8.3",
11+
"ext-PDO": "*",
12+
"ext-SPL": "*",
1113
"ext-ctype": "*",
14+
"ext-curl": "*",
15+
"ext-dom": "*",
1216
"ext-fileinfo": "*",
1317
"ext-intl": "*",
1418
"ext-json": "*",
1519
"ext-mbstring": "*",
16-
"ext-PDO": "*",
17-
"ext-SPL": "*",
1820
"ext-xsl": "*",
19-
"ext-curl": "*",
20-
"ext-dom": "*",
21+
"composer/package-versions-deprecated": "^1.11",
22+
"doctrine/dbal": "^2.13.0",
23+
"doctrine/doctrine-bundle": "^2.0",
24+
"doctrine/orm": "^2.7",
25+
"friendsofphp/proxy-manager-lts": "^1.0",
26+
"friendsofsymfony/http-cache-bundle": "^2.8",
27+
"friendsofsymfony/jsrouting-bundle": "^2.5",
28+
"guzzlehttp/guzzle": "^6.5",
29+
"ibexa/doctrine-schema": "~5.0.x-dev",
30+
"jms/translation-bundle": "^1.5",
31+
"league/flysystem-memory": "^2.0.6",
32+
"liip/imagine-bundle": "^2.3",
33+
"nelmio/cors-bundle": "^2.0",
34+
"oneup/flysystem-bundle": "^4.4.2",
35+
"pagerfanta/pagerfanta": "^2.1",
36+
"php-http/guzzle6-adapter": "^2.0",
37+
"psr/event-dispatcher": "^1.0",
38+
"sensio/framework-extra-bundle": "^6.1",
39+
"symfony-cmf/routing": "^2.3",
2140
"symfony/cache": "^5.3.0",
22-
"symfony/http-foundation": "^5.3.0",
23-
"symfony/framework-bundle": "^5.3.0",
24-
"symfony/process": "^5.3.0",
41+
"symfony/console": "^5.3.0",
2542
"symfony/dependency-injection": "^5.3.0",
2643
"symfony/event-dispatcher": "^5.3.0",
44+
"symfony/expression-language": "^5.3.0",
45+
"symfony/framework-bundle": "^5.3.0",
46+
"symfony/http-client": "^5.3.0",
47+
"symfony/http-foundation": "^5.3.0",
48+
"symfony/http-kernel": "^5.3.0",
2749
"symfony/mime": "^5.3.0",
28-
"symfony/translation": "^5.3.0",
29-
"symfony/yaml": "^5.3.0",
3050
"symfony/polyfill-php80": "^1.27",
51+
"symfony/process": "^5.3.0",
52+
"symfony/security-bundle": "^5.3.0",
3153
"symfony/security-core": "^5.3.0",
3254
"symfony/security-http": "^5.3.0",
33-
"symfony/security-bundle": "^5.3.0",
3455
"symfony/serializer": "^5.3.0",
35-
"symfony/http-client": "^5.3.0",
36-
"symfony/http-kernel": "^5.3.0",
37-
"symfony/console": "^5.3.0",
38-
"symfony/expression-language": "^5.3.0",
56+
"symfony/templating": "^5.3.0",
57+
"symfony/translation": "^5.3.0",
3958
"symfony/validator": "^5.3.0",
4059
"symfony/var-dumper": "^5.3.0",
41-
"ibexa/doctrine-schema": "~5.0.0@dev",
42-
"symfony-cmf/routing": "^2.3",
43-
"guzzlehttp/guzzle": "^6.5",
44-
"php-http/guzzle6-adapter": "^2.0",
45-
"nelmio/cors-bundle": "^2.0",
46-
"pagerfanta/pagerfanta": "^2.1",
47-
"doctrine/dbal": "^2.13.0",
48-
"doctrine/orm": "^2.7",
49-
"doctrine/doctrine-bundle": "^2.0",
50-
"liip/imagine-bundle": "^2.3",
51-
"oneup/flysystem-bundle": "^4.4.2",
52-
"league/flysystem-memory": "^2.0.6",
53-
"friendsofsymfony/http-cache-bundle": "^2.8",
54-
"sensio/framework-extra-bundle": "^6.1",
55-
"jms/translation-bundle": "^1.5",
56-
"twig/twig": "^3.0",
60+
"symfony/yaml": "^5.3.0",
5761
"twig/extra-bundle": "^3.0",
58-
"friendsofsymfony/jsrouting-bundle": "^2.5",
59-
"friendsofphp/proxy-manager-lts": "^1.0",
60-
"psr/event-dispatcher": "^1.0",
61-
"symfony/templating": "^5.3.0",
62-
"composer/package-versions-deprecated": "^1.11"
62+
"twig/twig": "^3.0"
6363
},
6464
"require-dev": {
6565
"behat/behat": "^3.6.1",
66-
"jenner/simple_fork": "^1.2",
6766
"friends-of-behat/mink-extension": "^2.4",
6867
"ibexa/ci-scripts": "^0.2@dev",
6968
"ibexa/code-style": "^1.0",
70-
"phpunit/phpunit": "^8.2",
69+
"jenner/simple_fork": "^1.2",
7170
"matthiasnoback/symfony-dependency-injection-test": "^4.1",
72-
"symfony/phpunit-bridge": "^5.1",
73-
"symfony/proxy-manager-bridge": "^5.3",
74-
"symfony/runtime": "^5.3.0",
7571
"phpstan/phpstan": "^1.2",
72+
"phpstan/phpstan-phpunit": "^1.3",
7673
"phpstan/phpstan-symfony": "^1.3",
77-
"phpstan/phpstan-phpunit": "^1.3"
74+
"phpunit/phpunit": "^8.2",
75+
"symfony/phpunit-bridge": "^5.1",
76+
"symfony/proxy-manager-bridge": "^5.3",
77+
"symfony/runtime": "^5.3.0"
7878
},
7979
"conflict": {
80-
"friendsofphp/php-cs-fixer": "3.5.0",
81-
"symfony/dependency-injection": "5.3.7",
82-
"symfony/security-core": "5.3.0",
8380
"doctrine/dbal": "2.7.0",
8481
"ezsystems/ezpublish-legacy": "*",
85-
"phpunit/phpunit": "8.4.0"
82+
"friendsofphp/php-cs-fixer": "3.5.0",
83+
"phpunit/phpunit": "8.4.0",
84+
"symfony/dependency-injection": "5.3.7",
85+
"symfony/security-core": "5.3.0"
8686
},
8787
"replace": {
8888
"ezsystems/ezplatform-kernel": "*"
@@ -131,6 +131,7 @@
131131
},
132132
"config": {
133133
"process-timeout": 3000,
134+
"sort-packages": true,
134135
"allow-plugins": {
135136
"composer/package-versions-deprecated": true,
136137
"*": false

0 commit comments

Comments
 (0)