Skip to content

Commit 283e3a9

Browse files
WyriHaximusWyriHaximus
authored
Merge pull request #276 from WyriHaximus/swich-to-centralized-makefiles
Switch to centralized Makefiles
2 parents a62c942 + bff90ce commit 283e3a9

File tree

5 files changed

+1708
-3737
lines changed

5 files changed

+1708
-3737
lines changed

‎Makefile

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

44
.PHONY: *
55

6-
COMPOSER_CACHE_DIR=$(shell composer config --global cache-dir -q || echo ${HOME}/.composer-php/cache)
76
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/.$$//')
87
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)
912

1013
ifneq ("$(wildcard /.you-are-in-a-wyrihaximus.net-php-docker-image)","")
1114
IN_DOCKER=TRUE
@@ -16,12 +19,11 @@ endif
1619
ifeq ("$(IN_DOCKER)","TRUE")
1720
DOCKER_RUN:=
1821
else
19-
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]);")
2022
DOCKER_RUN:=docker run --rm -it \
2123
-v "`pwd`:`pwd`" \
22-
-v "${COMPOSER_CACHE_DIR}:/home/app/.composer/cache" \
24+
-v "${COMPOSER_CACHE_DIR}:${COMPOSER_CONTAINER_CACHE_DIR}" \
2325
-w "`pwd`" \
24-
"ghcr.io/wyrihaximusnet/php:${PHP_VERSION}-nts-alpine${SLIM_DOCKER_IMAGE}-dev"
26+
"${CONTAINER_NAME}"
2527
endif
2628

2729
ifneq (,$(findstring icrosoft,$(shell cat /proc/version)))
@@ -30,13 +32,13 @@ else
3032
THREADS=$(shell nproc)
3133
endif
3234

33-
all: ## Runs everything ###
34-
@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | grep -v "###" | awk 'BEGIN {FS = ":.*?## "}; {printf "%s\n", $$1}' | xargs --open-tty $(MAKE)
35+
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)
3537

3638
syntax-php: ## Lint PHP syntax
3739
$(DOCKER_RUN) vendor/bin/parallel-lint --exclude vendor .
3840

39-
cs-fix: ## Fix any automatically fixable code style issues
41+
cs-fix: ## Fix any automatically fixable code style issues ###
4042
$(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
4143

4244
cs: ## Check the code for code style issues
@@ -45,44 +47,57 @@ cs: ## Check the code for code style issues
4547
stan: ## Run static analysis (PHPStan)
4648
$(DOCKER_RUN) vendor/bin/phpstan analyse src tests --level max --ansi -c ./etc/qa/phpstan.neon
4749

48-
psalm: ## Run static analysis (Psalm)
49-
$(DOCKER_RUN) vendor/bin/psalm --threads=$(THREADS) --shepherd --stats --config=./etc/qa/psalm.xml
50-
5150
unit-testing: ## Run tests
5251
$(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
5352
$(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
5453

55-
unit-testing-raw: ## Run tests ###
54+
unit-testing-raw: ## Run tests ####
5655
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
5756
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
5857

5958
mutation-testing: ## Run mutation testing
60-
$(DOCKER_RUN) vendor/bin/roave-infection-static-analysis-plugin --ansi --log-verbosity=all --threads=$(THREADS) --psalm-config etc/qa/psalm.xml || (cat ./var/infection.log && false)
59+
$(DOCKER_RUN) vendor/bin/infection --ansi --log-verbosity=all --threads=$(THREADS) || (cat ./var/infection.log && false)
6160

62-
mutation-testing-raw: ## Run mutation testing ###
63-
php vendor/roave/infection-static-analysis-plugin/bin/roave-infection-static-analysis-plugin --ansi --log-verbosity=all --threads=$(THREADS) --psalm-config etc/qa/psalm.xml || (cat ./var/infection.log && false)
61+
mutation-testing-raw: ## Run mutation testing ####
62+
vendor/bin/infection --ansi --log-verbosity=all --threads=$(THREADS) || (cat ./var/infection.log && false)
6463

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

6867
composer-unused: ## Ensure we don't require any package we don't use in this package directly
6968
$(DOCKER_RUN) vendor/bin/composer-unused --ansi --configuration=./etc/qa/composer-unused.php
7069

71-
composer-install: ## Install dependencies
72-
$(DOCKER_RUN) composer install --no-progress --ansi --no-interaction --prefer-dist -o
70+
libyear: ### Calculate how many libyear this package is behind with dependencies
71+
$(DOCKER_RUN) vendor/bin/libyear
7372

7473
backward-compatibility-check: ## Check code for backwards incompatible changes
7574
$(MAKE) backward-compatibility-check-raw || true
7675

7776
backward-compatibility-check-raw: ## Check code for backwards incompatible changes, doesn't ignore the failure ###
7877
$(DOCKER_RUN) vendor/bin/roave-backward-compatibility-check
7978

80-
shell: ## Provides Shell access in the expected environment ###
81-
$(DOCKER_RUN) bash
79+
install: ### Install dependencies ####
80+
$(DOCKER_RUN) composer install
8281

83-
task-list-ci: ## CI: Generate a JSON array of jobs to run, matches the commands run when running `make (|all)` ###
84-
@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | grep -v "###" | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "%s\n", $$1}' | jq --raw-input --slurp -c 'split("\n")| .[0:-1]'
82+
update: ### Update dependencies ####
83+
$(DOCKER_RUN) composer update -W
84+
85+
outdated: ### Show outdated dependencies ####
86+
$(DOCKER_RUN) composer outdated
8587

86-
help: ## Show this help ###
88+
shell: ## Provides Shell access in the expected environment ####
89+
$(DOCKER_RUN) bash
90+
91+
help: ## Show this help ####
8792
@printf "\033[33mUsage:\033[0m\n make [target]\n\n\033[33mTargets:\033[0m\n"
8893
@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf " \033[32m%-32s\033[0m %s\n", $$1, $$2}' | tr -d '#'
94+
95+
task-list-ci: ## CI: Generate a JSON array of jobs to run, matches the commands run when running `make (|all)` ####
96+
@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | grep -v "###" | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "%s\n", $$1}' | jq --raw-input --slurp -c 'split("\n")| .[0:-1]'
97+
98+
#task-list-ci: ## CI: Generate a JSON array of jobs to run, matches the commands run when running `make (|all)` ####
99+
# @grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sed 's/[^:]*://' | grep "##\%##" | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "%s\n", $$1}' | jq --raw-input --slurp -c 'split("\n")| .[0:-1]'
100+
#
101+
#task-list-ci-targeted: ## CI: Generate a JSON array of jobs to run, matches the commands run when running `make (|all)` ####
102+
# @grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sed 's/[^:]*://' | grep -v "###" | grep -v "##\%##" | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "%s\n", $$1}' | jq --raw-input --slurp -c 'split("\n")| .[0:-1]'
103+

‎composer.json

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,18 @@
99
}
1010
],
1111
"require": {
12-
"php": "^8.2",
13-
"phpunit/phpunit": "^10.5.29",
12+
"php": "^8.3",
13+
"phpunit/phpunit": "^12.1.2",
1414
"react/async": "^4.3.0",
1515
"react/event-loop": "^1.5.0",
1616
"react/promise": "^3.2.0",
1717
"wyrihaximus/phpstan-react": "^1",
18-
"wyrihaximus/react-phpunit-run-tests-in-fiber": "^2.0.0",
19-
"wyrihaximus/test-utilities": "^6.0.9"
18+
"wyrihaximus/react-phpunit-run-tests-in-fiber": "dev-main as 3.0.0",
19+
"wyrihaximus/test-utilities": "dev-master as 7.0.0"
2020
},
2121
"require-dev": {
22-
"react/promise-timer": "^1.11.0"
22+
"react/promise-timer": "^1.11.0",
23+
"wyrihaximus/makefiles": "^0.1.0"
2324
},
2425
"conflict": {
2526
"composer/compoer": "<2.6.0"
@@ -32,10 +33,7 @@
3233
"autoload-dev": {
3334
"psr-4": {
3435
"WyriHaximus\\Tests\\AsyncTestUtilities\\": "tests/"
35-
},
36-
"files": [
37-
"tests/bootstrap.php"
38-
]
36+
}
3937
},
4038
"config": {
4139
"allow-plugins": {
@@ -44,10 +42,11 @@
4442
"ergebnis/composer-normalize": true,
4543
"icanhazstring/composer-unused": true,
4644
"infection/extension-installer": true,
47-
"phpstan/extension-installer": true
45+
"phpstan/extension-installer": true,
46+
"wyrihaximus/makefiles": true
4847
},
4948
"platform": {
50-
"php": "8.2.13"
49+
"php": "8.3.13"
5150
},
5251
"sort-packages": true
5352
},

0 commit comments

Comments
 (0)