#9236: allow for setData to take in an object of type DataObject

Author: dmanners

lib/internal/Magento/Framework/Controller/Result/Json.php

@@ -52,9 +52,13 @@ public function __construct(
      * @param boolean $cycleCheck Optional; whether or not to check for object recursion; off by default
      * @param array $options Additional options used during encoding
      * @return $this
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function setData($data, $cycleCheck = false, $options = [])
     {
+        if ($data instanceof \Magento\Framework\DataObject) {
+            $data = $data->toArray();
+        }
         $this->json = $this->serializer->serialize($data);
         return $this;
     }