Merge pull request #17 from magento-commerce/1.0.2-master-php74

MC-34856: PHP 7.4 support for 2.3.x
magento · Mar 2, 2021 · 8073878 · 8073878
2 parents 58b1f98 + 8bf4e43
commit 8073878
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 12 deletions.
diff --git a/AdobeIms/composer.json b/AdobeIms/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-adobe-ims",
     "description": "Magento module responsible for authentication to Adobe services",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-adobe-ims-api": "*",
         "magento/module-authorization": "*",

diff --git a/AdobeImsApi/composer.json b/AdobeImsApi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-adobe-ims-api",
     "description": "Implementation of Magento module responsible for authentication to Adobe services",
     "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/AdobeStockAdminUi/Test/Unit/Controller/Adminhtml/System/Config/TestConnectionTest.php b/AdobeStockAdminUi/Test/Unit/Controller/Adminhtml/System/Config/TestConnectionTest.php
@@ -9,6 +9,8 @@
 
 use Magento\AdobeStockAdminUi\Controller\Adminhtml\System\Config\TestConnection;
 use Magento\AdobeStockClientApi\Api\ClientInterface;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Controller\Result\Json;
 use Magento\Framework\Controller\Result\JsonFactory;
 use Magento\Framework\Filter\StripTags;
@@ -42,6 +44,11 @@ class TestConnectionTest extends TestCase
      */
     private $stripTagsMock;
 
+    /**
+     * @var RequestInterface|MockObject
+     */
+    private $request;
+
     /**
      * @var TestConnection
      */
@@ -53,15 +60,21 @@ class TestConnectionTest extends TestCase
     protected function setUp(): void
     {
         $this->objectManager = new ObjectManager($this);
-        $this->clientMock = $this->getMockForAbstractClass(ClientInterface::class);
+        $context = $this->createMock(Context::class);
+        $this->request = $this->createMock(RequestInterface::class);
+        $context->expects($this->once())
+            ->method('getRequest')
+            ->willReturn($this->request);
+        $this->clientMock = $this->createMock(ClientInterface::class);
         $this->resultJsonFactoryMock = $this->createMock(JsonFactory::class);
         $this->stripTagsMock = $this->createMock(StripTags::class);
         $this->testConnection = $this->objectManager->getObject(
             TestConnection::class,
             [
                 'client' => $this->clientMock,
                 'resultJsonFactory' => $this->resultJsonFactoryMock,
-                'tagFilter' => $this->stripTagsMock
+                'tagFilter' => $this->stripTagsMock,
+                'context' => $context
             ]
         );
     }
@@ -71,6 +84,9 @@ protected function setUp(): void
      */
     public function testExecute(): void
     {
+        $this->request->expects($this->once())
+            ->method('getParams')
+            ->willReturn(['api_key' => 'the_api_key']);
         $this->clientMock->expects($this->once())
             ->method('testConnection')
             ->willReturn(true);
@@ -95,6 +111,9 @@ public function testExecute(): void
      */
     public function testExecuteWithError(): void
     {
+        $this->request->expects($this->once())
+            ->method('getParams')
+            ->willReturn(['api_key' => 'the_api_key']);
         $this->clientMock->expects($this->once())
             ->method('testConnection')
             ->willReturn(false);

diff --git a/AdobeStockAdminUi/composer.json b/AdobeStockAdminUi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-adobe-stock-admin-ui",
     "description": "Magento module responsible for the admin panel UI implementation",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-adobe-ims-api": "*",
         "magento/module-adobe-stock-client-api": "*",

diff --git a/AdobeStockAsset/composer.json b/AdobeStockAsset/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-adobe-stock-asset",
     "description": "Magento module responsible for the Adobe Stock assets handling implementation on Magento side",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-adobe-stock-asset-api": "*",
         "magento/module-adobe-stock-client-api": "*",

diff --git a/AdobeStockAssetApi/composer.json b/AdobeStockAssetApi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-adobe-stock-asset-api",
     "description": "Magento module responsible for Adobe Stock assets handling on Magento side",
     "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/AdobeStockClient/composer.json b/AdobeStockClient/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-adobe-stock-client",
     "description": "Magento module responsible for interaction with Adobe Stock API implementation",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-adobe-ims-api": "*",
         "magento/module-adobe-stock-client-api": "*",

diff --git a/AdobeStockClientApi/composer.json b/AdobeStockClientApi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-adobe-stock-client-api",
     "description": "Magento module responsible for interaction with Adobe Stock API",
     "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/AdobeStockImage/composer.json b/AdobeStockImage/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-adobe-stock-image",
     "description": "Magento module responsible for the images handling implementation",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-adobe-stock-client-api": "*",
         "magento/module-adobe-stock-asset-api": "*",

diff --git a/AdobeStockImageAdminUi/composer.json b/AdobeStockImageAdminUi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-adobe-stock-image-admin-ui",
     "description": "Magento module responsible for the admin panel images UI implementation",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*",
         "magento/module-adobe-ims": "*",
         "magento/module-adobe-ims-api": "*",

diff --git a/AdobeStockImageApi/composer.json b/AdobeStockImageApi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-adobe-stock-image-api",
     "description": "Magento module responsible for the images handling",
     "require": {
-        "php": "~7.1.3||~7.2.0||~7.3.0",
+        "php": "~7.3.0||~7.4.0",
         "magento/framework": "*"
     },
     "type": "magento2-module",