From aaeba31cabbd37001563cca26d392bb34bf32ea2 Mon Sep 17 00:00:00 2001 From: Luke Walsh Date: Mon, 17 Jan 2022 14:40:58 +0000 Subject: [PATCH 1/3] Update the API version to 2022-01 --- src/resources/config/shopify-app.php | 2 +- tests/Services/ApiHelperTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/resources/config/shopify-app.php b/src/resources/config/shopify-app.php index c1feb159..13338313 100644 --- a/src/resources/config/shopify-app.php +++ b/src/resources/config/shopify-app.php @@ -164,7 +164,7 @@ | */ - 'api_version' => env('SHOPIFY_API_VERSION', '2021-01'), + 'api_version' => env('SHOPIFY_API_VERSION', '2022-01'), /* |-------------------------------------------------------------------------- diff --git a/tests/Services/ApiHelperTest.php b/tests/Services/ApiHelperTest.php index 62d3cc65..bae97ba3 100644 --- a/tests/Services/ApiHelperTest.php +++ b/tests/Services/ApiHelperTest.php @@ -42,7 +42,7 @@ public function testMake(): void $this->assertInstanceOf(BasicShopifyAPI::class, $api); $this->assertSame(Util::getShopifyConfig('api_secret'), $this->app['config']->get('shopify-app.api_secret')); $this->assertSame(Util::getShopifyConfig('api_key'), $this->app['config']->get('shopify-app.api_key')); - $this->assertSame($this->app['config']->get('shopify-app.api_version'), '2021-01'); + $this->assertSame($this->app['config']->get('shopify-app.api_version'), '2022-01'); } public function testSetAndGetApi(): void From a93dc05452e7f947dd0f8506e1146d2cc797e089 Mon Sep 17 00:00:00 2001 From: Luke Walsh <32519106+Kyon147@users.noreply.github.com> Date: Thu, 20 Jan 2022 14:59:20 +0000 Subject: [PATCH 2/3] Skip composer normalize for php8.0 for now As there is a potential bug for this test on PHP8.0 it will only run for older versions. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fbbe5c61..6a985600 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,7 +75,7 @@ jobs: run: composer install --prefer-dist --no-progress - name: Normalize composer file - if: matrix.normalize == true + if: matrix.normalize == true && matrix.php !== '8.0' run: composer normalize --dry-run - name: Run test suite From 305feead1428f1f2bad788baf96bbbe656237e44 Mon Sep 17 00:00:00 2001 From: Luke Walsh <32519106+Kyon147@users.noreply.github.com> Date: Thu, 20 Jan 2022 15:00:53 +0000 Subject: [PATCH 3/3] Fix typo --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a985600..eebdc3ee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,7 +75,7 @@ jobs: run: composer install --prefer-dist --no-progress - name: Normalize composer file - if: matrix.normalize == true && matrix.php !== '8.0' + if: matrix.normalize == true && matrix.php != '8.0' run: composer normalize --dry-run - name: Run test suite