Merge branch '865-add-getParams-setParams-to-request-interface' of github.com:ashsmith/magento2 into 865-add-getParams-setParams-to-request-interface

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

Author: Ash Smith

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

@@ -151,13 +151,8 @@ protected function prepareContext()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->request = $this->getMock(
-            'Magento\Framework\App\RequestInterface',
-            ['getParam', 'getModuleName', 'setModuleName', 'getActionName', 'setActionName', 'getCookie', 'getParams', 'setParams'],
-            [],
-            '',
-            false
-        );
+        $this->request = $this->getMockBuilder('Magento\Framework\App\RequestInterface')
+            ->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);