Merge branch 'mainline_develop' into S73

Author: Maksym Aposov

app/code/Magento/Authorizenet/view/frontend/web/template/payment/authorizenet-directpost.html

@@ -61,7 +61,7 @@
                             "
                             class="action primary checkout"
                             disabled>
-                        <span data-bind="text: $t('Place Order')"></span>
+                        <span data-bind="i18n: 'Place Order'"></span>
                     </button>
                 </div>
             </div>

app/code/Magento/Backend/Model/Url.php

@@ -181,6 +181,10 @@ protected function _setRouteParams(array $data, $unsetOldParams = true)
      */
     public function getUrl($routePath = null, $routeParams = null)
     {
+        if (filter_var($routePath, FILTER_VALIDATE_URL)) {
+            return $routePath;
+        }
+
         $cacheSecretKey = false;
         if (is_array($routeParams) && isset($routeParams['_cache_secret_key'])) {
             unset($routeParams['_cache_secret_key']);
@@ -190,6 +194,7 @@ public function getUrl($routePath = null, $routeParams = null)
         if (!$this->useSecretKey()) {
             return $result;
         }
+        $this->_setRoutePath($routePath);
         $routeName = $this->_getRouteName('*');
         $controllerName = $this->_getControllerName(self::DEFAULT_CONTROLLER_NAME);
         $actionName = $this->_getActionName(self::DEFAULT_ACTION_NAME);

app/code/Magento/Backend/Test/Unit/Model/UrlTest.php

@@ -407,4 +407,10 @@ public function testGetSecretKeyGenerationWithRouteNameInForwardInfo()
         $keyFromRequest = $this->_model->getSecretKey();
         $this->assertEquals($keyFromParams, $keyFromRequest);
     }
+
+    public function testGetUrlWithUrlInRoutePath()
+    {
+        $routePath = 'https://localhost/index.php/catalog/product/view/id/100/?foo=bar#anchor';
+        static::assertEquals($routePath, $this->_model->getUrl($routePath));
+    }
 }

app/code/Magento/Backend/view/adminhtml/layout/default.xml

@@ -69,6 +69,7 @@
         </referenceContainer>
         <referenceContainer name="after.body.start">
             <block class="Magento\RequireJs\Block\Html\Head\Config" name="requirejs-config"/>
+            <block class="Magento\Translation\Block\Html\Head\Config" name="translate-config"/>
             <block class="Magento\Translation\Block\Js" name="translate" template="Magento_Translation::translate.phtml"/>
             <block class="Magento\Framework\View\Element\Js\Components" name="head.components" as="components" template="Magento_Backend::page/js/components.phtml"/>
             <block class="Magento\Framework\View\Element\Html\Calendar" name="head.calendar" as="calendar" template="Magento_Backend::page/js/calendar.phtml"/>

app/code/Magento/Braintree/view/frontend/web/template/payment/braintree-paypal-form.html

@@ -41,7 +41,7 @@
                         "
                         class="action primary checkout"
                         disabled>
-                    <span data-bind="text: $t('Place Order')"></span>
+                    <span data-bind="i18n: 'Place Order'"></span>
                 </button>
             </div>
         </div>

app/code/Magento/Braintree/view/frontend/web/template/payment/cc-form.html

@@ -36,12 +36,12 @@
 
         <fieldset data-bind="attr: {class: 'fieldset payment items ccard ' + getCode(), id: 'braintree_form_cc'}">
             <!-- ko if: (isShowLegend())-->
-            <legend class="legend"><span><!-- ko text: $t('Credit Card Information')--><!-- /ko --></span></legend><br />
+            <legend class="legend"><span><!-- ko i18n: 'Credit Card Information'--><!-- /ko --></span></legend><br />
             <!-- /ko -->
             <!-- ko if: (useVault()) -->
             <div>
                 <label data-bind="attr: {for: getCode() + '_cc_token'}" class="label">
-                    <span><!-- ko text: $t('Payment Information')--><!-- /ko --></span>
+                    <span><!-- ko i18n: 'Payment Information'--><!-- /ko --></span>
                 </label>
                 <div class="control">
                     <select name="payment[cc_token]" class="select"
@@ -60,7 +60,7 @@
             <!-- /ko -->
             <div class="field type required" data-bind="visible: isCcFormShown">
                 <label data-bind="attr: {for: getCode() + '_cc_type'}" class="label">
-                    <span><!-- ko text: $t('Credit Card Type')--><!-- /ko --></span>
+                    <span><!-- ko i18n: 'Credit Card Type'--><!-- /ko --></span>
                 </label>
                 <div class="control">
                     <!-- ko if: (!isCcDetectionEnabled())-->
@@ -102,7 +102,7 @@
             </div>
             <div class="field number required" data-bind="visible: isCcFormShown">
                 <label data-bind="attr: {for: getCode() + '_cc_number'}" class="label">
-                    <span><!-- ko text: $t('Credit Card Number')--><!-- /ko --></span>
+                    <span><!-- ko i18n: 'Credit Card Number'--><!-- /ko --></span>
                 </label>
                 <div class="control">
                     <input type="number" name="payment[cc_number]" class="input-text" value=""
@@ -112,7 +112,7 @@
             </div>
             <div class="field date required" data-bind="attr: {id: getCode() + '_cc_type_exp_div'}, visible: isCcFormShown">
                 <label data-bind="attr: {for: getCode() + '_expiration'}" class="label">
-                    <span><!-- ko text: $t('Expiration Date')--><!-- /ko --></span>
+                    <span><!-- ko i18n: 'Expiration Date'--><!-- /ko --></span>
                 </label>
                 <div class="control">
                     <div class="fields group group-2">
@@ -148,7 +148,7 @@
             <!-- ko if: (hasVerification())-->
             <div class="field cvv required" data-bind="attr: {id: getCode() + '_cc_type_cvv_div'}, visible: isCcFormShown">
                 <label data-bind="attr: {for: getCode() + '_cc_cid'}" class="label">
-                    <span><!-- ko text: $t('Card Verification Number')--><!-- /ko --></span>
+                    <span><!-- ko i18n: 'Card Verification Number'--><!-- /ko --></span>
                 </label>
                 <div class="control">
                     <input type="number"
@@ -166,7 +166,7 @@
                               tabindex="0"
                               data-toggle="dropdown"
                               data-bind="attr: {title: $t('What is this?')}, mageInit: {'dropdown':{'activeClass': '_active'}}">
-                            <span><!-- ko text: $t('What is this?')--><!-- /ko --></span>
+                            <span><!-- ko i18n: 'What is this?'--><!-- /ko --></span>
                         </span>
                         <div class="field-tooltip-content"
                              data-target="dropdown"
@@ -189,7 +189,7 @@
                            class="checkbox"
                            data-bind="checked: storeInVault"/>
                     <label class="label" for="braintree_store_in_vault">
-                        <span><!-- ko text: $t('Save this card for future use')--><!-- /ko --></span>
+                        <span><!-- ko i18n: 'Save this card for future use'--><!-- /ko --></span>
                     </label>
                 </div>
             </div>
@@ -212,7 +212,7 @@
                             css: {disabled: !isPlaceOrderActionAllowed()}
                             "
                             disabled>
-                        <span data-bind="text: $t('Place Order')"></span>
+                        <span data-bind="i18n: 'Place Order'"></span>
                     </button>
                 </div>
             </div>

app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php

@@ -26,7 +26,7 @@ class Renderer extends \Magento\Checkout\Block\Cart\Item\Renderer
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Catalog\Helper\Product\Configuration $productConfig
      * @param \Magento\Checkout\Model\Session $checkoutSession
-     * @param \Magento\Catalog\Helper\Image $imageHelper
+     * @param \Magento\Catalog\Helper\Image $imageBuilder
      * @param \Magento\Framework\Url\Helper\Data $urlHelper
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      * @param PriceCurrencyInterface $priceCurrency
@@ -39,7 +39,7 @@ public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
         \Magento\Catalog\Helper\Product\Configuration $productConfig,
         \Magento\Checkout\Model\Session $checkoutSession,
-        \Magento\Catalog\Helper\Image $imageHelper,
+        \Magento\Catalog\Block\Product\ImageBuilder $imageBuilder,
         \Magento\Framework\Url\Helper\Data $urlHelper,
         \Magento\Framework\Message\ManagerInterface $messageManager,
         PriceCurrencyInterface $priceCurrency,
@@ -52,7 +52,7 @@ public function __construct(
             $context,
             $productConfig,
             $checkoutSession,
-            $imageHelper,
+            $imageBuilder,
             $urlHelper,
             $messageManager,
             $priceCurrency,

app/code/Magento/Bundle/view/frontend/templates/catalog/product/view/summary.phtml

@@ -20,7 +20,7 @@
     </div>
     <div class="content">
         <div class="bundle-info">
-            <?php echo $block->getLayout()->createBlock('Magento\Catalog\Block\Product\Image')->init($_product, 'bundled_product_customization_page')->toHtml() ?>
+            <?php echo $block->getImage($_product, 'bundled_product_customization_page')->toHtml(); ?>
             <div class="product-details">
                 <strong class="product name"><?php echo $block->escapeHtml($_product->getName()) ?></strong>
                 <?php if ($_product->getIsSalable()): ?>

app/code/Magento/Captcha/view/frontend/web/template/checkout/captcha.html

@@ -6,7 +6,7 @@
 -->
 <!-- ko if: (isRequired() && getIsVisible())-->
 <div class="field captcha required" data-bind="blockLoader: getIsLoading()">
-    <label data-bind="attr: {for: 'captcha_' + formId}" class="label"><span data-bind="text: $t('Please type the letters below')"></span></label>
+    <label data-bind="attr: {for: 'captcha_' + formId}" class="label"><span data-bind="i18n: 'Please type the letters below'"></span></label>
     <div class="control captcha">
         <input name="captcha_string" type="text" class="input-text required-entry" data-bind="value: captchaValue(), attr: {id: 'captcha_' + formId, 'data-scope': dataScope}" />
         <input name="captcha_form_id" type="hidden" data-bind="value: formId,  attr: {'data-scope': dataScope}" />
@@ -20,12 +20,12 @@
                                         }"
                          class="captcha-img"/>
                     <button type="button" class="action reload captcha-reload" data-bind="attr: {title: $t('Reload captcha')}, click: refresh">
-                        <span data-bind="text: $t('Reload captcha')"></span>
+                        <span data-bind="i18n: 'Reload captcha'"></span>
                     </button>
                 </div>
             </div>
             <!-- ko if: isCaseSensitive()-->
-            <div class="captcha-note note" data-bind="text: $t('Attention: Captcha is case sensitive.')"></div>
+            <div class="captcha-note note" data-bind="i18n: 'Attention: Captcha is case sensitive.'"></div>
             <!-- /ko -->
         </div>
     </div>

app/code/Magento/Catalog/Block/Product/AbstractProduct.php

@@ -101,6 +101,7 @@ class AbstractProduct extends \Magento\Framework\View\Element\Template
     public function __construct(\Magento\Catalog\Block\Product\Context $context, array $data = [])
     {
         $this->_imageHelper = $context->getImageHelper();
+        $this->imageBuilder = $context->getImageBuilder();
         $this->_compareProduct = $context->getCompareProduct();
         $this->_wishlistHelper = $context->getWishlistHelper();
         $this->_cartHelper = $context->getCartHelper();
@@ -241,28 +242,6 @@ protected function _addProductAttributesAndPrices(\Magento\Catalog\Model\Resourc
             ->addUrlRewrite();
     }
 
-    /**
-     * Retrieve given media attribute label or product name if no label
-     *
-     * @param \Magento\Catalog\Model\Product $product
-     * @param string $mediaAttributeCode
-     *
-     * @return string
-     */
-    public function getImageLabel($product = null, $mediaAttributeCode = 'image')
-    {
-        if ($product === null) {
-            $product = $this->getProduct();
-        }
-
-        $label = $product->getData($mediaAttributeCode . '_label');
-        if (empty($label)) {
-            $label = $product->getName();
-        }
-
-        return $label;
-    }
-
     /**
      * Retrieve Product URL using UrlDataObject
      *
@@ -398,138 +377,6 @@ public function displayProductStockStatus()
         return (bool) $statusInfo->getDisplayStatus();
     }
 
-    /**
-     * Product thumbnail image url getter
-     *
-     * @param \Magento\Catalog\Model\Product $product
-     * @return string
-     */
-    public function getThumbnailUrl($product)
-    {
-        return (string) $this->_imageHelper->init($product, 'thumbnail')
-            ->resize($this->getThumbnailSize());
-    }
-
-    /**
-     * Thumbnail image size getter
-     *
-     * @return int
-     */
-    public function getThumbnailSize()
-    {
-        return $this->getVar('product_thumbnail_image_size', 'Magento_Catalog');
-    }
-
-    /**
-     * Product thumbnail image sidebar url getter
-     *
-     * @param \Magento\Catalog\Model\Product $product
-     * @return string
-     */
-    public function getThumbnailSidebarUrl($product)
-    {
-        return (string) $this->_imageHelper->init($product, 'thumbnail')
-            ->resize($this->getThumbnailSidebarSize());
-    }
-
-    /**
-     * Thumbnail image sidebar size getter
-     *
-     * @return int
-     */
-    public function getThumbnailSidebarSize()
-    {
-        return $this->getVar('product_thumbnail_image_sidebar_size', 'Magento_Catalog');
-    }
-
-    /**
-     * Product small image url getter
-     *
-     * @param \Magento\Catalog\Model\Product $product
-     * @return string
-     */
-    public function getSmallImageUrl($product)
-    {
-        return (string) $this->_imageHelper->init($product, 'small_image')
-            ->resize($this->getSmallImageSize());
-    }
-
-    /**
-     * Small image size getter
-     *
-     * @return int
-     */
-    public function getSmallImageSize()
-    {
-        return $this->getVar('product_small_image_size', 'Magento_Catalog');
-    }
-
-    /**
-     * Product small image sidebar url getter
-     *
-     * @param \Magento\Catalog\Model\Product $product
-     * @return string
-     */
-    public function getSmallImageSidebarUrl($product)
-    {
-        return (string) $this->_imageHelper->init($product, 'small_image')
-            ->resize($this->getSmallImageSidebarSize());
-    }
-
-    /**
-     * Small image sidebar size getter
-     *
-     * @return int
-     */
-    public function getSmallImageSidebarSize()
-    {
-        return $this->getVar('product_small_image_sidebar_size', 'Magento_Catalog');
-    }
-
-    /**
-     * Product base image url getter
-     *
-     * @param \Magento\Catalog\Model\Product $product
-     * @return string
-     */
-    public function getBaseImageUrl($product)
-    {
-        return (string) $this->_imageHelper->init($product, 'image')
-            ->resize($this->getBaseImageSize());
-    }
-
-    /**
-     * Base image size getter
-     *
-     * @return int
-     */
-    public function getBaseImageSize()
-    {
-        return $this->getVar('product_base_image_size', 'Magento_Catalog');
-    }
-
-    /**
-     * Product base image icon url getter
-     *
-     * @param \Magento\Catalog\Model\Product $product
-     * @return string
-     */
-    public function getBaseImageIconUrl($product)
-    {
-        return (string) $this->_imageHelper->init($product, 'image')
-            ->resize($this->getBaseImageIconSize());
-    }
-
-    /**
-     * Base image icon size getter
-     *
-     * @return int
-     */
-    public function getBaseImageIconSize()
-    {
-        return $this->getVar('product_base_image_icon_size', 'Magento_Catalog');
-    }
-
     /**
      * Get random string
      *
@@ -642,4 +489,20 @@ protected function getDetailsRendererList()
             'details.renderers'
         );
     }
+
+    /**
+     * Retrieve product image
+     *
+     * @param \Magento\Catalog\Model\Product $product
+     * @param string $imageId
+     * @param array $attributes
+     * @return \Magento\Catalog\Block\Product\Image
+     */
+    public function getImage($product, $imageId, $attributes = [])
+    {
+        return $this->imageBuilder->setProduct($product)
+            ->setImageId($imageId)
+            ->setAttributes($attributes)
+            ->create();
+    }
 }