Skip to content

Commit d50b4b9

Browse files
committed
[3.x] Update to PHP 8.4
1 parent be55cc0 commit d50b4b9

File tree

3 files changed

+1083
-1548
lines changed

3 files changed

+1083
-1548
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ SHELL=bash
44
.PHONY: *
55

66
CONTAINER_REGISTRY_REPO="ghcr.io/wyrihaximusnet/php"
7-
COMPOSER_SHOW_EXTENSION_LIST_PROD=$(shell composer show -t | grep -o "\-\-\(ext-\).\+" | sort | uniq | cut -d- -f4- | tr -d '\n' | grep . | sed '/^$$/d' | xargs | sed -e 's/ /, /g' | tr -cd '[:alnum:],' | sed 's/.$$//')
8-
COMPOSER_SHOW_EXTENSION_LIST_DEV=$(shell composer show -s | grep -o "\(ext-\).\+" | sort | uniq | cut -d- -f2- | cut -d" " -f1 | xargs | sed -e 's/ /, /g' | tr -cd '[:alnum:],')
7+
COMPOSER_SHOW_EXTENSION_LIST_PROD=$(shell ((command -v docker >/dev/null 2>&1) && docker run --rm -v "`pwd`:`pwd`" -w `pwd` ${CONTAINER_REGISTRY_REPO}:8.4-nts-alpine-slim-dev composer show -t) | grep -o "\-\-\(ext-\).\+" | sort | uniq | cut -d- -f4- | tr -d '\n' | grep . | sed '/^$$/d' | xargs | sed -e 's/ /, /g' | tr -cd '[:alnum:],' | sed 's/.$$//')
8+
COMPOSER_SHOW_EXTENSION_LIST_DEV=$(shell ((command -v docker >/dev/null 2>&1) && docker run --rm -v "`pwd`:`pwd`" -w `pwd` ${CONTAINER_REGISTRY_REPO}:8.4-nts-alpine-slim-dev composer show -s) | grep -o "\(ext-\).\+" | sort | uniq | cut -d- -f2- | cut -d" " -f1 | xargs | sed -e 's/ /, /g' | tr -cd '[:alnum:],')
99
COMPOSER_SHOW_EXTENSION_LIST=$(shell echo "${COMPOSER_SHOW_EXTENSION_LIST_PROD},${COMPOSER_SHOW_EXTENSION_LIST_DEV}")
1010
SLIM_DOCKER_IMAGE=$(shell php -r 'echo count(array_intersect(["gd", "vips"], explode(",", "${COMPOSER_SHOW_EXTENSION_LIST}"))) > 0 ? "" : "-slim";')
1111
NTS_OR_ZTS_DOCKER_IMAGE=$(shell php -r 'echo count(array_intersect(["parallel"], explode(",", "${COMPOSER_SHOW_EXTENSION_LIST}"))) > 0 ? "zts" : "nts";')
1212
PHP_VERSION:=$(shell (((command -v docker >/dev/null 2>&1) && docker run --rm -v "`pwd`:`pwd`" ${CONTAINER_REGISTRY_REPO}:8.4-nts-alpine-slim php -r "echo json_decode(file_get_contents('`pwd`/composer.json'), true)['config']['platform']['php'];") || echo "8.3") | php -r "echo str_replace('|', '.', explode('.', implode('|', explode('.', stream_get_contents(STDIN), 2)), 2)[0]);")
1313
CONTAINER_NAME=$(shell echo "${CONTAINER_REGISTRY_REPO}:${PHP_VERSION}-${NTS_OR_ZTS_DOCKER_IMAGE}-alpine${SLIM_DOCKER_IMAGE}-dev")
14-
COMPOSER_CACHE_DIR=$(shell composer config --global cache-dir -q || echo ${HOME}/.composer-php/cache)
14+
COMPOSER_CACHE_DIR=$(shell (command -v docker >/dev/null 2>&1) && docker run --rm -v "`pwd`:`pwd`" -w `pwd` ${CONTAINER_REGISTRY_REPO}:8.4-nts-alpine-slim-dev composer config --global cache-dir -q || echo ${HOME}/.composer-php/cache)
1515
COMPOSER_CONTAINER_CACHE_DIR=$(shell ((command -v docker >/dev/null 2>&1) && docker run --rm -it ${CONTAINER_NAME} composer config --global cache-dir -q) || echo ${HOME}/.composer-php/cache)
1616

1717
ifneq ("$(wildcard /.you-are-in-a-wyrihaximus.net-php-docker-image)","")

composer.json

Lines changed: 57 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,62 @@
11
{
2-
"name": "react-parallel/runtime",
3-
"description": "\ud83d\udca8 Convinence wrapper around ext-parallel Runtime for and ReactPHP",
4-
"license": "MIT",
5-
"authors": [
6-
{
7-
"name": "Cees-Jan Kiewiet",
8-
"email": "ceesjank@gmail.com",
9-
"homepage": "http://wyrihaximus.net/"
10-
}
11-
],
12-
"require": {
13-
"php": "^8.3",
14-
"ext-parallel": "*",
15-
"react-parallel/event-loop": "^2.1.0",
16-
"react/event-loop": "^1.5",
17-
"react/promise": "^3.2",
18-
"wyrihaximus/constants": "^1.6"
19-
},
20-
"require-dev": {
21-
"react-parallel/stubs": "^1.2",
22-
"wyrihaximus/async-test-utilities": "^9.3.0",
23-
"wyrihaximus/makefiles": "^0.5.0",
24-
"wyrihaximus/ticking-promise": "^3.1.0"
25-
},
26-
"autoload": {
27-
"psr-4": {
28-
"ReactParallel\\Runtime\\": "src/"
29-
}
2+
"name": "react-parallel/runtime",
3+
"description": "\ud83d\udca8 Convinence wrapper around ext-parallel Runtime for and ReactPHP",
4+
"license": "MIT",
5+
"authors": [
6+
{
7+
"name": "Cees-Jan Kiewiet",
8+
"email": "ceesjank@gmail.com",
9+
"homepage": "http://wyrihaximus.net/"
10+
}
11+
],
12+
"require": {
13+
"php": "^8.4",
14+
"ext-parallel": "*",
15+
"react-parallel/event-loop": "^2.1.0",
16+
"react/event-loop": "^1.5",
17+
"react/promise": "^3.3",
18+
"wyrihaximus/constants": "^1.6"
19+
},
20+
"require-dev": {
21+
"react-parallel/stubs": "^1.2",
22+
"wyrihaximus/async-test-utilities": "^10.1.0",
23+
"wyrihaximus/makefiles": "^0.6.0",
24+
"wyrihaximus/ticking-promise": "^3.1.0"
25+
},
26+
"autoload": {
27+
"psr-4": {
28+
"ReactParallel\\Runtime\\": "src/"
29+
}
30+
},
31+
"autoload-dev": {
32+
"psr-4": {
33+
"ReactParallel\\Tests\\Runtime\\": "tests/"
3034
},
31-
"autoload-dev": {
32-
"psr-4": {
33-
"ReactParallel\\Tests\\Runtime\\": "tests/"
34-
},
35-
"files": [
36-
"tests/LatchcombException.php"
37-
]
35+
"files": [
36+
"tests/LatchcombException.php"
37+
]
38+
},
39+
"config": {
40+
"allow-plugins": {
41+
"dealerdirect/phpcodesniffer-composer-installer": true,
42+
"ergebnis/composer-normalize": true,
43+
"icanhazstring/composer-unused": true,
44+
"infection/extension-installer": true,
45+
"phpstan/extension-installer": true,
46+
"wyrihaximus/makefiles": true,
47+
"wyrihaximus/test-utilities": true
3848
},
39-
"config": {
40-
"allow-plugins": {
41-
"dealerdirect/phpcodesniffer-composer-installer": true,
42-
"ergebnis/composer-normalize": true,
43-
"icanhazstring/composer-unused": true,
44-
"infection/extension-installer": true,
45-
"phpstan/extension-installer": true,
46-
"wyrihaximus/makefiles": true
47-
},
48-
"platform": {
49-
"php": "8.3.13"
50-
},
51-
"sort-packages": true
49+
"platform": {
50+
"php": "8.4.13"
5251
},
53-
"scripts": {
54-
"post-install-cmd": [
55-
"composer normalize"
56-
],
57-
"post-update-cmd": [
58-
"composer normalize"
59-
]
60-
}
52+
"sort-packages": true
53+
},
54+
"scripts": {
55+
"post-install-cmd": [
56+
"make on-install-or-update || true"
57+
],
58+
"post-update-cmd": [
59+
"make on-install-or-update || true"
60+
]
61+
}
6162
}

0 commit comments

Comments
 (0)