From 4bc5b3f584208e1475079a539781765f627ad329 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Wed, 7 Dec 2022 11:41:17 +0100 Subject: [PATCH 1/4] Add missing "@requires extension imagick" on tests --- test/Integration/ImagickRenderingTest.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/Integration/ImagickRenderingTest.php b/test/Integration/ImagickRenderingTest.php index 39e44bf..7d9dc53 100644 --- a/test/Integration/ImagickRenderingTest.php +++ b/test/Integration/ImagickRenderingTest.php @@ -21,6 +21,9 @@ final class ImagickRenderingTest extends TestCase { use MatchesSnapshots; + /** + * @requires extension imagick + */ public function testGenericQrCode() : void { $renderer = new ImageRenderer( @@ -35,6 +38,9 @@ public function testGenericQrCode() : void unlink($tempName); } + /** + * @requires extension imagick + */ public function testIssue79() : void { $eye = SquareEye::instance(); From 7b9016a34a818a517b028adc7512503ed3b27419 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Wed, 7 Dec 2022 11:41:38 +0100 Subject: [PATCH 2/4] Add "@group integration" on integration tests --- test/Integration/ImagickRenderingTest.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/Integration/ImagickRenderingTest.php b/test/Integration/ImagickRenderingTest.php index 7d9dc53..3df8687 100644 --- a/test/Integration/ImagickRenderingTest.php +++ b/test/Integration/ImagickRenderingTest.php @@ -17,6 +17,9 @@ use PHPUnit\Framework\TestCase; use Spatie\Snapshots\MatchesSnapshots; +/** + * @group integration + */ final class ImagickRenderingTest extends TestCase { use MatchesSnapshots; From 4e987baf967e32b6cdf9a9f87c8861f2d9c40f34 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Wed, 7 Dec 2022 11:42:29 +0100 Subject: [PATCH 3/4] Exclude tests from the composer archive --- .gitattributes | 1 - composer.json | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 519b4dc..d771b9a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,6 +2,5 @@ /.gitignore export-ignore /.github export-ignore /phpcs.xml export-ignore -/phpunit.xml.dist export-ignore /CHANGELOG.md export-ignore /Dockerfile export-ignore diff --git a/composer.json b/composer.json index 1440cc3..7f193da 100644 --- a/composer.json +++ b/composer.json @@ -34,5 +34,11 @@ "allow-plugins": { "ocramius/package-versions": true } + }, + "archive": { + "exclude": [ + "/test", + "/phpunit.xml.dist" + ] } } From bc63923b653bfccec54020a5b604c41679d9f7ec Mon Sep 17 00:00:00 2001 From: William Desportes Date: Wed, 7 Dec 2022 11:43:40 +0100 Subject: [PATCH 4/4] Bump GitHuba ctions --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b0f95f5..21e2584 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -30,7 +30,7 @@ jobs: php-versions: ['7.4', '8.0', '8.1', '8.2'] runs-on: ${{ matrix.operating-system }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -57,6 +57,6 @@ jobs: run: vendor/bin/phpunit --coverage-clover clover.xml - name: Codecov - uses: codecov/codecov-action@v2 + uses: codecov/codecov-action@v3 with: files: ./clover.xml