ENH Add versioning to Link

creative-commoners · Dec 4, 2023 · 3838387 · 3838387
1 parent 3c8edfd
commit 3838387
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -43,6 +43,21 @@ class Page extends SiteTree
         'HasManyLinks' => Link::class
     ];
 
+    private static array $owns = [
+        'HasOneLink',
+        'HasManyLinks',
+    ];
+
+    private static array $cascade_deletess = [
+        'HasOneLink'
+        'HasManyLinks',
+    ];
+
+    private static array $cascade_duplicatess = [
+        'HasOneLink'
+        'HasManyLinks',
+    ];
+
     public function getCMSFields()
     {
         $fields = parent::getCMSFields();

diff --git a/composer.json b/composer.json
@@ -4,7 +4,8 @@
     "type": "silverstripe-vendormodule",
     "require": {
         "php": "^8.1",
-        "silverstripe/cms": "^5"
+        "silverstripe/cms": "^5",
+        "silverstripe/versioned": "^2"
     },
     "require-dev": {
         "silverstripe/recipe-testing": "^3",

diff --git a/src/Models/Link.php b/src/Models/Link.php
@@ -5,7 +5,6 @@
 use InvalidArgumentException;
 use ReflectionException;
 use SilverStripe\Core\ClassInfo;
-use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Forms\CompositeValidator;
 use SilverStripe\Forms\DropdownField;
@@ -14,6 +13,7 @@
 use SilverStripe\LinkField\Type\Registry;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\FieldType\DBHTMLText;
+use SilverStripe\Versioned\Versioned;
 
 /**
  * A Link Data Object. This class should be a subclass, and you should never directly interact with a plain Link
@@ -30,6 +30,10 @@ class Link extends DataObject
         'Title' => 'Varchar',
         'OpenInNew' => 'Boolean',
     ];
+
+    private static array $extensions = [
+        Versioned::class,
+    ];
 
     /**
      * In-memory only property used to change link type

diff --git a/tests/php/Models/LinkTest.php b/tests/php/Models/LinkTest.php
@@ -45,11 +45,6 @@ protected function setUp(): void
         $image = $this->objFromFixture(Image::class, 'image-1');
         $image->setFromLocalFile(dirname(dirname(dirname(__FILE__))) . '/resources/600x400.png');
         $image->write();
-        $image->publishSingle();
-
-        /** @var SiteTree $page */
-        $page = $this->objFromFixture(SiteTree::class, 'page-1');
-        $page->publishSingle();
     }
 
     protected function tearDown(): void
@@ -250,14 +245,9 @@ public function linkTypeEnabledProvider(): array
      */
     public function testGetUrl(string $identifier, string $class, string $expected): void
     {
-        Versioned::withVersionedMode(function () use ($identifier, $class, $expected): void {
-            Versioned::set_stage(Versioned::LIVE);
-
-            /** @var Link $link */
-            $link = $this->objFromFixture($class, $identifier);
-
-            $this->assertSame($expected, $link->getURL(), 'We expect specific URL value');
-        });
+        /** @var Link $link */
+        $link = $this->objFromFixture($class, $identifier);
+        $this->assertSame($expected, $link->getURL(), 'We expect specific URL value');
     }
 
     public function linkUrlCasesDataProvider(): array
@@ -326,7 +316,7 @@ public function linkUrlCasesDataProvider(): array
             'file link / with image' => [
                 'file-link-with-image',
                 FileLink::class,
-                '/assets/ImageTest/600x400.png',
+                '/assets/8cf6c65fa7/600x400.png',
             ],
             'file link / no image' => [
                 'file-link-no-image',