Merge remote-tracking branch 'origin/2.4-develop-php74' into phpunit9/all-in-one

# Conflicts:
#	app/code/Magento/Catalog/Test/Unit/Model/Product/CopierTest.php
#	app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php
#	app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/BlockActionsTest.php
#	app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/PageActionsTest.php
#	app/code/Magento/Config/Test/Unit/Model/Config/Source/Email/TemplateTest.php
#	app/code/Magento/ConfigurableProduct/Test/Unit/Model/LinkManagementTest.php
#	app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderTest.php
#	app/code/Magento/Customer/Test/Unit/Model/EmailNotificationTest.php
#	app/code/Magento/Customer/Test/Unit/Ui/Component/ColumnFactoryTest.php
#	app/code/Magento/Customer/Test/Unit/Ui/Component/FilterFactoryTest.php
#	app/code/Magento/Customer/Test/Unit/Ui/Component/Listing/Column/ActionsTest.php
#	app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/SaveTest.php
#	app/code/Magento/Theme/Test/Unit/Ui/Component/Listing/Column/EditActionTest.php
#	app/code/Magento/Tinymce3/composer.json
#	composer.lock
#	dev/tests/integration/testsuite/Magento/Customer/Model/CustomerRegistryTest.php
#	dev/tests/integration/testsuite/Magento/Review/Controller/Adminhtml/Customer/ProductReviewsTest.php
#	dev/tests/integration/testsuite/Magento/Sales/Block/Order/Creditmemo/ItemsTest.php
#	dev/tests/integration/testsuite/Magento/Sales/Block/Order/Invoice/ItemsTest.php
#	dev/tests/integration/testsuite/Magento/Sales/Block/Order/ItemsTest.php

Author: lbajsarowicz

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/MediaGallery/Test/Unit/Model/Directory/IsBlacklistedTest.php

@@ -35,7 +35,7 @@ protected function setUp(): void
     {
         $this->config = $this->getMockBuilder(BlacklistPatternsConfigInterface::class)
             ->disableOriginalConstructor()
-            ->getMock();
+            ->getMockForAbstractClass();
         $this->config->expects($this->at(0))->method('get')->willReturn([
             'tmp' => '/pub\/media\/tmp/',
             'captcha' => '/pub\/media\/captcha/'

app/code/Magento/MediaGalleryCatalog/Test/Unit/Plugin/Product/Gallery/RemoveAssetAfterRemoveImageTest.php

@@ -56,8 +56,8 @@ protected function setUp(): void
         $this->processorSubjectMock = $this->createMock(ProcessorSubject::class);
         $this->productMock = $this->createMock(Product::class);
 
-        $this->deleteMediaAssetByPathMock = $this->createMock(DeleteAssetsByPathsInterface::class);
-        $this->loggerMock = $this->createMock(LoggerInterface::class);
+        $this->deleteMediaAssetByPathMock = $this->getMockForAbstractClass(DeleteAssetsByPathsInterface::class);
+        $this->loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
 
         $this->plugin = (new ObjectManagerHelper($this))->getObject(
             RemoveAssetAfterRemoveImage::class,

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": "*"

app/code/Magento/Tinymce3/composer.json

@@ -7,8 +7,7 @@
         "magento/module-backend": "*",
         "magento/module-ui": "*",
         "magento/module-variable": "*",
-        "magento/module-widget": "*",
-        "magento/module-cms": "*"
+        "magento/module-widget": "*"
     },
     "suggest": {
         "magento/module-cms": "*"

composer.lock

@@ -69,9 +69,9 @@ protected function _imitateTransactionStartRequest($eventName)
     /**
      * Setup expectations for "transaction start" use case
      *
-     * @param \PHPUnit\Framework\MockObject\Matcher\Invocation $invocationMatcher
+     * @param \PHPUnit\Framework\MockObject\Rule\InvocationOrder $invocationMatcher
      */
-    protected function _expectTransactionStart(\PHPUnit\Framework\MockObject\Matcher\Invocation $invocationMatcher)
+    protected function _expectTransactionStart(\PHPUnit\Framework\MockObject\Rule\InvocationOrder $invocationMatcher)
     {
         $this->_eventManager->expects($invocationMatcher)->method('fireEvent')->with('startTransaction');
         $this->_adapter->expects($this->once())->method('beginTransaction');
@@ -103,9 +103,9 @@ protected function _imitateTransactionRollbackRequest($eventName)
     /**
      * Setup expectations for "transaction rollback" use case
      *
-     * @param \PHPUnit\Framework\MockObject\Matcher\Invocation $invocationMatcher
+     * @param \PHPUnit\Framework\MockObject\Rule\InvocationOrder $invocationMatcher
      */
-    protected function _expectTransactionRollback(\PHPUnit\Framework\MockObject\Matcher\Invocation $invocationMatcher)
+    protected function _expectTransactionRollback(\PHPUnit\Framework\MockObject\Rule\InvocationOrder $invocationMatcher)
     {
         $this->_eventManager->expects($invocationMatcher)->method('fireEvent')->with('rollbackTransaction');
         $this->_adapter->expects($this->once())->method('rollback');