Merge pull request #1018 from creative-commoners/pulls/4/stop-depr

API Stop using deprecated API
silverstripe · Nov 11, 2022 · a3dc468 · a3dc468
2 parents 4374a69 + 08be023
commit a3dc468
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/src/Controllers/ElementalAreaController.php b/src/Controllers/ElementalAreaController.php
@@ -121,7 +121,7 @@ public function apiSaveForm(HTTPRequest $request)
             return null;
         }
 
-        $data = Convert::json2array($request->getBody());
+        $data = json_decode($request->getBody(), true);
         if (empty($data)) {
             $this->jsonError(400);
             return null;
@@ -166,7 +166,7 @@ public function apiSaveForm(HTTPRequest $request)
             return null;
         }
 
-        $body = Convert::raw2json([
+        $body = json_encode([
             'status' => 'success',
             'updated' => $updated,
         ]);

diff --git a/src/Extensions/ElementalAreaUsedOnTableExtension.php b/src/Extensions/ElementalAreaUsedOnTableExtension.php
@@ -36,7 +36,6 @@ public function updateUsageExcludedClasses(array &$excludedClasses)
      */
     public function updateUsage(ArrayList &$usage, DataObject &$record)
     {
-        Deprecation::notice('4.5.0', 'Use updateUsageExcludedClasses() instead');
         // noop
     }
 

diff --git a/tests/ElementControllerTest.php b/tests/ElementControllerTest.php
@@ -13,8 +13,6 @@ class ElementControllerTest extends FunctionalTest
 {
     protected static $fixture_file = 'ElementControllerTest.yml';
 
-    protected static $use_draft_site = true;
-
     protected static $required_extensions = [
         TestPage::class => [
             ElementalPageExtension::class,
-Original file line number
+Diff line change
@@ Expand Up @@
          */
         public function updateUsage(ArrayList &$usage, DataObject &$record)
         {
-            Deprecation::notice('4.5.0', 'Use updateUsageExcludedClasses() instead');
             // noop
         }
@@ Expand Down @@