Fix issue with config not serializing as it is a multi level object

magento · May 24, 2017 · abb39b4 · abb39b4
1 parent b379aea
commit abb39b4
Showing 1 changed file with 18 additions and 7 deletions.
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
@@ -45,7 +45,6 @@ public function __construct(
             $this->setType('textarea');
             $this->setExtType('textarea');
         }
-
         $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Framework\Serialize\Serializer\Json::class);
     }
@@ -64,10 +63,24 @@ protected function getButtonTranslations()
         return $buttonTranslations;
     }
 
+    /**
+     * @return bool|string
+     * @throws \InvalidArgumentException
+     */
+    private function getJsonConfig()
+    {
+        if (is_object($this->getConfig()) && method_exists($this->getConfig(), 'toJson')) {
+            return $this->getConfig()->toJson();
+        } else {
+            return $this->serializer->serialize(
+                $this->getConfig()
+            );
+        }
+    }
+
     /**
      * @return string
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     * @throws \InvalidArgumentException
      */
     public function getElementHtml()
     {
@@ -145,7 +158,7 @@ public function getElementHtml()
                 ], function(jQuery){' .
                 "\n" .
                 '  (function($) {$.mage.translate.add(' .
-                \Zend_Json::encode(
+                $this->serializer->serialize(
                     $this->getButtonTranslations()
                 ) .
                 ')})(jQuery);' .
@@ -154,9 +167,7 @@ public function getElementHtml()
                 ' = new tinyMceWysiwygSetup("' .
                 $this->getHtmlId() .
                 '", ' .
-                $this->serializer->serialize(
-                    $this->getConfig()
-                ) .
+                $this->getJsonConfig() .
                 ');' .
                 $forceLoad .
                 '
@@ -438,7 +449,7 @@ public function getConfig($key = null)
      * Translate string using defined helper
      *
      * @param string $string String to be translated
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function translate($string)
     {