From 383dfbf2375e8e35a0f229f78a3625c11bfbff84 Mon Sep 17 00:00:00 2001 From: Orkun Date: Mon, 9 Sep 2024 11:49:19 +0300 Subject: [PATCH 1/3] chore: dont overload config from cli for php-cs-fixer --- .git_hooks/pre-commit | 2 +- .php-cs-fixer.php | 2 +- scripts/generate.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.git_hooks/pre-commit b/.git_hooks/pre-commit index 4dfceeb5..9563dadc 100755 --- a/.git_hooks/pre-commit +++ b/.git_hooks/pre-commit @@ -1,3 +1,3 @@ #!/bin/sh -docker run --rm -v $(pwd):/code ghcr.io/php-cs-fixer/php-cs-fixer:${FIXER_VERSION:-3-php8.3} fix --config=/code/.php-cs-fixer.php /code/src \ No newline at end of file +docker run --rm -v $(pwd):/code ghcr.io/php-cs-fixer/php-cs-fixer:${FIXER_VERSION:-3-php8.3} fix --config=/code/.php-cs-fixer.php \ No newline at end of file diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php index e7b05d41..9986e176 100644 --- a/.php-cs-fixer.php +++ b/.php-cs-fixer.php @@ -23,5 +23,5 @@ ]) ->setFinder( PhpCsFixer\Finder::create() - ->in(__DIR__) + ->in(__DIR__ . "/src") ); \ No newline at end of file diff --git a/scripts/generate.sh b/scripts/generate.sh index 291233e1..e3bf58cb 100755 --- a/scripts/generate.sh +++ b/scripts/generate.sh @@ -48,7 +48,7 @@ fi echo "Using .php-cs-fixer.php configuration:" cat .php-cs-fixer.php -docker run --rm -v $(pwd):/code ghcr.io/php-cs-fixer/php-cs-fixer:${FIXER_VERSION:-3-php8.3} fix --config=/code/.php-cs-fixer.php /code/src +docker run --rm -v $(pwd):/code ghcr.io/php-cs-fixer/php-cs-fixer:${FIXER_VERSION:-3-php8.3} fix --config=/code/.php-cs-fixer.php # fix invalid code generated for structure with additionalProperties ( From 91e18c93c7ba31c65b880b0092e26cc279d7b6a8 Mon Sep 17 00:00:00 2001 From: Orkun Date: Mon, 9 Sep 2024 11:50:19 +0300 Subject: [PATCH 2/3] chore: remove coversnothing attribute from tests --- test/FingerprintApiTest.php | 5 ----- test/Sealed/SealedTest.php | 5 ----- test/WebhookVerifierTest.php | 5 ----- 3 files changed, 15 deletions(-) diff --git a/test/FingerprintApiTest.php b/test/FingerprintApiTest.php index 9967fee0..8f946e36 100644 --- a/test/FingerprintApiTest.php +++ b/test/FingerprintApiTest.php @@ -22,11 +22,6 @@ use GuzzleHttp\Psr7\Response; use PHPUnit\Framework\TestCase; -/** - * @internal - * - * @coversNothing - */ class FingerprintApiTest extends TestCase { public const MOCK_REQUEST_ID = '1708102555327.NLOjmg'; diff --git a/test/Sealed/SealedTest.php b/test/Sealed/SealedTest.php index 3e5f0edd..2f584b36 100644 --- a/test/Sealed/SealedTest.php +++ b/test/Sealed/SealedTest.php @@ -11,11 +11,6 @@ use GuzzleHttp\Psr7\Response; use PHPUnit\Framework\TestCase; -/** - * @internal - * - * @coversNothing - */ class SealedTest extends TestCase { public const VALID_KEY = 'p2PA7MGy5tx56cnyJaFZMr96BCFwZeHjZV2EqMvTq53='; diff --git a/test/WebhookVerifierTest.php b/test/WebhookVerifierTest.php index 228fdcfc..db0a5896 100644 --- a/test/WebhookVerifierTest.php +++ b/test/WebhookVerifierTest.php @@ -5,11 +5,6 @@ use Fingerprint\ServerAPI\Webhook\WebhookVerifier; use PHPUnit\Framework\TestCase; -/** - * @internal - * - * @coversNothing - */ class WebhookVerifierTest extends TestCase { private $secret = 'secret'; From e58356e44951c923462c35412951cd1a88ab249e Mon Sep 17 00:00:00 2001 From: Orkun Date: Mon, 9 Sep 2024 12:09:52 +0300 Subject: [PATCH 3/3] chore: force php-cs-fixer to use version 3.64 --- .git_hooks/pre-commit | 2 +- docker-compose.yml | 2 +- scripts/generate.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.git_hooks/pre-commit b/.git_hooks/pre-commit index 9563dadc..3af22284 100755 --- a/.git_hooks/pre-commit +++ b/.git_hooks/pre-commit @@ -1,3 +1,3 @@ #!/bin/sh -docker run --rm -v $(pwd):/code ghcr.io/php-cs-fixer/php-cs-fixer:${FIXER_VERSION:-3-php8.3} fix --config=/code/.php-cs-fixer.php \ No newline at end of file +docker run --rm -v $(pwd):/code ghcr.io/php-cs-fixer/php-cs-fixer:3.64-php8.3 fix --config=/code/.php-cs-fixer.php \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index bfbd8270..a8c68839 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,7 +22,7 @@ services: env_file: - .env lint: - image: ghcr.io/php-cs-fixer/php-cs-fixer:${FIXER_VERSION:-3-php8.3} + image: ghcr.io/php-cs-fixer/php-cs-fixer:3.64-php8.3 volumes: - .:/code - ./.php-cs-fixer.php:/code/.php-cs-fixer.php diff --git a/scripts/generate.sh b/scripts/generate.sh index e3bf58cb..d4e5289e 100755 --- a/scripts/generate.sh +++ b/scripts/generate.sh @@ -48,7 +48,7 @@ fi echo "Using .php-cs-fixer.php configuration:" cat .php-cs-fixer.php -docker run --rm -v $(pwd):/code ghcr.io/php-cs-fixer/php-cs-fixer:${FIXER_VERSION:-3-php8.3} fix --config=/code/.php-cs-fixer.php +docker run --rm -v $(pwd):/code ghcr.io/php-cs-fixer/php-cs-fixer:3.64-php8.3 fix --config=/code/.php-cs-fixer.php # fix invalid code generated for structure with additionalProperties (