Merge branch 'ACP2E-280' of https://github.com/magento-l3/magento2ce into PR-2021-12-21

Author: chittima

app/code/Magento/ReleaseNotification/Model/ContentProvider/Http/HttpContentProvider.php

@@ -32,19 +32,21 @@ class HttpContentProvider implements ContentProviderInterface
     private $urlBuilder;
 
     /**
-     * HttpContentProvider constructor.
      * @param ClientInterface $httpClient
      * @param UrlBuilder $urlBuilder
      * @param LoggerInterface $logger
+     * @param int $requestTimeout
      */
     public function __construct(
         ClientInterface $httpClient,
         UrlBuilder $urlBuilder,
-        LoggerInterface $logger
+        LoggerInterface $logger,
+        int $requestTimeout = 30
     ) {
         $this->httpClient = $httpClient;
         $this->urlBuilder = $urlBuilder;
         $this->logger = $logger;
+        $this->httpClient->setTimeout($requestTimeout);
     }
 
     /**
@@ -63,12 +65,7 @@ public function getContent($version, $edition, $locale)
                 }
             }
         } catch (\Exception $e) {
-            $this->logger->warning(
-                sprintf(
-                    'Failed to retrieve the release notification content. The response is: %s',
-                    empty($result) ? 'Response body is empty.' : $result
-                )
-            );
+            $this->logger->warning('Failed to retrieve the release notification content.', ['exception' => $e]);
         }
 
         return $result;
@@ -91,7 +88,7 @@ private function retrieveContent($version, $edition, $locale)
     /**
      * Returns the response body from the HTTP client
      *
-     * @param $url
+     * @param string $url
      * @return string
      */
     private function getResponse($url)

app/code/Magento/ReleaseNotification/Test/Unit/Model/ContentProvider/Http/HttpContentProviderTest.php

@@ -8,7 +8,6 @@
 namespace Magento\ReleaseNotification\Test\Unit\Model\ContentProvider\Http;
 
 use Magento\Framework\HTTP\ClientInterface;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\ReleaseNotification\Model\ContentProvider\Http\HttpContentProvider;
 use Magento\ReleaseNotification\Model\ContentProvider\Http\UrlBuilder;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -42,23 +41,19 @@ class HttpContentProviderTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->loggerMock = $this->getMockBuilder(LoggerInterface::class)
-            ->getMockForAbstractClass();
-        $this->urlBuilderMock = $this->getMockBuilder(UrlBuilder::class)
-            ->disableOriginalConstructor()
-            ->setMethods(['getUrl'])
-            ->getMock();
-        $this->httpClientMock = $this->getMockBuilder(ClientInterface::class)
-            ->getMockForAbstractClass();
-
-        $objectManager = new ObjectManager($this);
-        $this->httpContentProvider = $objectManager->getObject(
-            HttpContentProvider::class,
-            [
-                'httpClient' => $this->httpClientMock,
-                'urlBuilder' => $this->urlBuilderMock,
-                'logger' => $this->loggerMock
-            ]
+        $this->loggerMock = $this->createMock(LoggerInterface::class);
+        $this->urlBuilderMock = $this->createMock(UrlBuilder::class);
+        $this->httpClientMock = $this->createMock(ClientInterface::class);
+        $requestTimeout = 10;
+        $this->httpClientMock->expects($this->once())
+            ->method('setTimeout')
+            ->with($requestTimeout);
+
+        $this->httpContentProvider = new HttpContentProvider(
+            $this->httpClientMock,
+            $this->urlBuilderMock,
+            $this->loggerMock,
+            $requestTimeout
         );
     }
 

app/code/Magento/ReleaseNotification/etc/di.xml

@@ -30,4 +30,10 @@
             <argument name="pool" xsi:type="object">notificationPool</argument>
         </arguments>
     </type>
+    <type name="Magento\ReleaseNotification\Model\ContentProvider\Http\HttpContentProvider">
+        <arguments>
+            <argument name="httpClient" xsi:type="object" shared="false">Magento\Framework\HTTP\ClientInterface</argument>
+            <argument name="requestTimeout" xsi:type="number">5</argument>
+        </arguments>
+    </type>
 </config>