Merge branch '2.0' into 2

src/Extensions/FileArchiveExtension.php

@@ -77,6 +77,9 @@ public function getArchiveField()
     */
     public function isArchiveFieldEnabled()
     {
-        return Config::inst()->get(AssetControlExtension::class, 'keep_archived_assets');
+        // This should really only check File.keep_archived_assets, though it was originally
+        // only checking AssetControlExtension.keep_archived_assets, so keeping that for BC
+        return Config::inst()->get(AssetControlExtension::class, 'keep_archived_assets')
+          || Config::inst()->get(File::class, 'keep_archived_assets');
     }
 }

tests/Extensions/FileArchiveExtensionTest.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace SilverStripe\VersionedAdmin\Tests\Extensions;
+
+use SilverStripe\Dev\SapphireTest;
+use SilverStripe\Assets\AssetControlExtension;
+use SilverStripe\Core\Config\Config;
+use SilverStripe\Assets\File;
+
+class FileArchiveExtensionTest extends SapphireTest
+{
+    /**
+     * @dataProvider provideIsArchiveFieldEnabled
+     */
+    public function testIsArchiveFieldEnabled(
+        bool $assetControlExtension,
+        bool $file,
+        bool $expected
+    ): void {
+        Config::modify()->set(AssetControlExtension::class, 'keep_archived_assets', $assetControlExtension);
+        Config::modify()->set(File::class, 'keep_archived_assets', $file);
+        $actual = File::singleton()->isArchiveFieldEnabled();
+        $this->assertSame($expected, $actual);
+    }
+
+    public function provideIsArchiveFieldEnabled(): array
+    {
+        return [
+            [
+                'assetControlExtension' => false,
+                'file' => false,
+                'expected' => false,
+            ],
+            [
+                'assetControlExtension' => true,
+                'file' => false,
+                'expected' => true,
+            ],
+            [
+                'assetControlExtension' => false,
+                'file' => true,
+                'expected' => true,
+            ],
+            [
+                'assetControlExtension' => true,
+                'file' => true,
+                'expected' => true,
+            ],
+        ];
+    }
+}