MAGETWO-67048: Cannot add translate attribute into the di.xml

Author: nmalevanec

dev/tests/integration/testsuite/Magento/Framework/ObjectManager/Config/Reader/DomTest.php

@@ -3,8 +3,11 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\ObjectManager\Config\Reader;
 
+use Magento\Framework\Phrase;
+
 /**
  * Class DomTest @covers \Magento\Framework\ObjectManager\Config\Reader\Dom
  *
@@ -63,6 +66,16 @@ protected function setUp()
             false
         );
         $this->_fileResolverMock->expects($this->once())->method('get')->will($this->returnValue($this->_fileList));
+
+        /** @var Phrase\Renderer\Composite|\PHPUnit_Framework_MockObject_MockObject $renderer */
+        $renderer = $this->getMockBuilder(Phrase\Renderer\Composite::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        /** check arguments won't be translated for ObjectManager, even if has attribute 'translate'=true. */
+        $renderer->expects(self::never())
+            ->method('render');
+        Phrase::setRenderer($renderer);
+
         $this->_mapper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
             \Magento\Framework\ObjectManager\Config\Mapper\Dom::class
         );

dev/tests/integration/testsuite/Magento/Framework/ObjectManager/_files/config_one.xml

@@ -28,7 +28,7 @@
             <argument name="boolZeroParam" xsi:type="boolean">false</argument>
             <argument name="intValueParam" xsi:type="number">100500</argument>
             <argument name="nullValueParam" xsi:type="null"/>
-            <argument name="stringPatternParam" xsi:type="string">az-value</argument>
+            <argument name="stringPatternParam" xsi:type="string" translate="true">az-value</argument>
         </arguments>
     </type>
 </config>

lib/internal/Magento/Framework/App/ObjectManagerFactory.php

@@ -225,7 +225,7 @@ protected function createArgumentInterpreter(
         $result = new \Magento\Framework\Data\Argument\Interpreter\Composite(
             [
                 'boolean' => new \Magento\Framework\Data\Argument\Interpreter\Boolean($booleanUtils),
-                'string' => new \Magento\Framework\Data\Argument\Interpreter\StringUtils($booleanUtils),
+                'string' => new \Magento\Framework\Data\Argument\Interpreter\StringUtils($booleanUtils, false),
                 'number' => new \Magento\Framework\Data\Argument\Interpreter\Number(),
                 'null' => new \Magento\Framework\Data\Argument\Interpreter\NullType(),
                 'object' => new \Magento\Framework\Data\Argument\Interpreter\DataObject($booleanUtils),

lib/internal/Magento/Framework/Data/Argument/Interpreter/StringUtils.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Framework\Data\Argument\Interpreter;
 
 use Magento\Framework\Data\Argument\InterpreterInterface;
@@ -19,11 +20,24 @@ class StringUtils implements InterpreterInterface
     private $booleanUtils;
 
     /**
+     * Should string utils translate incoming string status.
+     *
+     * @var bool
+     */
+    private $translatable;
+
+    /**
+     * StringUtils constructor.
+     *
      * @param BooleanUtils $booleanUtils
+     * @param bool $translatable
      */
-    public function __construct(BooleanUtils $booleanUtils)
-    {
+    public function __construct(
+        BooleanUtils $booleanUtils,
+        $translatable = true
+    ) {
         $this->booleanUtils = $booleanUtils;
+        $this->translatable = $translatable;
     }
 
     /**
@@ -38,13 +52,18 @@ public function evaluate(array $data)
             if (!is_string($result)) {
                 throw new \InvalidArgumentException('String value is expected.');
             }
-            $needTranslation = isset($data['translate']) ? $this->booleanUtils->toBoolean($data['translate']) : false;
-            if ($needTranslation) {
-                $result = (string)new \Magento\Framework\Phrase($result);
+            if ($this->translatable) {
+                $needTranslation = isset($data['translate'])
+                    ? $this->booleanUtils->toBoolean($data['translate'])
+                    : false;
+                if ($needTranslation) {
+                    $result = (string)new \Magento\Framework\Phrase($result);
+                }
             }
         } else {
             $result = '';
         }
+
         return $result;
     }
 }