Merge remote-tracking branch 'tango-ce/MAGETWO-33060' into MAGETWO-32571

Yuri Kovsher · Yuri Kovsher · commit 782c8efa1f42 · 2015-02-09T16:48:53.000+02:00
Conflicts:
	lib/internal/Magento/Framework/Exception/AbstractAggregateException.php
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -809,7 +809,7 @@ protected function _prepareProduct(\Magento\Framework\Object $buyRequest, $produ
             }
         }
 
-        return $this->getSpecifyOptionMessage();
+        return (string)$this->getSpecifyOptionMessage();
     }
 
     /**
@@ -834,7 +834,7 @@ public function checkProductBuyState($product)
                 }
             }
             if (empty($attributes)) {
-                throw new \Magento\Framework\Model\Exception($this->getSpecifyOptionMessage());
+                throw new \Magento\Framework\Model\Exception((string)$this->getSpecifyOptionMessage());
             }
         }
         return $this;
@@ -843,7 +843,7 @@ public function checkProductBuyState($product)
     /**
      * Retrieve message for specify option(s)
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getSpecifyOptionMessage()
     {
diff --git a/app/code/Magento/Customer/Model/Resource/GroupRepository.php b/app/code/Magento/Customer/Model/Resource/GroupRepository.php
@@ -124,7 +124,7 @@ public function save(\Magento\Customer\Api\Data\GroupInterface $group)
              * Would like a better way to determine this error condition but
              *  difficult to do without imposing more database calls
              */
-            if ($e->getMessage() === __('Customer Group already exists.')) {
+            if ($e->getMessage() == (string)__('Customer Group already exists.')) {
                 throw new InvalidTransitionException('Customer Group already exists.');
             }
             throw $e;
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php b/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;
diff --git a/app/code/Magento/Payment/Block/Info/Cc.php b/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()));
diff --git a/app/code/Magento/Store/Ui/DataProvider/Options.php b/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,
             ],
diff --git a/app/functions.php b/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);
 }
diff --git a/dev/tests/integration/testsuite/Magento/Captcha/Model/ObserverTest.php b/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());
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Model/Type/OnepageTest.php b/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.'
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php
@@ -291,7 +291,10 @@ public function testPrepareForCart()
 
     public function testGetSpecifyOptionMessage()
     {
-        $this->assertEquals('Please specify the product\'s option(s).', $this->_model->getSpecifyOptionMessage());
+        $this->assertEquals(
+            'Please specify the product\'s option(s).',
+            (string)$this->_model->getSpecifyOptionMessage()
+        );
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRatesTest.php b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRatesTest.php
@@ -52,7 +52,7 @@ public function testSaveAction()
         $this->dispatch('backend/admin/system_currency/saveRates');
 
         $this->assertSessionMessages(
-            $this->contains(__('All valid rates have been saved.')),
+            $this->contains((string)__('All valid rates have been saved.')),
             \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
         );
 
@@ -84,7 +84,7 @@ public function testSaveWithWarningAction()
         $this->dispatch('backend/admin/system_currency/saveRates');
 
         $this->assertSessionMessages(
-            $this->contains(__('Please correct the input data for %1 => %2 rate', $currencyCode, $currencyTo)),
+            $this->contains((string)__('Please correct the input data for %1 => %2 rate', $currencyCode, $currencyTo)),
             \Magento\Framework\Message\MessageInterface::TYPE_WARNING
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Data/Argument/Interpreter/StringTest.php b/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()
diff --git a/dev/tests/integration/testsuite/Magento/Indexer/Model/ShellTest.php b/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);
         }
     }
 
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/Attribute/Source/Price/ViewTest.php b/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));
     }
 
     /**
diff --git a/dev/tests/unit/testsuite/Magento/CatalogWidget/Model/Rule/Condition/CombineTest.php b/dev/tests/unit/testsuite/Magento/CatalogWidget/Model/Rule/Condition/CombineTest.php
@@ -44,10 +44,10 @@ protected function setUp()
 
     public function testGetNewChildSelectOptions()
     {
-        $options = [
-            ['value' => '', 'label' => 'Please choose a condition to add.'],
-            ['value' => 'Magento\CatalogWidget\Model\Rule\Condition\Combine', 'label' => 'Conditions Combination'],
-            ['label' => 'Product Attribute', 'value' => [
+        $expectedOptions = [
+            ['value' => '', 'label' => __('Please choose a condition to add.')],
+            ['value' => 'Magento\CatalogWidget\Model\Rule\Condition\Combine', 'label' => __('Conditions Combination')],
+            ['label' => __('Product Attribute'), 'value' => [
                 ['value' => 'Magento\CatalogWidget\Model\Rule\Condition\Product|sku', 'label' => 'SKU'],
                 ['value' => 'Magento\CatalogWidget\Model\Rule\Condition\Product|category', 'label' => 'Category'],
             ]],
@@ -65,9 +65,9 @@ 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());
+        $this->assertEquals($expectedOptions, $this->condition->getNewChildSelectOptions());
     }
 
     public function testCollectValidatedAttributes()
diff --git a/dev/tests/unit/testsuite/Magento/Cms/Block/Adminhtml/Block/EditTest.php b/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()
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php
@@ -321,17 +321,17 @@ public function testGetAllDesignAbstractions()
         $expected = [
             'customer_account' => [
                 'name' => 'customer_account',
-                'label' => 'Customer My Account (All Pages)',
+                'label' => __('Customer My Account (All Pages)'),
                 'design_abstraction' => 'custom',
             ],
             'page_empty' => [
                 'name' => 'page_empty',
-                'label' => 'All Empty Layout Pages',
+                'label' => __('All Empty Layout Pages'),
                 'design_abstraction' => 'page_layout',
             ],
         ];
 
-        $this->assertSame($expected, $this->_model->getAllDesignAbstractions());
+        $this->assertEquals($expected, $this->_model->getAllDesignAbstractions());
     }
 
     public function testIsPageLayoutDesignAbstractions()
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/NameTest.php b/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'));
     }
 
     /**
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/ConfirmTest.php b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/ConfirmTest.php
@@ -388,12 +388,12 @@ public function testSuccessRedirect(
             ->with($this->equalTo('*/*/index'), ['_secure' => true])
             ->will($this->returnValue($successUrl));
 
-        $this->redirectMock->expects($this->once())
+        $this->redirectMock->expects($this->never())
             ->method('success')
             ->with($this->equalTo($resultUrl))
             ->will($this->returnValue($resultUrl));
 
-        $this->scopeConfigMock->expects($this->once())
+        $this->scopeConfigMock->expects($this->never())
             ->method('isSetFlag')
             ->with(
                 $this->equalTo(Url::XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD),
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Model/Metadata/Form/BooleanTest.php b/dev/tests/unit/testsuite/Magento/Customer/Model/Metadata/Form/BooleanTest.php
@@ -25,7 +25,7 @@ public function testGetOptionText($value, $expected)
             $value,
             0
         );
-        $this->assertSame($expected, $boolean->outputValue());
+        $this->assertSame($expected, (string)$boolean->outputValue());
     }
 
     public function getOptionTextDataProvider()
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
@@ -701,7 +701,7 @@ public function testGetLabel()
     {
         $objectManager = new ObjectManager($this);
         $taxTotalsCalcModel = $objectManager->getObject('Magento\Tax\Model\Sales\Total\Quote\Tax');
-        $this->assertSame($taxTotalsCalcModel->getLabel(), __('Tax'));
+        $this->assertEquals($taxTotalsCalcModel->getLabel(), __('Tax'));
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Phrase.php b/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();
+    }
 }
diff --git a/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php b/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
@@ -6,6 +6,7 @@
 
 namespace Magento\Framework\Reflection;
 
+use Magento\Framework\Phrase;
 use Magento\Framework\Api\AttributeValue;
 use Magento\Framework\Api\ExtensibleDataInterface;
 use Magento\Framework\Api\SimpleDataObjectConverter;
@@ -109,13 +110,13 @@ public function buildOutputDataArray($dataObject, $dataObjectType)
                 $key = SimpleDataObjectConverter::camelCaseToSnakeCase(substr($methodName, 3));
                 if ($key === ExtensibleDataInterface::CUSTOM_ATTRIBUTES) {
                     $value = $this->convertCustomAttributes($value, $dataObjectType);
-                } elseif (is_object($value)) {
+                } elseif (is_object($value) && !($value instanceof Phrase)) {
                     $value = $this->buildOutputDataArray($value, $returnType);
                 } elseif (is_array($value)) {
                     $valueResult = [];
                     $arrayElementType = substr($returnType, 0, -2);
                     foreach ($value as $singleValue) {
-                        if (is_object($singleValue)) {
+                        if (is_object($singleValue) && !($singleValue instanceof Phrase)) {
                             $singleValue = $this->buildOutputDataArray($singleValue, $arrayElementType);
                         }
                         $valueResult[] = $this->castValueToType($singleValue, $arrayElementType);

Original file line number	Diff line number	Diff line change
`@@ -809,7 +809,7 @@ protected function _prepareProduct(\Magento\Framework\Object $buyRequest, $produ`
`809`	`809`	`}`
`810`	`810`	`}`
`811`	`811`
`812`		`- return $this->getSpecifyOptionMessage();`
	`812`	`+ return (string)$this->getSpecifyOptionMessage();`
`813`	`813`	`}`
`814`	`814`
`815`	`815`	`/**`
`@@ -834,7 +834,7 @@ public function checkProductBuyState($product)`
`834`	`834`	`}`
`835`	`835`	`}`
`836`	`836`	`if (empty($attributes)) {`
`837`		`- throw new \Magento\Framework\Model\Exception($this->getSpecifyOptionMessage());`
	`837`	`+ throw new \Magento\Framework\Model\Exception((string)$this->getSpecifyOptionMessage());`
`838`	`838`	`}`
`839`	`839`	`}`
`840`	`840`	`return $this;`
`@@ -843,7 +843,7 @@ public function checkProductBuyState($product)`
`843`	`843`	`/**`
`844`	`844`	`* Retrieve message for specify option(s)`
`845`	`845`	`*`
`846`		`- * @return string`
	`846`	`+ * @return \Magento\Framework\Phrase`
`847`	`847`	`*/`
`848`	`848`	`public function getSpecifyOptionMessage()`
`849`	`849`	`{`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ public function save(\Magento\Customer\Api\Data\GroupInterface $group)`
`124`	`124`	`* Would like a better way to determine this error condition but`
`125`	`125`	`* difficult to do without imposing more database calls`
`126`	`126`	`*/`
`127`		`- if ($e->getMessage() === __('Customer Group already exists.')) {`
	`127`	`+ if ($e->getMessage() == (string)__('Customer Group already exists.')) {`
`128`	`128`	`throw new InvalidTransitionException('Customer Group already exists.');`
`129`	`129`	`}`
`130`	`130`	`throw $e;`
Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,7 @@ public function getErrorMessages()`
`465`	`465`	`$messages = [];`
`466`	`466`	`foreach ($this->_errors as $errorCode => $errorRows) {`
`467`	`467`	`if (isset($this->_messageTemplates[$errorCode])) {`
`468`		`- $errorCode = __($this->_messageTemplates[$errorCode]);`
	`468`	`+ $errorCode = (string)__($this->_messageTemplates[$errorCode]);`
`469`	`469`	`}`
`470`	`470`	`foreach ($errorRows as $errorRowData) {`
`471`	`471`	`$key = $errorRowData[1] ? sprintf($errorCode, $errorRowData[1]) : $errorCode;`
Original file line number	Diff line number	Diff line change
`@@ -97,19 +97,19 @@ protected function _prepareSpecificInformation($transport = null)`
`97`	`97`	`$transport = parent::_prepareSpecificInformation($transport);`
`98`	`98`	`$data = [];`
`99`	`99`	`if ($ccType = $this->getCcTypeName()) {`
`100`		`- $data[__('Credit Card Type')] = $ccType;`
	`100`	`+ $data[(string)__('Credit Card Type')] = $ccType;`
`101`	`101`	`}`
`102`	`102`	`if ($this->getInfo()->getCcLast4()) {`
`103`		`- $data[__('Credit Card Number')] = sprintf('xxxx-%s', $this->getInfo()->getCcLast4());`
	`103`	`+ $data[(string)__('Credit Card Number')] = sprintf('xxxx-%s', $this->getInfo()->getCcLast4());`
`104`	`104`	`}`
`105`	`105`	`if (!$this->getIsSecureMode()) {`
`106`	`106`	`if ($ccSsIssue = $this->getInfo()->getCcSsIssue()) {`
`107`		`- $data[__('Switch/Solo/Maestro Issue Number')] = $ccSsIssue;`
	`107`	`+ $data[(string)__('Switch/Solo/Maestro Issue Number')] = $ccSsIssue;`
`108`	`108`	`}`
`109`	`109`	`$year = $this->getInfo()->getCcSsStartYear();`
`110`	`110`	`$month = $this->getInfo()->getCcSsStartMonth();`
`111`	`111`	`if ($year && $month) {`
`112`		`- $data[__('Switch/Solo/Maestro Start Date')] = $this->_formatCardDate($year, $month);`
	`112`	`+ $data[(string)__('Switch/Solo/Maestro Start Date')] = $this->_formatCardDate($year, $month);`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`	`return $transport->setData(array_merge($data, $transport->getData()));`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`/**`
`8`	`8`	`* Create value-object \Magento\Framework\Phrase`
`9`	`9`	`*`
`10`		`- * @return string`
	`10`	`+ * @return \Magento\Framework\Phrase`
`11`	`11`	`*/`
`12`	`12`	`function __()`
`13`	`13`	`{`
`@@ -18,11 +18,5 @@ function __()`
`18`	`18`	`$argc = $argc[0];`
`19`	`19`	`}`
`20`	`20`
`21`		`- /**`
`22`		`- * Type casting to string is a workaround.`
`23`		`- * Many places in client code at the moment are unable to handle the \Magento\Framework\Phrase object properly.`
`24`		`- * The intended behavior is to use __toString(),`
`25`		`- * so that rendering of the phrase happens only at the last moment when needed`
`26`		`- */`
`27`		`- return (string)new \Magento\Framework\Phrase($text, $argc);`
	`21`	`+ return new \Magento\Framework\Phrase($text, $argc);`
`28`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function testBackendLoginActionWithInvalidCaptchaReturnsError()`
`32`	`32`	`];`
`33`	`33`	`$this->getRequest()->setPost($post);`
`34`	`34`	`$this->dispatch('backend/admin');`
`35`		`- $this->assertContains(__('Incorrect CAPTCHA'), $this->getResponse()->getBody());`
	`35`	`+ $this->assertContains((string)__('Incorrect CAPTCHA'), $this->getResponse()->getBody());`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -482,7 +482,7 @@ public function testSaveBillingNewAddressErrorExistingEmail()`
`482`	`482`	`$this->assertArrayHasKey('message', $result, 'Error message was expected to be set');`
`483`	`483`	`$this->assertStringStartsWith(`
`484`	`484`	`'There is already a registered customer using this email address',`
`485`		`- $result['message'],`
	`485`	`+ (string)$result['message'],`
`486`	`486`	`'Validation error is invalid.'`
`487`	`487`	`);`
`488`	`488`	`}`
Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,10 @@ public function testPrepareForCart()`
`291`	`291`
`292`	`292`	`public function testGetSpecifyOptionMessage()`
`293`	`293`	`{`
`294`		`- $this->assertEquals('Please specify the product\'s option(s).', $this->_model->getSpecifyOptionMessage());`
	`294`	`+ $this->assertEquals(`
	`295`	`+ 'Please specify the product\'s option(s).',`
	`296`	`+ (string)$this->_model->getSpecifyOptionMessage()`
	`297`	`+ );`
`295`	`298`	`}`
`296`	`299`
`297`	`300`	`/**`