From f5ddbe9eb04986d16cd2cf7c9780afd52cc29b14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Tesa=CC=81rek?= Date: Wed, 19 Aug 2020 13:42:14 +0200 Subject: [PATCH 1/4] Fix exception plugin typing. --- composer.json | 3 ++- tests/unit/Http/Plugin/ExceptionPluginTest.php | 10 ++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 23b1ebc..4e2606e 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,8 @@ "phpstan/phpstan": "^0.12.0", "phpstan/phpstan-phpunit": "^0.12.1", "phpunit/phpunit": "^6.4 || ^7.0 || ^8.0", - "symfony/var-dumper": "^3.3 || ^4.0 || ^5.0" + "symfony/var-dumper": "^3.3 || ^4.0 || ^5.0", + "symplify/easy-coding-standard": "*" }, "config": { "sort-packages": true diff --git a/tests/unit/Http/Plugin/ExceptionPluginTest.php b/tests/unit/Http/Plugin/ExceptionPluginTest.php index ffcb8e3..678dc91 100644 --- a/tests/unit/Http/Plugin/ExceptionPluginTest.php +++ b/tests/unit/Http/Plugin/ExceptionPluginTest.php @@ -7,6 +7,7 @@ use GuzzleHttp\Psr7\Response; use Http\Client\Promise\HttpFulfilledPromise; use Http\Client\Promise\HttpRejectedPromise; +use Http\Promise\Promise; use Lmc\Matej\Exception\AuthorizationException; use Lmc\Matej\Exception\RequestException; use PHPUnit\Framework\TestCase; @@ -30,7 +31,9 @@ public function shouldReturnResponseWhenNoError(int $statusCode): void }; $plugin = new ExceptionPlugin(); - $promise = $plugin->handleRequest($request, $next, function (): void {}); + $promise = $plugin->handleRequest($request, $next, function() use ($response): Promise { + return new HttpFulfilledPromise($response); + }); $this->assertInstanceOf(HttpFulfilledPromise::class, $promise); $this->assertSame($response, $promise->wait()); } @@ -63,7 +66,10 @@ public function shouldThrowExceptionBasedOnStatusCode(int $statusCode, string $e $plugin = new ExceptionPlugin(); - $promise = $plugin->handleRequest($request, $next, function (): void {}); + $promise = $plugin->handleRequest($request, $next, function() use ($response): Promise { + return new HttpFulfilledPromise($response); + }); + $this->assertInstanceOf(HttpRejectedPromise::class, $promise); $this->expectException($expectedExceptionClass); From 6e514107b9a62d35cd8c05e128696a89fc6f0b4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Tesa=CC=81rek?= Date: Wed, 19 Aug 2020 13:48:11 +0200 Subject: [PATCH 2/4] Freeze esc version. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4e2606e..981240c 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,7 @@ "phpstan/phpstan-phpunit": "^0.12.1", "phpunit/phpunit": "^6.4 || ^7.0 || ^8.0", "symfony/var-dumper": "^3.3 || ^4.0 || ^5.0", - "symplify/easy-coding-standard": "*" + "symplify/easy-coding-standard": "7.2.19" }, "config": { "sort-packages": true From dc81d9c9e6e97a96e6b0d238fffd47b9ea40f193 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Tesa=CC=81rek?= Date: Wed, 19 Aug 2020 14:10:50 +0200 Subject: [PATCH 3/4] Bump php version for tests. --- .github/workflows/php.yml | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index cb2d2de..81afc0e 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v2 - uses: nanasess/setup-php@master with: - php-version: '7.1' + php-version: '7.3' - name: Validate composer.json and composer.lock run: composer validate diff --git a/composer.json b/composer.json index 981240c..4e2606e 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,7 @@ "phpstan/phpstan-phpunit": "^0.12.1", "phpunit/phpunit": "^6.4 || ^7.0 || ^8.0", "symfony/var-dumper": "^3.3 || ^4.0 || ^5.0", - "symplify/easy-coding-standard": "7.2.19" + "symplify/easy-coding-standard": "*" }, "config": { "sort-packages": true From 3f61175ecc3b80a3509dedbb4ab4abd008dfee51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Tesa=CC=81rek?= Date: Wed, 19 Aug 2020 14:28:56 +0200 Subject: [PATCH 4/4] Run integration tests in github actions. --- .github/workflows/php.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 81afc0e..39288a1 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -34,4 +34,8 @@ jobs: run: composer install --prefer-dist --no-progress --no-suggest - name: Run test suite + env: + MATEJ_TEST_ACCOUNTID: ${{ secrets.MATEJ_TEST_ACCOUNTID }} + MATEJ_TEST_APIKEY: ${{ secrets.MATEJ_TEST_APIKEY }} + MATEJ_TEST_BASE_URL: ${{ secrets.MATEJ_TEST_BASE_URL }} run: composer all