Fixed condition with usage isPost method

- removed private function isPost
- removed unused imports
- added request method isPost
- added interface that expands HTTP request class
- fixed unit test in Contact module
- fixed integration tests in Contact module

Author: pusachev

app/code/Magento/Contact/Controller/Index/Post.php

@@ -12,7 +12,6 @@
 use Magento\Framework\App\Request\DataPersistorInterface;
 use Magento\Framework\Controller\Result\Redirect;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\HTTP\PhpEnvironment\Request;
 use Psr\Log\LoggerInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject;
@@ -67,7 +66,7 @@ public function __construct(
      */
     public function execute()
     {
-        if (!$this->isPostRequest()) {
+        if (!$this->getRequest()->isPost()) {
             return $this->resultRedirectFactory->create()->setPath('*/*/');
         }
         try {
@@ -101,16 +100,6 @@ private function sendEmail($post)
         );
     }
 
-    /**
-     * @return bool
-     */
-    private function isPostRequest()
-    {
-        /** @var Request $request */
-        $request = $this->getRequest();
-        return !empty($request->getPostValue());
-    }
-
     /**
      * @return array
      * @throws \Exception

app/code/Magento/Contact/Test/Unit/Controller/Index/PostTest.php

@@ -78,7 +78,7 @@ protected function setUp()
             $this->createMock(\Magento\Framework\Message\ManagerInterface::class);
         $this->requestStub = $this->createPartialMock(
             \Magento\Framework\App\Request\Http::class,
-            ['getPostValue', 'getParams', 'getParam']
+            ['getPostValue', 'getParams', 'getParam', 'isPost']
         );
         $this->redirectResultMock = $this->createMock(\Magento\Framework\Controller\Result\Redirect::class);
         $this->redirectResultMock->method('setPath')->willReturnSelf();
@@ -174,6 +174,10 @@ public function testExecuteValidPost()
      */
     private function stubRequestPostData($post)
     {
+        $this->requestStub
+             ->expects($this->once())
+             ->method('isPost')
+             ->willReturn(!empty($post));
         $this->requestStub->method('getPostValue')->willReturn($post);
         $this->requestStub->method('getParams')->willReturn($post);
         $this->requestStub->method('getParam')->willReturnCallback(

dev/tests/integration/testsuite/Magento/Contact/Controller/IndexTest.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Contact\Controller;
 
+use Zend\Http\Request;
+
 /**
  * Contact index controller test
  */
@@ -19,6 +21,7 @@ public function testPostAction()
             'hideit' => '',
         ];
         $this->getRequest()->setPostValue($params);
+        $this->getRequest()->setMethod(Request::METHOD_POST);
 
         $this->dispatch('contact/index/post');
         $this->assertRedirect($this->stringContains('contact/index'));
@@ -38,6 +41,7 @@ public function testPostAction()
     public function testInvalidPostAction($params, $expectedMessage)
     {
         $this->getRequest()->setPostValue($params);
+        $this->getRequest()->setMethod(Request::METHOD_POST);
 
         $this->dispatch('contact/index/post');
         $this->assertRedirect($this->stringContains('contact/index'));

lib/internal/Magento/Framework/App/HttpRequestInterface.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Framework\App;
+
+interface HttpRequestInterface
+{
+    /**
+     * Returned true if POST request
+     *
+     * @return boolean
+     */
+    public function isPost();
+
+    /**
+     * Returned true if GET request
+     *
+     * @return boolean
+     */
+    public function isGet();
+
+    /**
+     * Returned true if PATCH request
+     *
+     * @return boolean
+     */
+    public function isPatch();
+
+    /**
+     * Returned true if DELETE request
+     *
+     * @return boolean
+     */
+    public function isDelete();
+
+    /**
+     * Returned true if PUT request
+     *
+     * @return boolean
+     */
+    public function isPut();
+
+    /**
+     * Returned true if Ajax request
+     *
+     * @return boolean
+     */
+    public function isAjax();
+}

lib/internal/Magento/Framework/App/Request/Http.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Framework\App\Request;
 
+use Magento\Framework\App\HttpRequestInterface;
 use Magento\Framework\App\RequestContentInterface;
 use Magento\Framework\App\RequestSafetyInterface;
 use Magento\Framework\App\Route\ConfigInterface\Proxy as ConfigInterface;
@@ -16,7 +17,7 @@
 /**
  * Http request
  */
-class Http extends Request implements RequestContentInterface, RequestSafetyInterface
+class Http extends Request implements RequestContentInterface, RequestSafetyInterface, HttpRequestInterface
 {
     /**#@+
      * HTTP Ports