Merge remote-tracking branch 'magento2/develop' into develop

Author: viktym

.travis.yml

@@ -14,11 +14,12 @@ php:
 env:
   global:
     - COMPOSER_BIN_DIR=~/bin
-    - INTEGRATION_SETS=2
+    - INTEGRATION_SETS=3
   matrix:
     - TEST_SUITE=unit
     - TEST_SUITE=integration INTEGRATION_INDEX=1
     - TEST_SUITE=integration INTEGRATION_INDEX=2
+    - TEST_SUITE=integration INTEGRATION_INDEX=3
     - TEST_SUITE=static
 cache:
   apt: true

app/code/Magento/Backend/Model/Setup/MenuBuilder.php

@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Backend\Model\Setup;
+
+use Magento\Backend\Model\Menu;
+use Magento\Backend\Model\Menu\Builder;
+use Magento\Framework\App\DocRootLocator;
+
+/**
+ * Plugin class to remove web setup wizard from menu if application root is pub/ and no setup url variable is specified.
+ */
+class MenuBuilder
+{
+    /**
+     * @var DocRootLocator
+     */
+    protected $docRootLocator;
+
+    /**
+     * MenuBuilder constructor.
+     *
+     * @param DocRootLocator $docRootLocator
+     */
+    public function __construct(DocRootLocator $docRootLocator)
+    {
+        $this->docRootLocator = $docRootLocator;
+    }
+
+    /**
+     * Removes 'Web Setup Wizard' from the menu if doc root is pub and no setup url variable is specified.
+     *
+     * @param Builder $subject
+     * @param Menu $menu
+     * @return Menu
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterGetResult(Builder $subject, Menu $menu)
+    {
+        if ($this->docRootLocator->isPub()) {
+            $menu->remove('Magento_Backend::setup_wizard');
+        }
+        return $menu;
+    }
+}

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

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Backend\Test\Unit\Model;
+
+use Magento\Backend\Model\Setup\MenuBuilder;
+
+class MenuBuilderTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider afterGetResultDataProvider
+     *
+     * @param string $isPub
+     * @param int $times
+     * @param bool $result
+     */
+    public function testAfterGetResult($isPub, $times)
+    {
+        $docRootLocator = $this->getMock('\Magento\Framework\App\DocRootLocator', [], [], '', false);
+        $docRootLocator->expects($this->once())->method('isPub')->willReturn($isPub);
+        $model = new MenuBuilder($docRootLocator);
+        /** @var \Magento\Backend\Model\Menu $menu */
+        $menu = $this->getMock('\Magento\Backend\Model\Menu', [], [], '', false);
+        $menu->expects($this->exactly($times))->method('remove')->willReturn(true);
+
+        /** @var \Magento\Backend\Model\Menu\Builder $menuBuilder */
+        $menuBuilder = $this->getMock('\Magento\Backend\Model\Menu\Builder', [], [], '', false);
+
+        $this->assertInstanceOf(
+            '\Magento\Backend\Model\Menu',
+            $model->afterGetResult($menuBuilder, $menu)
+        );
+    }
+
+    public function afterGetResultDataProvider()
+    {
+        return [[true, 1], [false, 0],];
+    }
+}

app/code/Magento/Backend/etc/adminhtml/di.xml

@@ -138,4 +138,7 @@
             <argument name="isIncludesAvailable" xsi:type="boolean">false</argument>
         </arguments>
     </type>
+    <type name="Magento\Backend\Model\Menu\Builder">
+        <plugin name="SetupMenuBuilder" type="Magento\Backend\Model\Setup\MenuBuilder" />
+    </type>
 </config>

app/code/Magento/Checkout/Controller/Index/Index.php

@@ -34,8 +34,6 @@ public function execute()
 
         $this->_customerSession->regenerateId();
         $this->_objectManager->get('Magento\Checkout\Model\Session')->setCartWasUpdated(false);
-        $currentUrl = $this->_url->getUrl('*/*/*', ['_secure' => true]);
-        $this->_objectManager->get('Magento\Customer\Model\Session')->setBeforeAuthUrl($currentUrl);
         $this->getOnepage()->initCheckout();
         $resultPage = $this->resultPageFactory->create();
         $resultPage->getConfig()->getTitle()->set(__('Checkout'));

app/code/Magento/Cms/view/adminhtml/templates/browser/content.phtml

@@ -20,6 +20,7 @@
                 <div class="title"><?php /* @escapeNotVerified */ echo $block->getHeaderText() ?></div>
             </div>
         </div>
+        <div id="error-message" data-action="show-error"></div>
         <div id="contents-uploader" class="contents-uploader"><?php echo $block->getChildHtml('wysiwyg_images.uploader') ?></div>
         <div id="contents"></div>
     </div>

app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml

@@ -69,10 +69,16 @@ require([
         },
         done: function (e, data) {
             var progressSelector = '#' + data.fileId + ' .progressbar-container .progressbar';
+            var tempErrorMessage = document.createElement("div");
             $(progressSelector).css('width', '100%');
+            $('[data-action="show-error"]').children(".message").remove();
             if (data.result && !data.result.hasOwnProperty('errorcode')) {
                 $(progressSelector).removeClass('upload-progress').addClass('upload-success');
             } else {
+                tempErrorMessage.className = "message message-warning warning";
+                tempErrorMessage.innerHTML = data.result.error;
+
+                $('[data-action="show-error"]').append(tempErrorMessage);
                 $(progressSelector).removeClass('upload-progress').addClass('upload-failure');
             }
         },

app/code/Magento/Sales/Model/Order/AddressRepository.php

@@ -91,7 +91,6 @@ public function getList(\Magento\Framework\Api\SearchCriteria $searchCriteria)
                 $searchResult->addFieldToFilter($filter->getField(), [$condition => $filter->getValue()]);
             }
         }
-
         $searchResult->setCurPage($searchCriteria->getCurrentPage());
         $searchResult->setPageSize($searchCriteria->getPageSize());
 

app/code/Magento/Sales/Model/Order/CreditmemoRepository.php

@@ -99,6 +99,7 @@ public function getList(\Magento\Framework\Api\SearchCriteria $searchCriteria)
                 $searchResult->addFieldToFilter($filter->getField(), [$condition => $filter->getValue()]);
             }
         }
+        $searchResult->setSearchCriteria($searchCriteria);
         $searchResult->setCurPage($searchCriteria->getCurrentPage());
         $searchResult->setPageSize($searchCriteria->getPageSize());
         return $searchResult;

app/code/Magento/Sales/Model/Order/InvoiceRepository.php

@@ -95,6 +95,7 @@ public function getList(\Magento\Framework\Api\SearchCriteria $searchCriteria)
                 $collection->addFieldToFilter($filter->getField(), [$condition => $filter->getValue()]);
             }
         }
+        $collection->setSearchCriteria($searchCriteria);
         $collection->setCurPage($searchCriteria->getCurrentPage());
         $collection->setPageSize($searchCriteria->getPageSize());
         return $collection;