Merge pull request magento#121 from magento-extensibility/ashsmith-86…

…5-add-getParams-setParams-to-request-interface

[Github] Merge public Github commits

dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/RequestTest.php

@@ -17,9 +17,9 @@ class RequestTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->_model = new \Magento\TestFramework\Request(
-            $this->getMock('Magento\Framework\App\Route\ConfigInterface\Proxy', [], [], '', false),
-            $this->getMock('Magento\Framework\App\Request\PathInfoProcessorInterface', [], [], '', false),
             $this->getMock('Magento\Framework\Stdlib\Cookie\CookieReaderInterface'),
+            $this->getMock('Magento\Framework\App\Route\ConfigInterface\Proxy', [], [], '', false),
+            $this->getMock('Magento\Framework\App\Request\PathInfoProcessorInterface'),
             $this->getMock('Magento\Framework\ObjectManagerInterface')
         );
     }

dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/TestCase/ControllerAbstractTest.php

@@ -19,9 +19,9 @@ protected function setUp()
     {
         $this->messageManager = $this->getMock('\Magento\Framework\Message\Manager', [], [], '', false);
         $request = new \Magento\TestFramework\Request(
-            $this->getMock('Magento\Framework\App\Route\ConfigInterface\Proxy', [], [], '', false),
-            $this->getMock('Magento\Framework\App\Request\PathInfoProcessorInterface', [], [], '', false),
             $this->getMock('Magento\Framework\Stdlib\Cookie\CookieReaderInterface'),
+            $this->getMock('Magento\Framework\App\Route\ConfigInterface\Proxy', [], [], '', false),
+            $this->getMock('Magento\Framework\App\Request\PathInfoProcessorInterface'),
             $this->getMock('Magento\Framework\ObjectManagerInterface')
         );
         $response = new \Magento\TestFramework\Response(

dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php

@@ -2087,7 +2087,6 @@
     ['getFiles', 'Magento\Framework\App\Request\Http'],
     ['getAlias', 'Magento\Framework\App\Request\Http', 'Magento\Framework\HTTP\PhpEnvironment\Request'],
     ['setAlias', 'Magento\Framework\App\Request\Http', 'Magento\Framework\HTTP\PhpEnvironment\Request'],
-    ['getParam', 'Magento\Framework\App\RequestInterface'],
     [
         'render',
         'Magento\Framework\Webapi\ErrorProcessor',

dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Action/Attribute/SaveTest.php

@@ -27,7 +27,7 @@ class SaveTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Backend\App\Action\Context|\PHPUnit_Framework_MockObject_MockObject */
     protected $context;
 
-    /** @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject */
     protected $request;
 
     /** @var \Magento\Framework\App\Response\Http|\PHPUnit_Framework_MockObject_MockObject */
@@ -150,13 +150,8 @@ protected function prepareContext()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->request = $this->getMock(
-            'Magento\Framework\App\RequestInterface',
-            ['getParam', 'getModuleName', 'setModuleName', 'getActionName', 'setActionName', 'getCookie', 'isSecure'],
-            [],
-            '',
-            false
-        );
+        $this->request = $this->getMockBuilder('Magento\Framework\App\Request\Http')
+            ->disableOriginalConstructor()->getMock();
         $this->response = $this->getMock('Magento\Framework\App\Response\Http', [], [], '', false);
         $this->objectManager = $this->getMock('Magento\Framework\ObjectManagerInterface');
         $this->eventManager = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);

dev/tests/unit/testsuite/Magento/Checkout/Helper/CartTest.php

@@ -51,21 +51,8 @@ class CartTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->requestMock = $this->getMock(
-            '\Magento\Framework\App\RequestInterface',
-            [
-                'getRouteName',
-                'getControllerName',
-                'getParam',
-                'setActionName',
-                'getActionName',
-                'setModuleName',
-                'getModuleName',
-                'getCookie',
-                'isAjax',
-                'isSecure',
-            ]
-        );
+        $this->requestMock = $this->getMockBuilder('Magento\Framework\App\Request\Http')
+            ->disableOriginalConstructor()->getMock();
         $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
         /** @var \Magento\Framework\App\Helper\Context $context */
         $context = $objectManagerHelper->getObject(

dev/tests/unit/testsuite/Magento/Checkout/Model/Type/OnepageTest.php

@@ -43,7 +43,7 @@ class OnepageTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $storeManagerMock;
 
-    /** @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject */
     protected $requestMock;
 
     /** @var \PHPUnit_Framework_MockObject_MockObject */
@@ -132,19 +132,8 @@ protected function setUp()
             false
         );
         $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
-        $this->requestMock = $this->getMockBuilder('Magento\Framework\App\RequestInterface')
-            ->setMethods([
-                'isAjax',
-                'getModuleName',
-                'setModuleName',
-                'getActionName',
-                'setActionName',
-                'getParam',
-                'getCookie',
-                'isSecure',
-            ])
-            ->getMock();
-
+        $this->requestMock = $this->getMockBuilder('Magento\Framework\App\Request\Http')
+            ->disableOriginalConstructor()->getMock();
         $this->addressFactoryMock = $this->getMock('Magento\Customer\Model\AddressFactory', [], [], '', false);
         $this->formFactoryMock = $this->getMock('Magento\Customer\Model\Metadata\FormFactory', [], [], '', false);
         $this->customerFactoryMock = $this->getMock('Magento\Customer\Model\CustomerFactory', [], [], '', false);

dev/tests/unit/testsuite/Magento/Customer/Controller/Account/CreateTest.php

@@ -63,18 +63,8 @@ protected function setUp()
         $this->registrationMock = $this->getMock('\Magento\Customer\Model\Registration', [], [], '', false);
         $this->redirectMock = $this->getMock('Magento\Framework\App\Response\RedirectInterface');
         $this->response = $this->getMock('Magento\Framework\App\ResponseInterface');
-        $this->request = $this->getMockBuilder('Magento\Framework\App\RequestInterface')
-            ->setMethods([
-                'isPost',
-                'getModuleName',
-                'setModuleName',
-                'getActionName',
-                'setActionName',
-                'getParam',
-                'getCookie',
-                'isSecure',
-            ])
-            ->getMock();
+        $this->request = $this->getMockBuilder('Magento\Framework\App\Request\Http')
+            ->disableOriginalConstructor()->getMock();
         $this->redirectResultMock = $this->getMock('Magento\Framework\Controller\Result\Redirect', [], [], '', false);
 
         $this->redirectFactoryMock = $this->getMock(

dev/tests/unit/testsuite/Magento/Customer/Controller/Account/LoginPostTest.php

@@ -22,7 +22,7 @@ class LoginPostTest extends \PHPUnit_Framework_TestCase
     protected $object;
 
     /**
-     * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $request;
 
@@ -98,18 +98,8 @@ class LoginPostTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->request = $this->getMockBuilder('Magento\Framework\App\RequestInterface')
-            ->setMethods([
-                'isPost',
-                'getModuleName',
-                'setModuleName',
-                'getActionName',
-                'setActionName',
-                'getParam',
-                'getCookie',
-                'isSecure',
-            ])
-            ->getMock();
+        $this->request = $this->getMockBuilder('Magento\Framework\App\Request\Http')
+            ->disableOriginalConstructor()->getMock();
         $this->response = $this->getMock(
             'Magento\Framework\App\ResponseInterface',
             ['setRedirect', 'sendResponse'],

dev/tests/unit/testsuite/Magento/Customer/Controller/Adminhtml/Index/IndexTest.php

@@ -21,7 +21,7 @@ class IndexTest extends \PHPUnit_Framework_TestCase
     protected $context;
 
     /**
-     * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\App\Request|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $requestMock;
 
@@ -62,20 +62,8 @@ class IndexTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->requestMock = $this->getMockBuilder('Magento\Framework\App\RequestInterface')
-            ->setMethods(
-                [
-                    'getQuery',
-                    'getModuleName',
-                    'setModuleName',
-                    'getActionName',
-                    'setActionName',
-                    'getParam',
-                    'getCookie',
-                    'isSecure',
-                ]
-            )
-            ->getMock();
+        $this->requestMock = $this->getMockBuilder('Magento\Framework\App\Request\Http')
+            ->disableOriginalConstructor()->getMock();
         $this->resultForwardFactoryMock = $this->getMockBuilder('Magento\Backend\Model\View\Result\ForwardFactory')
             ->disableOriginalConstructor()
             ->setMethods(['create'])

dev/tests/unit/testsuite/Magento/Customer/Controller/Ajax/LoginTest.php

@@ -21,7 +21,7 @@ class LoginTest extends \PHPUnit_Framework_TestCase
     protected $object;
 
     /**
-     * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\App\Request\Http|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $request;
 
@@ -67,21 +67,8 @@ class LoginTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->request = $this->getMockBuilder('Magento\Framework\App\RequestInterface')
-            ->setMethods([
-                'isPost',
-                'getModuleName',
-                'setModuleName',
-                'getActionName',
-                'setActionName',
-                'getParam',
-                'getCookie',
-                'getContent',
-                'getMethod',
-                'isXmlHttpRequest',
-                'isSecure',
-            ])
-            ->getMock();
+        $this->request = $this->getMockBuilder('Magento\Framework\App\Request\Http')
+            ->disableOriginalConstructor()->getMock();
         $this->response = $this->getMock(
             'Magento\Framework\App\ResponseInterface',
             ['setRedirect', 'sendResponse', 'representJson', 'setHttpResponseCode'],

dev/tests/unit/testsuite/Magento/Customer/Model/Metadata/Form/FileTest.php

@@ -21,7 +21,7 @@ class FileTest extends AbstractFormTestCase
     /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Filesystem */
     protected $fileSystemMock;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\App\RequestInterface */
+    /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\App\Request\Http */
     protected $requestMock;
 
     /**
@@ -38,20 +38,8 @@ protected function setUp()
             ->disableOriginalConstructor()->getMock();
         $this->fileSystemMock = $this->getMockBuilder('Magento\Framework\Filesystem')
             ->disableOriginalConstructor()->getMock();
-        $this->requestMock = $this->getMockBuilder('Magento\Framework\App\RequestInterface')
-            ->setMethods(
-                [
-                    'getParam',
-                    'getParams',
-                    'getModuleName',
-                    'setModuleName',
-                    'getActionName',
-                    'setActionName',
-                    'getCookie',
-                    'isSecure',
-                ]
-            )
-            ->getMock();
+        $this->requestMock = $this->getMockBuilder('Magento\Framework\App\Request\Http')
+            ->disableOriginalConstructor()->getMock();
         $this->uploaderFactoryMock = $this->getMock('Magento\Framework\File\UploaderFactory', [], [], '', false);
     }
 

dev/tests/unit/testsuite/Magento/DesignEditor/Controller/Varien/Router/StandardTest.php

@@ -66,9 +66,6 @@ public function testMatch(
     ) {
         $this->_model = $this->_prepareMocksForTestMatch($request, $isVde, $isLoggedIn, $routers);
         $this->assertEquals($matchedValue, $this->_model->match($request));
-        if ($isVde && $isLoggedIn) {
-            $this->assertEquals(self::TEST_PATH, $request->getPathInfo());
-        }
     }
 
     /**
@@ -79,30 +76,26 @@ public function testMatch(
      */
     public function matchDataProvider()
     {
-        $objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface');
         $this->_cookieReaderMock = $this->getMock('Magento\Framework\Stdlib\Cookie\CookieReaderInterface');
-        $uri    = self::TEST_HOST . '/' . self::VDE_FRONT_NAME . self::TEST_PATH;
-        $notVdeUrl = self::TEST_HOST . self::TEST_PATH;
+        $vdePath    = '/' . self::VDE_FRONT_NAME . self::TEST_PATH;
+        $notVdePath = self::TEST_PATH;
 
         $excludedRouters = ['admin' => 'admin router', 'vde' => 'vde router'];
 
-        $routerListMock = $this->getMock(
-            '\Magento\Framework\App\Route\ConfigInterface\Proxy',
-            [],
-            [],
-            '',
-            false
-        );
-
         $infoProcessorMock = $this->getMock('Magento\Framework\App\Request\PathInfoProcessorInterface');
         $infoProcessorMock->expects($this->any())->method('process')->will($this->returnArgument(1));
 
         // test data to verify routers match logic
-        $matchedRequest = $this->getMock(
-            'Magento\Framework\App\Request\Http',
-            ['_isFrontArea'],
-            [$routerListMock, $infoProcessorMock, $this->_cookieReaderMock, $objectManagerMock, $uri]
-        );
+        $notVdeRequest = $this->getMockBuilder('Magento\Framework\App\Request\Http')
+            ->disableOriginalConstructor()->getMock();
+        $notVdeRequest->expects($this->any())
+            ->method('getPathInfo')
+            ->willReturn($vdePath);
+        $vdeRequest = $this->getMockBuilder('Magento\Framework\App\Request\Http')
+            ->disableOriginalConstructor()->getMock();
+        $vdeRequest->expects($this->any())
+            ->method('getPathInfo')
+            ->willReturn($notVdePath);
 
         $matchedController = $this->getMockForAbstractClass(
             'Magento\Framework\App\Action\AbstractAction',
@@ -118,13 +111,13 @@ public function matchDataProvider()
         )->method(
             'match'
         )->with(
-            $matchedRequest
+            $notVdeRequest
         )->will(
             $this->returnValue($matchedController)
         );
         $matchedRouter->expects($this->once())
             ->method('match')
-            ->with($matchedRequest)
+            ->with($notVdeRequest)
             ->will($this->returnValue($matchedController));
 
         // method "match" will not be invoked for this router because controller will be found by first router
@@ -138,39 +131,23 @@ public function matchDataProvider()
 
         $routers = [
             'not vde request' => [
-                '$request' => $this->getMock(
-                        'Magento\Framework\App\Request\Http', ['_isFrontArea'], [
-                            $routerListMock,
-                            $infoProcessorMock,
-                            $this->_cookieReaderMock,
-                            $objectManagerMock,
-                            $notVdeUrl
-                        ]
-                    ),
+                '$request' => $vdeRequest,
                 '$isVde'           => false,
                 '$isLoggedIn'      => true,
             ],
             'not logged as admin' => [
-                '$request' => $this->getMock(
-                        'Magento\Framework\App\Request\Http',
-                        ['_isFrontArea'],
-                        [$routerListMock, $infoProcessorMock, $this->_cookieReaderMock, $objectManagerMock, $uri]
-                    ),
+                '$request' => $notVdeRequest,
                 '$isVde'           => true,
                 '$isLoggedIn'      => false,
             ],
             'no matched routers' => [
-                '$request' => $this->getMock(
-                        'Magento\Framework\App\Request\Http',
-                        ['_isFrontArea'],
-                        [$routerListMock, $infoProcessorMock, $this->_cookieReaderMock, $objectManagerMock, $uri]
-                    ),
+                '$request' => $notVdeRequest,
                 '$isVde'           => true,
                 '$isLoggedIn'      => true,
                 '$routers'         => $excludedRouters
             ],
             'matched routers' => [
-                '$request' => $matchedRequest,
+                '$request' => $notVdeRequest,
                 '$isVde' => true,
                 '$isLoggedIn' => true,
                 '$routers' => $matchedRouters,