From 2e182531cd66ddf2c28e9d25740afd3b998b490e Mon Sep 17 00:00:00 2001 From: "renzheng.wang" Date: Fri, 11 Oct 2024 19:06:46 +0800 Subject: [PATCH 1/2] fix include path --- composer.json | 3 +-- .../Core/Logger}/compatibility/DefaultLoggerPsrLogV1.php | 0 .../Core/Logger}/compatibility/DefaultLoggerPsrLogV3.php | 0 .../Core/Logger}/compatibility/DisabledLoggerPsrLogV1.php | 0 .../Core/Logger}/compatibility/DisabledLoggerPsrLogV3.php | 0 5 files changed, 1 insertion(+), 2 deletions(-) rename {lib => src/Core/Logger}/compatibility/DefaultLoggerPsrLogV1.php (100%) rename {lib => src/Core/Logger}/compatibility/DefaultLoggerPsrLogV3.php (100%) rename {lib => src/Core/Logger}/compatibility/DisabledLoggerPsrLogV1.php (100%) rename {lib => src/Core/Logger}/compatibility/DisabledLoggerPsrLogV3.php (100%) diff --git a/composer.json b/composer.json index ad32e33..f902756 100644 --- a/composer.json +++ b/composer.json @@ -41,6 +41,5 @@ }, "scripts": { "test": "vendor/bin/phpunit" - }, - "include-path": ["lib/"] + } } diff --git a/lib/compatibility/DefaultLoggerPsrLogV1.php b/src/Core/Logger/compatibility/DefaultLoggerPsrLogV1.php similarity index 100% rename from lib/compatibility/DefaultLoggerPsrLogV1.php rename to src/Core/Logger/compatibility/DefaultLoggerPsrLogV1.php diff --git a/lib/compatibility/DefaultLoggerPsrLogV3.php b/src/Core/Logger/compatibility/DefaultLoggerPsrLogV3.php similarity index 100% rename from lib/compatibility/DefaultLoggerPsrLogV3.php rename to src/Core/Logger/compatibility/DefaultLoggerPsrLogV3.php diff --git a/lib/compatibility/DisabledLoggerPsrLogV1.php b/src/Core/Logger/compatibility/DisabledLoggerPsrLogV1.php similarity index 100% rename from lib/compatibility/DisabledLoggerPsrLogV1.php rename to src/Core/Logger/compatibility/DisabledLoggerPsrLogV1.php diff --git a/lib/compatibility/DisabledLoggerPsrLogV3.php b/src/Core/Logger/compatibility/DisabledLoggerPsrLogV3.php similarity index 100% rename from lib/compatibility/DisabledLoggerPsrLogV3.php rename to src/Core/Logger/compatibility/DisabledLoggerPsrLogV3.php From 61189ab827c08d4c0c5d32c0e97e10c0c82637b4 Mon Sep 17 00:00:00 2001 From: "renzheng.wang" Date: Fri, 11 Oct 2024 19:22:27 +0800 Subject: [PATCH 2/2] update lint --- .github/workflows/php.yml | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index cd7b546..e776f52 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -17,7 +17,7 @@ jobs: run: composer install --prefer-dist --no-progress --no-suggest - name: Run code sniffer - run: vendor/bin/phpcs + run: vendor/bin/phpcs --ignore=./src/Core/Logger/compatibility/*.php - name: Run test suite run: vendor/bin/phpunit --coverage-clover=coverage.xml diff --git a/Makefile b/Makefile index ca2df45..b55ab85 100644 --- a/Makefile +++ b/Makefile @@ -2,12 +2,12 @@ install: composer install lint: - php vendor/bin/phpcs -n + php vendor/bin/phpcs --ignore=./src/Core/Logger/compatibility/*.php -n compatible: php vendor/bin/phpcs --config-set installed_paths vendor/phpcompatibility/php-compatibility php vendor/bin/phpcs --config-set testVersion 5.6 - php vendor/bin/phpcs -p --standard=PHPCompatibility src + php vendor/bin/phpcs -p --standard=PHPCompatibility --ignore=./src/Core/Logger/compatibility/*.php src fmt: php vendor/bin/phpcbf