From f6e77cdf926e599ccecb232764a719ae59a60549 Mon Sep 17 00:00:00 2001 From: Attila Fulop <1162360+fulopattila122@users.noreply.github.com> Date: Wed, 13 Mar 2024 10:34:52 +0200 Subject: [PATCH] Added Laravel 11 Support --- .github/workflows/tests.yml | 2 +- Changelog.md | 3 + composer.json | 6 +- phpunit.xml.dist | 113 ++++++++---------- src/Adjustments/.github/workflows/tests.yml | 2 +- src/Adjustments/Changelog.md | 1 + src/Adjustments/composer.json | 6 +- src/Cart/.github/workflows/tests.yml | 2 +- src/Cart/Changelog.md | 1 + src/Cart/composer.json | 6 +- src/Category/.github/workflows/tests.yml | 2 +- src/Category/Changelog.md | 1 + src/Category/composer.json | 8 +- src/Channel/.github/workflows/tests.yml | 2 +- src/Channel/Changelog.md | 1 + src/Channel/composer.json | 6 +- ...024_01_26_103355_extend_channels_table.php | 1 + src/Checkout/.github/workflows/tests.yml | 2 +- src/Checkout/Changelog.md | 1 + src/Checkout/composer.json | 8 +- src/Contracts/.github/workflows/tests.yml | 2 +- src/Contracts/Changelog.md | 1 + src/Contracts/composer.json | 4 +- .../LoadsMediaConversionsFromConfig.php | 4 +- src/Links/.github/workflows/tests.yml | 2 +- src/Links/Changelog.md | 1 + src/Links/composer.json | 8 +- src/MasterProduct/.github/workflows/tests.yml | 2 +- src/MasterProduct/Changelog.md | 1 + src/MasterProduct/composer.json | 8 +- src/Order/.github/workflows/tests.yml | 2 +- src/Order/Changelog.md | 1 + src/Order/composer.json | 6 +- src/Payment/.github/workflows/tests.yml | 2 +- src/Payment/Changelog.md | 1 + src/Payment/composer.json | 6 +- src/Product/.github/workflows/tests.yml | 2 +- src/Product/Changelog.md | 1 + src/Product/composer.json | 8 +- src/Properties/.github/workflows/tests.yml | 2 +- src/Properties/Changelog.md | 1 + src/Properties/composer.json | 8 +- src/Shipment/.github/workflows/tests.yml | 2 +- src/Shipment/Changelog.md | 1 + src/Shipment/composer.json | 8 +- src/Support/.github/workflows/tests.yml | 2 +- src/Support/Changelog.md | 3 + src/Support/Traits/BuyableImageSpatieV7.php | 23 ---- src/Support/Traits/BuyableImageSpatieV8.php | 23 ---- src/Support/composer.json | 8 +- src/Taxes/.github/workflows/tests.yml | 2 +- src/Taxes/Changelog.md | 1 + src/Taxes/composer.json | 6 +- 53 files changed, 145 insertions(+), 181 deletions(-) delete mode 100644 src/Support/Traits/BuyableImageSpatieV7.php delete mode 100644 src/Support/Traits/BuyableImageSpatieV8.php diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8383afa66..4c331d830 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: php: ['8.2', '8.3'] - laravel: ['10.38', '10.46'] + laravel: ['10.38', '10.48', '11.0'] name: PHP ${{ matrix.php }} Laravel ${{ matrix.laravel }} steps: - name: Checkout diff --git a/Changelog.md b/Changelog.md index 2c5d7f42a..b12910741 100644 --- a/Changelog.md +++ b/Changelog.md @@ -9,11 +9,14 @@ - Dropped Laravel 9 Support - Dropped Enum v3 Support - Added PHP 8.3 Support +- Added Laravel 11 Support - Changed minimum Laravel version to v10.38.2 - Changed minimal Enum requirement to v4.2 - Upgraded to Konekt Address, Customer and User modules to v3 +- Upgraded to Laravel Media Library v11 - Removed the Vanilo v2 `Framework` namespace compatibility layer - Removed the throwing of `CartUpdated` event when destroying a cart (`CartDeleting` and `CartDeleted` remains) +- Removed the deprecated `BuyableImageSpatieV7` and `BuyableImageSpatieV8` traits - Added the `currency` field to the orders table - Added the following fields to the Channel model/table: - `currency` diff --git a/composer.json b/composer.json index aba0cc2d2..55473456f 100644 --- a/composer.json +++ b/composer.json @@ -19,10 +19,10 @@ "ext-json": "*", "ext-pdo": "*", "doctrine/dbal": "^3.5.1", - "laravel/framework": "^10.38.2", + "laravel/framework": "^10.38.2|^11.0", "konekt/enum": "^4.2", "konekt/concord": "^1.13", - "spatie/laravel-medialibrary": "^10.0", + "spatie/laravel-medialibrary": "^11.0", "cviebrock/eloquent-sluggable": "^10.0|^11.0", "konekt/laravel-migration-compatibility": "^1.6", "konekt/address": "^3.1", @@ -58,7 +58,7 @@ ] }, "require-dev": { - "orchestra/testbench": "^8.0", + "orchestra/testbench": "^8.0|^9.0", "phpunit/phpunit" : "^10.0", "laravel/legacy-factories": "^1.0.4" }, diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 002f437e7..bc8c130bc 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,64 +1,53 @@ - - - - src/Contracts/Tests - - - src/Support/Tests - - - src/Product/Tests - - - src/MasterProduct/Tests - - - src/Properties/Tests - - - src/Category/Tests - - - src/Links/Tests - - - src/Channel/Tests - - - src/Cart/Tests - - - src/Checkout/Tests - - - src/Order/Tests - - - src/Payment/Tests - - - src/Shipment/Tests - - - src/Adjustments/Tests - - - src/Taxes/Tests - - - src/Foundation/Tests - - + + + + src/Contracts/Tests + + + src/Support/Tests + + + src/Product/Tests + + + src/MasterProduct/Tests + + + src/Properties/Tests + + + src/Category/Tests + + + src/Links/Tests + + + src/Channel/Tests + + + src/Cart/Tests + + + src/Checkout/Tests + + + src/Order/Tests + + + src/Payment/Tests + + + src/Shipment/Tests + + + src/Adjustments/Tests + + + src/Taxes/Tests + + + src/Foundation/Tests + + diff --git a/src/Adjustments/.github/workflows/tests.yml b/src/Adjustments/.github/workflows/tests.yml index c4c27903f..4248d0265 100644 --- a/src/Adjustments/.github/workflows/tests.yml +++ b/src/Adjustments/.github/workflows/tests.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: php: ['8.2', '8.3'] - laravel: ['10.38', '10.46'] + laravel: ['10.38', '10.48', '11.0'] name: PHP ${{ matrix.php }} Laravel ${{ matrix.laravel }} steps: - name: Checkout diff --git a/src/Adjustments/Changelog.md b/src/Adjustments/Changelog.md index be0cabdc6..7fff6373b 100644 --- a/src/Adjustments/Changelog.md +++ b/src/Adjustments/Changelog.md @@ -9,6 +9,7 @@ - Dropped Laravel 9 Support - Dropped Enum v3 Support - Added PHP 8.3 Support +- Added Laravel 11 Support - Changed minimum Laravel version to v10.38.2 - Changed minimal Enum requirement to v4.2 - Added the `AdjusterAliases` class that for decoupling FQCNs from the database diff --git a/src/Adjustments/composer.json b/src/Adjustments/composer.json index 50a10210d..76d7f8069 100644 --- a/src/Adjustments/composer.json +++ b/src/Adjustments/composer.json @@ -21,11 +21,11 @@ "konekt/concord": "^1.13", "konekt/enum": "^4.2", "konekt/enum-eloquent": "^1.9", - "laravel/framework": "^10.38.2" + "laravel/framework": "^10.38.2|^11.0" }, "require-dev": { - "phpunit/phpunit": "^9.0", - "orchestra/testbench": "^8.0" + "phpunit/phpunit": "^10.0", + "orchestra/testbench": "^8.0|^9.0" }, "autoload": { "psr-4": { "Vanilo\\Adjustments\\": "" } diff --git a/src/Cart/.github/workflows/tests.yml b/src/Cart/.github/workflows/tests.yml index c4c27903f..4248d0265 100644 --- a/src/Cart/.github/workflows/tests.yml +++ b/src/Cart/.github/workflows/tests.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: php: ['8.2', '8.3'] - laravel: ['10.38', '10.46'] + laravel: ['10.38', '10.48', '11.0'] name: PHP ${{ matrix.php }} Laravel ${{ matrix.laravel }} steps: - name: Checkout diff --git a/src/Cart/Changelog.md b/src/Cart/Changelog.md index c57115b09..2e536d500 100644 --- a/src/Cart/Changelog.md +++ b/src/Cart/Changelog.md @@ -9,6 +9,7 @@ - Dropped Laravel 9 Support - Dropped Enum v3 Support - Added PHP 8.3 Support +- Added Laravel 11 Support - Changed minimum Laravel version to v10.38.2 - Changed minimal Enum requirement to v4.2 - Removed the throwing of `CartUpdated` event when destroying a cart (`CartDeleting` and `CartDeleted` remains) diff --git a/src/Cart/composer.json b/src/Cart/composer.json index e67d8e30f..6d5ab3205 100644 --- a/src/Cart/composer.json +++ b/src/Cart/composer.json @@ -20,14 +20,14 @@ "php": "^8.2", "konekt/concord": "^1.13", "konekt/enum": "^4.2", - "laravel/framework": "^10.38.2", + "laravel/framework": "^10.38.2|^11.0", "vanilo/contracts": "^4.0", "vanilo/support": "^4.0" }, "require-dev": { "ext-sqlite3": "*", - "phpunit/phpunit": "^9.0", - "orchestra/testbench": "^8.0", + "phpunit/phpunit": "^10.0", + "orchestra/testbench": "^8.0|^9.0", "laravel/legacy-factories": "^1.0" }, "autoload": { diff --git a/src/Category/.github/workflows/tests.yml b/src/Category/.github/workflows/tests.yml index c4c27903f..4248d0265 100644 --- a/src/Category/.github/workflows/tests.yml +++ b/src/Category/.github/workflows/tests.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: php: ['8.2', '8.3'] - laravel: ['10.38', '10.46'] + laravel: ['10.38', '10.48', '11.0'] name: PHP ${{ matrix.php }} Laravel ${{ matrix.laravel }} steps: - name: Checkout diff --git a/src/Category/Changelog.md b/src/Category/Changelog.md index 19159f18e..0aea7df8e 100644 --- a/src/Category/Changelog.md +++ b/src/Category/Changelog.md @@ -8,6 +8,7 @@ - Dropped PHP 8.0 & PHP 8.1 Support - Dropped Laravel 9 Support - Added PHP 8.3 Support +- Added Laravel 11 Support - Changed minimum Laravel version to v10.38.2 ## 3.x Series diff --git a/src/Category/composer.json b/src/Category/composer.json index 872fc35f3..55acb2491 100644 --- a/src/Category/composer.json +++ b/src/Category/composer.json @@ -19,12 +19,12 @@ "require": { "php": "^8.2", "konekt/concord": "^1.13", - "cviebrock/eloquent-sluggable": "^10.0", - "laravel/framework": "^10.38.2" + "cviebrock/eloquent-sluggable": "^10.0|^10.0", + "laravel/framework": "^10.38.2|^11.0" }, "require-dev": { - "phpunit/phpunit": "^9.0", - "orchestra/testbench": "^8.0" + "phpunit/phpunit": "^10.0", + "orchestra/testbench": "^8.0|^9.0" }, "autoload": { "psr-4": { "Vanilo\\Category\\": "" } diff --git a/src/Channel/.github/workflows/tests.yml b/src/Channel/.github/workflows/tests.yml index c4c27903f..4248d0265 100644 --- a/src/Channel/.github/workflows/tests.yml +++ b/src/Channel/.github/workflows/tests.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: php: ['8.2', '8.3'] - laravel: ['10.38', '10.46'] + laravel: ['10.38', '10.48', '11.0'] name: PHP ${{ matrix.php }} Laravel ${{ matrix.laravel }} steps: - name: Checkout diff --git a/src/Channel/Changelog.md b/src/Channel/Changelog.md index fbdc08aa2..965678fd0 100644 --- a/src/Channel/Changelog.md +++ b/src/Channel/Changelog.md @@ -8,6 +8,7 @@ - Dropped PHP 8.0 & PHP 8.1 Support - Dropped Laravel 9 Support - Added PHP 8.3 Support +- Added Laravel 11 Support - Changed minimum Laravel version to v10.38.2 - Added the following fields to the Channel model/table: - `currency` diff --git a/src/Channel/composer.json b/src/Channel/composer.json index 7d72d0798..14f54bd12 100644 --- a/src/Channel/composer.json +++ b/src/Channel/composer.json @@ -20,11 +20,11 @@ "php": "^8.2", "konekt/concord": "^1.13", "cviebrock/eloquent-sluggable": "^10.0", - "laravel/framework": "^10.38.2" + "laravel/framework": "^10.38.2|^11.0" }, "require-dev": { - "phpunit/phpunit": "^9.0", - "orchestra/testbench": "^8.0", + "phpunit/phpunit": "^10.0", + "orchestra/testbench": "^8.0|^9.0", "laravel/legacy-factories": "^1.0" }, "autoload": { diff --git a/src/Channel/resources/database/migrations/2024_01_26_103355_extend_channels_table.php b/src/Channel/resources/database/migrations/2024_01_26_103355_extend_channels_table.php index 7776d92b6..6112f0e98 100644 --- a/src/Channel/resources/database/migrations/2024_01_26_103355_extend_channels_table.php +++ b/src/Channel/resources/database/migrations/2024_01_26_103355_extend_channels_table.php @@ -36,6 +36,7 @@ public function down(): void $table->dropColumn('language'); }); Schema::table('channels', function (Blueprint $table) { + $table->dropUnique('channels_domain_unique'); $table->dropColumn('domain'); }); Schema::table('channels', function (Blueprint $table) { diff --git a/src/Checkout/.github/workflows/tests.yml b/src/Checkout/.github/workflows/tests.yml index c4c27903f..4248d0265 100644 --- a/src/Checkout/.github/workflows/tests.yml +++ b/src/Checkout/.github/workflows/tests.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: php: ['8.2', '8.3'] - laravel: ['10.38', '10.46'] + laravel: ['10.38', '10.48', '11.0'] name: PHP ${{ matrix.php }} Laravel ${{ matrix.laravel }} steps: - name: Checkout diff --git a/src/Checkout/Changelog.md b/src/Checkout/Changelog.md index c856c1578..a81aa22a0 100644 --- a/src/Checkout/Changelog.md +++ b/src/Checkout/Changelog.md @@ -9,6 +9,7 @@ - Dropped Laravel 9 Support - Dropped Enum v3 Support - Added PHP 8.3 Support +- Added Laravel 11 Support - Changed minimum Laravel version to v10.38.2 - Changed minimal Enum requirement to v4.2 - Added the `BillpayerChanged` event diff --git a/src/Checkout/composer.json b/src/Checkout/composer.json index 0db1e96b6..292b2a956 100644 --- a/src/Checkout/composer.json +++ b/src/Checkout/composer.json @@ -20,14 +20,14 @@ "php": "^8.2", "konekt/concord": "^1.13", "konekt/enum": "^4.2", - "laravel/framework": "^10.38.2", + "laravel/framework": "^10.38.2|^11.0", "vanilo/support": "^4.0", "vanilo/contracts": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^9.0", - "orchestra/testbench": "^8.0", - "konekt/address": "^2.8" + "phpunit/phpunit": "^10.0", + "orchestra/testbench": "^8.0|^9.0", + "konekt/address": "^3.0" }, "autoload": { "psr-4": { "Vanilo\\Checkout\\": "" } diff --git a/src/Contracts/.github/workflows/tests.yml b/src/Contracts/.github/workflows/tests.yml index c4c27903f..4248d0265 100644 --- a/src/Contracts/.github/workflows/tests.yml +++ b/src/Contracts/.github/workflows/tests.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: php: ['8.2', '8.3'] - laravel: ['10.38', '10.46'] + laravel: ['10.38', '10.48', '11.0'] name: PHP ${{ matrix.php }} Laravel ${{ matrix.laravel }} steps: - name: Checkout diff --git a/src/Contracts/Changelog.md b/src/Contracts/Changelog.md index 97a9a9f86..ec5cbebeb 100644 --- a/src/Contracts/Changelog.md +++ b/src/Contracts/Changelog.md @@ -8,6 +8,7 @@ - Dropped PHP 8.0 & PHP 8.1 Support - Dropped Laravel 9 Support - Added PHP 8.3 Support +- Added Laravel 11 Support - Changed minimum Laravel version to v10.38.2 - Added the `Stockable` interface - Added the `Merchant` interface diff --git a/src/Contracts/composer.json b/src/Contracts/composer.json index b834a98bc..dd2a85f4e 100644 --- a/src/Contracts/composer.json +++ b/src/Contracts/composer.json @@ -18,11 +18,11 @@ ], "require": { "php": "^8.2", - "illuminate/support": "^10.38.2", + "illuminate/support": "^10.38.2|^11.0", "nette/schema": "^1.2.5" }, "require-dev": { - "phpunit/phpunit" : "^9.0" + "phpunit/phpunit": "^10.0" }, "autoload": { "psr-4": { "Vanilo\\Contracts\\": "" } diff --git a/src/Foundation/Traits/LoadsMediaConversionsFromConfig.php b/src/Foundation/Traits/LoadsMediaConversionsFromConfig.php index 87a027daf..b76ff5278 100644 --- a/src/Foundation/Traits/LoadsMediaConversionsFromConfig.php +++ b/src/Foundation/Traits/LoadsMediaConversionsFromConfig.php @@ -14,7 +14,7 @@ namespace Vanilo\Foundation\Traits; -use Spatie\Image\Manipulations; +use Spatie\Image\Enums\Fit; trait LoadsMediaConversionsFromConfig { @@ -30,7 +30,7 @@ public function loadConversionsFromVaniloConfig(): void foreach ($variants as $name => $settings) { $conversion = $this->addMediaConversion($name) ->fit( - $settings['fit'] ?? Manipulations::FIT_CONTAIN, + Fit::from($settings['fit'] ?? Fit::Contain->value), $settings['width'] ?? 250, $settings['height'] ?? 250 ); diff --git a/src/Links/.github/workflows/tests.yml b/src/Links/.github/workflows/tests.yml index 514d17165..cdac57296 100644 --- a/src/Links/.github/workflows/tests.yml +++ b/src/Links/.github/workflows/tests.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: php: ['8.2', '8.3'] - laravel: ['10.38', '10.46'] + laravel: ['10.38', '10.48', '11.0'] name: PHP ${{ matrix.php }} Laravel ${{ matrix.laravel }} steps: - name: Checkout diff --git a/src/Links/Changelog.md b/src/Links/Changelog.md index 95d9572a9..247bf84aa 100644 --- a/src/Links/Changelog.md +++ b/src/Links/Changelog.md @@ -8,6 +8,7 @@ - Dropped PHP 8.0 & PHP 8.1 Support - Dropped Laravel 9 Support - Added PHP 8.3 Support +- Added Laravel 11 Support - Changed minimum Laravel version to v10.38.2 ## 3.x Series diff --git a/src/Links/composer.json b/src/Links/composer.json index 3c8064b2a..8cc29c457 100644 --- a/src/Links/composer.json +++ b/src/Links/composer.json @@ -18,13 +18,13 @@ ], "require": { "php": "^8.2", - "cviebrock/eloquent-sluggable": "^10.0", - "illuminate/support": "^10.38", + "cviebrock/eloquent-sluggable": "^10.0|^11.0", + "illuminate/support": "^10.38|^11.0", "konekt/concord": "^1.13" }, "require-dev": { - "phpunit/phpunit": "^9.0|^10.0", - "orchestra/testbench": "^8.0" + "phpunit/phpunit": "^10.0", + "orchestra/testbench": "^8.0|^9.0" }, "autoload": { "psr-4": { diff --git a/src/MasterProduct/.github/workflows/tests.yml b/src/MasterProduct/.github/workflows/tests.yml index c4c27903f..4248d0265 100644 --- a/src/MasterProduct/.github/workflows/tests.yml +++ b/src/MasterProduct/.github/workflows/tests.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: php: ['8.2', '8.3'] - laravel: ['10.38', '10.46'] + laravel: ['10.38', '10.48', '11.0'] name: PHP ${{ matrix.php }} Laravel ${{ matrix.laravel }} steps: - name: Checkout diff --git a/src/MasterProduct/Changelog.md b/src/MasterProduct/Changelog.md index d7748b913..29e538bae 100644 --- a/src/MasterProduct/Changelog.md +++ b/src/MasterProduct/Changelog.md @@ -9,6 +9,7 @@ - Dropped Laravel 9 Support - Dropped Enum v3 Support - Added PHP 8.3 Support +- Added Laravel 11 Support - Changed minimum Laravel version to v10.38.2 - Changed minimal Enum requirement to v4.2 - Added the `Stockable` interface to the `MasterProductVariant` Model diff --git a/src/MasterProduct/composer.json b/src/MasterProduct/composer.json index 64d5ebe7b..90c869a05 100644 --- a/src/MasterProduct/composer.json +++ b/src/MasterProduct/composer.json @@ -18,11 +18,11 @@ ], "require": { "php": "^8.2", - "cviebrock/eloquent-sluggable": "^10.0", + "cviebrock/eloquent-sluggable": "^10.0|^11.0", "konekt/concord": "^1.13", "konekt/enum": "^4.2", "konekt/enum-eloquent": "^1.9", - "laravel/framework": "^10.38.2", + "laravel/framework": "^10.38.2|^11.0", "vanilo/contracts": "^4.0", "vanilo/product": "^4.0", "vanilo/support": "^4.0" @@ -31,8 +31,8 @@ "vanilo/properties": "Allows establishing variants based on properties like color, size, etc" }, "require-dev": { - "phpunit/phpunit": "^9.0", - "orchestra/testbench": "^8.0", + "phpunit/phpunit": "^10.0", + "orchestra/testbench": "^8.0|^9.0", "vanilo/properties": "^4.0" }, "autoload": { diff --git a/src/Order/.github/workflows/tests.yml b/src/Order/.github/workflows/tests.yml index 514d17165..cdac57296 100644 --- a/src/Order/.github/workflows/tests.yml +++ b/src/Order/.github/workflows/tests.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: php: ['8.2', '8.3'] - laravel: ['10.38', '10.46'] + laravel: ['10.38', '10.48', '11.0'] name: PHP ${{ matrix.php }} Laravel ${{ matrix.laravel }} steps: - name: Checkout diff --git a/src/Order/Changelog.md b/src/Order/Changelog.md index 002caa160..eae28c8ae 100644 --- a/src/Order/Changelog.md +++ b/src/Order/Changelog.md @@ -9,6 +9,7 @@ - Dropped Laravel 9 Support - Dropped Enum v3 Support - Added PHP 8.3 Support +- Added Laravel 11 Support - Changed minimum Laravel version to v10.38.2 - Changed minimal Enum requirement to v4.2 - Upgraded to Konekt Address and User modules to v3 diff --git a/src/Order/composer.json b/src/Order/composer.json index 05d0d48dd..974850b5d 100644 --- a/src/Order/composer.json +++ b/src/Order/composer.json @@ -23,13 +23,13 @@ "konekt/enum": "^4.2", "konekt/laravel-migration-compatibility": "^1.6", "konekt/user": "^3.0", - "laravel/framework": "^10.38.2", + "laravel/framework": "^10.38.2|^11.0", "vanilo/contracts": "^4.0", "vanilo/support": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^9.0", - "orchestra/testbench": "^8.0", + "phpunit/phpunit": "^10.0", + "orchestra/testbench": "^8.0|^9.0", "laravel/legacy-factories": "^1.0" }, "autoload": { diff --git a/src/Payment/.github/workflows/tests.yml b/src/Payment/.github/workflows/tests.yml index 955303c70..85869c21a 100644 --- a/src/Payment/.github/workflows/tests.yml +++ b/src/Payment/.github/workflows/tests.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: php: ['8.2', '8.3'] - laravel: ['10.38', '10.46'] + laravel: ['10.38', '10.48', '11.0'] name: PHP ${{ matrix.php }} Laravel ${{ matrix.laravel }} steps: - name: Checkout diff --git a/src/Payment/Changelog.md b/src/Payment/Changelog.md index c87c6662c..d80cf7097 100644 --- a/src/Payment/Changelog.md +++ b/src/Payment/Changelog.md @@ -9,6 +9,7 @@ - Dropped Laravel 9 Support - Dropped Enum v3 Support - Added PHP 8.3 Support +- Added Laravel 11 Support - Changed minimum Laravel version to v10.38.2 - Changed minimal Enum requirement to v4.2 - BC: Changed the `PaymentMethod` interface into Configurable diff --git a/src/Payment/composer.json b/src/Payment/composer.json index 55e468397..3abbeb7fa 100644 --- a/src/Payment/composer.json +++ b/src/Payment/composer.json @@ -20,13 +20,13 @@ "php": "^8.2", "konekt/concord": "^1.13", "konekt/enum": "^4.2", - "laravel/framework": "^10.38.2", + "laravel/framework": "^10.38.2|^11.0", "vanilo/contracts": "^4.0", "vanilo/support": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^9.0", - "orchestra/testbench": "^8.0" + "phpunit/phpunit": "^10.0", + "orchestra/testbench": "^8.0|^9.0" }, "autoload": { "psr-4": { "Vanilo\\Payment\\": "" } diff --git a/src/Product/.github/workflows/tests.yml b/src/Product/.github/workflows/tests.yml index c4c27903f..4248d0265 100644 --- a/src/Product/.github/workflows/tests.yml +++ b/src/Product/.github/workflows/tests.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: php: ['8.2', '8.3'] - laravel: ['10.38', '10.46'] + laravel: ['10.38', '10.48', '11.0'] name: PHP ${{ matrix.php }} Laravel ${{ matrix.laravel }} steps: - name: Checkout diff --git a/src/Product/Changelog.md b/src/Product/Changelog.md index cef140fe3..6ee154716 100644 --- a/src/Product/Changelog.md +++ b/src/Product/Changelog.md @@ -9,6 +9,7 @@ - Dropped Laravel 9 Support - Dropped Enum v3 Support - Added PHP 8.3 Support +- Added Laravel 11 Support - Changed minimum Laravel version to v10.38.2 - Changed minimal Enum requirement to v4.2 - Added the `Stockable` interface to the Product Model diff --git a/src/Product/composer.json b/src/Product/composer.json index a98dcd619..83da940c8 100644 --- a/src/Product/composer.json +++ b/src/Product/composer.json @@ -21,14 +21,14 @@ "konekt/concord": "^1.13", "konekt/enum": "^4.2", "konekt/enum-eloquent": "^1.9", - "laravel/framework": "^10.38.2", + "laravel/framework": "^10.38.2|^11.0", "vanilo/contracts": "^4.0", "vanilo/support": "^4.0", - "cviebrock/eloquent-sluggable": "^10.0" + "cviebrock/eloquent-sluggable": "^10.0|^11.0" }, "require-dev": { - "phpunit/phpunit": "^9.0", - "orchestra/testbench": "^8.0" + "phpunit/phpunit": "^10.0", + "orchestra/testbench": "^8.0|^9.0" }, "autoload": { "psr-4": { "Vanilo\\Product\\": "" } diff --git a/src/Properties/.github/workflows/tests.yml b/src/Properties/.github/workflows/tests.yml index c4c27903f..4248d0265 100644 --- a/src/Properties/.github/workflows/tests.yml +++ b/src/Properties/.github/workflows/tests.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: php: ['8.2', '8.3'] - laravel: ['10.38', '10.46'] + laravel: ['10.38', '10.48', '11.0'] name: PHP ${{ matrix.php }} Laravel ${{ matrix.laravel }} steps: - name: Checkout diff --git a/src/Properties/Changelog.md b/src/Properties/Changelog.md index 46e60a14b..4e2df8049 100644 --- a/src/Properties/Changelog.md +++ b/src/Properties/Changelog.md @@ -9,6 +9,7 @@ - Dropped PHP 8.0 & PHP 8.1 Support - Dropped Laravel 9 Support - Added PHP 8.3 Support +- Added Laravel 11 Support - Changed minimum Laravel version to v10.38.2 ## 3.x Series diff --git a/src/Properties/composer.json b/src/Properties/composer.json index 19aecb186..2ff727f2c 100644 --- a/src/Properties/composer.json +++ b/src/Properties/composer.json @@ -19,12 +19,12 @@ "require": { "php": "^8.2", "konekt/concord": "^1.13", - "laravel/framework": "^10.38.2", - "cviebrock/eloquent-sluggable": "^10.0" + "laravel/framework": "^10.38.2|^11.0", + "cviebrock/eloquent-sluggable": "^10.0|^11.0" }, "require-dev": { - "phpunit/phpunit": "^9.0", - "orchestra/testbench": "^8.0", + "phpunit/phpunit": "^10.0", + "orchestra/testbench": "^8.0|^9.0", "laravel/legacy-factories": "^1.0.4" }, "autoload": { diff --git a/src/Shipment/.github/workflows/tests.yml b/src/Shipment/.github/workflows/tests.yml index c4c27903f..4248d0265 100644 --- a/src/Shipment/.github/workflows/tests.yml +++ b/src/Shipment/.github/workflows/tests.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: php: ['8.2', '8.3'] - laravel: ['10.38', '10.46'] + laravel: ['10.38', '10.48', '11.0'] name: PHP ${{ matrix.php }} Laravel ${{ matrix.laravel }} steps: - name: Checkout diff --git a/src/Shipment/Changelog.md b/src/Shipment/Changelog.md index 50b6bfbb2..05f29b127 100644 --- a/src/Shipment/Changelog.md +++ b/src/Shipment/Changelog.md @@ -9,6 +9,7 @@ - Dropped Laravel 9 Support - Dropped Enum v3 Support - Added PHP 8.3 Support +- Added Laravel 11 Support - Changed minimum Laravel version to v10.38.2 - Changed minimal Enum requirement to v4.2 - Added `isZoneRestricted()` & `isNotZoneRestricted()` helper methods to the `ShippingMethod` class diff --git a/src/Shipment/composer.json b/src/Shipment/composer.json index 70b582787..7f725be16 100644 --- a/src/Shipment/composer.json +++ b/src/Shipment/composer.json @@ -18,17 +18,17 @@ ], "require": { "php": "^8.2", - "konekt/address": "^2.8", + "konekt/address": "^3.0", "konekt/concord": "^1.13", "konekt/enum": "^4.2", "konekt/laravel-migration-compatibility": "^1.6", - "laravel/framework": "^10.38.2", + "laravel/framework": "^10.38.2|^11.0", "vanilo/contracts": "^4.0", "vanilo/support": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^9.0", - "orchestra/testbench": "^8.0", + "phpunit/phpunit": "^10.0", + "orchestra/testbench": "^8.0|^9.0", "laravel/legacy-factories": "^1.0" }, "autoload": { diff --git a/src/Support/.github/workflows/tests.yml b/src/Support/.github/workflows/tests.yml index c4c27903f..4248d0265 100644 --- a/src/Support/.github/workflows/tests.yml +++ b/src/Support/.github/workflows/tests.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: php: ['8.2', '8.3'] - laravel: ['10.38', '10.46'] + laravel: ['10.38', '10.48', '11.0'] name: PHP ${{ matrix.php }} Laravel ${{ matrix.laravel }} steps: - name: Checkout diff --git a/src/Support/Changelog.md b/src/Support/Changelog.md index 718361c9e..c588e89b1 100644 --- a/src/Support/Changelog.md +++ b/src/Support/Changelog.md @@ -8,10 +8,13 @@ - Dropped PHP 8.0 & PHP 8.1 Support - Dropped Laravel 9 Support - Added PHP 8.3 Support +- Added Laravel 11 Support - Changed minimum Laravel version to v10.38.2 - Added the `Features` accessor class, which is a syntactic sugar for areas of the configuration - Added the `Merchant` DTO class, that complies with the common, v4 `Merchant` interface - Added the `Address` DTO class (implements the `Address` interface) +- Removed the deprecated `BuyableImageSpatieV7` and `BuyableImageSpatieV8` traits +- Upgraded to Laravel Media Library v11 ## 3.x Series diff --git a/src/Support/Traits/BuyableImageSpatieV7.php b/src/Support/Traits/BuyableImageSpatieV7.php deleted file mode 100644 index 3d7c7c8cd..000000000 --- a/src/Support/Traits/BuyableImageSpatieV7.php +++ /dev/null @@ -1,23 +0,0 @@ -