From c5723be31cb2b321b07fa839ec2150653871ef98 Mon Sep 17 00:00:00 2001
From: "James (PD)" <69664712+JamesDPC@users.noreply.github.com>
Date: Mon, 30 Mar 2026 17:49:46 +1100
Subject: [PATCH 1/2] Update for SS6 support

---
 .github/workflows/ci.yml |  2 +-
 composer.json            | 30 +++++++++++++++++++++---------
 phpunit.xml.dist         | 12 ++++++------
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 481f1c8..d3fb0a0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ on:
 jobs:
   Silverstripe:
     name: 'Silverstripe (bundle)'
-    uses: nswdpc/ci-files/.github/workflows/silverstripe_53_83.yml@v-4
+    uses: nswdpc/ci-files/.github/workflows/silverstripe_6_83.yml@v-4
   PHPStan:
     name: 'PHPStan (analyse)'
     uses: nswdpc/ci-files/.github/workflows/phpstan.silverstripe_83.yml@v-4
diff --git a/composer.json b/composer.json
index 96736cf..3b9a74d 100644
--- a/composer.json
+++ b/composer.json
@@ -22,26 +22,36 @@
         }
     ],
     "require": {
-        "dnadesign/silverstripe-elemental": "^5",
-        "gorriecoe/silverstripe-linkfield": "^1.1",
-        "silverstripe/taxonomy": "^3",
-        "silverstripe/tagfield" : "^3",
-        "silverstripe/asset-admin": "^2.4"
+        "dnadesign/silverstripe-elemental": "^6",
+        "gorriecoe/silverstripe-linkfield": "dev-ss6",
+        "silverstripe/taxonomy": "^4",
+        "silverstripe/tagfield" : "^4",
+        "silverstripe/asset-admin": "^3"
     },
     "require-dev": {
         "cambis/silverstripe-rector": "^2",
         "cambis/silverstan": "^2",
         "friendsofphp/php-cs-fixer": "^3",
         "nswdpc/ci-files": "dev-v-4",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^11.5",
         "phpstan/phpstan": "^2",
         "phpstan/phpstan-phpunit": "^2",
         "rector/rector": "^2"
     },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/nswdpc/silverstripe-linkfield.git"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/nswdpc/silverstripe-link.git"
+        }
+    ],
     "scripts": {
         "phpstan-analyse": "./vendor/bin/phpstan analyse --ansi --no-progress --no-interaction --configuration vendor/nswdpc/ci-files/phpstan/.phpstan.silverstripe.neon src/ tests/",
-        "rector-dryrun": "./vendor/bin/rector process --dry-run --ansi --config vendor/nswdpc/ci-files/rector/.rector.silverstripe_53_83.php src/ tests/",
-        "rector-process": "./vendor/bin/rector process --no-diffs --ansi --config vendor/nswdpc/ci-files/rector/.rector.silverstripe_53_83.php src/ tests/",
+        "rector-dryrun": "./vendor/bin/rector process --dry-run --ansi --config vendor/nswdpc/ci-files/rector/.rector.silverstripe_6_83.php src/ tests/",
+        "rector-process": "./vendor/bin/rector process --no-diffs --ansi --config vendor/nswdpc/ci-files/rector/.rector.silverstripe_6_83.php src/ tests/",
         "phpcsfixer-fix": "./vendor/bin/php-cs-fixer fix --ansi --no-interaction --config vendor/nswdpc/ci-files/php-cs-fixer/.php-cs-fixer.php src/ tests/"
     },
     "config": {
@@ -51,5 +61,7 @@
             "silverstripe/recipe-plugin": true,
             "phpstan/extension-installer": true
         }
-    }
+    },
+    "prefer-stable": true,
+    "minimum-stability": "dev"
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 8875838..4b99aff 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage includeUncoveredFiles="true">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd">
+  <testsuite name="nswdpc/silverstripe-elemental-decoratedcontent">
+    <directory>tests/</directory>
+  </testsuite>
+  <source>
     <include>
       <directory suffix=".php">src/</directory>
     </include>
     <exclude>
       <directory suffix=".php">tests/</directory>
     </exclude>
-  </coverage>
-  <testsuite name="nswdpc/silverstripe-elemental-decoratedcontent">
-    <directory>tests/</directory>
-  </testsuite>
+  </source>
 </phpunit>

From bbb7b1530d4396569b179047fb009ff3c1b826c8 Mon Sep 17 00:00:00 2001
From: JamesDPC <69664712+JamesDPC@users.noreply.github.com>
Date: Mon, 30 Mar 2026 06:51:14 +0000
Subject: [PATCH 2/2] [rector] Automated updates generated by rector
 configuration

---
 src/Models/Elements/ElementDecoratedContent.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Models/Elements/ElementDecoratedContent.php b/src/Models/Elements/ElementDecoratedContent.php
index 44a71ed..8df6654 100644
--- a/src/Models/Elements/ElementDecoratedContent.php
+++ b/src/Models/Elements/ElementDecoratedContent.php
@@ -72,7 +72,7 @@ class ElementDecoratedContent extends ElementContent
     /**
      * @inheritdoc
      */
-    private static string $description = 'A content element with extra fields';
+    private static string $class_description = 'A content element with extra fields';
 
     /**
      * @inheritdoc