From 34bc93cccca1e03d2a27c4ef29573cb613ecc59f Mon Sep 17 00:00:00 2001 From: fadrian06 Date: Tue, 23 Jun 2026 10:58:27 -0400 Subject: [PATCH 1/2] Combine PHPStan and PHPCS in lint script --- composer.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 70a09ca..17c4cda 100644 --- a/composer.json +++ b/composer.json @@ -99,9 +99,11 @@ "rm server.pid", "echo \"Performance Tests Completed.\"" ], - "lint": "phpstan --no-progress --memory-limit=256M", + "lint": [ + "phpstan --no-progress --memory-limit=256M -n", + "phpcs" + ], "beautify": "phpcbf", - "phpcs": "phpcs", "post-install-cmd": [ "@php -r \"if (!file_exists('phpcs.xml')) copy('phpcs.xml.dist', 'phpcs.xml');\"", "@php -r \"if (!file_exists('phpstan.neon')) copy('phpstan.dist.neon', 'phpstan.neon');\"", From 2f533dcdf41428d340e3f06410f33c1f86251ad7 Mon Sep 17 00:00:00 2001 From: fadrian06 Date: Tue, 23 Jun 2026 11:44:11 -0400 Subject: [PATCH 2/2] Combine phpcs in lint in ai instructions --- .gemini/GEMINI.md | 3 +-- .github/copilot-instructions.md | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.gemini/GEMINI.md b/.gemini/GEMINI.md index 59a33e4..4c6da83 100644 --- a/.gemini/GEMINI.md +++ b/.gemini/GEMINI.md @@ -15,9 +15,8 @@ This is the main FlightPHP core library for building fast, simple, and extensibl ## Development & Testing - Run tests: `composer test` (uses phpunit/phpunit and spatie/phpunit-watcher) - Run test server: `composer test-server` or `composer test-server-v2` -- Lint code: `composer lint` (uses phpstan/phpstan, level 6) +- Lint code & Check code style: `composer lint` (uses phpstan/phpstan, level 6) - Beautify code: `composer beautify` (uses squizlabs/php_codesniffer, PSR1) -- Check code style: `composer phpcs` - Test coverage: `composer test-coverage` ## Coding Standards diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index 59a33e4..4c6da83 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -15,9 +15,8 @@ This is the main FlightPHP core library for building fast, simple, and extensibl ## Development & Testing - Run tests: `composer test` (uses phpunit/phpunit and spatie/phpunit-watcher) - Run test server: `composer test-server` or `composer test-server-v2` -- Lint code: `composer lint` (uses phpstan/phpstan, level 6) +- Lint code & Check code style: `composer lint` (uses phpstan/phpstan, level 6) - Beautify code: `composer beautify` (uses squizlabs/php_codesniffer, PSR1) -- Check code style: `composer phpcs` - Test coverage: `composer test-coverage` ## Coding Standards