From bb75e2f5dde0c690449015e0e393f56b27aa86a9 Mon Sep 17 00:00:00 2001 From: Adrien Roches Date: Sat, 5 Oct 2024 15:31:10 +0200 Subject: [PATCH 1/5] [UPDATE] Add composer analyser checker --- .github/workflows/tests.yml | 3 +++ composer.json | 1 + 2 files changed, 4 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index cbb542e5..016bca8f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -50,5 +50,8 @@ jobs: with: dependency-versions: '${{ matrix.deps }}' + - name: 'Validate dependencies' + run: './vendor/bin/composer-dependency-analyser' + - name: 'Run test suite' run: 'php vendor/bin/phpunit' diff --git a/composer.json b/composer.json index 598513c2..79e653fe 100644 --- a/composer.json +++ b/composer.json @@ -38,6 +38,7 @@ "phpstan/phpstan": "^1.10", "phpstan/phpstan-symfony": "^1.3", "phpunit/phpunit": "^10.4", + "shipmonk/composer-dependency-analyser": "^1.7", "symfony/framework-bundle": "^6.4 || ^7.0", "symfony/monolog-bundle": "^3.10", "symfony/stopwatch": "^6.4 || ^7.0", From 8498fbbce9f275a67a1f9241ef7e8688cc011a8d Mon Sep 17 00:00:00 2001 From: Adrien Roches Date: Sat, 5 Oct 2024 15:43:27 +0200 Subject: [PATCH 2/5] [UPDATE] Dependencies --- composer.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 79e653fe..c77535bb 100644 --- a/composer.json +++ b/composer.json @@ -23,14 +23,15 @@ "require": { "php": ">=8.1", "ext-json": "*", + "psr/container": "^2.0", + "psr/log": "^3.0", "symfony/config": "^6.4 || ^7.0", "symfony/dependency-injection": "^6.4 || ^7.0", "symfony/filesystem": "^6.4 || ^7.0", - "symfony/http-client": "^6.4 || ^7.0", + "symfony/http-client-contracts": "^3.5", "symfony/http-foundation": "^6.4 || ^7.0", "symfony/http-kernel": "^6.4 || ^7.0", - "symfony/mime": "^6.4 || ^7.0", - "symfony/string": "^6.4 || ^7.0" + "symfony/mime": "^6.4 || ^7.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.41", @@ -40,10 +41,13 @@ "phpunit/phpunit": "^10.4", "shipmonk/composer-dependency-analyser": "^1.7", "symfony/framework-bundle": "^6.4 || ^7.0", + "symfony/http-client": "^7.1", "symfony/monolog-bundle": "^3.10", + "symfony/routing": "^7.1", "symfony/stopwatch": "^6.4 || ^7.0", "symfony/twig-bundle": "^6.4 || ^7.0", - "symfony/var-dumper": "^6.4 || ^7.0" + "symfony/var-dumper": "^6.4 || ^7.0", + "twig/twig": "^3.14" }, "config": { "allow-plugins": { From ae7c03f3a935ec78b803a47b622a5436371e97f2 Mon Sep 17 00:00:00 2001 From: Adrien Roches Date: Sat, 5 Oct 2024 15:54:09 +0200 Subject: [PATCH 3/5] [UPDATE] Configure composer analyser --- .github/workflows/tests.yml | 2 +- .php-cs-fixer.dist.php | 2 ++ composer-dependency-analyser.php | 22 +++++++++++++++++++ .../Pdf/AbstractChromiumPdfBuilderTest.php | 2 ++ 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 composer-dependency-analyser.php diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 016bca8f..7c7f131f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -51,7 +51,7 @@ jobs: dependency-versions: '${{ matrix.deps }}' - name: 'Validate dependencies' - run: './vendor/bin/composer-dependency-analyser' + run: './vendor/bin/composer-dependency-analyser --show-all-usages' - name: 'Run test suite' run: 'php vendor/bin/phpunit' diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index bcc531f2..0dbd7982 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -6,7 +6,9 @@ __DIR__ . '/docs', __DIR__ . '/src', __DIR__ . '/tests', + __DIR__ . '/', ]) + ->notPath('var') ; return (new PhpCsFixer\Config()) diff --git a/composer-dependency-analyser.php b/composer-dependency-analyser.php new file mode 100644 index 00000000..ecd43ca0 --- /dev/null +++ b/composer-dependency-analyser.php @@ -0,0 +1,22 @@ +addPathToScan(__DIR__.'/src', isDev: false) + ->addPathToScan(__DIR__.'/src/DataCollector', isDev: true) + ->addPathToScan(__DIR__.'/src/Debug', isDev: true) + ->addPathToScan(__DIR__.'/tests', isDev: true) + + ->ignoreErrorsOnPackage('symfony/routing', [ + ErrorType::DEV_DEPENDENCY_IN_PROD, + ]) + ->ignoreErrorsOnPackage('twig/twig', [ + ErrorType::DEV_DEPENDENCY_IN_PROD, + ]) +; diff --git a/tests/Builder/Pdf/AbstractChromiumPdfBuilderTest.php b/tests/Builder/Pdf/AbstractChromiumPdfBuilderTest.php index 980b651c..d5155cfc 100644 --- a/tests/Builder/Pdf/AbstractChromiumPdfBuilderTest.php +++ b/tests/Builder/Pdf/AbstractChromiumPdfBuilderTest.php @@ -8,6 +8,7 @@ use PHPUnit\Framework\Attributes\UsesClass; use Sensiolabs\GotenbergBundle\Builder\Pdf\AbstractChromiumPdfBuilder; use Sensiolabs\GotenbergBundle\Builder\Pdf\AbstractPdfBuilder; +use Sensiolabs\GotenbergBundle\Enumeration\PaperSize; use Sensiolabs\GotenbergBundle\Enumeration\PaperSizeInterface; use Sensiolabs\GotenbergBundle\Enumeration\PdfFormat; use Sensiolabs\GotenbergBundle\Enumeration\Unit; @@ -22,6 +23,7 @@ #[CoversClass(AbstractChromiumPdfBuilder::class)] #[UsesClass(AbstractPdfBuilder::class)] #[UsesClass(Unit::class)] +#[UsesClass(PaperSize::class)] #[UsesClass(AssetBaseDirFormatter::class)] #[UsesClass(GotenbergAssetExtension::class)] class AbstractChromiumPdfBuilderTest extends AbstractBuilderTestCase From 16bfeace1ef08e519af0d2b5b5c594a7fc515718 Mon Sep 17 00:00:00 2001 From: Adrien Roches Date: Sun, 6 Oct 2024 09:27:05 +0200 Subject: [PATCH 4/5] [UPDATE] Dev dependencies --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index c77535bb..1ffd9ef4 100644 --- a/composer.json +++ b/composer.json @@ -41,9 +41,9 @@ "phpunit/phpunit": "^10.4", "shipmonk/composer-dependency-analyser": "^1.7", "symfony/framework-bundle": "^6.4 || ^7.0", - "symfony/http-client": "^7.1", + "symfony/http-client": "^6.4 || ^7.0", "symfony/monolog-bundle": "^3.10", - "symfony/routing": "^7.1", + "symfony/routing": "^6.4 || ^7.0", "symfony/stopwatch": "^6.4 || ^7.0", "symfony/twig-bundle": "^6.4 || ^7.0", "symfony/var-dumper": "^6.4 || ^7.0", From ccdc085a98de9a6e358f81c04ea2fe80ca1b2d52 Mon Sep 17 00:00:00 2001 From: Adrien Roches Date: Sun, 13 Oct 2024 17:57:02 +0200 Subject: [PATCH 5/5] Update .php-cs-fixer.dist.php --- .php-cs-fixer.dist.php | 1 - 1 file changed, 1 deletion(-) diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index 0dbd7982..418c4639 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -6,7 +6,6 @@ __DIR__ . '/docs', __DIR__ . '/src', __DIR__ . '/tests', - __DIR__ . '/', ]) ->notPath('var') ;