fix: continue with patching old tests and wrong configuration

.gitignore

@@ -5,3 +5,4 @@ npm-debug.log
 /public
 /resources
 .phpunit.result.cache
+/app

composer.json

@@ -18,6 +18,7 @@
     "require": {
         "silverstripe/cms": "^4.0 || ^5.0",
         "symbiote/silverstripe-gridfieldextensions": "*",
+        "silverstripe/asset-admin": "*",
         "silverstripe/taxonomy": "*"
     },
     "suggest": {

docs/en/configuration.md

@@ -12,17 +12,16 @@ project root directory:
 
 ```yaml
 DMS:
-  folder_name: my-custom-folder
+    folder_name: my-custom-folder
 ```
 
-
 ## Enable/disable documents/sets for a specific page type
 
 If you don't need documents/document sets for a specific page type you can disable this with YAML configuration:
 
 ```yaml
 MyPageType:
-  documents_enabled: false
+    documents_enabled: false
 ```
 
 Likewise, you could override a previously set configuration value by setting this back to `true` in a configuration
@@ -38,12 +37,13 @@ To add extra allowed file extensions purely for DMS documents, you can update th
 
 ```yaml
 DMSDocumentAddController:
-  allowed_extensions:
-    - php
-    - php5
+    allowed_extensions:
+        - php
+        - php5
 ```
 
 ## Adding fields to the Query Builder
+
 Query builder fields are read from the DMSDocument::searchable_fields property set in [querybuilder.yml](../../_config/querybuilder.yml). Some default fields are provided and can be customised
 by modifying the field and/or filter properties of a field or adding a new field entirely.
 
@@ -54,21 +54,21 @@ The default searchable filters available to query builder is as follows:
 
 ```yaml
 DMSDocument:
-  searchable_fields:
-    Title:
-      title: "Document title matches ..."
-    Description:
-      title: "Document summary matches ..."
-    CreatedByID:
-      title: 'Document created by ...'
-      field: 'ListboxField'
-      filter: 'ExactMatchFilter'
-    LastEditedByID:
-      title: 'Document last changed by ...'
-      field: 'ListboxField'
-      filter: 'ExactMatchFilter'
-    Filename:
-      title: 'File name'
+    searchable_fields:
+        Title:
+            title: "Document title matches ..."
+        Description:
+            title: "Document summary matches ..."
+        CreatedByID:
+            title: "Document created by ..."
+            field: "ListboxField"
+            filter: "ExactMatchFilter"
+        LastEditedByID:
+            title: "Document last changed by ..."
+            field: "ListboxField"
+            filter: "ExactMatchFilter"
+        Filename:
+            title: "File name"
 ```
 
 ## Change the shortcode handler
@@ -77,15 +77,18 @@ If you need to change the `dms_document_link` shortcode handler for some reason,
 and some PHP:
 
 ```yaml
-DMS:
-  shortcode_handler_key: your_shortcode
+Sunnysideup\DMS\DMS:
+    shortcode_handler_key: your_shortcode
 ```
 
 And for example in `_config.php`:
 
 ```php
+use Sunnysideup\DMS\DMS;
+use Sunnysideup\DMS\DMSShortcodeHandler;
+
 ShortcodeParser::get('default')->register(
-    Config::inst()->get('DMS', 'shortcode_handler_key'),
-    array('DMSShortcodeHandler', 'handle')
+    Config::inst()->get(DMS::class, 'shortcode_handler_key'),
+    [DMSShortcodeHandler::class, 'handle']
 );
 ```

phpunit.xml.dist

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
-    <include>
-      <directory suffix=".php">src/.</directory>
-    </include>
-    <exclude>
-      <directory suffix=".php">tests/</directory>
-    </exclude>
-  </coverage>
-  <testsuites>
-    <testsuite name="Default">
-      <directory>tests</directory>
-    </testsuite>
-  </testsuites>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/silverstripe/cms/tests/bootstrap.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+    <coverage includeUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">src/.</directory>
+        </include>
+        <exclude>
+            <directory suffix=".php">tests/</directory>
+        </exclude>
+    </coverage>
+    <testsuites>
+        <testsuite name="Default">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
 </phpunit>

src/DMS.php

@@ -9,4 +9,6 @@ class DMS
     use Configurable;
 
     private static $folder_name = 'dms';
+
+    private static $shortcode_handler_key = 'dms';
 }

src/DMSShortcodeHandler.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Sunnysideup\DMS;
+
+use SilverStripe\View\Parsers\ShortcodeParser;
+use Sunnysideup\DMS\Model\DMSDocument;
+
+class DMSShortcodeHandler
+{
+    public static function handle($arguments, $content, ShortcodeParser $parser, $tag, array $extra = [])
+    {
+        if (!empty($arguments['id'])) {
+            $document = DMSDocument::get()->byID($arguments['id']);
+
+            if ($document && !$document->isHidden()) {
+                if ($content) {
+                    return sprintf(
+                        '<a href="%s">%s</a>',
+                        $document->Link(),
+                        $parser->parse($content)
+                    );
+                }
+
+                if (isset($extra['element'])) {
+                    $extra['element']->setAttribute('data-ext', $document->getExtension());
+                    $extra['element']->setAttribute('data-size', $document->getFileSizeFormatted());
+                }
+
+                return $document->Link();
+            }
+        }
+
+        return '';
+    }
+}

src/Model/DMSDocument.php

@@ -42,6 +42,7 @@
 use Sunnysideup\DMS\Admin\DMSDocumentAdmin;;
 
 use SilverStripe\Core\Injector\Injector;
+use SilverStripe\Security\Security;
 
 /**
  * @package dms
@@ -373,12 +374,12 @@ public function getPermissionsActionPanel()
 
     public function onBeforeWrite()
     {
-        // Set user fields
-        if ($currentUserID = Member::currentUserID()) {
+        if ($currentUser = Security::getCurrentUser()) {
             if (!$this->CreatedByID) {
-                $this->CreatedByID = $currentUserID;
+                $this->CreatedByID = $currentUser->ID;
             }
-            $this->LastEditedByID = $currentUserID;
+
+            $this->LastEditedByID = $currentUser->ID;
         }
 
         if ($this->TempFileID) {