Merge branch '4.0' into 4

silverstripe · Aug 15, 2024 · ed84556 · ed84556
2 parents c76fdba + e19de2b
commit ed84556
Showing 1 changed file with 30 additions and 27 deletions.
diff --git a/tests/php/Controllers/LinkFieldControllerTest.php b/tests/php/Controllers/LinkFieldControllerTest.php
@@ -538,38 +538,41 @@ public function testLinkArchive(
         int $expectedCode
     ): void {
         TestPhoneLink::$fail = $fail;
-        if ($fail == 'can-delete') {
+        if ($fail === 'can-delete') {
             // Remove the Versioned extension because there's logic in LinkFieldController
             // to use either canArchive() or canDelete() based on the presence of the Versioned extension
             // Note that you must remove the extension on the base class rather than a TestOnly subclass
             Link::remove_extension(Versioned::class);
         }
-        $owner = $this->getFixtureLinkOwner();
-        $ownerID = $owner->ID;
-        $ownerClass = urlencode($owner->ClassName);
-        $ownerRelation = 'Link';
-        $ownerLinkID = $owner->LinkID;
-        $id = $this->getID($idType);
-        $fixtureID = $this->getFixtureLink()->ID;
-        if ($id === -1) {
-            $url = "/admin/linkfield/delete?ownerID=$ownerID&ownerClass=$ownerClass&ownerRelation=$ownerRelation";
-        } else {
-            $url = "/admin/linkfield/delete/$id?ownerID=$ownerID&ownerClass=$ownerClass&ownerRelation=$ownerRelation";
-        }
-        $headers = [];
-        if ($fail !== 'csrf-token') {
-            $headers = array_merge($headers, $this->csrfTokenheader());
-        }
-        $response = $this->mainSession->sendRequest('DELETE', $url, [], $headers);
-        $this->assertSame('application/json', $response->getHeader('Content-type'));
-        $this->assertSame($expectedCode, $response->getStatusCode());
-        if ($expectedCode >= 400) {
-            $this->assertNotNull(TestPhoneLink::get()->byID($fixtureID));
-        } else {
-            $this->assertNull(TestPhoneLink::get()->byID($fixtureID));
-        }
-        if ($fail == 'can-delete') {
-            Link::add_extension(Versioned::class);
+        try {
+            $owner = $this->getFixtureLinkOwner();
+            $ownerID = $owner->ID;
+            $ownerClass = urlencode($owner->ClassName);
+            $ownerRelation = 'Link';
+            $ownerLinkID = $owner->LinkID;
+            $id = $this->getID($idType);
+            $fixtureID = $this->getFixtureLink()->ID;
+            if ($id === -1) {
+                $url = "/admin/linkfield/delete?ownerID=$ownerID&ownerClass=$ownerClass&ownerRelation=$ownerRelation";
+            } else {
+                $url = "/admin/linkfield/delete/$id?ownerID=$ownerID&ownerClass=$ownerClass&ownerRelation=$ownerRelation";
+            }
+            $headers = [];
+            if ($fail !== 'csrf-token') {
+                $headers = array_merge($headers, $this->csrfTokenheader());
+            }
+            $response = $this->mainSession->sendRequest('DELETE', $url, [], $headers);
+            $this->assertSame('application/json', $response->getHeader('Content-type'));
+            $this->assertSame($expectedCode, $response->getStatusCode());
+            if ($expectedCode >= 400) {
+                $this->assertNotNull(TestPhoneLink::get()->byID($fixtureID));
+            } else {
+                $this->assertNull(TestPhoneLink::get()->byID($fixtureID));
+            }
+        } finally {
+            if ($fail === 'can-delete') {
+                Link::add_extension(Versioned::class);
+            }
         }
     }