Start working through CMS 6 support

Author: chrispenny

composer.json

@@ -27,7 +27,7 @@
     "require-dev": {
         "silverstripe/recipe-cms": "^6",
         "phpunit/phpunit": "^11.3",
-        "slevomat/coding-standard": "^8.8"
+        "slevomat/coding-standard": "~8.18.0"
     },
     "repositories": [
         {

phpcs.xml

@@ -5,6 +5,8 @@
     <file>src</file>
     <file>tests</file>
 
+    <!-- Don't sniff test classes, because they include PHP attributes that cause Slevomat to throw errors -->
+    <exclude-pattern>./tests/*</exclude-pattern>
     <!-- Don't sniff third party libraries -->
     <exclude-pattern>./vendor/*</exclude-pattern>
     <exclude-pattern>*/thirdparty/*</exclude-pattern>
@@ -148,6 +150,8 @@
         <exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingTraversableTypeHintSpecification"/>
         <!-- Leave group order up to us -->
         <exclude name="SlevomatCodingStandard.Classes.ClassStructure.IncorrectGroupOrder"/>
+        <!-- Leave the order up to us to decide -->
+        <exclude name="SlevomatCodingStandard.Classes.ClassStructure.IncorrectGroupOrder"/>
     </rule>
 
     <rule ref="SlevomatCodingStandard.Namespaces.UnusedUses">

src/Constants/SearchFile.php

@@ -16,7 +16,7 @@ final class SearchFile
     /**
      * File size limit in bytes
      */
-    public const SIZE_LIMIT = 15 * 1024 * 1024;
+    public const int SIZE_LIMIT = 15 * 1024 * 1024;
 
     public static function sizeLimit(): string
     {

src/Extensions/FileExtension.php

@@ -6,14 +6,14 @@
 use SilverStripe\Assets\Folder;
 use SilverStripe\Assets\Image;
 use SilverStripe\Core\Convert;
+use SilverStripe\Core\Extension;
 use SilverStripe\ForagerBifrost\Constants\SearchFile;
-use SilverStripe\ORM\DataExtension;
 
 /**
  * @property int $ContentSize
  * @method File|$this getOwner()
  */
-class FileExtension extends DataExtension
+class FileExtension extends Extension
 {
 
     /**

src/Reports/LargeDocumentReport.php

@@ -4,7 +4,7 @@
 
 use SilverStripe\Assets\File;
 use SilverStripe\ForagerBifrost\Constants\SearchFile;
-use SilverStripe\ORM\SS_List;
+use SilverStripe\Model\List\SS_List;
 use SilverStripe\Reports\Report;
 
 class LargeDocumentReport extends Report

src/Service/BifrostService.php

@@ -45,7 +45,7 @@ public function getDocumentationURL(): ?string
         return sprintf('%s/api/v1/docs', $this->getExternalURL());
     }
 
-    private const DEFAULT_FIELD_TYPE = 'text';
+    private const string DEFAULT_FIELD_TYPE = 'text';
 
     private Client $client;
 

src/Service/ClientFactory.php

@@ -14,13 +14,13 @@
 class ClientFactory implements Factory
 {
 
-    private const ENDPOINT = 'BIFROST_ENDPOINT';
-    private const QUERY_API_KEY = 'BIFROST_QUERY_API_KEY';
+    private const string ENDPOINT = 'BIFROST_ENDPOINT';
+    private const string QUERY_API_KEY = 'BIFROST_QUERY_API_KEY';
 
     /**
      * @throws Exception
      */
-    public function create($service, array $params = []) // phpcs:ignore SlevomatCodingStandard.TypeHints
+    public function create(string $service, array $params = []): ?object
     {
         $host = $params['host'] ?? null;
         $token = $params['token'] ?? null;