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

dmanners · Jan 11, 2018 · 9263b1d · 9263b1d
1 parent 41a4cf6
commit 9263b1d
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/lib/internal/Magento/Framework/Controller/Result/Json.php b/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;
     }