From bcbf565083314d8b6a149fd233af55b8e683ff31 Mon Sep 17 00:00:00 2001 From: "reactphp-parallel-renovate-runner[bot]" <226772824+reactphp-parallel-renovate-runner[bot]@users.noreply.github.com> Date: Sat, 6 Sep 2025 22:05:02 +0000 Subject: [PATCH] Update dependency wyrihaximus/makefiles to ^0.7.3 --- Makefile | 23 +++++++++++++++++------ composer.json | 2 +- composer.lock | 22 +++++++++++----------- 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 67346d1..5bfacc5 100644 --- a/Makefile +++ b/Makefile @@ -4,14 +4,14 @@ SHELL=bash .PHONY: * CONTAINER_REGISTRY_REPO="ghcr.io/wyrihaximusnet/php" -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/.$$//') -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:],') +COMPOSER_SHOW_EXTENSION_LIST_PROD=$(shell (((command -v composer >/dev/null 2>&1) && composer show -t --no-plugins) || docker run --rm -v "`pwd`:`pwd`" -w `pwd` ${CONTAINER_REGISTRY_REPO}:8.4-nts-alpine-slim-dev composer show -t --no-plugins) | grep -o "\-\-\(ext-\).\+" | sort | uniq | cut -d- -f4- | tr -d '\n' | grep . | sed '/^$$/d' | xargs | sed -e 's/ /, /g' | tr -cd '[:alnum:],' | sed 's/.$$//') +COMPOSER_SHOW_EXTENSION_LIST_DEV=$(shell (((command -v composer >/dev/null 2>&1) && composer show -s --no-plugins) || docker run --rm -v "`pwd`:`pwd`" -w `pwd` ${CONTAINER_REGISTRY_REPO}:8.4-nts-alpine-slim-dev composer show -s --no-plugins) | grep -o "\(ext-\).\+" | sort | uniq | cut -d- -f2- | cut -d" " -f1 | xargs | sed -e 's/ /, /g' | tr -cd '[:alnum:],') COMPOSER_SHOW_EXTENSION_LIST=$(shell echo "${COMPOSER_SHOW_EXTENSION_LIST_PROD},${COMPOSER_SHOW_EXTENSION_LIST_DEV}") SLIM_DOCKER_IMAGE=$(shell php -r 'echo count(array_intersect(["gd", "vips"], explode(",", "${COMPOSER_SHOW_EXTENSION_LIST}"))) > 0 ? "" : "-slim";') NTS_OR_ZTS_DOCKER_IMAGE=$(shell php -r 'echo count(array_intersect(["parallel"], explode(",", "${COMPOSER_SHOW_EXTENSION_LIST}"))) > 0 ? "zts" : "nts";') 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]);") CONTAINER_NAME=$(shell echo "${CONTAINER_REGISTRY_REPO}:${PHP_VERSION}-${NTS_OR_ZTS_DOCKER_IMAGE}-alpine${SLIM_DOCKER_IMAGE}-dev") -COMPOSER_CACHE_DIR=$(shell composer config --global cache-dir -q || echo ${HOME}/.composer-php/cache) +COMPOSER_CACHE_DIR=$(shell (command -v composer >/dev/null 2>&1) && composer config --global cache-dir -q || echo ${HOME}/.composer-php/cache) 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) ifneq ("$(wildcard /.you-are-in-a-wyrihaximus.net-php-docker-image)","") @@ -38,7 +38,7 @@ else endif all: ## Runs everything #### - @grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | grep -v "####" | awk 'BEGIN {FS = ":.*?## "}; {printf "%s\n", $$1}' | xargs -o $(MAKE) + @grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | grep -v "##*I*##" | grep -v "####" | awk 'BEGIN {FS = ":.*?## "}; {printf "%s\n", $$1}' | xargs -o $(MAKE) on-install-or-update: ## Runs everything #### @grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | grep -E "##\*(I|ILH)\*##" | awk 'BEGIN {FS = ":.*?## "}; {printf "%s\n", $$1}' | xargs -o $(MAKE) @@ -69,10 +69,10 @@ unit-testing-raw: ## Run tests ##*D*## #### 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 mutation-testing: ## Run mutation testing ##*LCH*## - $(DOCKER_RUN) vendor/bin/infection --ansi --log-verbosity=all --ignore-msi-with-no-mutations --threads=$(THREADS) || (cat ./var/infection.log && false) + $(DOCKER_RUN) vendor/bin/infection --ansi --log-verbosity=all --ignore-msi-with-no-mutations --configuration=./etc/qa/infection.json5 --threads=$(THREADS) || (cat ./var/infection.log && false) mutation-testing-raw: ## Run mutation testing #### - vendor/bin/infection --ansi --log-verbosity=all --ignore-msi-with-no-mutations --threads=$(THREADS) || (cat ./var/infection.log && false) + vendor/bin/infection --ansi --log-verbosity=all --ignore-msi-with-no-mutations --configuration=./etc/qa/infection.json5 --threads=$(THREADS) || (cat ./var/infection.log && false) composer-require-checker: ## Ensure we require every package used in this package directly ##*C*## $(DOCKER_RUN) vendor/bin/composer-require-checker --ignore-parse-errors --ansi -vvv --config-file=./etc/qa/composer-require-checker.json @@ -118,3 +118,14 @@ task-list-ci-locked: ## CI: Generate a JSON array of jobs to run against the loc task-list-ci-high: ## CI: Generate a JSON array of jobs to run against the highest dependencies on the primary threading target @grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | grep -E "##\*(H|LH|LCH|LC)\*##" | grep -v "###" | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "%s\n", $$1}' | jq --raw-input --slurp -c 'split("\n")| .[0:-1]' + +## Temporary set of migrations to get all my repos in shape +php-migrations-move-infection: #### Move infection.json.dist to etc/qa/infection.json5 ##*I*## + ($(DOCKER_RUN) mv infection.json.dist etc/qa/infection.json5 || true) + +php-migrations-remove-phpunit-config-dir-from-infection: #### Drop XXX from etc/qa/infection.json5 ##*I*## + ($(DOCKER_RUN) php -r '$$infectionFile = "etc/qa/infection.json5"; if (!file_exists($$infectionFile)) {exit;} $$json = json_decode(file_get_contents($$infectionFile), true); if (!is_array($$json)) {exit;} if (!array_key_exists("phpUnit", $$json)) {exit;} unset($$json["phpUnit"]); file_put_contents($$infectionFile, json_encode($$json, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . "\r\n");' || true) + +php-migrations-create-empty-placeholder-old-infection-config-file-path: #### Create empty infection.json.dist to fool Renovate ##*I*## + ($(DOCKER_RUN) touch infection.json.dist || true) + diff --git a/composer.json b/composer.json index 0f478c6..93411bb 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "require-dev": { "react-parallel/stubs": "^1.2", "wyrihaximus/async-test-utilities": "^9.3.0", - "wyrihaximus/makefiles": "^0.5.0", + "wyrihaximus/makefiles": "^0.7.3", "wyrihaximus/ticking-promise": "^3.1.0" }, "autoload": { diff --git a/composer.lock b/composer.lock index b9df280..48ff80b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "81029aeb9efe622dd145b145a80d0ead", + "content-hash": "bdee975cbad4a9002b402530efef482d", "packages": [ { "name": "lcobucci/clock", @@ -9539,25 +9539,25 @@ }, { "name": "wyrihaximus/makefiles", - "version": "0.5.0", + "version": "0.7.3", "source": { "type": "git", "url": "https://github.com/WyriHaximus/Makefiles.git", - "reference": "5717bc0de6496a12734cf3f2de20859a692297f0" + "reference": "7025e9acb27255d55e60b16f1210985e58d62b8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WyriHaximus/Makefiles/zipball/5717bc0de6496a12734cf3f2de20859a692297f0", - "reference": "5717bc0de6496a12734cf3f2de20859a692297f0", + "url": "https://api.github.com/repos/WyriHaximus/Makefiles/zipball/7025e9acb27255d55e60b16f1210985e58d62b8c", + "reference": "7025e9acb27255d55e60b16f1210985e58d62b8c", "shasum": "" }, "require": { "composer-plugin-api": "^2", - "ext-json": "^8.3", - "php": "^8.3" + "ext-json": "^8.4", + "php": "^8.4" }, "require-dev": { - "wyrihaximus/test-utilities": "^7.5.2" + "wyrihaximus/test-utilities": "^8.1.0" }, "type": "composer-plugin", "extra": { @@ -9578,10 +9578,10 @@ "email": "ceesjank@gmail.com" } ], - "description": "🛠️ Test utilities for api-clients packages", + "description": "🧱 Makefile building blocks", "support": { "issues": "https://github.com/WyriHaximus/Makefiles/issues", - "source": "https://github.com/WyriHaximus/Makefiles/tree/0.5.0" + "source": "https://github.com/WyriHaximus/Makefiles/tree/0.7.3" }, "funding": [ { @@ -9589,7 +9589,7 @@ "type": "github" } ], - "time": "2025-08-15T05:34:56+00:00" + "time": "2025-09-06T21:11:50+00:00" }, { "name": "wyrihaximus/phpstan-react",