Skip to content

Commit 94847c2

Browse files
authored
Upgrade to PHP 8.0 (#262)
* update Dockerfile runtime to PHP 8.0, update all components necessary and fix issues with tests. Replace Diactoros with Nyholm Psr17 factory * set the php version more effectively * use composer LTS * update CI file for newer PHP too * update elife libraries to latest supported * merge artifacts lost * update elife/api-client to latest stable * update all dependencies * Updates for newer PHPUnit from master merge * Updates for newer PHPUnit from master merge * Update all dependencies again * Update silex * Update dependencies to fix warnings given in test output * Revert "Update dependencies to fix warnings given in test output" This reverts commit a43fdbf.
1 parent 6378d89 commit 94847c2

File tree

10 files changed

+2741
-1441
lines changed

10 files changed

+2741
-1441
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM composer:2.2 AS build
33
COPY composer.json composer.lock ./
44
RUN composer --no-interaction install --no-suggest --prefer-dist
55

6-
FROM elifesciences/php_7.0_cli:656bb4bdf1e49a5e80337e2a7c4f44f10c3f52b0 AS base
6+
FROM ghcr.io/elifesciences/php:8.0-cli@sha256:f681973227dbab578218a98f252dfd36fd42016b74be6d0044221a7d8cdcc4e6 AS base
77

88
USER elife
99

composer.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,32 +13,32 @@
1313
}
1414
},
1515
"require": {
16-
"php": "^7.0",
17-
"elife/api-problem": "^1.0",
18-
"elife/content-negotiator": "^1.0",
19-
"elife/ping": "^1.0",
16+
"php": "8.0.*",
17+
"elife/api-problem": "^1.3",
18+
"elife/content-negotiator": "^1.1",
19+
"elife/ping": "^1.2",
2020
"jdesrosiers/silex-cors-provider": "^1.2",
21-
"silex/silex": "^2.0",
22-
"symfony/finder": "^3.1",
23-
"symfony/http-foundation": "^3.1",
24-
"symfony/http-kernel": "^3.1"
21+
"nyholm/psr7": "^1.8",
22+
"silexandfriends/silex": "^2.3",
23+
"symfony/finder": "^4.4",
24+
"symfony/http-foundation": "^4.4",
25+
"symfony/http-kernel": "^4.4"
2526
},
2627
"require-dev": {
2728
"elife/api": "^2.31",
28-
"elife/api-client": "^1.0@dev",
29-
"elife/api-validator": "^1.0@dev",
30-
"guzzlehttp/guzzle": "^6.0",
31-
"guzzlehttp/psr7": "^1.3",
29+
"elife/api-client": "^1.1",
30+
"elife/api-validator": "^1.1",
31+
"guzzlehttp/guzzle": "^7.9",
32+
"guzzlehttp/psr7": "^2.7",
3233
"justinrainbow/json-schema": "^5.1",
33-
"phpunit/phpunit": "^5.5",
34+
"phpunit/phpunit": "^9.6",
3435
"squizlabs/php_codesniffer": "^3.5",
35-
"symfony/filesystem": "^3.4",
36-
"symfony/psr-http-message-bridge": "^1.0",
37-
"zendframework/zend-diactoros": "^1.3"
36+
"symfony/filesystem": "^4.4",
37+
"symfony/psr-http-message-bridge": "^2.0"
3838
},
3939
"config": {
4040
"platform": {
41-
"php": "7.0.29"
41+
"php": "8.0.30"
4242
},
4343
"sort-packages": true
4444
}

0 commit comments

Comments
 (0)