Skip to content

Commit 2997bd5

Browse files
WyriHaximusWyriHaximus
authored
Merge pull request #27 from WyriHaximus/php-8.4-PLUS-QA-updates
PHP 8.4 + QA updates
2 parents 1b74649 + bad5c61 commit 2997bd5

File tree

8 files changed

+1251
-1653
lines changed

8 files changed

+1251
-1653
lines changed

‎Makefile

Lines changed: 31 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,16 @@ SHELL=bash
33

44
.PHONY: *
55

6-
COMPOSER_SHOW_EXTENSION_LIST=$(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/.$$//')
6+
CONTAINER_REGISTRY_REPO="ghcr.io/wyrihaximusnet/php"
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:],')
9+
COMPOSER_SHOW_EXTENSION_LIST=$(shell echo "${COMPOSER_SHOW_EXTENSION_LIST_PROD},${COMPOSER_SHOW_EXTENSION_LIST_DEV}")
710
SLIM_DOCKER_IMAGE=$(shell php -r 'echo count(array_intersect(["gd", "vips"], explode(",", "${COMPOSER_SHOW_EXTENSION_LIST}"))) > 0 ? "" : "-slim";')
8-
PHP_VERSION:=$(shell docker run --rm -v "`pwd`:`pwd`" jess/jq jq -r -c '.config.platform.php' "`pwd`/composer.json" | php -r "echo str_replace('|', '.', explode('.', implode('|', explode('.', stream_get_contents(STDIN), 2)), 2)[0]);")
9-
CONTAINER_NAME=$(shell echo "ghcr.io/wyrihaximusnet/php:${PHP_VERSION}-nts-alpine${SLIM_DOCKER_IMAGE}-dev")
10-
COMPOSER_CACHE_DIR=$(shell composer config --global cache-dir -q || echo ${HOME}/.composer-php/cache)
11-
COMPOSER_CONTAINER_CACHE_DIR=$(shell docker run --rm -it ${CONTAINER_NAME} composer config --global cache-dir -q || echo ${HOME}/.composer-php/cache)
11+
NTS_OR_ZTS_DOCKER_IMAGE=$(shell php -r 'echo count(array_intersect(["parallel"], explode(",", "${COMPOSER_SHOW_EXTENSION_LIST}"))) > 0 ? "zts" : "nts";')
12+
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]);")
13+
CONTAINER_NAME=$(shell echo "${CONTAINER_REGISTRY_REPO}:${PHP_VERSION}-${NTS_OR_ZTS_DOCKER_IMAGE}-alpine${SLIM_DOCKER_IMAGE}-dev")
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)
15+
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)
1216

1317
ifneq ("$(wildcard /.you-are-in-a-wyrihaximus.net-php-docker-image)","")
1418
IN_DOCKER=TRUE
@@ -23,6 +27,7 @@ else
2327
-v "`pwd`:`pwd`" \
2428
-v "${COMPOSER_CACHE_DIR}:${COMPOSER_CONTAINER_CACHE_DIR}" \
2529
-w "`pwd`" \
30+
-e OTEL_PHP_FIBERS_ENABLED="true" \
2631
"${CONTAINER_NAME}"
2732
endif
2833

@@ -33,46 +38,48 @@ else
3338
endif
3439

3540
all: ## Runs everything ####
36-
@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | grep -v "####" | awk 'BEGIN {FS = ":.*?## "}; {printf "%s\n", $$1}' | xargs --open-tty $(MAKE)
41+
@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | grep -v "####" | awk 'BEGIN {FS = ":.*?## "}; {printf "%s\n", $$1}' | xargs -o $(MAKE)
3742

38-
update-phpstan-extension: ## Update rules
39-
$(DOCKER_RUN) php utils/update.php
43+
on-install-or-update: ## Runs everything ####
44+
@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | grep -E "##\*(I|ILH)\*##" | awk 'BEGIN {FS = ":.*?## "}; {printf "%s\n", $$1}' | xargs -o $(MAKE)
4045

41-
syntax-php: ## Lint PHP syntax ##*LH*##
46+
syntax-php: ## Lint PHP syntax ##*ILH*##
4247
$(DOCKER_RUN) vendor/bin/parallel-lint --exclude vendor .
4348

44-
cs-fix: ## Fix any automatically fixable code style issues ###
45-
$(DOCKER_RUN) vendor/bin/phpcbf --parallel=$(THREADS) --cache=./var/.phpcs.cache.json --standard=./etc/qa/phpcs.xml || $(DOCKER_RUN) vendor/bin/phpcbf --parallel=$(THREADS) --cache=./var/.phpcs.cache.json --standard=./etc/qa/phpcs.xml || $(DOCKER_RUN) vendor/bin/phpcbf --parallel=$(THREADS) --cache=./var/.phpcs.cache.json --standard=./etc/qa/phpcs.xml -vvvv
49+
composer-normalize: ### Normalize composer.json ##*I*##
50+
$(DOCKER_RUN) composer normalize
51+
$(DOCKER_RUN) composer update --lock --no-scripts
52+
53+
rector-upgrade: ## Upgrade any automatically upgradable old code ##*I*##
54+
$(DOCKER_RUN) vendor/bin/rector -c ./etc/qa/rector.php
55+
56+
cs-fix: ## Fix any automatically fixable code style issues ##*I*##
57+
$(DOCKER_RUN) vendor/bin/phpcbf --parallel=1 --cache=./var/.phpcs.cache.json --standard=./etc/qa/phpcs.xml || $(DOCKER_RUN) vendor/bin/phpcbf --parallel=1 --cache=./var/.phpcs.cache.json --standard=./etc/qa/phpcs.xml || $(DOCKER_RUN) vendor/bin/phpcbf --parallel=1 --cache=./var/.phpcs.cache.json --standard=./etc/qa/phpcs.xml -vvvv
4658

4759
cs: ## Check the code for code style issues ##*LCH*##
48-
$(DOCKER_RUN) vendor/bin/phpcs --parallel=$(THREADS) --cache=./var/.phpcs.cache.json --standard=./etc/qa/phpcs.xml
60+
$(DOCKER_RUN) vendor/bin/phpcs --parallel=1 --cache=./var/.phpcs.cache.json --standard=./etc/qa/phpcs.xml
4961

5062
stan: ## Run static analysis (PHPStan) ##*LCH*##
51-
$(DOCKER_RUN) vendor/bin/phpstan analyse src tests --level max --ansi -c ./etc/qa/phpstan.neon
63+
$(DOCKER_RUN) vendor/bin/phpstan analyse etc src tests --level max --ansi -c ./etc/qa/phpstan.neon
5264

5365
unit-testing: ## Run tests ##*A*##
5466
$(DOCKER_RUN) vendor/bin/phpunit --colors=always -c ./etc/qa/phpunit.xml --coverage-text --coverage-html ./var/tests-unit-coverage-html --coverage-clover ./var/tests-unit-clover-coverage.xml
55-
$(DOCKER_RUN) test -n "$(COVERALLS_REPO_TOKEN)" && test -n "$(COVERALLS_RUN_LOCALLY)" && test -f ./var/tests-unit-clover-coverage.xml && vendor/bin/php-coveralls -v --coverage_clover ./build/logs/clover.xml --json_path ./var/tests-unit-clover-coverage-upload.json || true
5667

57-
unit-testing-raw: ## Run tests ##*D*##
68+
unit-testing-raw: ## Run tests ##*D*## ####
5869
php vendor/phpunit/phpunit/phpunit --colors=always -c ./etc/qa/phpunit.xml --coverage-text --coverage-html ./var/tests-unit-coverage-html --coverage-clover ./var/tests-unit-clover-coverage.xml
59-
test -n "$(COVERALLS_REPO_TOKEN)" && test -n "$(COVERALLS_RUN_LOCALLY)" && test -f ./var/tests-unit-clover-coverage.xml && ./vendor/bin/php-coveralls -v --coverage_clover ./build/logs/clover.xml --json_path ./var/tests-unit-clover-coverage-upload.json || true
6070

6171
mutation-testing: ## Run mutation testing ##*LCH*##
62-
$(DOCKER_RUN) vendor/bin/infection --ansi --log-verbosity=all --threads=$(THREADS) || (cat ./var/infection.log && false)
72+
$(DOCKER_RUN) vendor/bin/infection --ansi --log-verbosity=all --ignore-msi-with-no-mutations --threads=$(THREADS) || (cat ./var/infection.log && false)
6373

6474
mutation-testing-raw: ## Run mutation testing ####
65-
vendor/bin/infection --ansi --log-verbosity=all --threads=$(THREADS) || (cat ./var/infection.log && false)
75+
vendor/bin/infection --ansi --log-verbosity=all --ignore-msi-with-no-mutations --threads=$(THREADS) || (cat ./var/infection.log && false)
6676

6777
composer-require-checker: ## Ensure we require every package used in this package directly ##*C*##
6878
$(DOCKER_RUN) vendor/bin/composer-require-checker --ignore-parse-errors --ansi -vvv --config-file=./etc/qa/composer-require-checker.json
6979

7080
composer-unused: ## Ensure we don't require any package we don't use in this package directly ##*C*##
7181
$(DOCKER_RUN) vendor/bin/composer-unused --ansi --configuration=./etc/qa/composer-unused.php
7282

73-
libyear: ### Calculate how many libyear this package is behind with dependencies
74-
$(DOCKER_RUN) vendor/bin/libyear
75-
7683
backward-compatibility-check: ## Check code for backwards incompatible changes ##*C*##
7784
$(MAKE) backward-compatibility-check-raw || true
7885

@@ -91,6 +98,9 @@ outdated: ### Show outdated dependencies ####
9198
shell: ## Provides Shell access in the expected environment ####
9299
$(DOCKER_RUN) bash
93100

101+
update-phpstan-extension: ## Update rules
102+
$(DOCKER_RUN) php utils/update.php
103+
94104
help: ## Show this help ####
95105
@printf "\033[33mUsage:\033[0m\n make [target]\n\n\033[33mTargets:\033[0m\n"
96106
@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf " \033[32m%-32s\033[0m %s\n", $$1, $$2}' | tr -d '#'

‎composer.json

Lines changed: 52 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,57 @@
11
{
2-
"name": "wyrihaximus/phpstan-react",
3-
"description": "\ud83d\udc4e ReactPHP extension for PHPStan",
4-
"license": "MIT",
5-
"require": {
6-
"php": "^8.3"
7-
},
8-
"require-dev": {
9-
"jawira/case-converter": "^3.5",
10-
"nikic/php-parser": "^5.4.0",
11-
"phpstan/phpdoc-parser": "^2.1.0",
12-
"wyrihaximus/makefiles": "^0.3.0",
13-
"wyrihaximus/test-utilities": "^7.0.0"
14-
},
15-
"autoload": {
16-
"psr-4": {
17-
"WyriHaximus\\React\\PHPStan\\": "src/"
18-
}
19-
},
20-
"autoload-dev": {
21-
"psr-4": {
22-
"WyriHaximus\\React\\PHPStan\\Utils\\": "utils/",
23-
"WyriHaximus\\Tests\\React\\PHPStan\\": "tests/"
24-
}
25-
},
26-
"config": {
27-
"allow-plugins": {
28-
"composer/package-versions-deprecated": true,
29-
"dealerdirect/phpcodesniffer-composer-installer": true,
30-
"ergebnis/composer-normalize": true,
31-
"icanhazstring/composer-unused": true,
32-
"infection/extension-installer": true,
33-
"phpstan/extension-installer": true,
34-
"wyrihaximus/makefiles": true
35-
},
36-
"platform": {
37-
"php": "8.3.13"
38-
},
39-
"sort-packages": true
2+
"name": "wyrihaximus/phpstan-react",
3+
"description": "\ud83d\udc4e ReactPHP extension for PHPStan",
4+
"license": "MIT",
5+
"require": {
6+
"php": "^8.4"
7+
},
8+
"require-dev": {
9+
"jawira/case-converter": "^3.6",
10+
"nikic/php-parser": "^5.6.1",
11+
"phpstan/phpdoc-parser": "^2.2.0",
12+
"wyrihaximus/makefiles": "^0.6.0",
13+
"wyrihaximus/test-utilities": "^8.1.0"
14+
},
15+
"autoload": {
16+
"psr-4": {
17+
"WyriHaximus\\React\\PHPStan\\": "src/"
18+
}
19+
},
20+
"autoload-dev": {
21+
"psr-4": {
22+
"WyriHaximus\\React\\PHPStan\\Utils\\": "utils/",
23+
"WyriHaximus\\Tests\\React\\PHPStan\\": "tests/"
24+
}
25+
},
26+
"config": {
27+
"allow-plugins": {
28+
"composer/package-versions-deprecated": true,
29+
"dealerdirect/phpcodesniffer-composer-installer": true,
30+
"ergebnis/composer-normalize": true,
31+
"icanhazstring/composer-unused": true,
32+
"infection/extension-installer": true,
33+
"phpstan/extension-installer": true,
34+
"wyrihaximus/makefiles": true,
35+
"wyrihaximus/test-utilities": true
4036
},
41-
"extra": {
42-
"phpstan": {
43-
"includes": [
44-
"extension.neon"
45-
]
46-
}
37+
"platform": {
38+
"php": "8.4.13"
4739
},
48-
"scripts": {
49-
"post-install-cmd": [
50-
"composer normalize"
51-
],
52-
"post-update-cmd": [
53-
"composer normalize"
54-
]
40+
"sort-packages": true
41+
},
42+
"extra": {
43+
"phpstan": {
44+
"includes": [
45+
"extension.neon"
46+
]
5547
}
48+
},
49+
"scripts": {
50+
"post-install-cmd": [
51+
"make on-install-or-update || true"
52+
],
53+
"post-update-cmd": [
54+
"make on-install-or-update || true"
55+
]
56+
}
5657
}

0 commit comments

Comments
 (0)