MAGETWO-33073: Upgrade request class.

Author: Sergey Semenov

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

@@ -2060,7 +2060,7 @@
     ['getRequestedControllerName', 'Magento\Framework\App\Request\Http'],
     ['getRequestedRouteName', 'Magento\Framework\App\Request\Http'],
     ['isStraight', 'Magento\Framework\App\Request\Http'],
-    ['getBaseUrl', 'Magento\Framework\App\Request\Http'],
+    ['getBaseUrl', 'Magento\Framework\App\Request\Http', 'Magento\Framework\HTTP\PhpEnvironment\Request'],
     ['getAliases', 'Magento\Framework\App\Request\Http'],
     ['setPathInfo', 'Magento\Framework\App\Request\Http', 'Magento\Framework\HTTP\PhpEnvironment\Request'],
     ['getRawBody', 'Magento\Framework\View\Context', 'getContent'],

dev/tests/unit/testsuite/Magento/Framework/HTTP/PhpEnvironment/RequestTest.php

@@ -177,7 +177,7 @@ public function testGetFiles()
     public function testGetBaseUrlWithUrl()
     {
         $this->model = $this->getModel();
-        $this->model->setBaseUrl('http://test.com/one/two');
+        $this->model->setBaseUrl('http:\/test.com\one/two');
         $this->assertEquals('http://test.com/one/two', $this->model->getBaseUrl());
     }
 

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

@@ -131,7 +131,7 @@ public function setPathInfo($pathInfo = null)
     {
         if ($pathInfo === null) {
             $requestUri = $this->getRequestUri();
-            if ('/' == $requestUri) {
+            if ('/' === $requestUri) {
                 return $this;
             }
 
@@ -143,7 +143,7 @@ public function setPathInfo($pathInfo = null)
 
             $baseUrl = $this->getBaseUrl();
             $pathInfo = substr($requestUri, strlen($baseUrl));
-            if (!empty($baseUrl) && '/' === $pathInfo) {
+            if (!empty($baseUrl) && false === $pathInfo) {
                 $pathInfo = '';
             } elseif (null === $baseUrl) {
                 $pathInfo = $requestUri;

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

@@ -641,7 +641,7 @@ public function getUserParam($key, $default = null)
     public function setRequestUri($requestUri = null)
     {
         if ($requestUri === null) {
-            $this->requestUri = $this->detectRequestUri();
+            $requestUri = $this->detectRequestUri();
         } elseif (!is_string($requestUri)) {
             return $this;
         } else {
@@ -654,4 +654,17 @@ public function setRequestUri($requestUri = null)
         $this->requestUri = $requestUri;
         return $this;
     }
+
+
+    /**
+     * Get base url
+     *
+     * @return string
+     */
+    public function getBaseUrl()
+    {
+        $url = urldecode(parent::getBaseUrl());
+        $url = str_replace('\\', '/', $url);
+        return $url;
+    }
 }