From 2d0ea9f599a2ae6dc7cb39b23d82a51bb5fefbea Mon Sep 17 00:00:00 2001 From: "renovate-runner[bot]" <224860489+renovate-runner[bot]@users.noreply.github.com> Date: Wed, 13 Aug 2025 06:13:25 +0000 Subject: [PATCH] Update dependency wyrihaximus/makefiles to ^0.4.3 --- Makefile | 23 +++++++++++++++-------- composer.json | 2 +- composer.lock | 24 ++++++++++++------------ 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 753b042..e8e71a8 100644 --- a/Makefile +++ b/Makefile @@ -3,10 +3,13 @@ SHELL=bash .PHONY: * -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/.$$//') +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=$(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 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]);") -CONTAINER_NAME=$(shell echo "ghcr.io/wyrihaximusnet/php:${PHP_VERSION}-nts-alpine${SLIM_DOCKER_IMAGE}-dev") +CONTAINER_NAME=$(shell echo "ghcr.io/wyrihaximusnet/php:${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_CONTAINER_CACHE_DIR=$(shell docker run --rm -it ${CONTAINER_NAME} composer config --global cache-dir -q || echo ${HOME}/.composer-php/cache) @@ -23,6 +26,7 @@ else -v "`pwd`:`pwd`" \ -v "${COMPOSER_CACHE_DIR}:${COMPOSER_CONTAINER_CACHE_DIR}" \ -w "`pwd`" \ + -e OTEL_PHP_FIBERS_ENABLED="true" \ "${CONTAINER_NAME}" endif @@ -35,18 +39,20 @@ endif all: ## Runs everything #### @grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | grep -v "####" | awk 'BEGIN {FS = ":.*?## "}; {printf "%s\n", $$1}' | xargs --open-tty $(MAKE) - syntax-php: ## Lint PHP syntax ##*LH*## $(DOCKER_RUN) vendor/bin/parallel-lint --exclude vendor . +rector-upgrade: ## Upgrade any automatically upgradable old code ### + $(DOCKER_RUN) vendor/bin/rector -c ./etc/qa/rector.php + cs-fix: ## Fix any automatically fixable code style issues ### - $(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 + $(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 cs: ## Check the code for code style issues ##*LCH*## - $(DOCKER_RUN) vendor/bin/phpcs --parallel=$(THREADS) --cache=./var/.phpcs.cache.json --standard=./etc/qa/phpcs.xml + $(DOCKER_RUN) vendor/bin/phpcs --parallel=1 --cache=./var/.phpcs.cache.json --standard=./etc/qa/phpcs.xml stan: ## Run static analysis (PHPStan) ##*LCH*## - $(DOCKER_RUN) vendor/bin/phpstan analyse src tests --level max --ansi -c ./etc/qa/phpstan.neon + $(DOCKER_RUN) vendor/bin/phpstan analyse etc src tests --level max --ansi -c ./etc/qa/phpstan.neon unit-testing: ## Run tests ##*A*## $(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 @@ -57,10 +63,10 @@ unit-testing-raw: ## Run tests ##*D*## #### 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 mutation-testing: ## Run mutation testing ##*LCH*## - $(DOCKER_RUN) vendor/bin/infection --ansi --log-verbosity=all --threads=$(THREADS) || (cat ./var/infection.log && false) + $(DOCKER_RUN) vendor/bin/infection --ansi --log-verbosity=all --ignore-msi-with-no-mutations --threads=$(THREADS) || (cat ./var/infection.log && false) mutation-testing-raw: ## Run mutation testing #### - vendor/bin/infection --ansi --log-verbosity=all --threads=$(THREADS) || (cat ./var/infection.log && false) + vendor/bin/infection --ansi --log-verbosity=all --ignore-msi-with-no-mutations --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 @@ -89,6 +95,7 @@ outdated: ### Show outdated dependencies #### shell: ## Provides Shell access in the expected environment #### $(DOCKER_RUN) bash + help: ## Show this help #### @printf "\033[33mUsage:\033[0m\n make [target]\n\n\033[33mTargets:\033[0m\n" @grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf " \033[32m%-32s\033[0m %s\n", $$1, $$2}' | tr -d '#' diff --git a/composer.json b/composer.json index 490f325..52ba44c 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ }, "require-dev": { "wyrihaximus/async-test-utilities": "^9.0.0", - "wyrihaximus/makefiles": "^0.3.1" + "wyrihaximus/makefiles": "^0.4.3" }, "autoload": { "psr-4": { diff --git a/composer.lock b/composer.lock index e2a5172..911ddd9 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": "43591b90e162daf6d46e0a72d94c35da", + "content-hash": "ec399fffa4215fdc79e1a4079232eb6f", "packages": [ { "name": "clue/redis-protocol", @@ -9662,25 +9662,25 @@ }, { "name": "wyrihaximus/makefiles", - "version": "0.3.1", + "version": "0.4.3", "source": { "type": "git", "url": "https://github.com/WyriHaximus/Makefiles.git", - "reference": "849fa4ff809f9e18dabbfa77573a6b15cde9b2d9" + "reference": "8c917764c88465d3029c417c42af9885ec6442f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WyriHaximus/Makefiles/zipball/849fa4ff809f9e18dabbfa77573a6b15cde9b2d9", - "reference": "849fa4ff809f9e18dabbfa77573a6b15cde9b2d9", + "url": "https://api.github.com/repos/WyriHaximus/Makefiles/zipball/8c917764c88465d3029c417c42af9885ec6442f7", + "reference": "8c917764c88465d3029c417c42af9885ec6442f7", "shasum": "" }, "require": { "composer-plugin-api": "^2", - "ext-json": "^8.2", - "php": "^8.2" + "ext-json": "^8.3", + "php": "^8.3" }, "require-dev": { - "wyrihaximus/async-test-utilities": "^8.0.5" + "wyrihaximus/test-utilities": "^7.5.1" }, "type": "composer-plugin", "extra": { @@ -9704,7 +9704,7 @@ "description": "🛠️ Test utilities for api-clients packages", "support": { "issues": "https://github.com/WyriHaximus/Makefiles/issues", - "source": "https://github.com/WyriHaximus/Makefiles/tree/0.3.1" + "source": "https://github.com/WyriHaximus/Makefiles/tree/0.4.3" }, "funding": [ { @@ -9712,7 +9712,7 @@ "type": "github" } ], - "time": "2025-04-26T23:25:34+00:00" + "time": "2025-06-23T09:26:35+00:00" }, { "name": "wyrihaximus/phpstan-react", @@ -10027,13 +10027,13 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": false, "prefer-lowest": false, "platform": { "php": "^8.3" }, - "platform-dev": [], + "platform-dev": {}, "platform-overrides": { "php": "8.3.13" },