Merge branch '2.2-develop' of github.com:magento/magento2ce into MPI-PR

Author: YevSent

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

@@ -85,12 +85,22 @@ public function getFormKey()
      *
      * @param string $moduleName Full module name
      * @return boolean
-     * @deprecated 100.2.0 Magento does not support custom disabling/enabling module output since 2.2.0 version
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @deprecated 100.2.0 Magento does not support disabling/enabling modules output from the Admin Panel since 2.2.0
+     * version. Module output can still be enabled/disabled in configuration files. However, this functionality should
+     * not be used in future development. Module design should explicitly state dependencies to avoid requiring output
+     * disabling. This functionality will temporarily be kept in Magento core, as there are unresolved modularity
+     * issues that will be addressed in future releases.
      */
     public function isOutputEnabled($moduleName = null)
     {
-        return true;
+        if ($moduleName === null) {
+            $moduleName = $this->getModuleName();
+        }
+
+        return !$this->_scopeConfig->isSetFlag(
+            'advanced/modules_disable_output/' . $moduleName,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+        );
     }
 
     /**

app/code/Magento/Bundle/view/adminhtml/web/js/bundle-type-handler.js

@@ -2,7 +2,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-/*jshint browser:true jquery:true expr:true*/
+
 define([
     'jquery',
     'Magento_Catalog/catalog/type-events',

app/code/Magento/Bundle/view/frontend/web/js/float.js

@@ -5,6 +5,7 @@
 
 /**
  * @api
+ * @deprecated since version 2.2.0
  */
 define([
     'jquery',

app/code/Magento/Captcha/view/frontend/web/onepage.js

@@ -3,6 +3,9 @@
  * See COPYING.txt for license details.
  */
 
+/**
+ * @deprecated since version 2.2.0
+ */
 define(['jquery'], function ($) {
     'use strict';
 

app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Options/AjaxTest.php

@@ -58,6 +58,12 @@ public function testToHtml()
             ->getMock();
         $eventManager->expects($this->exactly(2))->method('dispatch')->will($this->returnValue(true));
 
+        $scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config::class)
+            ->setMethods(['getValue'])
+            ->disableOriginalConstructor()->getMock();
+        $scopeConfig->expects($this->once())->method('getValue')->withAnyParameters()
+            ->will($this->returnValue(false));
+
         $product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)->disableOriginalConstructor()
             ->setMethods(['setStoreId', 'load', 'getId', '__wakeup', '__sleep'])
             ->getMock();
@@ -90,6 +96,8 @@ public function testToHtml()
 
         $this->context->expects($this->once())->method('getEventManager')
             ->will($this->returnValue($eventManager));
+        $this->context->expects($this->once())->method('getScopeConfig')
+            ->will($this->returnValue($scopeConfig));
         $this->context->expects($this->once())->method('getLayout')
             ->will($this->returnValue($layout));
         $this->context->expects($this->once())->method('getRequest')

app/code/Magento/Catalog/Test/Unit/Block/Product/Widget/NewWidgetTest.php

@@ -186,6 +186,8 @@ protected function generalGetProductCollection()
     {
         $this->eventManager->expects($this->exactly(2))->method('dispatch')
             ->will($this->returnValue(true));
+        $this->scopeConfig->expects($this->once())->method('getValue')->withAnyParameters()
+            ->willReturn(false);
         $this->cacheState->expects($this->atLeastOnce())->method('isEnabled')->withAnyParameters()
             ->willReturn(false);
         $this->catalogConfig->expects($this->once())->method('getProductAttributes')

app/code/Magento/Catalog/view/adminhtml/web/catalog/category/edit.js

@@ -2,8 +2,10 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 /**
  * Create/edit some category
+ * @deprecated since version 2.2.0
  */
 
 /* global tree */

app/code/Magento/Catalog/view/adminhtml/web/js/bundle-proxy-button.js

@@ -5,6 +5,7 @@
 
 /**
  * @api
+ * @deprecated since version 2.2.0
  */
 define([
     'Magento_Ui/js/form/components/button',

app/code/Magento/Catalog/view/adminhtml/web/js/components/checkbox.js

@@ -1,7 +1,11 @@
-/* Copyright © Magento, Inc. All rights reserved.
-* See COPYING.txt for license details.
-*/
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
 
+/**
+ * @deprecated since version 2.2.0
+ */
 define([
     'Magento_Ui/js/form/element/abstract',
     'knockout'

app/code/Magento/Catalog/view/adminhtml/web/js/components/input-handle-required.js

@@ -3,6 +3,9 @@
  * See COPYING.txt for license details.
  */
 
+/**
+ * @deprecated since version 2.2.0
+ */
 define([
     'Magento_Ui/js/form/element/abstract'
 ], function (Abstract) {