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

- Unit & integration tests modified;
- Framework DataObjectProcessor updated;

Author: Dmytro Poperechnyy

app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php

@@ -465,7 +465,7 @@ public function getErrorMessages()
         $messages = [];
         foreach ($this->_errors as $errorCode => $errorRows) {
             if (isset($this->_messageTemplates[$errorCode])) {
-                $errorCode = __($this->_messageTemplates[$errorCode]);
+                $errorCode = (string)__($this->_messageTemplates[$errorCode]);
             }
             foreach ($errorRows as $errorRowData) {
                 $key = $errorRowData[1] ? sprintf($errorCode, $errorRowData[1]) : $errorCode;

dev/tests/integration/testsuite/Magento/Captcha/Model/ObserverTest.php

@@ -32,7 +32,7 @@ public function testBackendLoginActionWithInvalidCaptchaReturnsError()
         ];
         $this->getRequest()->setPost($post);
         $this->dispatch('backend/admin');
-        $this->assertContains(__('Incorrect CAPTCHA'), $this->getResponse()->getBody());
+        $this->assertContains((string)__('Incorrect CAPTCHA'), $this->getResponse()->getBody());
     }
 
     /**

dev/tests/integration/testsuite/Magento/Checkout/Model/Type/OnepageTest.php

@@ -482,7 +482,7 @@ public function testSaveBillingNewAddressErrorExistingEmail()
         $this->assertArrayHasKey('message', $result, 'Error message was expected to be set');
         $this->assertStringStartsWith(
             'There is already a registered customer using this email address',
-            $result['message'],
+            (string)$result['message'],
             'Validation error is invalid.'
         );
     }

dev/tests/integration/testsuite/Magento/Framework/Data/Argument/Interpreter/StringTest.php

@@ -48,7 +48,7 @@ function ($input) {
     public function testEvaluate($input, $expected)
     {
         $actual = $this->_model->evaluate($input);
-        $this->assertSame($expected, $actual);
+        $this->assertSame($expected, (string)$actual);
     }
 
     public function evaluateDataProvider()

dev/tests/integration/testsuite/Magento/Indexer/Model/ShellTest.php

@@ -65,7 +65,7 @@ public function testRunIndexList()
         );
         foreach ($indexerCollection->getItems() as $indexer) {
             /** @var \Magento\Indexer\Model\IndexerInterface $indexer */
-            $this->assertContains($indexer->getTitle(), $result);
+            $this->assertContains((string)$indexer->getTitle(), $result);
         }
     }
 

dev/tests/unit/testsuite/Magento/Bundle/Model/Product/Attribute/Source/Price/ViewTest.php

@@ -74,7 +74,7 @@ public function testGetOptionTextForExistLabel()
     {
         $existValue = 1;
 
-        $this->assertInternalType('string', $this->model->getOptionText($existValue));
+        $this->assertInstanceOf('Magento\Framework\Phrase', $this->model->getOptionText($existValue));
     }
 
     /**

dev/tests/unit/testsuite/Magento/CatalogWidget/Model/Rule/Condition/CombineTest.php

@@ -44,7 +44,7 @@ protected function setUp()
 
     public function testGetNewChildSelectOptions()
     {
-        $options = [
+        $expectedOptions = [
             ['value' => '', 'label' => 'Please choose a condition to add.'],
             ['value' => 'Magento\CatalogWidget\Model\Rule\Condition\Combine', 'label' => 'Conditions Combination'],
             ['label' => 'Product Attribute', 'value' => [
@@ -65,9 +65,14 @@ public function testGetNewChildSelectOptions()
         $productCondition->expects($this->any())->method('getAttributeOption')
             ->will($this->returnValue($attributeOptions));
 
-        $this->conditionFactory->expects($this->once())->method('create')->will($this->returnValue($productCondition));
+        $this->conditionFactory->expects($this->atLeastOnce())->method('create')->willReturn($productCondition);
 
-        $this->assertSame($options, $this->condition->getNewChildSelectOptions());
+        $actualOptions = $this->condition->getNewChildSelectOptions();
+        foreach ($actualOptions as $key => $option) {
+            $actualOptions[$key]['label'] = (string)$option['label'];
+        }
+
+        $this->assertSame($expectedOptions, $actualOptions);
     }
 
     public function testCollectValidatedAttributes()

dev/tests/unit/testsuite/Magento/Cms/Block/Adminhtml/Block/EditTest.php

@@ -84,7 +84,7 @@ public function testGetHeaderText($modelBlockId)
             ->with($title)
             ->willReturn($escapedTitle);
 
-        $this->assertInternalType('string', $this->this->getHeaderText());
+        $this->assertInstanceOf('Magento\Framework\Phrase', $this->this->getHeaderText());
     }
 
     public function getHeaderTextDataProvider()

dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php

@@ -331,7 +331,12 @@ public function testGetAllDesignAbstractions()
             ],
         ];
 
-        $this->assertSame($expected, $this->_model->getAllDesignAbstractions());
+        $actualAbstractions = $this->_model->getAllDesignAbstractions();
+        foreach ($actualAbstractions as $key => $abstraction) {
+            $actualAbstractions[$key]['label'] = (string)$abstraction['label'];
+        }
+
+        $this->assertSame($expected, $actualAbstractions);
     }
 
     public function testIsPageLayoutDesignAbstractions()

dev/tests/unit/testsuite/Magento/Customer/Block/Widget/NameTest.php

@@ -367,13 +367,7 @@ public function getContainerClassNameProvider()
      */
     public function testGetStoreLabel($attributeCode, $storeLabel, $expectedValue)
     {
-        $this->attribute->expects(
-            $this->once()
-        )->method(
-            'getStoreLabel'
-        )->will(
-            $this->returnValue($storeLabel)
-        );
+        $this->attribute->expects($this->atLeastOnce())->method('getStoreLabel')->willReturn($storeLabel);
         $this->assertEquals($expectedValue, $this->_block->getStoreLabel($attributeCode));
     }
 
@@ -405,7 +399,7 @@ public function testGetStoreLabelWithException()
                 )
             )
         );
-        $this->assertSame('', $this->_block->getStoreLabel('attributeCode'));
+        $this->assertSame('', (string)$this->_block->getStoreLabel('attributeCode'));
     }
 
     /**