MC-34039: Merge 2.4-develop into 2.4-develop-php74

fascinosum · fascinosum · commit f7cc122c23d0 · 2020-05-07T11:10:37.000-05:00
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
@@ -27,7 +27,6 @@
 use Magento\CatalogInventory\Api\StockStateInterface;
 use Magento\CatalogInventory\Model\StockRegistry;
 use Magento\CatalogInventory\Model\StockState;
-use Magento\CatalogRule\Model\ResourceModel\Product\CollectionProcessor;
 use Magento\Framework\DataObject;
 use Magento\Framework\EntityManager\EntityMetadataInterface;
 use Magento\Framework\EntityManager\MetadataPool;
@@ -174,12 +173,6 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->catalogRuleProcessor = $this->getMockBuilder(
-            CollectionProcessor::class
-        )
-            ->disableOriginalConstructor()
-            ->getMock();
-
         $this->serializer = $this->getMockBuilder(Json::class)
             ->setMethods(null)
             ->disableOriginalConstructor()
diff --git a/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php b/app/code/Magento/Captcha/Test/Unit/Model/DefaultTest.php
@@ -290,8 +290,8 @@ protected function _getHelperStub()
             Data::class
         )->disableOriginalConstructor()
             ->setMethods(
-            ['getConfig', 'getFonts', '_getWebsiteCode', 'getImgUrl']
-        )->getMock();
+                ['getConfig', 'getFonts', '_getWebsiteCode', 'getImgUrl']
+            )->getMock();
 
         $helper->expects(
             $this->any()
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/SaveTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/SaveTest.php
@@ -283,55 +283,47 @@ public function testExecute($categoryId, $storeId, $parentId)
         $this->requestMock->expects($this->atLeastOnce())
             ->method('getParam')
             ->willReturnMap(
-                
-                    [
-                        ['id', false, $categoryId],
-                        ['store', null, $storeId],
-                        ['parent', null, $parentId],
-                    ]
-                
+                [
+                    ['id', false, $categoryId],
+                    ['store', null, $storeId],
+                    ['parent', null, $parentId],
+                ]
             );
         $this->objectManagerMock->expects($this->atLeastOnce())
             ->method('create')
             ->willReturn($categoryMock);
         $this->objectManagerMock->expects($this->atLeastOnce())
             ->method('get')
             ->willReturnMap(
-                
-                    [
-                        [Session::class, $sessionMock],
-                        [Registry::class, $registryMock],
-                        [Config::class, $wysiwygConfigMock],
-                        [StoreManagerInterface::class, $storeManagerMock],
-                    ]
-                
+                [
+                    [Session::class, $sessionMock],
+                    [Registry::class, $registryMock],
+                    [Config::class, $wysiwygConfigMock],
+                    [StoreManagerInterface::class, $storeManagerMock],
+                ]
             );
         $categoryMock->expects($this->once())
             ->method('setStoreId')
             ->with($storeId);
         $registryMock->expects($this->any())
             ->method('register')
             ->willReturnMap(
-                
-                    [
-                        ['category', $categoryMock],
-                        ['current_category', $categoryMock],
-                    ]
-                
+                [
+                    ['category', $categoryMock],
+                    ['current_category', $categoryMock],
+                ]
             );
         $wysiwygConfigMock->expects($this->once())
             ->method('setStoreId')
             ->with($storeId);
         $this->requestMock->expects($this->atLeastOnce())
             ->method('getPost')
             ->willReturnMap(
-                
-                    [
-                        ['use_config', ['attribute']],
-                        ['use_default', ['default-attribute']],
-                        ['return_session_messages_only', true],
-                    ]
-                
+                [
+                    ['use_config', ['attribute']],
+                    ['use_default', ['default-attribute']],
+                    ['return_session_messages_only', true],
+                ]
             );
         $this->requestMock->expects($this->atLeastOnce())
             ->method('getPostValue')
@@ -375,13 +367,11 @@ public function testExecute($categoryId, $storeId, $parentId)
         $categoryMock->expects($this->atLeastOnce())
             ->method('setData')
             ->willReturnMap(
-                
-                    [
-                        ['attribute', null, true],
-                        ['default-attribute', false, true],
-                        ['use_post_data_config', ['attribute'], true],
-                    ]
-                
+                [
+                    ['attribute', null, true],
+                    ['default-attribute', false, true],
+                    ['use_post_data_config', ['attribute'], true],
+                ]
             );
         $categoryMock->expects($this->once())
             ->method('getDefaultAttributeSetId')
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/FrontendStorageConfigurationPoolTest.php b/app/code/Magento/Catalog/Test/Unit/Model/FrontendStorageConfigurationPoolTest.php
@@ -28,7 +28,8 @@ class FrontendStorageConfigurationPoolTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->defaultStorageConfiguration = $this->getMockForAbstractClass(FrontendStorageConfigurationInterface::class);
+        $this->defaultStorageConfiguration =
+            $this->getMockForAbstractClass(FrontendStorageConfigurationInterface::class);
         $productStorageConfiguration = $this->getMockForAbstractClass(ProductInterface::class);
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->model = $this->objectManagerHelper->getObject(
diff --git a/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Backend/ArrayBackendTest.php b/app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Backend/ArrayBackendTest.php
@@ -40,7 +40,7 @@ protected function setUp(): void
     public function testValidate($data)
     {
         $this->_attribute->expects($this->atLeastOnce())->method('getAttributeCode')->willReturn('code');
-        $product = new DataObject(['code' => $data, 'empty' => '']);
+        $product = new DataObject(['code' => $data, 'empty' => null]);
         $this->_model->validate($product);
         $this->assertEquals('1,2,3', $product->getCode());
         $this->assertNull($product->getEmpty());
diff --git a/app/code/Magento/LoginAsCustomer/composer.json b/app/code/Magento/LoginAsCustomer/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-login-as-customer",
     "description": "Allow for admin to enter a customer account",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-customer": "*",
         "magento/module-login-as-customer-api": "*"
diff --git a/app/code/Magento/LoginAsCustomerApi/composer.json b/app/code/Magento/LoginAsCustomerApi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-login-as-customer-api",
     "description": "Allow for admin to enter a customer account",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*"
     },
     "type": "magento2-module",
diff --git a/app/code/Magento/LoginAsCustomerLog/composer.json b/app/code/Magento/LoginAsCustomerLog/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-login-as-customer-log",
     "description": "",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-backend": "*",
         "magento/module-customer": "*",
diff --git a/app/code/Magento/LoginAsCustomerPageCache/composer.json b/app/code/Magento/LoginAsCustomerPageCache/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-login-as-customer-page-cache",
     "description": "",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-customer": "*",
         "magento/module-store": "*"
diff --git a/app/code/Magento/LoginAsCustomerSales/composer.json b/app/code/Magento/LoginAsCustomerSales/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-login-as-customer-sales",
     "description": "",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-backend": "*",
         "magento/module-checkout": "*",
diff --git a/app/code/Magento/LoginAsCustomerUi/composer.json b/app/code/Magento/LoginAsCustomerUi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-login-as-customer-ui",
     "description": "",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-login-as-customer-api": "*",
         "magento/module-backend": "*",
diff --git a/app/code/Magento/LoginAsCustomerWebapi/composer.json b/app/code/Magento/LoginAsCustomerWebapi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-login-as-customer-webapi",
     "description": "Grants admin token customer account",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-customer": "*",
         "magento/module-integration": "*",
diff --git a/app/code/Magento/Review/Test/Unit/Helper/DataTest.php b/app/code/Magento/Review/Test/Unit/Helper/DataTest.php
@@ -129,7 +129,7 @@ public function testGetIsGuestAllowToWrite()
     {
         $this->scopeConfig->expects($this->any())->method('isSetFlag')
             ->with('catalog/review/allow_guest', ScopeInterface::SCOPE_STORE)
-            ->willReturn('1');
+            ->willReturn(true);
 
         $this->assertTrue($this->helper->getIsGuestAllowToWrite());
     }
diff --git a/app/code/Magento/Theme/Test/Unit/Block/Html/Header/LogoTest.php b/app/code/Magento/Theme/Test/Unit/Block/Html/Header/LogoTest.php
@@ -70,7 +70,7 @@ public function testGetLogoHeight()
         ];
         $block = $objectManager->getObject(Logo::class, $arguments);
 
-        $this->assertNull($block->getLogoHeight());
+        $this->assertEquals(0, $block->getLogoHeight());
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/AddressTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/Quote/AddressTest.php
@@ -262,7 +262,7 @@ public function testSameAsBillingAfterCustomerWesChanged()
         $this->_quote->setOrigData('customer_id', null);
         $shippingAddress = $this->_quote->getShippingAddress();
         $shippingAddress->beforeSave();
-        $this->assertFalse($this->_quote->getShippingAddress()->getSameAsBilling());
+        $this->assertSame(0, $this->_quote->getShippingAddress()->getSameAsBilling());
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/CompiledTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Factory/CompiledTest.php
@@ -218,7 +218,7 @@ public function testCreateGetArgumentsInRuntime()
         $this->assertInstanceOf($nonSharedType, $result->getNonSharedDependency());
         $this->assertEquals('value', $result->getValue());
         $this->assertEquals(['default_value1', 'default_value2'], $result->getValueArray());
-        $this->assertNull($result->getGlobalValue());
+        $this->assertSame('', $result->getGlobalValue());
         $this->assertNull($result->getNullValue());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,8 @@ class FrontendStorageConfigurationPoolTest extends TestCase`
`28`	`28`
`29`	`29`	`protected function setUp(): void`
`30`	`30`	`{`
`31`		`- $this->defaultStorageConfiguration = $this->getMockForAbstractClass(FrontendStorageConfigurationInterface::class);`
	`31`	`+ $this->defaultStorageConfiguration =`
	`32`	`+ $this->getMockForAbstractClass(FrontendStorageConfigurationInterface::class);`
`32`	`33`	`$productStorageConfiguration = $this->getMockForAbstractClass(ProductInterface::class);`
`33`	`34`	`$this->objectManagerHelper = new ObjectManagerHelper($this);`
`34`	`35`	`$this->model = $this->objectManagerHelper->getObject(`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ protected function setUp(): void`
`40`	`40`	`public function testValidate($data)`
`41`	`41`	`{`
`42`	`42`	`$this->_attribute->expects($this->atLeastOnce())->method('getAttributeCode')->willReturn('code');`
`43`		`- $product = new DataObject(['code' => $data, 'empty' => '']);`
	`43`	`+ $product = new DataObject(['code' => $data, 'empty' => null]);`
`44`	`44`	`$this->_model->validate($product);`
`45`	`45`	`$this->assertEquals('1,2,3', $product->getCode());`
`46`	`46`	`$this->assertNull($product->getEmpty());`