From d1a9c4ea0e1dbf8dd66abf1f92a4fb3d9ffba86d Mon Sep 17 00:00:00 2001 From: RenoSimonsTTL Date: Fri, 8 Sep 2023 14:14:04 +0200 Subject: [PATCH 1/8] BEL-373 Bump Storyblok php client to ^2.6 --- CHANGELOG.md | 3 +++ composer.json | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0980db9..698760b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ All notable changes to `laravel-storyblok` will be documented in this file. +## 2.1.0 - 2023-09-08 +- Upgrade to the latest version of the storyblock client for v2 support + ## 2.0.0 - 2022-11-29 - Upgrade to thet latext version of the rich text resolver (https://github.com/storyblok/storyblok-php-richtext-renderer/releases/tag/2.1.0) diff --git a/composer.json b/composer.json index 15a91c5..1bac523 100644 --- a/composer.json +++ b/composer.json @@ -19,15 +19,15 @@ ], "require": { "php": "^8.0", + "ext-json": "*", + "apix/cache": "^1.3", + "illuminate/console": "^8.0|^9.0", "illuminate/contracts": "^8.0|^9.0", "illuminate/filesystem": "^8.0|^9.0", - "illuminate/support": "^8.0|^9.0", - "illuminate/console": "^8.0|^9.0", "illuminate/routing": "^8.0|^9.0", - "storyblok/php-client": "^1.6", - "storyblok/richtext-resolver": "^2.1", - "apix/cache": "^1.3", - "ext-json": "*" + "illuminate/support": "^8.0|^9.0", + "storyblok/php-client": "^2.6", + "storyblok/richtext-resolver": "^2.1" }, "require-dev": { "orchestra/testbench": "^6.0|^7.0", From b8252465a52cdc2122bbbb9a8063262f053b4e75 Mon Sep 17 00:00:00 2001 From: RenoSimonsTTL Date: Fri, 22 Sep 2023 10:11:26 +0200 Subject: [PATCH 2/8] BEL-373 Added Laravel 10 support --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 1bac523..0ea1a71 100644 --- a/composer.json +++ b/composer.json @@ -21,11 +21,11 @@ "php": "^8.0", "ext-json": "*", "apix/cache": "^1.3", - "illuminate/console": "^8.0|^9.0", - "illuminate/contracts": "^8.0|^9.0", - "illuminate/filesystem": "^8.0|^9.0", - "illuminate/routing": "^8.0|^9.0", - "illuminate/support": "^8.0|^9.0", + "illuminate/console": "^8.0|^9.0|^10.0", + "illuminate/contracts": "^8.0|^9.0|^10.0", + "illuminate/filesystem": "^8.0|^9.0|^10.0", + "illuminate/routing": "^8.0|^9.0|^10.0", + "illuminate/support": "^8.0|^9.0|^10.0", "storyblok/php-client": "^2.6", "storyblok/richtext-resolver": "^2.1" }, From 4c28de694d80245407d2c4cffbf77472fc52941f Mon Sep 17 00:00:00 2001 From: RenoSimonsTTL Date: Fri, 22 Sep 2023 10:12:30 +0200 Subject: [PATCH 3/8] BEL-373 Bump min php version to 8.1 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0ea1a71..23acc1c 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ } ], "require": { - "php": "^8.0", + "php": "^8.1", "ext-json": "*", "apix/cache": "^1.3", "illuminate/console": "^8.0|^9.0|^10.0", From 7b7dcb794da148b5d6a55ad5c7e034b2a4cdd0c1 Mon Sep 17 00:00:00 2001 From: RenoSimonsTTL Date: Mon, 2 Oct 2023 11:41:45 +0200 Subject: [PATCH 4/8] PR support 8.2 php & remove support for L8 --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 23acc1c..30672c6 100644 --- a/composer.json +++ b/composer.json @@ -18,14 +18,14 @@ } ], "require": { - "php": "^8.1", + "php": "^8.1|^8.2", "ext-json": "*", "apix/cache": "^1.3", - "illuminate/console": "^8.0|^9.0|^10.0", - "illuminate/contracts": "^8.0|^9.0|^10.0", - "illuminate/filesystem": "^8.0|^9.0|^10.0", - "illuminate/routing": "^8.0|^9.0|^10.0", - "illuminate/support": "^8.0|^9.0|^10.0", + "illuminate/console": "^9.0|^10.0", + "illuminate/contracts": "^9.0|^10.0", + "illuminate/filesystem": "^9.0|^10.0", + "illuminate/routing": "^9.0|^10.0", + "illuminate/support": "^9.0|^10.0", "storyblok/php-client": "^2.6", "storyblok/richtext-resolver": "^2.1" }, From aa50ec21c02d75e510a9dddefdd89e39408a5d29 Mon Sep 17 00:00:00 2001 From: RenoSimonsTTL Date: Mon, 2 Oct 2023 11:46:23 +0200 Subject: [PATCH 5/8] Update tests to L9, L10 & PHP8.1,2 --- .github/workflows/run-tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 2cdda85..9e45734 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -9,14 +9,14 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest, windows-latest] - php: [8.0, 8.1] - laravel: [8.*, 9.*] + php: [8.1, 8.2] + laravel: [9.*, 10.*] stability: [prefer-lowest, prefer-stable] include: - - laravel: 8.* - testbench: 6.23 - laravel: 9.* testbench: 7.* + - laravel: 10.* + testbench: 7.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} From 1b9e67f38b22cb7efd0a22bdc3e940510e027365 Mon Sep 17 00:00:00 2001 From: RenoSimonsTTL Date: Mon, 2 Oct 2023 12:02:56 +0200 Subject: [PATCH 6/8] Testbench for L10 --- .github/workflows/run-tests.yml | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 9e45734..b9a0ead 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -16,7 +16,7 @@ jobs: - laravel: 9.* testbench: 7.* - laravel: 10.* - testbench: 7.* + testbench: 8.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} diff --git a/composer.json b/composer.json index 30672c6..420f9f5 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "storyblok/richtext-resolver": "^2.1" }, "require-dev": { - "orchestra/testbench": "^6.0|^7.0", + "orchestra/testbench": "^6.0|^7.0|^8.0", "phpunit/phpunit": "^9.5.8" }, "autoload": { From 43b2686ca8b334fd092e9613efeedc2916487fb6 Mon Sep 17 00:00:00 2001 From: RenoSimonsTTL Date: Mon, 2 Oct 2023 16:43:46 +0200 Subject: [PATCH 7/8] Removed apix/cache --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 420f9f5..fc642f9 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,6 @@ "require": { "php": "^8.1|^8.2", "ext-json": "*", - "apix/cache": "^1.3", "illuminate/console": "^9.0|^10.0", "illuminate/contracts": "^9.0|^10.0", "illuminate/filesystem": "^9.0|^10.0", From 586f7703f9972d3ac396078abc18d1dae03e998b Mon Sep 17 00:00:00 2001 From: RenoSimonsTTL Date: Mon, 2 Oct 2023 17:30:19 +0200 Subject: [PATCH 8/8] Update changelog & removed testbench L8 support --- CHANGELOG.md | 5 ++++- composer.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 698760b..c2134bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,11 @@ All notable changes to `laravel-storyblok` will be documented in this file. -## 2.1.0 - 2023-09-08 +## 2.1.0 - 2023-10-02 - Upgrade to the latest version of the storyblock client for v2 support +- Laravel 10 is now supported +- Laravel 8 is no longer supported +- PHP 8.0 is no longer supported ## 2.0.0 - 2022-11-29 - Upgrade to thet latext version of the rich text resolver (https://github.com/storyblok/storyblok-php-richtext-renderer/releases/tag/2.1.0) diff --git a/composer.json b/composer.json index fc642f9..c95856c 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "storyblok/richtext-resolver": "^2.1" }, "require-dev": { - "orchestra/testbench": "^6.0|^7.0|^8.0", + "orchestra/testbench": "^7.0|^8.0", "phpunit/phpunit": "^9.5.8" }, "autoload": {