Merge branch 'develop' of https://github.corp.ebay.com/magento2/magento2ce into Troll_S31

Author: Roman Ganin

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/AjaxMarkAsRead.php

@@ -15,7 +15,7 @@ class AjaxMarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Not
      */
     public function execute()
     {
-        if (!$this->getRequest()->getPost()) {
+        if (!$this->getRequest()->getPostValue()) {
             return;
         }
         $notificationId = (int)$this->getRequest()->getPost('id');

app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php

@@ -8,6 +8,8 @@
 
 namespace Magento\AdminNotification\Model\System\Message;
 
+use Magento\Store\Model\Store;
+
 class Baseurl implements \Magento\Framework\Notification\MessageInterface
 {
     /**
@@ -56,9 +58,9 @@ public function __construct(
     protected function _getConfigUrl()
     {
         $output = '';
-        $defaultUnsecure = $this->_config->getValue(\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_URL, 'default');
+        $defaultUnsecure = $this->_config->getValue(Store::XML_PATH_UNSECURE_BASE_URL, 'default');
 
-        $defaultSecure = $this->_config->getValue(\Magento\Store\Model\Store::XML_PATH_SECURE_BASE_URL, 'default');
+        $defaultSecure = $this->_config->getValue(Store::XML_PATH_SECURE_BASE_URL, 'default');
 
         if ($defaultSecure == \Magento\Store\Model\Store::BASE_URL_PLACEHOLDER ||
             $defaultUnsecure == \Magento\Store\Model\Store::BASE_URL_PLACEHOLDER

app/code/Magento/AdminNotification/Model/System/Message/Security.php

@@ -8,6 +8,8 @@
 
 namespace Magento\AdminNotification\Model\System\Message;
 
+use Magento\Store\Model\Store;
+
 class Security implements \Magento\Framework\Notification\MessageInterface
 {
     /**
@@ -93,7 +95,7 @@ private function _canShowNotification()
      */
     private function _isFileAccessible()
     {
-        $unsecureBaseURL = $this->_config->getValue(\Magento\Store\Model\Store::XML_PATH_UNSECURE_BASE_URL, 'default');
+        $unsecureBaseURL = $this->_config->getValue(Store::XML_PATH_UNSECURE_BASE_URL, 'default');
 
         /** @var $http \Magento\Framework\HTTP\Adapter\Curl */
         $http = $this->_curlFactory->create();

app/code/Magento/Backend/App/AbstractAction.php

@@ -72,7 +72,7 @@ abstract class AbstractAction extends \Magento\Framework\App\Action\Action
     protected $_canUseBaseUrl;
 
     /**
-     * @var \Magento\Core\App\Action\FormKeyValidator
+     * @var \Magento\Framework\Data\Form\FormKey\Validator
      */
     protected $_formKeyValidator;
 
@@ -202,8 +202,7 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
         }
 
         if ($request->isDispatched() && $request->getActionName() !== 'denied' && !$this->_isAllowed()) {
-            $this->_response->setHeader('HTTP/1.1', '403 Forbidden');
-            $this->_response->setHttpResponseCode(403);
+            $this->_response->setStatusHeader(403, '1.1', 'Forbidden');
             if (!$this->_auth->isLoggedIn()) {
                 return $this->_redirect('*/auth/login');
             }

app/code/Magento/Backend/App/Action/Context.php

@@ -32,7 +32,7 @@ class Context extends \Magento\Framework\App\Action\Context
     protected $_backendUrl;
 
     /**
-     * @var \Magento\Core\App\Action\FormKeyValidator
+     * @var \Magento\Framework\Data\Form\FormKey\Validator
      */
     protected $_formKeyValidator;
 
@@ -66,7 +66,7 @@ class Context extends \Magento\Framework\App\Action\Context
      * @param \Magento\Backend\Model\Auth $auth
      * @param \Magento\Backend\Helper\Data $helper
      * @param \Magento\Backend\Model\UrlInterface $backendUrl
-     * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
+     * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param bool $canUseBaseUrl
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -86,7 +86,7 @@ public function __construct(
         \Magento\Backend\Model\Auth $auth,
         \Magento\Backend\Helper\Data $helper,
         \Magento\Backend\Model\UrlInterface $backendUrl,
-        \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
+        \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
         \Magento\Framework\Locale\ResolverInterface $localeResolver,
         $canUseBaseUrl = false
     ) {
@@ -146,7 +146,7 @@ public function getCanUseBaseUrl()
     }
 
     /**
-     * @return \Magento\Core\App\Action\FormKeyValidator
+     * @return \Magento\Framework\Data\Form\FormKey\Validator
      */
     public function getFormKeyValidator()
     {

app/code/Magento/Backend/App/Action/Plugin/Authentication.php

@@ -163,7 +163,7 @@ protected function _performLogin(\Magento\Framework\App\RequestInterface $reques
         $postLogin = $request->getPost('login');
         $username = isset($postLogin['username']) ? $postLogin['username'] : '';
         $password = isset($postLogin['password']) ? $postLogin['password'] : '';
-        $request->setPost('login', null);
+        $request->setPostValue('login', null);
 
         try {
             $this->_auth->login($username, $password);

app/code/Magento/Backend/App/Action/Plugin/MassactionKey.php

@@ -28,7 +28,7 @@ public function aroundDispatch(
         if ($key) {
             $postData = $request->getPost($key);
             $value = is_array($postData) ? $postData : explode(',', $postData);
-            $request->setPost($key, $value ? $value : null);
+            $request->setPostValue($key, $value ? $value : null);
         }
         return $proceed($request);
     }

app/code/Magento/Backend/App/Router.php

@@ -8,7 +8,7 @@
  */
 namespace Magento\Backend\App;
 
-class Router extends \Magento\Core\App\Router\Base
+class Router extends \Magento\Framework\App\Router\Base
 {
     /**
      * @var \Magento\Backend\App\ConfigInterface
@@ -53,11 +53,9 @@ class Router extends \Magento\Core\App\Router\Base
      * @param \Magento\Framework\App\ResponseFactory $responseFactory
      * @param \Magento\Framework\App\Route\ConfigInterface $routeConfig
      * @param \Magento\Framework\UrlInterface $url
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo
      * @param string $routerId
      * @param \Magento\Framework\Code\NameBuilder $nameBuilder
+     * @param \Magento\Framework\App\Router\PathConfigInterface $pathConfig
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $coreConfig
      * @param \Magento\Backend\App\ConfigInterface $backendConfig
      *
@@ -70,11 +68,9 @@ public function __construct(
         \Magento\Framework\App\ResponseFactory $responseFactory,
         \Magento\Framework\App\Route\ConfigInterface $routeConfig,
         \Magento\Framework\UrlInterface $url,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo,
         $routerId,
         \Magento\Framework\Code\NameBuilder $nameBuilder,
+        \Magento\Framework\App\Router\PathConfigInterface $pathConfig,
         \Magento\Framework\App\Config\ScopeConfigInterface $coreConfig,
         \Magento\Backend\App\ConfigInterface $backendConfig
     ) {
@@ -85,11 +81,9 @@ public function __construct(
             $responseFactory,
             $routeConfig,
             $url,
-            $storeManager,
-            $scopeConfig,
-            $urlSecurityInfo,
             $routerId,
-            $nameBuilder
+            $nameBuilder,
+            $pathConfig
         );
         $this->_coreConfig = $coreConfig;
         $this->_backendConfig = $backendConfig;

app/code/Magento/Backend/Block/System/Cache/Form.php

@@ -13,25 +13,25 @@
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
-     * @var \Magento\Core\Helper\Data
+     * @var \Magento\Framework\App\Cache\TypeListInterface
      */
-    protected $_coreData;
+    protected $cacheTypeList;
 
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\Data\FormFactory $formFactory
-     * @param \Magento\Core\Helper\Data $coreData
+     * @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Framework\Registry $registry,
         \Magento\Framework\Data\FormFactory $formFactory,
-        \Magento\Core\Helper\Data $coreData,
+        \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList,
         array $data = []
     ) {
-        $this->_coreData = $coreData;
+        $this->cacheTypeList = $cacheTypeList;
         parent::__construct($context, $registry, $formFactory, $data);
     }
 
@@ -63,7 +63,7 @@ public function initForm()
             ]
         );
 
-        foreach ($this->_coreData->getCacheTypes() as $type => $label) {
+        foreach ($this->cacheTypeList->getTypeLabels() as $type => $label) {
             $fieldset->addField(
                 'enable_' . $type,
                 'checkbox',

app/code/Magento/Backend/Controller/Adminhtml/Denied.php

@@ -41,12 +41,12 @@ public function execute()
         if (!$this->_auth->isLoggedIn()) {
             /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
             $resultRedirect = $this->resultRedirectFactory->create();
-            $resultRedirect->setHeader('HTTP/1.1', '403 Forbidden');
+            $resultRedirect->setStatusHeader(403, '1.1', 'Forbidden');
             return $resultRedirect->setPath('*/auth/login');
         }
         /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
         $resultPage = $this->resultPageFactory->create();
-        $resultPage->setHeader('HTTP/1.1', '403 Forbidden');
+        $resultPage->setStatusHeader(403, '1.1', 'Forbidden');
         $resultPage->addHandle('adminhtml_denied');
         return $resultPage;
     }