Merge pull request #3501 from magento-plankton/2.1-develop-merge-2.1.16

[Plankton] Magento 2.1.16 Publication

Author: xmav

CHANGELOG.md

@@ -1,3 +1,61 @@
+2.1.16
+=============
+* GitHub issues:
+    * [#16653](https://github.com/magento/magento2/issues/16653) -- Not possible to create an invoice (fixed in [magento/magento2#17413](https://github.com/magento/magento2/pull/17413))
+    * [#16655](https://github.com/magento/magento2/issues/16655) -- Block totalbar not used in invoice create and credit memo create screens (fixed in [magento/magento2#17413](https://github.com/magento/magento2/pull/17413))
+    * [#4803](https://github.com/magento/magento2/issues/4803) -- Incorrect return value from Product Attribute Repository (fixed in [magento/magento2#15688](https://github.com/magento/magento2/pull/15688))
+    * [#12250](https://github.com/magento/magento2/issues/12250) -- View.xml is inheriting image sizes from parent (so an optional field is replaced by the value of parent) (fixed in [magento/magento2#17439](https://github.com/magento/magento2/pull/17439))
+    * [#13429](https://github.com/magento/magento2/issues/13429) -- Magento 2.2.2 password reset strength meter (fixed in [magento/magento2#17290](https://github.com/magento/magento2/pull/17290))
+    * [#15028](https://github.com/magento/magento2/issues/15028) -- Configurable product addtocart with restAPI not working as expected (fixed in [magento/magento2#17476](https://github.com/magento/magento2/pull/17476))
+    * [#17289](https://github.com/magento/magento2/issues/17289) -- Magento 2.2.5: Year-to-date dropdown in Stores>Configuration>General>Reports>Dashboard (fixed in [magento/magento2#17496](https://github.com/magento/magento2/pull/17496))
+    * [#16555](https://github.com/magento/magento2/issues/16555) -- "Shipping address is not set" exception in Multishipping Checkout. (fixed in [magento/magento2#16783](https://github.com/magento/magento2/pull/16783))
+    * [#14056](https://github.com/magento/magento2/issues/14056) -- Coupon API not working for guest user (fixed in [magento/magento2#16782](https://github.com/magento/magento2/pull/16782))
+    * [#6305](https://github.com/magento/magento2/issues/6305) -- Can't save Customizable options (fixed in [magento/magento2#17609](https://github.com/magento/magento2/pull/17609))
+    * [#16273](https://github.com/magento/magento2/issues/16273) -- Method $product->getUrlInStore() returning extremely long URLs, could be a bug (fixed in [magento/magento2#16310](https://github.com/magento/magento2/pull/16310))
+    * [#16499](https://github.com/magento/magento2/issues/16499) -- User role issue with customer group (fixed in [magento/magento2#17629](https://github.com/magento/magento2/pull/17629))
+    * [#13102](https://github.com/magento/magento2/issues/13102) -- review/product/listAjax/id/{{non existent id}/ (fixed in [magento/magento2#17632](https://github.com/magento/magento2/pull/17632))
+    * [#17648](https://github.com/magento/magento2/issues/17648) -- UI validation rule for valid time am/pm doesn't work when js is minified (fixed in [magento/magento2#17689](https://github.com/magento/magento2/pull/17689))
+    * [#17700](https://github.com/magento/magento2/issues/17700) -- Message list component: the message type is always error when parameters specified (fixed in [magento/magento2#17702](https://github.com/magento/magento2/pull/17702))
+    * [#14248](https://github.com/magento/magento2/issues/14248) -- Transparent background becomes black for thumbnails of PNG into Wysiwyg editor... (fixed in [magento/magento2#17855](https://github.com/magento/magento2/pull/17855))
+    * [#17851](https://github.com/magento/magento2/issues/17851) -- Wishlist icon cut on Shopping cart page in mobile view (fixed in [magento/magento2#17912](https://github.com/magento/magento2/pull/17912))
+    * [#10687](https://github.com/magento/magento2/issues/10687) -- Product image roles randomly disappear (fixed in [magento/magento2#17553](https://github.com/magento/magento2/pull/17553))
+    * [#8035](https://github.com/magento/magento2/issues/8035) -- Join extension attributes are not added to Order results (REST api) (fixed in [magento/magento2#16169](https://github.com/magento/magento2/pull/16169))
+    * [#2146](https://github.com/magento/magento2/issues/2146) -- Countries dropdown is empty (fixed in [magento/magento2#17194](https://github.com/magento/magento2/pull/17194))
+    * [#4547](https://github.com/magento/magento2/issues/4547) -- Support for new .tech TLD and others required (fixed in [magento/magento2#11576](https://github.com/magento/magento2/pull/11576))
+* GitHub pull requests:
+    * [magento/magento2#17413](https://github.com/magento/magento2/pull/17413) -- [Backport] [Fix #16655] Block totalbar not used in invoice create and credit memo create screens (by @dverkade)
+    * [magento/magento2#17422](https://github.com/magento/magento2/pull/17422) -- [Backport] Resolved special character issue for sidebar (by @mage2pratik)
+    * [magento/magento2#15688](https://github.com/magento/magento2/pull/15688) -- [Backport] Fix #4803: Incorrect return value from Product Attribute Repository (by @cream-julian)
+    * [magento/magento2#17439](https://github.com/magento/magento2/pull/17439) -- [Backport] magento/magento2#12250: View.xml is inheriting image sizes from parennt (by @quisse)
+    * [magento/magento2#17290](https://github.com/magento/magento2/pull/17290) -- [Backport] Fix bug Magento 2.2.2 password reset strength meter #13429 (by @jignesh-baldha)
+    * [magento/magento2#17476](https://github.com/magento/magento2/pull/17476) -- [Backport] Convert to string $option->getValue, in order to be compared with other (by @mage2pratik)
+    * [magento/magento2#17496](https://github.com/magento/magento2/pull/17496) -- [Backport] Magento 2.2.5: Year-to-date dropdown in Stores>Configuration>General>Reports>Dashboard #17289 (by @ronak2ram)
+    * [magento/magento2#16783](https://github.com/magento/magento2/pull/16783) -- [Backport] Fix the issue with "Shipping address is not set" exception (by @dmytro-ch)
+    * [magento/magento2#17366](https://github.com/magento/magento2/pull/17366) -- [Backport] Fixed some minor css issue (by @arnoudhgz)
+    * [magento/magento2#16782](https://github.com/magento/magento2/pull/16782) -- [Backport] issue/14056 - Coupon API not working for guest user (by @gelanivishal)
+    * [magento/magento2#17083](https://github.com/magento/magento2/pull/17083) -- [Backport] Make scope parameters of methods to save/delete config optional (by @mageprince)
+    * [magento/magento2#17609](https://github.com/magento/magento2/pull/17609) -- [Backport] 6305 - Resolved product custom option title save issue (by @jignesh-baldha)
+    * [magento/magento2#17613](https://github.com/magento/magento2/pull/17613) -- [Backport] Added template as argument to the store address renderer to allow custom formatting (by @TomashKhamlai)
+    * [magento/magento2#16310](https://github.com/magento/magento2/pull/16310) -- #16273: [Backport] Fix bug in method getUrlInStore() of product model (by @vasilii-b)
+    * [magento/magento2#17629](https://github.com/magento/magento2/pull/17629) -- [Backport] Solution for User role issue with customer group (by @jignesh-baldha)
+    * [magento/magento2#17632](https://github.com/magento/magento2/pull/17632) -- [Backport] Fixed review list ajax if product not exist redirect to 404 page #13102 (by @mage2pratik)
+    * [magento/magento2#17667](https://github.com/magento/magento2/pull/17667) -- [Backport] Added unit test for newsletter problem model (by @jignesh-baldha)
+    * [magento/magento2#17684](https://github.com/magento/magento2/pull/17684) -- [Backport] Fix Custom Attribute Group can not translate in catalog/product page (by @dmytro-ch)
+    * [magento/magento2#17689](https://github.com/magento/magento2/pull/17689) -- [Backport] Update time12h javascript validation rule to be compatible with js minify (by @dmytro-ch)
+    * [magento/magento2#17682](https://github.com/magento/magento2/pull/17682) -- [Backport] CMS: Add missing unit tests for model classes (by @dmytro-ch)
+    * [magento/magento2#17702](https://github.com/magento/magento2/pull/17702) -- [Backport] Message list component fix: the message type is always error when parameters specified (by @dmytro-ch)
+    * [magento/magento2#17606](https://github.com/magento/magento2/pull/17606) -- [Backport] Catalog: Add unit tests for Cron classes (by @jignesh-baldha)
+    * [magento/magento2#17774](https://github.com/magento/magento2/pull/17774) -- Fix for ProductLink - setterName was incorrectly being set (by @insanityinside)
+    * [magento/magento2#17855](https://github.com/magento/magento2/pull/17855) -- [Backport] Fixes black background for png images in wysiwyg editors. (by @eduard13)
+    * [magento/magento2#17839](https://github.com/magento/magento2/pull/17839) -- [Backport] [Search] Unit test for SynonymAnalyzer model. 2.1 back port. (by @furseyev)
+    * [magento/magento2#17912](https://github.com/magento/magento2/pull/17912) -- [Backport] Resolved : Wishlist icon cut on Shopping cart page in mobile view #17851 #28 (by @hitesh-wagento)
+    * [magento/magento2#17940](https://github.com/magento/magento2/pull/17940) -- [Backport] Sales: Add unit test for validator model class (by @dmytro-ch)
+    * [magento/magento2#17883](https://github.com/magento/magento2/pull/17883) -- Update for pull request #17774 - now using SimpleDataObjectConverter: (by @insanityinside)
+    * [magento/magento2#17553](https://github.com/magento/magento2/pull/17553) -- [Backport] Fix #10687 - Product image roles disappearing (by @eduard13)
+    * [magento/magento2#16169](https://github.com/magento/magento2/pull/16169) -- [Backport] #8035 join extension attributes not added to orders (by @Scarraban)
+    * [magento/magento2#17194](https://github.com/magento/magento2/pull/17194) -- [Backport] Fixes reverted for remove space when only one country in drop-down on both cart (by @nilesh2jcommerce)
+    * [magento/magento2#11576](https://github.com/magento/magento2/pull/11576) -- Fix Support for new Email address domain #4547 (by @elachino)
+
 2.1.15
 =============
 * GitHub issues:

app/code/Magento/AdminNotification/composer.json

@@ -10,7 +10,7 @@
         "lib-libxml": "*"
     },
     "type": "magento2-module",
-    "version": "100.1.5",
+    "version": "100.1.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/AdvancedPricingImportExport/composer.json

@@ -13,7 +13,7 @@
         "magento/framework": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.5",
+    "version": "100.1.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Authorization/composer.json

@@ -7,7 +7,7 @@
         "magento/framework": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.4",
+    "version": "100.1.5",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Authorizenet/composer.json

@@ -13,7 +13,7 @@
         "magento/framework": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.8",
+    "version": "100.1.9",
     "license": [
         "proprietary"
     ],

app/code/Magento/Backend/Block/System/Store/Delete/Form.php

@@ -5,13 +5,39 @@
  */
 namespace Magento\Backend\Block\System\Store\Delete;
 
+use Magento\Backup\Helper\Data as BackupHelper;
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Adminhtml cms block edit form
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
+    /**
+     * @var BackupHelper
+     */
+    private $backup;
+
+    /**
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Framework\Data\FormFactory $formFactory
+     * @param array $data
+     * @param BackupHelper|null $backup
+     */
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Framework\Registry $registry,
+        \Magento\Framework\Data\FormFactory $formFactory,
+        array $data = [],
+        BackupHelper $backup = null
+    ) {
+        parent::__construct($context, $registry, $formFactory, $data);
+        $this->backup = $backup ?: ObjectManager::getInstance()->get(BackupHelper::class);
+    }
+
     /**
      * Init form
      *
@@ -25,7 +51,7 @@ protected function _construct()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     protected function _prepareForm()
     {
@@ -45,15 +71,21 @@ protected function _prepareForm()
 
         $fieldset->addField('item_id', 'hidden', ['name' => 'item_id', 'value' => $dataObject->getId()]);
 
+        $backupOptions = ['0' => __('No')];
+        $backupSelected = '0';
+        if ($this->backup->isEnabled()) {
+            $backupOptions['1'] = __('Yes');
+            $backupSelected = '1';
+        }
         $fieldset->addField(
             'create_backup',
             'select',
             [
                 'label' => __('Create DB Backup'),
                 'title' => __('Create DB Backup'),
                 'name' => 'create_backup',
-                'options' => ['1' => __('Yes'), '0' => __('No')],
-                'value' => '1'
+                'options' => $backupOptions,
+                'value' => $backupSelected
             ]
         );
 

app/code/Magento/Backend/Controller/Adminhtml/System/Store.php

@@ -16,6 +16,7 @@
  * Store controller
  *
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
  */
 abstract class Store extends Action
 {
@@ -88,6 +89,8 @@ protected function createPage()
      * Backup database
      *
      * @return bool
+     *
+     * @deprecated Backup module is to be removed.
      */
     protected function _backupDatabase()
     {

app/code/Magento/Backend/composer.json

@@ -22,7 +22,7 @@
         "magento/framework": "100.1.*"
     },
     "type": "magento2-module",
-    "version": "100.1.10",
+    "version": "100.1.11",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Backup/Controller/Adminhtml/Index.php

@@ -5,10 +5,14 @@
  */
 namespace Magento\Backup\Controller\Adminhtml;
 
+use Magento\Backup\Helper\Data as Helper;
+use Magento\Framework\App\ObjectManager;
+
 /**
  * Backup admin controller
  *
  * @author      Magento Core Team <core@magentocommerce.com>
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
  */
 abstract class Index extends \Magento\Backend\App\Action
 {
@@ -46,27 +50,47 @@ abstract class Index extends \Magento\Backend\App\Action
      */
     protected $maintenanceMode;
 
+    /**
+     * @var Helper
+     */
+    private $helper;
+
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\Backup\Factory $backupFactory
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
      * @param \Magento\Backup\Model\BackupFactory $backupModelFactory
      * @param \Magento\Framework\App\MaintenanceMode $maintenanceMode
+     * @param Helper|null $helper
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Framework\Registry $coreRegistry,
         \Magento\Framework\Backup\Factory $backupFactory,
         \Magento\Framework\App\Response\Http\FileFactory $fileFactory,
         \Magento\Backup\Model\BackupFactory $backupModelFactory,
-        \Magento\Framework\App\MaintenanceMode $maintenanceMode
+        \Magento\Framework\App\MaintenanceMode $maintenanceMode,
+        Helper $helper = null
     ) {
         $this->_coreRegistry = $coreRegistry;
         $this->_backupFactory = $backupFactory;
         $this->_fileFactory = $fileFactory;
         $this->_backupModelFactory = $backupModelFactory;
         $this->maintenanceMode = $maintenanceMode;
+        $this->helper = $helper ?: ObjectManager::getInstance()->get(Helper::class);
         parent::__construct($context);
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function dispatch(\Magento\Framework\App\RequestInterface $request)
+    {
+        if (!$this->helper->isEnabled()) {
+            return $this->_redirect('*/*/disabled');
+        }
+
+        return parent::dispatch($request);
+    }
 }

app/code/Magento/Backup/Controller/Adminhtml/Index/Disabled.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Backup\Controller\Adminhtml\Index;
+
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\View\Result\PageFactory;
+
+/**
+ * Inform that backup is disabled.
+ */
+class Disabled extends Action
+{
+    /**
+     * @see _isAllowed()
+     */
+    const ADMIN_RESOURCE = 'Magento_Backend::backup';
+
+    /**
+     * @var PageFactory
+     */
+    private $pageFactory;
+
+    /**
+     * @param Context $context
+     * @param PageFactory $pageFactory
+     */
+    public function __construct(Context $context, PageFactory $pageFactory)
+    {
+        parent::__construct($context);
+        $this->pageFactory = $pageFactory;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function execute()
+    {
+        return $this->pageFactory->create();
+    }
+}