Added Laravel 11 Support

vanilophp · Mar 13, 2024 · f6e77cd · f6e77cd
1 parent 0e7059e
commit f6e77cd
Show file tree

Hide file tree

Showing 53 changed files with 145 additions and 181 deletions.
diff --git 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
@@ -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
@@ -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
@@ -1,64 +1,53 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         verbose="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
-    <testsuites>
-        <testsuite name="Contract Tests">
-            <directory>src/Contracts/Tests</directory>
-        </testsuite>
-        <testsuite name="Support Tests">
-            <directory>src/Support/Tests</directory>
-        </testsuite>
-        <testsuite name="Product Tests">
-            <directory>src/Product/Tests</directory>
-        </testsuite>
-        <testsuite name="Master Product Tests">
-            <directory>src/MasterProduct/Tests</directory>
-        </testsuite>
-        <testsuite name="Properties Tests">
-            <directory>src/Properties/Tests</directory>
-        </testsuite>
-        <testsuite name="Category Tests">
-            <directory>src/Category/Tests</directory>
-        </testsuite>
-        <testsuite name="Links Tests">
-            <directory>src/Links/Tests</directory>
-        </testsuite>
-        <testsuite name="Channel Tests">
-            <directory>src/Channel/Tests</directory>
-        </testsuite>
-        <testsuite name="Cart Tests">
-            <directory>src/Cart/Tests</directory>
-        </testsuite>
-        <testsuite name="Checkout Tests">
-            <directory>src/Checkout/Tests</directory>
-        </testsuite>
-        <testsuite name="Order Tests">
-            <directory>src/Order/Tests</directory>
-        </testsuite>
-        <testsuite name="Payment Tests">
-            <directory>src/Payment/Tests</directory>
-        </testsuite>
-        <testsuite name="Shipment Tests">
-            <directory>src/Shipment/Tests</directory>
-        </testsuite>
-        <testsuite name="Adjustments Tests">
-            <directory>src/Adjustments/Tests</directory>
-        </testsuite>
-        <testsuite name="Taxes Tests">
-            <directory>src/Taxes/Tests</directory>
-        </testsuite>
-        <testsuite name="Foundation Tests">
-            <directory>src/Foundation/Tests</directory>
-        </testsuite>
-    </testsuites>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <testsuites>
+    <testsuite name="Contract Tests">
+      <directory>src/Contracts/Tests</directory>
+    </testsuite>
+    <testsuite name="Support Tests">
+      <directory>src/Support/Tests</directory>
+    </testsuite>
+    <testsuite name="Product Tests">
+      <directory>src/Product/Tests</directory>
+    </testsuite>
+    <testsuite name="Master Product Tests">
+      <directory>src/MasterProduct/Tests</directory>
+    </testsuite>
+    <testsuite name="Properties Tests">
+      <directory>src/Properties/Tests</directory>
+    </testsuite>
+    <testsuite name="Category Tests">
+      <directory>src/Category/Tests</directory>
+    </testsuite>
+    <testsuite name="Links Tests">
+      <directory>src/Links/Tests</directory>
+    </testsuite>
+    <testsuite name="Channel Tests">
+      <directory>src/Channel/Tests</directory>
+    </testsuite>
+    <testsuite name="Cart Tests">
+      <directory>src/Cart/Tests</directory>
+    </testsuite>
+    <testsuite name="Checkout Tests">
+      <directory>src/Checkout/Tests</directory>
+    </testsuite>
+    <testsuite name="Order Tests">
+      <directory>src/Order/Tests</directory>
+    </testsuite>
+    <testsuite name="Payment Tests">
+      <directory>src/Payment/Tests</directory>
+    </testsuite>
+    <testsuite name="Shipment Tests">
+      <directory>src/Shipment/Tests</directory>
+    </testsuite>
+    <testsuite name="Adjustments Tests">
+      <directory>src/Adjustments/Tests</directory>
+    </testsuite>
+    <testsuite name="Taxes Tests">
+      <directory>src/Taxes/Tests</directory>
+    </testsuite>
+    <testsuite name="Foundation Tests">
+      <directory>src/Foundation/Tests</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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