MAGETWO-33060: Refactor __() to return Phrase object

Author: Dmytro Poperechnyy

app/code/Magento/Payment/Block/Info/Cc.php

@@ -97,19 +97,19 @@ protected function _prepareSpecificInformation($transport = null)
         $transport = parent::_prepareSpecificInformation($transport);
         $data = [];
         if ($ccType = $this->getCcTypeName()) {
-            $data[__('Credit Card Type')] = $ccType;
+            $data[(string)__('Credit Card Type')] = $ccType;
         }
         if ($this->getInfo()->getCcLast4()) {
-            $data[__('Credit Card Number')] = sprintf('xxxx-%s', $this->getInfo()->getCcLast4());
+            $data[(string)__('Credit Card Number')] = sprintf('xxxx-%s', $this->getInfo()->getCcLast4());
         }
         if (!$this->getIsSecureMode()) {
             if ($ccSsIssue = $this->getInfo()->getCcSsIssue()) {
-                $data[__('Switch/Solo/Maestro Issue Number')] = $ccSsIssue;
+                $data[(string)__('Switch/Solo/Maestro Issue Number')] = $ccSsIssue;
             }
             $year = $this->getInfo()->getCcSsStartYear();
             $month = $this->getInfo()->getCcSsStartMonth();
             if ($year && $month) {
-                $data[__('Switch/Solo/Maestro Start Date')] = $this->_formatCardDate($year, $month);
+                $data[(string)__('Switch/Solo/Maestro Start Date')] = $this->_formatCardDate($year, $month);
             }
         }
         return $transport->setData(array_merge($data, $transport->getData()));

app/code/Magento/Store/Ui/DataProvider/Options.php

@@ -53,7 +53,7 @@ public function getOptions(array $options = [])
         $storeCollection = $this->systemStore->getStoreCollection();
 
         $currentOptions = [
-            __('All Store Views') => [
+            (string)__('All Store Views') => [
                 'label' => __('All Store Views'),
                 'value' => 0,
             ],

app/functions.php

@@ -7,7 +7,7 @@
 /**
  * Create value-object \Magento\Framework\Phrase
  *
- * @return string
+ * @return \Magento\Framework\Phrase
  */
 function __()
 {
@@ -18,11 +18,5 @@ function __()
         $argc = $argc[0];
     }
 
-    /**
-     * Type casting to string is a workaround.
-     * Many places in client code at the moment are unable to handle the \Magento\Framework\Phrase object properly.
-     * The intended behavior is to use __toString(),
-     * so that rendering of the phrase happens only at the last moment when needed
-     */
-    return (string)new \Magento\Framework\Phrase($text, $argc);
+    return new \Magento\Framework\Phrase($text, $argc);
 }

lib/internal/Magento/Framework/Phrase.php

@@ -7,9 +7,10 @@
  */
 namespace Magento\Framework;
 
+use Zend\Stdlib\JsonSerializable;
 use Magento\Framework\Phrase\RendererInterface;
 
-class Phrase
+class Phrase implements JsonSerializable
 {
     /**
      * Default phrase renderer. Allows stacking renderers that "don't know about each other"
@@ -84,4 +85,14 @@ public function __toString()
     {
         return $this->render();
     }
+
+    /**
+     * Specify data which should be serialized to JSON
+     *
+     * @return string
+     */
+    public function jsonSerialize()
+    {
+        return $this->render();
+    }
 }