Skip to content

Commit d562d2d

Browse files
WyriHaximusWyriHaximus
authored
Merge pull request #73 from reactphp-parallel/2.x-PHP-8.4PLUS
[2.x] Update to PHP 8.4+
2 parents bb32da6 + f5b35d0 commit d562d2d

File tree

3 files changed

+1111
-1576
lines changed

3 files changed

+1111
-1576
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: 62 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,66 @@
11
{
2-
"name": "react-parallel/limited-pool",
3-
"description": "\ud83c\udfd4\ufe0f Limited pool for ext-parallel",
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-
"react-parallel/contracts": "^2.1.0",
15-
"react/async": "^4.3.0",
16-
"react/event-loop": "^1.5.0",
17-
"react/promise": "^3.2.0",
18-
"wyrihaximus/pool-info": "^2.0.0"
19-
},
20-
"require-dev": {
21-
"ext-parallel": "*",
22-
"moneyphp/money": "^4.7.0",
23-
"react-parallel/event-loop": "^2.1.0",
24-
"react-parallel/infinite-pool": "^3.1.0",
25-
"react-parallel/pool-tests": "^5.0.0",
26-
"react-parallel/stubs": "^1.2.0",
27-
"wyrihaximus/async-test-utilities": "^9.3.0",
28-
"wyrihaximus/makefiles": "^0.5.0"
29-
},
30-
"minimum-stability": "dev",
31-
"prefer-stable": true,
32-
"autoload": {
33-
"psr-4": {
34-
"ReactParallel\\Pool\\Limited\\": "src/"
35-
}
36-
},
37-
"autoload-dev": {
38-
"psr-4": {
39-
"ReactParallel\\Tests\\Pool\\Limited\\": "tests/"
40-
}
2+
"name": "react-parallel/limited-pool",
3+
"description": "\ud83c\udfd4\ufe0f Limited pool for ext-parallel",
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+
"react-parallel/contracts": "^2.1.0",
15+
"react/async": "^4.3.0",
16+
"react/event-loop": "^1.5.0",
17+
"react/promise": "^3.2.0",
18+
"wyrihaximus/pool-info": "^2.0.0"
19+
},
20+
"require-dev": {
21+
"ext-parallel": "*",
22+
"moneyphp/money": "^4.7.0",
23+
"react-parallel/event-loop": "^2.1.0",
24+
"react-parallel/infinite-pool": "^3.1.0",
25+
"react-parallel/pool-tests": "^5.1.0",
26+
"react-parallel/stubs": "^1.2.0",
27+
"wyrihaximus/async-test-utilities": "^10.1.0",
28+
"wyrihaximus/makefiles": "^0.6.0"
29+
},
30+
"minimum-stability": "dev",
31+
"prefer-stable": true,
32+
"autoload": {
33+
"psr-4": {
34+
"ReactParallel\\Pool\\Limited\\": "src/"
35+
}
36+
},
37+
"autoload-dev": {
38+
"psr-4": {
39+
"ReactParallel\\Tests\\Pool\\Limited\\": "tests/"
40+
}
41+
},
42+
"config": {
43+
"allow-plugins": {
44+
"dealerdirect/phpcodesniffer-composer-installer": true,
45+
"ergebnis/composer-normalize": true,
46+
"icanhazstring/composer-unused": true,
47+
"infection/extension-installer": true,
48+
"ocramius/package-versions": true,
49+
"phpstan/extension-installer": true,
50+
"wyrihaximus/makefiles": true,
51+
"wyrihaximus/test-utilities": true
4152
},
42-
"config": {
43-
"allow-plugins": {
44-
"dealerdirect/phpcodesniffer-composer-installer": true,
45-
"ergebnis/composer-normalize": true,
46-
"icanhazstring/composer-unused": true,
47-
"infection/extension-installer": true,
48-
"ocramius/package-versions": true,
49-
"phpstan/extension-installer": true,
50-
"wyrihaximus/makefiles": true
51-
},
52-
"platform": {
53-
"php": "8.3.13"
54-
},
55-
"sort-packages": true
53+
"platform": {
54+
"php": "8.4.13"
5655
},
57-
"scripts": {
58-
"post-install-cmd": [
59-
"composer normalize"
60-
],
61-
"post-update-cmd": [
62-
"composer normalize"
63-
]
64-
}
56+
"sort-packages": true
57+
},
58+
"scripts": {
59+
"post-install-cmd": [
60+
"make on-install-or-update || true"
61+
],
62+
"post-update-cmd": [
63+
"make on-install-or-update || true"
64+
]
65+
}
6566
}

0 commit comments

Comments
 (0)