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

Author: fascinosum

app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php

@@ -302,11 +302,9 @@ protected function setUp(): void
         $this->serializerMock->expects($this->any())
             ->method('unserialize')
             ->willReturnCallback(
-
-                    function ($value) {
-                        return json_decode($value, true);
-                    }
-
+                function ($value) {
+                    return json_decode($value, true);
+                }
             );
 
         $mediaProcessor = $this->objectManager->getObject(
@@ -348,7 +346,9 @@ function ($value) {
     public function testGetAbsentProduct()
     {
         $this->expectException(\Magento\Framework\Exception\NoSuchEntityException::class);
-        $this->expectExceptionMessage('The product that was requested doesn\'t exist. Verify the product and try again.');
+        $this->expectExceptionMessage(
+            'The product that was requested doesn\'t exist. Verify the product and try again.'
+        );
 
         $this->productFactory->expects($this->once())->method('create')
             ->willReturn($this->product);
@@ -415,7 +415,9 @@ public function testGetWithSetStoreId()
     public function testGetByIdAbsentProduct()
     {
         $this->expectException(\Magento\Framework\Exception\NoSuchEntityException::class);
-        $this->expectExceptionMessage('The product that was requested doesn\'t exist. Verify the product and try again.');
+        $this->expectExceptionMessage(
+            'The product that was requested doesn\'t exist. Verify the product and try again.'
+        );
 
         $this->productFactory->expects($this->once())->method('create')
             ->willReturn($this->product);

app/code/Magento/MediaContent/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-media-content",
     "description": "Magento module provides the implementation for managing relations between content and media files used in that content",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-media-content-api": "*",
         "magento/module-media-gallery-api": "*"

app/code/Magento/MediaContentApi/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-media-content-api",
     "description": "Magento module provides the API interfaces for managing relations between content and media files used in that content",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/module-media-gallery-api": "*",
         "magento/framework": "*"
     },

app/code/Magento/MediaContentCatalog/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-media-content-catalog",
     "description": "Magento module provides the implementation of MediaContent functionality for Magento_Catalog module",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/module-media-content-api": "*",
         "magento/module-catalog": "*",
         "magento/framework": "*"

app/code/Magento/MediaContentCms/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-media-content-cms",
     "description": "Magento module provides the implementation of MediaContent functionality for Magento_Cms module",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/module-media-content-api": "*",
         "magento/module-cms": "*",
         "magento/framework": "*"

app/code/Magento/MediaGalleryCatalog/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-media-gallery-catalog",
     "description": "Magento module responsible for catalog gallery processor delete operation handling",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-media-gallery-api": "*",
         "magento/module-catalog": "*"