Fix for issue #21299. Change HEAD action mapping to GET action interface and add HEAD request handling

Author: Oleksandr Iegorov

lib/internal/Magento/Framework/App/Test/Unit/HttpTest.php

@@ -181,13 +181,9 @@ public function testLaunchException()
         $this->setUpLaunch();
         $this->frontControllerMock->expects($this->once())
             ->method('dispatch')
-            ->with($this->requestMock)->will(
-                $this->returnCallback(
-                    function () {
-                        // phpcs:ignore Magento2.Exceptions.DirectThrow
-                        throw new \Exception('Message');
-                    }
-                )
+            ->with($this->requestMock)
+            ->willThrowException(
+                new \Exception('Message')
             );
         $this->http->launch();
     }

lib/internal/Magento/Framework/File/Test/Unit/Transfer/Adapter/HttpTest.php

@@ -73,10 +73,10 @@ public function testSend(): void
         $this->mime->expects($this->once())
             ->method('getMimeType')
             ->with($file)
-            ->will($this->returnValue($contentType));
+            ->willReturn($contentType);
         $this->request->expects($this->once())
             ->method('isHead')
-            ->will($this->returnValue(false));
+            ->willReturn(false);
         $this->expectOutputString(file_get_contents($file));
 
         $this->object->send($file);

lib/internal/Magento/Framework/File/Transfer/Adapter/Http.php

@@ -6,40 +6,45 @@
 
 namespace Magento\Framework\File\Transfer\Adapter;
 
+use Magento\Framework\HTTP\PhpEnvironment\Response;
+use Magento\Framework\File\Mime;
+use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\App\ObjectManager;
+
 /**
  * File adapter to send the file to the client.
  */
 class Http
 {
     /**
-     * @var \Magento\Framework\HTTP\PhpEnvironment\Response
+     * @var Response
      */
     private $response;
 
     /**
-     * @var \Magento\Framework\File\Mime
+     * @var Mime
      */
     private $mime;
 
     /**
-     * @var \Magento\Framework\App\Request\Http
+     * @var HttpRequest
      */
     private $request;
 
     /**
-     * @param \Magento\Framework\HTTP\PhpEnvironment\Response $response
-     * @param \Magento\Framework\File\Mime $mime
-     * @param \Magento\Framework\App\Request\Http|null $request
+     * @param Response $response
+     * @param Mime $mime
+     * @param HttpRequest|null $request
      */
     public function __construct(
-        \Magento\Framework\HTTP\PhpEnvironment\Response $response,
-        \Magento\Framework\File\Mime $mime,
-        \Magento\Framework\App\Request\Http $request = null
+        Response $response,
+        Mime $mime,
+        HttpRequest $request = null
     ) {
         $this->response = $response;
         $this->mime = $mime;
-        $objectManager = \Magento\Framework\App\ObjectManager::getInstance();
-        $this->request = $request ?: $objectManager->get(\Magento\Framework\App\Request\Http::class);
+        $objectManager = ObjectManager::getInstance();
+        $this->request = $request ?: $objectManager->get(HttpRequest::class);
     }
 
     /**