ENGCOM-4653: Remove direct $_SERVER variable use #20968

magento-engcom-team · magento-engcom-team · commit 795a027c2604 · 2019-04-03T05:15:25.000-05:00
- Merge Pull Request #20968 from dominicfernando/magento2:code-cleanup-remove-server - Merged commits: 1. 8af727d
diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php
@@ -716,7 +716,8 @@ protected function _updatePathUseRewrites($url)
             if ($this->_isCustomEntryPoint()) {
                 $indexFileName = 'index.php';
             } else {
-                $indexFileName = basename($_SERVER['SCRIPT_FILENAME']);
+                $scriptFilename = $this->_request->getServer('SCRIPT_FILENAME');
+                $indexFileName = basename($scriptFilename);
             }
             $url .= $indexFileName . '/';
         }

Original file line number	Diff line number	Diff line change
`@@ -716,7 +716,8 @@ protected function _updatePathUseRewrites($url)`
`716`	`716`	`if ($this->_isCustomEntryPoint()) {`
`717`	`717`	`$indexFileName = 'index.php';`
`718`	`718`	`} else {`
`719`		`- $indexFileName = basename($_SERVER['SCRIPT_FILENAME']);`
	`719`	`+ $scriptFilename = $this->_request->getServer('SCRIPT_FILENAME');`
	`720`	`+ $indexFileName = basename($scriptFilename);`
`720`	`721`	`}`
`721`	`722`	`$url .= $indexFileName . '/';`
`722`	`723`	`}`