Merge branch '2.4-develop' of github.com:magento-commerce/magento2ce into ACPT-488-ACPT-489-ACPT-490

Author: JacobBrownAustin

dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php

@@ -4246,6 +4246,7 @@
     ['Zend_Uri', 'Laminas\Uri\Uri'],
     ['Zend_Mime', 'Magento\Framework\HTTP\Mime'],
     ['Zend_Mail'],
+    ['Zend_Json'],
     ['Magento\Framework\Encryption\Crypt', 'Magento\Framework\Encryption\EncryptionAdapterInterface'],
     ['Magento\Wishlist\Setup\Patch\Schema\AddProductIdConstraint'],
     ['Magento\Elasticsearch\Block\Adminhtml\System\Config\TestConnection'],

lib/internal/Magento/Framework/Json/Decoder.php

@@ -5,11 +5,27 @@
  */
 namespace Magento\Framework\Json;
 
+use Magento\Framework\Serialize\Serializer\Json as JsonSerializer;
+
 /**
+ * phpcs:ignore Magento2.Commenting.ClassAndInterfacePHPDocFormatting
  * @deprecated 101.0.0 @see \Magento\Framework\Serialize\Serializer\Json::unserialize
  */
 class Decoder implements DecoderInterface
 {
+    /**
+     * @var JsonSerializer
+     */
+    private JsonSerializer $jsonSerializer;
+
+    /**
+     * @param JsonSerializer $serializer
+     */
+    public function __construct(JsonSerializer $serializer)
+    {
+        $this->jsonSerializer = $serializer;
+    }
+
     /**
      * Decodes the given $data string which is encoded in the JSON format.
      *
@@ -18,6 +34,6 @@ class Decoder implements DecoderInterface
      */
     public function decode($data)
     {
-        return \Zend_Json::decode($data);
+        return $this->jsonSerializer->unserialize((string) $data);
     }
 }

lib/internal/Magento/Framework/Json/Encoder.php

@@ -5,35 +5,56 @@
  */
 namespace Magento\Framework\Json;
 
+use Magento\Framework\Serialize\Serializer\Json as JsonSerializer;
+use Magento\Framework\Translate\InlineInterface;
+
 /**
+ * phpcs:ignore Magento2.Commenting.ClassAndInterfacePHPDocFormatting
  * @deprecated 101.0.0 @see \Magento\Framework\Serialize\Serializer\Json::serialize
  */
 class Encoder implements EncoderInterface
 {
     /**
      * Translator
      *
-     * @var \Magento\Framework\Translate\InlineInterface
+     * @var InlineInterface
+     */
+    protected InlineInterface $translateInline;
+
+    /**
+     * @var JsonSerializer
      */
-    protected $translateInline;
+    private JsonSerializer $jsonSerializer;
 
     /**
-     * @param \Magento\Framework\Translate\InlineInterface $translateInline
+     * @param InlineInterface $translateInline
+     * @param JsonSerializer $serializer
      */
-    public function __construct(\Magento\Framework\Translate\InlineInterface $translateInline)
+    public function __construct(InlineInterface $translateInline, JsonSerializer $serializer)
     {
         $this->translateInline = $translateInline;
+        $this->jsonSerializer = $serializer;
     }
 
     /**
      * Encode the mixed $data into the JSON format.
      *
-     * @param mixed $data
+     * @param mixed $valueToEncode
      * @return string
      */
-    public function encode($data)
+    public function encode($valueToEncode)
     {
-        $this->translateInline->processResponseBody($data);
-        return \Zend_Json::encode($data);
+        if (is_object($valueToEncode)) {
+            if (method_exists($valueToEncode, 'toJson')) {
+                return $valueToEncode->toJson();
+            }
+
+            if (method_exists($valueToEncode, 'toArray')) {
+                return self::encode($valueToEncode->toArray());
+            }
+        }
+        $this->translateInline->processResponseBody($valueToEncode);
+
+        return $this->jsonSerializer->serialize($valueToEncode);
     }
 }