change: update to use updated testsuite (#12)

* change: update to use current testsuite

* stan

* fix doPublis & doUnpublish

* stan again

* more stan

* changed compatibility to only support SS6

Author: mleutenegger

.github/workflows/tests.yml

@@ -11,7 +11,7 @@ on:
       - .htaccess
       - '**.md'
     branches:
-      - master
+      - 'master'
   pull_request:
     paths-ignore:
       - .chglog/**
@@ -23,25 +23,23 @@ on:
       - .htaccess
       - '**.md'
     branches:
-      - master
+      - '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: false
+      phpunit: true
       phpstan: true
-      phpcs: true
-  # silverstripe-client:
-  #   name: 📦 Client Testsuite
-  #   uses: syntro-opensource/workflows/.github/workflows/client.yml@master
-  #   with:
-  #     eslint: true
-  #     eslint_dir: client/src/seo-field/
-  #     eslint_configfile: client/src/seo-field/.eslintrc
-  #     eslint_ext:
-  #     eslint_max-warnings:
-  #     stylelint: true
-  #     stylelint_glob: client/src/seo-field/**/*.scss
-  #     stylelint_max-warnings:
+  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/

composer.json

@@ -9,15 +9,15 @@
     ],
     "license": "BSD-3-Clause",
     "require": {
-        "silverstripe/framework": "^5 || ^6",
-        "silverstripe/admin": "^2.0 || ^3.0",
-        "dnadesign/silverstripe-elemental": "^5 || ^6",
-        "symbiote/silverstripe-gridfieldextensions": "^4 || ^5"
+        "silverstripe/framework": "^6",
+        "silverstripe/admin": "^3.0",
+        "dnadesign/silverstripe-elemental": "^6",
+        "symbiote/silverstripe-gridfieldextensions": "^5"
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "^3.0",
-        "syntro/silverstripe-phpstan": "^1",
-        "phpunit/phpunit": "^9.5"
+        "cambis/silverstan": "^2.0",
+        "phpunit/phpunit": "^11.0"
     },
     "scripts": {
         "phpcs": "~/.composer/vendor/bin/phpcs src/ tests/",

phpstan-dev.neon

@@ -1,2 +1,2 @@
 includes:
-    - ../../syntro/silverstripe-phpstan/phpstan.neon
+    - ../../vendor/cambis/silverstan/extension.neon

phpstan.neon

@@ -1,2 +1,2 @@
 includes:
-    - vendor/syntro/silverstripe-phpstan/phpstan.neon
+    - vendor/cambis/silverstan/extension.neon

phpunit.xml

@@ -3,24 +3,23 @@
     bootstrap="vendor/silverstripe/framework/tests/bootstrap.php"
     colors="true"
     backupGlobals="false"
-    backupStaticAttributes="false"
+    backupStaticProperties="false"
     beStrictAboutChangesToGlobalState="true"
     beStrictAboutOutputDuringTests="true"
     beStrictAboutTestsThatDoNotTestAnything="true"
-    beStrictAboutTodoAnnotatedTests="true"
     failOnRisky="true"
     failOnWarning="true"
 >
     <testsuite name="Default">
-        <directory>tests/php</directory>
+        <directory>tests</directory>
     </testsuite>
 
-    <coverage>
-        <exclude>
-            <directory suffix=".php">vendor/</directory>
-        </exclude>
+    <source>
         <include>
-            <directory suffix=".php">src</directory>
+            <directory suffix=".php">./src</directory>
         </include>
-    </coverage>
+        <exclude>
+            <directory suffix=".php">vendor</directory>
+        </exclude>
+    </source>
 </phpunit>

src/Forms/GridFieldConfig_ElementalChildren.php

@@ -40,25 +40,21 @@ public function __construct($itemsPerPage = null, $showPagination = null, $showA
     {
         parent::__construct();
 
-        $this->addComponent(new GridFieldButtonRow('before'));
-        $this->addComponent(new GridFieldAddNewButton('buttons-before-left'));
-        $this->addComponent(new GridFieldToolbarHeader());
-        $this->addComponent($filter = new GridFieldFilterHeader());
-        $this->addComponent(new GridFieldDataColumns());
-        $this->addComponent(new VersionedGridFieldState());
-        $this->addComponent(new GridFieldEditButton());
+        $this->addComponent(GridFieldButtonRow::create('before'));
+        $this->addComponent(GridFieldAddNewButton::create('buttons-before-left'));
+        $this->addComponent(GridFieldToolbarHeader::create());
+        $this->addComponent($filter = GridFieldFilterHeader::create());
+        $this->addComponent(GridFieldDataColumns::create());
+        $this->addComponent(GridFieldEditButton::create());
         $this->addComponent(new GridFieldArchiveAction());
         $this->addComponent(new GridFieldUnpublishAction());
         $this->addComponent(new GridFieldPublishAction());
-        $this->addComponent(new GridField_ActionMenu());
-        $this->addComponent(new GridFieldPageCount('toolbar-header-right'));
-        $this->addComponent($pagination = new GridFieldPaginator($itemsPerPage));
-        $this->addComponent(new GridFieldDetailForm(null, $showPagination, $showAdd));
-        $this->addComponent(new GridFieldOrderableRows('Sort'));
-        $this->addComponent(new GridFieldTitleHeader());
-
-        $filter->setThrowExceptionOnBadDataType(false);
-        $pagination->setThrowExceptionOnBadDataType(false);
+        $this->addComponent(GridField_ActionMenu::create());
+        $this->addComponent(GridFieldPageCount::create('toolbar-header-right'));
+        $this->addComponent($pagination = GridFieldPaginator::create($itemsPerPage));
+        $this->addComponent(GridFieldDetailForm::create(null, $showPagination, $showAdd));
+        $this->addComponent(GridFieldOrderableRows::create('Sort'));
+        $this->addComponent(GridFieldTitleHeader::create());
 
         $this->extend('updateConfig');
     }

src/Forms/GridFieldPublishAction.php

@@ -197,12 +197,7 @@ public function handleAction(GridField $gridField, $actionName, $arguments, $dat
         /** @var \SilverStripe\ORM\DataList */
         $list = $gridField->getList();
         $item = $list->byID($arguments['RecordID']);
-
-        try {
-            $item->doPublish();
-        } catch (\Exception $e) {
-            $item->publishRecursive();
-        }
+        $item->publishRecursive();
 
         // output a success message to the user
         Controller::curr()->getResponse()->setStatusCode(

src/Forms/GridFieldUnpublishAction.php

@@ -197,6 +197,10 @@ public function handleAction(GridField $gridField, $actionName, $arguments, $dat
         /** @var \SilverStripe\ORM\DataList */
         $list = $gridField->getList();
         $item = $list->byID($arguments['RecordID']);
+
+        // We ignore this error, as the method exists in Versioned extension but
+        // phpstan cannot verify that here.
+        /** @phpstan-ignore method.notFound */
         $item->doUnpublish();
 
         // output a success message to the user

src/Model/BaseItem.php

@@ -187,7 +187,7 @@ public function canDelete($member = null)
         }
 
         if ($page = $this->getPage()) {
-            return $page->canArchive($member);
+            return $page->canDelete($member);
         }
 
         return Permission::check('CMS_ACCESS', 'any', $member);