From 34b9ac1e8b82bf19e468c07ffead7f82f6215e6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Witold=20Wis=CC=81niewski?= Date: Mon, 22 Jul 2024 09:36:42 +0200 Subject: [PATCH 1/5] Added phpstan --- .github/workflows/phpstan.yml | 39 +++++++++++++++++++++++++++++++++++ composer.json | 5 +++-- phpstan.neon | 10 +++++++++ 3 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/phpstan.yml create mode 100644 phpstan.neon diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml new file mode 100644 index 0000000..225a807 --- /dev/null +++ b/.github/workflows/phpstan.yml @@ -0,0 +1,39 @@ +name: Tests PHPStan in environments + +on: [pull_request] + +jobs: + php82-laravel-latest-phpstan-postgres: + runs-on: ubuntu-latest + container: + image: escolalms/php:8.2 + + services: + postgres: + image: postgres:12 + env: + POSTGRES_USER: postgres + POSTGRES_PASSWORD: postgres + POSTGRES_DB: test + TZ: Europe/Warsaw + ports: + - 5432:5432 + + steps: + - name: Instantiate package + uses: actions/checkout@v2 + + - name: Setup environment + run: cp env/postgres/* . + + - name: Update composer + run: COMPOSER_ROOT_VERSION=0.9.9 composer update + + - name: Clear config + run: vendor/bin/testbench config:clear + + - name: Publish things + run: vendor/bin/testbench migrate:fresh + + - name: Run tests + run: vendor/bin/phpstan analyse diff --git a/composer.json b/composer.json index 2f77089..b89ae9f 100644 --- a/composer.json +++ b/composer.json @@ -28,8 +28,9 @@ "escolalms/topic-type-project": "^0", "escolalms/assign-without-account": "^0", "escolalms/video": "^0", - "orchestra/testbench": "^5.0|^6.0", - "phpunit/phpunit": "^9.0" + "orchestra/testbench": ">=5.0", + "phpunit/phpunit": "^9.0", + "nunomaduro/larastan": "^2.0" }, "suggest": { "escolalms/auth": "^0.1.54", diff --git a/phpstan.neon b/phpstan.neon new file mode 100644 index 0000000..99fcd65 --- /dev/null +++ b/phpstan.neon @@ -0,0 +1,10 @@ +includes: + - ./vendor/nunomaduro/larastan/extension.neon + +parameters: + + paths: + - src/ + + # The level 9 is the highest level + level: 5 From 79b0b01db55898d81f9f76f20851798692da7323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Witold=20Wis=CC=81niewski?= Date: Mon, 22 Jul 2024 09:47:33 +0200 Subject: [PATCH 2/5] fix tests --- .github/workflows/test.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2631d56..72b995b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -101,12 +101,12 @@ jobs: - name: Instantiate package uses: actions/checkout@v2 - - name: Update composer - run: composer update - - name: Setup environment run: cp env/postgres/* . + - name: Update composer + run: composer update + - name: Clear config run: vendor/bin/testbench config:clear @@ -147,12 +147,12 @@ jobs: - name: Instantiate package uses: actions/checkout@v2 - - name: Update composer - run: composer update - - name: Setup environment run: cp env/postgres/* . + - name: Update composer + run: composer update + - name: Clear config run: vendor/bin/testbench config:clear From a1f3bf823ab4a9f0d5cd24f27ea89aeed250366f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Witold=20Wis=CC=81niewski?= Date: Mon, 22 Jul 2024 09:57:57 +0200 Subject: [PATCH 3/5] Changed phpstan level --- phpstan.neon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpstan.neon b/phpstan.neon index 99fcd65..e349cbf 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -7,4 +7,4 @@ parameters: - src/ # The level 9 is the highest level - level: 5 + level: 2 From 9b345aee02963fef5d9f646004e3993ed408d784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Witold=20Wis=CC=81niewski?= Date: Mon, 22 Jul 2024 10:04:54 +0200 Subject: [PATCH 4/5] phpstan level --- phpstan.neon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpstan.neon b/phpstan.neon index e349cbf..130082e 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -7,4 +7,4 @@ parameters: - src/ # The level 9 is the highest level - level: 2 + level: 1 From df0b7bcb055d8d4de1a291e001994b3b0bf972a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Witold=20Wis=CC=81niewski?= Date: Mon, 22 Jul 2024 10:12:25 +0200 Subject: [PATCH 5/5] fix --- src/Core/EmailChannel.php | 3 +++ src/Services/MjmlService.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Core/EmailChannel.php b/src/Core/EmailChannel.php index 18fc969..aa544d9 100644 --- a/src/Core/EmailChannel.php +++ b/src/Core/EmailChannel.php @@ -73,8 +73,11 @@ private static function fixHtml(string $html): string public static function sections(): Collection { return new Collection([ + // @phpstan-ignore-next-line new TemplateSectionSchema('title', TemplateSectionTypeEnum::SECTION_TEXT(), true), + // @phpstan-ignore-next-line new TemplateSectionSchema('content', TemplateSectionTypeEnum::SECTION_MJML(), true), + // @phpstan-ignore-next-line new TemplateSectionSchema('contentHtml', TemplateSectionTypeEnum::SECTION_HTML(), false, true), ]); } diff --git a/src/Services/MjmlService.php b/src/Services/MjmlService.php index 7e23f24..c580324 100644 --- a/src/Services/MjmlService.php +++ b/src/Services/MjmlService.php @@ -20,7 +20,7 @@ public function render(string $mjml): string throw new Exception('Missing MJML API id and/or secret'); } - $renderer = new ApiRenderer($apiId, $apiSecret); + $renderer = new ApiRenderer($apiId); } else { $renderer = new BinaryRenderer(); }