Merge pull request #287 from magento-ogre/MAGETWO-47301-PHP7-Integration-Test-Syntax

[Ogres] PHP7 fix

Author: Kopylova,Olga(okopylova)

app/code/Magento/Authorizenet/Test/Unit/Model/DirectpostTest.php

@@ -331,7 +331,7 @@ public function testCheckResponseCodeFailure($responseCode)
         $this->dataHelperMock->expects($this->any())
             ->method('wrapGatewayError')
             ->with($reasonText)
-            ->willReturn(__('Gateway error: ' . $reasonText));
+            ->willReturn(__('Gateway error: %1', $reasonText));
 
         $this->directpost->checkResponseCode();
     }

app/code/Magento/Backend/i18n/en_US.csv

@@ -306,7 +306,7 @@ YTD,YTD
 "Maximum sender name length is 255. Please correct your settings.","Maximum sender name length is 255. Please correct your settings."
 "The file you're uploading exceeds the server size limit of %1 kilobytes.","The file you're uploading exceeds the server size limit of %1 kilobytes."
 "The base directory to upload file is not specified.","The base directory to upload file is not specified."
-"The specified image adapter cannot be used because of: ","The specified image adapter cannot be used because of: "
+"The specified image adapter cannot be used because of: %1","The specified image adapter cannot be used because of: %1"
 "Default scope","Default scope"
 "Base currency","Base currency"
 "Display default currency","Display default currency"

app/code/Magento/Checkout/view/frontend/web/template/billing-address.html

@@ -6,7 +6,7 @@
 -->
 <div class="billing-address-same-as-shipping-block field choice" data-bind="visible: canUseShippingAddress()">
     <input type="checkbox" name="billing-address-same-as-shipping" data-bind="checked: isAddressSameAsShipping, click: useShippingAddress, attr: {id: 'billing-address-same-as-shipping-' + $parent.getCode()}"/>
-    <label data-bind="i18n: 'My billing and shipping address are the same', attr: {for: 'billing-address-same-as-shipping-' + $parent.getCode()}"></label>
+    <label data-bind="attr: {for: 'billing-address-same-as-shipping-' + $parent.getCode()}"><span data-bind="i18n: 'My billing and shipping address are the same'"></span></label>
 </div>
 
 <!-- ko template: 'Magento_Checkout/billing-address/details' --><!-- /ko -->

app/code/Magento/Config/Model/Config/Backend/Image/Adapter.php

@@ -53,7 +53,7 @@ public function beforeSave()
         try {
             $this->_imageFactory->create($this->getValue());
         } catch (\Exception $e) {
-            $message = __('The specified image adapter cannot be used because of: ' . $e->getMessage());
+            $message = __('The specified image adapter cannot be used because of: %1', $e->getMessage());
             throw new \Magento\Framework\Exception\LocalizedException($message);
         }
 

app/code/Magento/Config/Model/Config/Compiler/IncludeElement.php

@@ -112,6 +112,6 @@ protected function getContent($includePath)
             return $directoryRead->readFile($path);
         }
 
-        throw new LocalizedException(__('The file "' . $path . '" does not exist'));
+        throw new LocalizedException(__('The file "%1" does not exist', $path));
     }
 }

app/code/Magento/Cookie/Model/Config/Backend/Domain.php

@@ -50,7 +50,7 @@ public function beforeSave()
 
         // Empty value is treated valid and will be handled when read the value out
         if (!empty($value) && !$this->configValidator->isValid($value)) {
-            $msg = __('Invalid domain name: ' . join('; ', $this->configValidator->getMessages()));
+            $msg = __('Invalid domain name: %1', join('; ', $this->configValidator->getMessages()));
             throw new \Magento\Framework\Exception\LocalizedException($msg);
         }
     }

app/code/Magento/Cookie/Model/Config/Backend/Lifetime.php

@@ -49,7 +49,7 @@ public function beforeSave()
         $value = $this->getValue();
 
         if (!empty($value) && !$this->configValidator->isValid($value)) {
-            $msg = __('Invalid cookie lifetime: ' . join('; ', $this->configValidator->getMessages()));
+            $msg = __('Invalid cookie lifetime: %1', join('; ', $this->configValidator->getMessages()));
             throw new \Magento\Framework\Exception\LocalizedException($msg);
         }
         return parent::beforeSave();

app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php

@@ -497,7 +497,7 @@ public function getBackend()
             }
             $backend = $this->_universalFactory->create($this->getBackendModel());
             if (!$backend) {
-                throw new LocalizedException(__('Invalid backend model specified: ' . $this->getBackendModel()));
+                throw new LocalizedException(__('Invalid backend model specified: %1', $this->getBackendModel()));
             }
             $this->_backend = $backend->setAttribute($this);
         }

app/code/Magento/Eav/i18n/en_US.csv

@@ -71,7 +71,7 @@ Letters,Letters
 "Invalid default decimal value","Invalid default decimal value"
 "Invalid default date","Invalid default date"
 "Invalid entity supplied","Invalid entity supplied"
-"Invalid backend model specified: ","Invalid backend model specified: "
+"Invalid backend model specified: %1","Invalid backend model specified: %1"
 "Source model ""%1"" not found for attribute ""%2""","Source model ""%1"" not found for attribute ""%2"""
 "The value of attribute ""%1"" must be unique","The value of attribute ""%1"" must be unique"
 "Invalid date","Invalid date"

app/code/Magento/Email/Model/Template/Filter.php

@@ -920,7 +920,7 @@ public function applyInlineCss($html)
                     !== false
                 ) {
                     throw new \Magento\Framework\Exception\MailException(
-                        __('<pre>' . PHP_EOL . $cssToInline . PHP_EOL . '</pre>')
+                        __('<pre> %1 </pre>', PHP_EOL . $cssToInline . PHP_EOL)
                     );
                 }