From b1cc60660770d2c5decfa87467589680bcd744f2 Mon Sep 17 00:00:00 2001
From: AntonioCS <antoniocs@gmail.com>
Date: Thu, 8 Jan 2026 19:55:30 +0000
Subject: [PATCH] Restructure PHP analysis staged targets to action/staged
 pattern
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- phpcs.mk: Rename php/phpcs/staged → php/phpcs/check/staged, add php/phpcs/fix/staged
- phpstan.mk: Rename php/phpstan/staged → php/phpstan/analyse/staged
- psalm.mk: Rename php/psalm/staged → php/psalm/analyse/staged
- CHANGELOG.md: Add v2.2.11 entry
---
 CHANGELOG.md                   | 11 +++++++++++
 modules/php/phpcs/phpcs.mk     |  5 ++++-
 modules/php/phpstan/phpstan.mk |  2 +-
 modules/php/psalm/psalm.mk     |  2 +-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61035ad..40d8787 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## [2.2.11] - 2026-01-08
+
+### Changed
+- **PHP analysis staged targets renamed** for consistent `action/staged` pattern:
+  - `php/phpcs/staged` → `php/phpcs/check/staged`
+  - `php/phpstan/staged` → `php/phpstan/analyse/staged`
+  - `php/psalm/staged` → `php/psalm/analyse/staged`
+
+### Added
+- **`php/phpcs/fix/staged`**: Run PHP Code Beautifier on staged PHP files only
+
 ## [2.2.10] - 2026-01-06
 
 ### Fixed
diff --git a/modules/php/phpcs/phpcs.mk b/modules/php/phpcs/phpcs.mk
index 8a19c63..bf8e374 100644
--- a/modules/php/phpcs/phpcs.mk
+++ b/modules/php/phpcs/phpcs.mk
@@ -47,9 +47,12 @@ php/phpcs/fix: ## Run PHP Code Beautifier to auto-fix (phpcs_files= for paths, p
 	$(eval $@_cmd := $(phpcbf_bin) $(call phpcs_build_args))
 	$(call php_invoke,$($@_cmd))
 
-php/phpcs/staged: ## Run PHP CodeSniffer on staged PHP files only
+php/phpcs/check/staged: ## Run PHP CodeSniffer on staged PHP files only
 	$(call php_run_on_staged,$(phpcs_bin) -s)
 
+php/phpcs/fix/staged: ## Run PHP Code Beautifier on staged PHP files only
+	$(call php_run_on_staged,$(phpcbf_bin))
+
 endif # __MB_TEST_DISCOVERY__
 
 endif # __MB_MODULES_PHP_PHPCS__
diff --git a/modules/php/phpstan/phpstan.mk b/modules/php/phpstan/phpstan.mk
index 33cd6fd..250f817 100644
--- a/modules/php/phpstan/phpstan.mk
+++ b/modules/php/phpstan/phpstan.mk
@@ -41,7 +41,7 @@ php/phpstan/analyse: ## Run PHPStan analysis (phpstan_files= for paths, phpstan_
 		$(call mb_printf_info,Results saved to $(phpstan_output_file))\
 	)
 
-php/phpstan/staged: ## Run PHPStan on staged PHP files only
+php/phpstan/analyse/staged: ## Run PHPStan on staged PHP files only
 	$(call php_run_on_staged,$(phpstan_bin) analyse)
 
 endif # __MB_TEST_DISCOVERY__
diff --git a/modules/php/psalm/psalm.mk b/modules/php/psalm/psalm.mk
index 7a5c5c1..3002f39 100644
--- a/modules/php/psalm/psalm.mk
+++ b/modules/php/psalm/psalm.mk
@@ -40,7 +40,7 @@ php/psalm/analyse: ## Run Psalm analysis (psalm_files= for paths, psalm_args= fo
 		$(call mb_printf_info,Results saved to $(psalm_output_file))\
 	)
 
-php/psalm/staged: ## Run Psalm on staged PHP files only
+php/psalm/analyse/staged: ## Run Psalm on staged PHP files only
 	$(call php_run_on_staged,$(psalm_bin))
 
 endif # __MB_TEST_DISCOVERY__