MAGETWO-37230: replace 'forwarded' parameter with flag

Author: Dale Sikkema

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

@@ -228,14 +228,10 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
      */
     protected function _isUrlChecked()
     {
-        return !$this->_actionFlag->get(
-            '',
-            self::FLAG_IS_URLS_CHECKED
-        ) && !$this->getRequest()->getParam(
-            'forwarded'
-        ) && !$this->_getSession()->getIsUrlNotice(
-            true
-        ) && !$this->_canUseBaseUrl;
+        return !$this->_actionFlag->get('', self::FLAG_IS_URLS_CHECKED)
+        && !$this->getRequest()->isForwarded()
+        && !$this->_getSession()->getIsUrlNotice(true)
+        && !$this->_canUseBaseUrl;
     }
 
     /**

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

@@ -108,10 +108,9 @@ protected function _processNotLoggedInUser(\Magento\Framework\App\RequestInterfa
         if ($request->getPost('login') && $this->_performLogin($request)) {
             $isRedirectNeeded = $this->_redirectIfNeededAfterLogin($request);
         }
-        if (!$isRedirectNeeded && !$request->getParam('forwarded')) {
+        if (!$isRedirectNeeded && !$request->isForwarded()) {
             if ($request->getParam('isIframe')) {
-                $request->setParam(
-                    'forwarded',
+                $request->setForwarded(
                     true
                 )->setRouteName(
                     'adminhtml'
@@ -123,8 +122,7 @@ protected function _processNotLoggedInUser(\Magento\Framework\App\RequestInterfa
                     false
                 );
             } elseif ($request->getParam('isAjax')) {
-                $request->setParam(
-                    'forwarded',
+                $request->setForwarded(
                     true
                 )->setRouteName(
                     'adminhtml'
@@ -136,8 +134,7 @@ protected function _processNotLoggedInUser(\Magento\Framework\App\RequestInterfa
                     false
                 );
             } else {
-                $request->setParam(
-                    'forwarded',
+                $request->setForwarded(
                     true
                 )->setRouteName(
                     'adminhtml'

lib/internal/Magento/Framework/HTTP/PhpEnvironment/Request.php

@@ -67,6 +67,12 @@ class Request extends \Zend\Http\PhpEnvironment\Request
      */
     protected $dispatched = false;
 
+    /**
+     * Flag for whether the request is forwarded or not
+     *
+     * @var bool
+     */
+    protected $forwarded;
 
     /**
      * @var CookieReaderInterface
@@ -690,4 +696,22 @@ public function getBaseUrl()
         $url = str_replace('\\', '/', $url);
         return $url;
     }
+
+    /**
+     * @return bool
+     */
+    public function isForwarded()
+    {
+        return $this->forwarded;
+    }
+
+    /**
+     * @param bool $forwarded
+     * @return $this
+     */
+    public function setForwarded($forwarded)
+    {
+        $this->forwarded = $forwarded;
+        return $this;
+    }
 }