Merge branch '2.3-develop' into MAGETWO-70174-data-migration

Author: Robert He

.gitignore

@@ -34,7 +34,6 @@ atlassian*
 /.php_cs.cache
 /grunt-config.json
 /dev/tools/grunt/configs/local-themes.js
-
 /pub/media/*.*
 !/pub/media/.htaccess
 /pub/media/attribute/*

app/code/Magento/Backend/Block/Menu.php

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Backend\Block;
 
 /**
@@ -137,7 +135,9 @@ protected function _getAnchorLabel($menuItem)
      */
     protected function _renderMouseEvent($menuItem)
     {
-        return $menuItem->hasChildren() ? 'onmouseover="Element.addClassName(this,\'over\')" onmouseout="Element.removeClassName(this,\'over\')"' : '';
+        return $menuItem->hasChildren()
+            ? 'onmouseover="Element.addClassName(this,\'over\')" onmouseout="Element.removeClassName(this,\'over\')"'
+            : '';
     }
 
     /**

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

@@ -10,7 +10,6 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- * @codingStandardsIgnoreFile
  */
 class UrlTest extends \PHPUnit\Framework\TestCase
 {
@@ -81,7 +80,10 @@ class UrlTest extends \PHPUnit\Framework\TestCase
     protected function setUp()
     {
         $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
-        $this->_menuMock = $this->createPartialMock(\Magento\Backend\Model\Menu::class, ['getFirstAvailableChild', 'get', 'getFirstAvailable']);
+        $this->_menuMock = $this->createPartialMock(
+            \Magento\Backend\Model\Menu::class,
+            ['getFirstAvailableChild', 'get', 'getFirstAvailable']
+        );
 
         $this->_menuConfigMock = $this->createMock(\Magento\Backend\Model\Menu\Config::class);
         $this->_menuConfigMock->expects($this->any())->method('getMenu')->will($this->returnValue($this->_menuMock));
@@ -136,7 +138,9 @@ protected function setUp()
             ->method('getHash')
             ->willReturnArgument(0);
         $routeParamsResolver = $this->createMock(\Magento\Framework\Url\RouteParamsResolver::class);
-        $this->routeParamsResolverFactoryMock = $this->createMock(\Magento\Framework\Url\RouteParamsResolverFactory::class);
+        $this->routeParamsResolverFactoryMock = $this->createMock(
+            \Magento\Framework\Url\RouteParamsResolverFactory::class
+        );
         $this->routeParamsResolverFactoryMock->expects($this->any())
             ->method('create')
             ->willReturn($routeParamsResolver);

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

@@ -10,5 +10,4 @@
         <link src="Magento_Backend::js/bootstrap/editor.js"/>
         <css src="prototype/windows/themes/default.css"/>
     </head>
-    <body/>
 </page>

app/code/Magento/Backend/view/adminhtml/templates/widget/form/container.phtml

@@ -12,6 +12,15 @@
 <?php if ($block->getButtonsHtml('header')): ?>
     <div class="page-form-actions" <?= /* @escapeNotVerified */ $block->getUiId('content-header') ?>><?= $block->getButtonsHtml('header') ?></div>
 <?php endif; ?>
+<?php if ($block->getButtonsHtml('toolbar')): ?>
+    <div class="page-main-actions">
+        <div class="page-actions">
+            <div class="page-actions-buttons">
+                <?= $block->getButtonsHtml('toolbar') ?>
+            </div>
+        </div>
+    </div>
+<?php endif; ?>
 <?= $block->getFormHtml() ?>
 <?php if ($block->hasFooterButtons()): ?>
     <div class="content-footer">

app/code/Magento/Backend/view/adminhtml/templates/widget/form/element.phtml

@@ -62,8 +62,9 @@
       <label for="<?= $element->getHtmlId() ?>"><?= /* @escapeNotVerified */ $element->getLabel() ?>:</label>
         <script>
         require([
-            'tinymce'
+            'tinymceDeprecated'
         ], function(tinyMCE){
+
             tinyMCE.init({
                 mode : "exact",
                 theme : "advanced",

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Attributes.php

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Bundle\Block\Adminhtml\Catalog\Product\Edit\Tab;
 
 /**

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Bundle\Block\Catalog\Product\View\Type\Bundle;
 
 /**
@@ -93,7 +91,7 @@ public function __construct(
      */
     public function showSingle()
     {
-        if (is_null($this->_showSingle)) {
+        if ($this->_showSingle === null) {
             $option = $this->getOption();
             $selections = $option->getSelections();
 
@@ -238,7 +236,11 @@ public function getProduct()
     public function getSelectionQtyTitlePrice($selection, $includeContainer = true)
     {
         $this->setFormatProduct($selection);
-        $priceTitle = '<span class="product-name">' . $selection->getSelectionQty() * 1 . ' x ' . $this->escapeHtml($selection->getName()) . '</span>';
+        $priceTitle = '<span class="product-name">'
+            . $selection->getSelectionQty() * 1
+            . ' x '
+            . $this->escapeHtml($selection->getName())
+            . '</span>';
 
         $priceTitle .= ' &nbsp; ' . ($includeContainer ? '<span class="price-notice">' : '') . '+' .
             $this->renderPriceString($selection, $includeContainer) . ($includeContainer ? '</span>' : '');

app/code/Magento/Bundle/Model/Product/Type.php

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Bundle\Model\Product;
 
 use Magento\Framework\App\ObjectManager;
@@ -897,8 +895,7 @@ public function getOptionsByIds($optionIds, $product)
         $usedOptions = $product->getData($this->_keyUsedOptions);
         $usedOptionsIds = $product->getData($this->_keyUsedOptionsIds);
 
-        if (
-            !$usedOptions
+        if (!$usedOptions
             || $this->serializer->serialize($usedOptionsIds) != $this->serializer->serialize($optionIds)
         ) {
             $usedOptions = $this->_bundleOption
@@ -1261,7 +1258,9 @@ protected function checkIsAllRequiredOptions($product, $isStrictProcessMode, $op
         if (!$product->getSkipCheckRequiredOption() && $isStrictProcessMode) {
             foreach ($optionsCollection->getItems() as $option) {
                 if ($option->getRequired() && !isset($options[$option->getId()])) {
-                    throw new \Magento\Framework\Exception\LocalizedException(__('Please select all required options.'));
+                    throw new \Magento\Framework\Exception\LocalizedException(
+                        __('Please select all required options.')
+                    );
                 }
             }
         }

app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/Invoice.php

@@ -10,8 +10,6 @@
 
 /**
  * Order invoice pdf default items renderer
- *
- * @codingStandardsIgnoreFile
  */
 class Invoice extends AbstractItems
 {