add: Silverstripe 6 Support (#10)

mleutenegger · web-flow · commit 2ecebe55ae67 · 2025-10-28T14:14:18.000+01:00
* remove: CMS is no longer a required dependency

* add: Silverstripe 6 Support

* fix: master used for PRs

* fix: phpunit

* fix 💩

* fix phpstan

* make phpunit resolve

* resolve phpunit...

* fix stan

* only use SS 6

* stan again

* cs

* use 6.0 for coverage

* update phpunit
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,16 +1,45 @@
 name: 🎭 Tests
 on:
-  - push
-env:
-  DB: MYSQL
-  PDO: 1
-  SS_ENVIRONMENT_TYPE: "dev"
-  RECIPE_CMS_VERSION: 4.x-dev
+  push:
+    paths-ignore:
+      - .chglog/**
+      - .github/**
+      - '!.github/workflows/tests.yml'
+      - .editorconfig
+      - .gitattributes
+      - .gitignore
+      - .htaccess
+      - '**.md'
+    branches:
+      - 'master'
+  pull_request:
+    paths-ignore:
+      - .chglog/**
+      - .github/**
+      - '!.github/workflows/tests.yml'
+      - .editorconfig
+      - .gitattributes
+      - .gitignore
+      - .htaccess
+      - '**.md'
+    branches:
+      - 'master'
+
 jobs:
-  silverstripe-module:
-    name: 🧰 Silverstripe Module Testsuite
-    uses: syntro-opensource/workflows/.github/workflows/silverstripe-module.yml@master
+  silverstripe-module-6:
+    name: 🧰 Silverstripe Module Testsuite 6
+    uses: syntro-opensource/workflows/.github/workflows/silverstripe-module-6.yml@master
     with:
       phpunit: true
       phpstan: true
-      phpcs: true
+  silverstripe-module-codecoverage:
+    name: 📊 Silverstripe Code Coverage
+    uses: syntro-opensource/workflows/.github/workflows/silverstripe-module-codecoverage.yml@master
+    with:
+      php_version: 8.3
+      silverstripe_version: 6.0
+  silverstripe-phpcs:
+    name: 🧹 Silverstripe PHPCS
+    uses: syntro-opensource/workflows/.github/workflows/silverstripe-phpcs.yml@master
+    with:
+      dir: src/
diff --git a/composer.json b/composer.json
@@ -9,19 +9,18 @@
         }
     ],
     "require": {
-        "php": "^7.4.0 || ^8",
-        "silverstripe/cms": "^4 || ^5",
-        "silverstripe/framework": "^4 || ^5",
+        "php": "^8",
+        "silverstripe/framework": "^6",
         "giggsey/libphonenumber-for-php": "^8.0"
     },
     "require-dev": {
+        "silverstripe/cms": "^6",
         "squizlabs/php_codesniffer": "^3.0",
-        "syntro/silverstripe-phpstan": "^1",
-        "phpunit/phpunit": "^9.4"
+        "cambis/silverstan": "^2.0",
+        "phpunit/phpunit": "^11"
     },
     "keywords": [
         "silverstripe",
-        "silverstripe 4",
         "frontend forms"
     ],
     "license": "BSD-3-Clause",
@@ -40,7 +39,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.x-dev"
+            "dev-master": "6.x-dev"
         }
     },
     "config": {
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,2 +1,2 @@
 includes:
-    - vendor/syntro/silverstripe-phpstan/phpstan.neon
+    - vendor/cambis/silverstan/extension.neon
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,25 +1,26 @@
 
 <phpunit
     bootstrap="vendor/silverstripe/framework/tests/bootstrap.php"
-	colors="true"
-	backupGlobals="false"
-	backupStaticAttributes="false"
-	beStrictAboutChangesToGlobalState="true"
-	beStrictAboutOutputDuringTests="true"
-	beStrictAboutTestsThatDoNotTestAnything="true"
-	beStrictAboutTodoAnnotatedTests="true"
-	failOnRisky="true"
-	failOnWarning="true"
+    colors="true"
+    backupGlobals="false"
+    backupStaticProperties="false"
+    beStrictAboutChangesToGlobalState="true"
+    beStrictAboutOutputDuringTests="true"
+    beStrictAboutTestsThatDoNotTestAnything="true"
+    failOnRisky="true"
+    failOnWarning="true"
 >
     <testsuite name="Default">
         <directory>tests</directory>
     </testsuite>
-    <coverage>
+
+    <source>
         <include>
-            <directory suffix=".php">src</directory>
+            <directory suffix=".php">./src</directory>
         </include>
         <exclude>
-            <directory suffix=".php">vendor/</directory>
+            <directory suffix=".php">vendor</directory>
+            <directory suffix=".php">./src/Dev</directory>
         </exclude>
-    </coverage>
-</phpunit>
+    </source>
+</phpunit>
diff --git a/src/Dev/FormPage.php b/src/Dev/FormPage.php
@@ -11,5 +11,10 @@
  */
 class FormPage extends SiteTree implements TestOnly
 {
-
+    /**
+     * Defines the database table name
+     *  @var string
+     * @config
+     */
+    private static $table_name = 'FormPage';
 }
diff --git a/src/Dev/FormPageController.php b/src/Dev/FormPageController.php
@@ -7,7 +7,7 @@
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\Form;
 use SilverStripe\Forms\FormAction;
-use SilverStripe\Forms\RequiredFields;
+use SilverStripe\Forms\Validation\RequiredFieldsValidator;
 use Syntro\SilverstripeBootstrapForms\Forms\CheckboxField;
 use Syntro\SilverstripeBootstrapForms\Forms\CheckboxSetField;
 use Syntro\SilverstripeBootstrapForms\Forms\DropdownField;
@@ -41,7 +41,7 @@ class FormPageController extends ContentController implements TestOnly
      */
     public function Form()
     {
-        $fields = new FieldList(
+        $fields = FieldList::create(
             $checkboxfield = CheckboxField::create('checkboxfield', 'checkboxfield'),
             $checkboxsetfield = CheckboxSetField::create('checkboxsetfield', 'checkboxsetfield', ['a' => 'value a', 'b' => 'value b']),
             $dropdownfield = DropdownField::create('dropdownfield', 'dropdownfield', ['a' => 'value a', 'b' => 'value b']),
@@ -63,9 +63,9 @@ public function Form()
         $textareafield->addHolderClass('textareafieldholderclass')->addExtraClass('textareafieldextraclass');
         $textfield->addHolderClass('textfieldholderclass')->addExtraClass('textfieldextraclass');
 
-        $actions = new FieldList(FormAction::create('submit', 'Submit'));
-        $required = new RequiredFields('required');
-        $form = new Form($this, 'Form', $fields, $actions, $required);
+        $actions = FieldList::create(FormAction::create('submit', 'Submit'));
+        $required = RequiredFieldsValidator::create(['required']);
+        $form = Form::create($this, 'Form', $fields, $actions, $required);
 
         return $form;
     }
diff --git a/src/Forms/CheckboxField.php b/src/Forms/CheckboxField.php
@@ -28,9 +28,9 @@ class CheckboxField extends BackendCheckboxField
     /**
      * Creates a new field.
      *
-     * @param string                                      $name  The internal field name, passed to forms.
-     * @param null|string|\SilverStripe\View\ViewableData $title The human-readable field label.
-     * @param mixed                                       $value The value of the field.
+     * @param string                                    $name  The internal field name, passed to forms.
+     * @param null|string|\SilverStripe\Model\ModelData $title The human-readable field label.
+     * @param mixed                                     $value The value of the field.
      */
     function __construct($name, $title = null, $value = null)
     {
diff --git a/src/Forms/TextareaField.php b/src/Forms/TextareaField.php
@@ -18,9 +18,9 @@ class TextareaField extends BackendTextareaField
     /**
      * Creates a new field.
      *
-     * @param string                                      $name  The internal field name, passed to forms.
-     * @param null|string|\SilverStripe\View\ViewableData $title The human-readable field label.
-     * @param mixed                                       $value The value of the field.
+     * @param string                                    $name  The internal field name, passed to forms.
+     * @param null|string|\SilverStripe\Model\ModelData $title The human-readable field label.
+     * @param mixed                                     $value The value of the field.
      */
     function __construct($name, $title = null, $value = null)
     {

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`includes:`
`2`		`- - vendor/syntro/silverstripe-phpstan/phpstan.neon`
	`2`	`+ - vendor/cambis/silverstan/extension.neon`
Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,10 @@`
`11`	`11`	`*/`
`12`	`12`	`class FormPage extends SiteTree implements TestOnly`
`13`	`13`	`{`
`14`		`-`
	`14`	`+ /**`
	`15`	`+ * Defines the database table name`
	`16`	`+ * @var string`
	`17`	`+ * @config`
	`18`	`+ */`
	`19`	`+ private static $table_name = 'FormPage';`
`15`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,9 @@ class CheckboxField extends BackendCheckboxField`
`28`	`28`	`/**`
`29`	`29`	`* Creates a new field.`
`30`	`30`	`*`
`31`		`- * @param string $name The internal field name, passed to forms.`
`32`		`- * @param null\|string\|\SilverStripe\View\ViewableData $title The human-readable field label.`
`33`		`- * @param mixed $value The value of the field.`
	`31`	`+ * @param string $name The internal field name, passed to forms.`
	`32`	`+ * @param null\|string\|\SilverStripe\Model\ModelData $title The human-readable field label.`
	`33`	`+ * @param mixed $value The value of the field.`
`34`	`34`	`*/`
`35`	`35`	`function __construct($name, $title = null, $value = null)`
`36`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,9 @@ class TextareaField extends BackendTextareaField`
`18`	`18`	`/**`
`19`	`19`	`* Creates a new field.`
`20`	`20`	`*`
`21`		`- * @param string $name The internal field name, passed to forms.`
`22`		`- * @param null\|string\|\SilverStripe\View\ViewableData $title The human-readable field label.`
`23`		`- * @param mixed $value The value of the field.`
	`21`	`+ * @param string $name The internal field name, passed to forms.`
	`22`	`+ * @param null\|string\|\SilverStripe\Model\ModelData $title The human-readable field label.`
	`23`	`+ * @param mixed $value The value of the field.`
`24`	`24`	`*/`
`25`	`25`	`function __construct($name, $title = null, $value = null)`
`26`	`26`	`{`