Get realpath for DOCUMENT_ROOT to support symlinking

Willem de Groot · Willem de Groot · commit dc9b9a16bca1 · 2016-02-03T13:27:11.000+01:00
diff --git a/app/code/Magento/Sitemap/Model/Sitemap.php b/app/code/Magento/Sitemap/Model/Sitemap.php
@@ -630,7 +630,7 @@ protected function _getFormattedLastmodDate($date)
      */
     protected function _getDocumentRoot()
     {
-        return $this->_request->getServer('DOCUMENT_ROOT');
+        return realpath($this->_request->getServer('DOCUMENT_ROOT'));
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/App/SetupInfo.php b/lib/internal/Magento/Framework/App/SetupInfo.php
@@ -59,7 +59,7 @@ public function __construct($server, $projectRoot = '')
         if (empty($server['DOCUMENT_ROOT'])) {
             throw new \InvalidArgumentException('DOCUMENT_ROOT variable is unavailable.');
         }
-        $this->docRoot = rtrim(str_replace('\\', '/', $server['DOCUMENT_ROOT']), '/');
+        $this->docRoot = rtrim(str_replace('\\', '/', realpath($server['DOCUMENT_ROOT'])), '/');
         $this->projectRoot = $projectRoot ?: $this->detectProjectRoot();
         $this->projectRoot = str_replace('\\', '/', $this->projectRoot);
     }
diff --git a/pub/errors/processor.php b/pub/errors/processor.php
@@ -301,7 +301,7 @@ protected function _getIndexDir()
     {
         $documentRoot = '';
         if (!empty($_SERVER['DOCUMENT_ROOT'])) {
-            $documentRoot = rtrim($_SERVER['DOCUMENT_ROOT'], '/');
+            $documentRoot = rtrim(realpath($_SERVER['DOCUMENT_ROOT']), '/');
         }
         return dirname($documentRoot . $this->_scriptName) . '/';
     }

Original file line number	Diff line number	Diff line change
`@@ -630,7 +630,7 @@ protected function _getFormattedLastmodDate($date)`
`630`	`630`	`*/`
`631`	`631`	`protected function _getDocumentRoot()`
`632`	`632`	`{`
`633`		`- return $this->_request->getServer('DOCUMENT_ROOT');`
	`633`	`+ return realpath($this->_request->getServer('DOCUMENT_ROOT'));`
`634`	`634`	`}`
`635`	`635`
`636`	`636`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public function __construct($server, $projectRoot = '')`
`59`	`59`	`if (empty($server['DOCUMENT_ROOT'])) {`
`60`	`60`	`throw new \InvalidArgumentException('DOCUMENT_ROOT variable is unavailable.');`
`61`	`61`	`}`
`62`		`- $this->docRoot = rtrim(str_replace('\\', '/', $server['DOCUMENT_ROOT']), '/');`
	`62`	`+ $this->docRoot = rtrim(str_replace('\\', '/', realpath($server['DOCUMENT_ROOT'])), '/');`
`63`	`63`	`$this->projectRoot = $projectRoot ?: $this->detectProjectRoot();`
`64`	`64`	`$this->projectRoot = str_replace('\\', '/', $this->projectRoot);`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@ protected function _getIndexDir()`
`301`	`301`	`{`
`302`	`302`	`$documentRoot = '';`
`303`	`303`	`if (!empty($_SERVER['DOCUMENT_ROOT'])) {`
`304`		`- $documentRoot = rtrim($_SERVER['DOCUMENT_ROOT'], '/');`
	`304`	`+ $documentRoot = rtrim(realpath($_SERVER['DOCUMENT_ROOT']), '/');`
`305`	`305`	`}`
`306`	`306`	`return dirname($documentRoot . $this->_scriptName) . '/';`
`307`	`307`	`}`