Statamic v6 (#6)

Author: JonKaric

.github/workflows/run-tests.yml

@@ -9,9 +9,9 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        php: [8.2, 8.3]
-        laravel: [10.*, 11.*]
-        statamic: [^5.0]
+        php: [8.3]
+        laravel: [12.*]
+        statamic: [^6.0]
     name: PHP ${{ matrix.php }} - Statamic ${{ matrix.statamic }} - Laravel ${{ matrix.laravel }}
     steps:
       - name: Checkout code

composer.json

@@ -11,12 +11,12 @@
         }
     },
     "require": {
-        "statamic/cms": "^5.18.0"
+        "statamic/cms": "^5.18.0|^6.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^8.0 || ^9.0",
-        "phpunit/phpunit": "^9.0 || ^10.0 || ^11.0",
-        "laravel/pint": "^1.17"
+        "orchestra/testbench": "^10.0",
+        "phpunit/phpunit": "^12.0",
+        "laravel/pint": "^1.27"
     },
     "config": {
         "allow-plugins": {
@@ -39,6 +39,6 @@
             ]
         }
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "prefer-stable": true
 }

src/Dictionaries/PaymentIcons.php

@@ -12,10 +12,13 @@ class PaymentIcons extends BasicDictionary
 {
     protected function getItemLabel(array $item): string
     {
-        $style = 'display: flex; align-items: center; gap: 0.6rem; margin-top: 0.4rem; margin-bottom: 0.4rem;';
-        $spanStyle = 'border: 2px solid #00000017; display: flex; border-radius: 7px; overflow: hidden; min-width: 38px;';
+        // Statamic V6 now escapes the labels. Can only return the text label for now.
 
-        return "<span style=\"{$style}\"><span style=\"{$spanStyle}\">{$item['icon']}</span> {$item['label']}</span>";
+        // $style = 'display: flex; align-items: center; gap: 0.6rem; margin-top: 0.4rem; margin-bottom: 0.4rem;';
+        // $spanStyle = 'border: 2px solid #00000017; display: flex; border-radius: 7px; overflow: hidden; min-width: 38px;';
+
+        // return "<span style=\"{$style}\"><span style=\"{$spanStyle}\">{$item['icon']}</span> {$item['label']}</span>";
+        return $item['label'];
     }
 
     protected function getItems(): array