MC-33823: Merge CE, EE and B2B changes

Author: Oleksandr Gorkun

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/composite/configure.phtml

@@ -62,7 +62,7 @@
             "mage/mage"
         ], function(jQuery){
             jQuery('.product_composite_configure_form').each(function () {
-                Jquery(this).mage('form').mage('validation');
+                jQuery(this).mage('form').mage('validation');
             });
         });
 script;

dev/tests/integration/testsuite/Magento/Backend/Block/Widget/Button/SplitButtonTest.php

@@ -28,7 +28,7 @@ class SplitButtonTest extends TestCase
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->layout = $objectManager->get(LayoutInterface::class);

dev/tests/integration/testsuite/Magento/Backend/Block/Widget/ButtonTest.php

@@ -27,7 +27,7 @@ class ButtonTest extends TestCase
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->layout = $objectManager->get(LayoutInterface::class);

dev/tests/integration/testsuite/Magento/Cms/Controller/PageTest.php

@@ -18,7 +18,7 @@ class PageTest extends \Magento\TestFramework\TestCase\AbstractController
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         Bootstrap::getObjectManager()->configure([
             'preferences' => [

dev/tests/integration/testsuite/Magento/Csp/Helper/InlineUtilTest.php

@@ -38,7 +38,7 @@ class InlineUtilTest extends TestCase
     /**
      * @inheritDoc
      */
-    public function setUp()
+    public function setUp(): void
     {
         Bootstrap::getObjectManager()->configure([
             'preferences' => [
@@ -53,7 +53,7 @@ public function setUp()
     /**
      * @inheritDoc
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->util = null;
         $this->secureHtmlRenderer = null;

dev/tests/integration/testsuite/Magento/Csp/Model/Collector/ControllerCollectorTest.php

@@ -27,7 +27,7 @@ class ControllerCollectorTest extends TestCase
     /**
      * @inheritDoc
      */
-    public function setUp()
+    public function setUp(): void
     {
         $this->collector = Bootstrap::getObjectManager()->create(ControllerCollector::class);
     }

dev/tests/integration/testsuite/Magento/Framework/View/Helper/SecureHtmlRendererTest.php

@@ -25,7 +25,7 @@ class SecureHtmlRendererTest extends TestCase
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
         //Clearing the processors list to ensure stable results.

dev/tests/integration/testsuite/Magento/Framework/View/LayoutTestWithExceptions.php

@@ -14,7 +14,7 @@ class LayoutTestWithExceptions extends \PHPUnit\Framework\TestCase
      */
     protected $layout;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         $layoutFactory = $objectManager->get(\Magento\Framework\View\LayoutFactory::class);

dev/tests/integration/testsuite/Magento/Ui/Component/Control/ButtonTest.php

@@ -27,7 +27,7 @@ class ButtonTest extends TestCase
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->layout = $objectManager->get(LayoutInterface::class);

dev/tests/integration/testsuite/Magento/Ui/Component/Control/SplitButtonTest.php

@@ -28,7 +28,7 @@ class SplitButtonTest extends TestCase
     /**
      * @inheritDoc
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
         $this->layout = $objectManager->get(LayoutInterface::class);