From 86f88f09c881e3c321e18ee2374cbf460b3dec79 Mon Sep 17 00:00:00 2001 From: Caprico <2081806+Caprico85@users.noreply.github.com> Date: Fri, 7 Aug 2026 09:53:46 +0200 Subject: [PATCH] USE $_SERVER['SCRIPT_FILENAME'] instead of getenv() --- .phpstan.dist.baselines/argument.type.php | 10 ---------- app/code/core/Mage/Api/Helper/Data.php | 4 +++- app/code/core/Mage/Api2/Model/Route/ApiType.php | 6 +++++- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.phpstan.dist.baselines/argument.type.php b/.phpstan.dist.baselines/argument.type.php index 4bd301edf6b..91614c91996 100644 --- a/.phpstan.dist.baselines/argument.type.php +++ b/.phpstan.dist.baselines/argument.type.php @@ -791,11 +791,6 @@ 'count' => 1, 'path' => __DIR__ . '/../app/code/core/Mage/Api/Helper/Data.php', ]; -$ignoreErrors[] = [ - 'rawMessage' => 'Parameter #1 $path of function basename expects string, string|false given.', - 'count' => 1, - 'path' => __DIR__ . '/../app/code/core/Mage/Api/Helper/Data.php', -]; $ignoreErrors[] = [ 'rawMessage' => 'Parameter #1 $node of method Varien_Simplexml_Config::setXml() expects Varien_Simplexml_Element, Varien_Simplexml_Element|false given.', 'count' => 1, @@ -1091,11 +1086,6 @@ 'count' => 1, 'path' => __DIR__ . '/../app/code/core/Mage/Api2/Model/Resource/Validator/Eav.php', ]; -$ignoreErrors[] = [ - 'rawMessage' => 'Parameter #1 $path of function basename expects string, string|false given.', - 'count' => 1, - 'path' => __DIR__ . '/../app/code/core/Mage/Api2/Model/Route/ApiType.php', -]; $ignoreErrors[] = [ 'rawMessage' => 'Parameter #1 $adminId of method Mage_Api2_Adminhtml_Api2_RoleController::_addUserToRole() expects int, int|string given.', 'count' => 1, diff --git a/app/code/core/Mage/Api/Helper/Data.php b/app/code/core/Mage/Api/Helper/Data.php index 6931b36bf96..92b759c2189 100644 --- a/app/code/core/Mage/Api/Helper/Data.php +++ b/app/code/core/Mage/Api/Helper/Data.php @@ -362,6 +362,7 @@ public function getCacheId() * @param bool $htmlSpecialChars * @return string * @throws Zend_Uri_Exception + * @SuppressWarnings("PHPMD.Superglobals") */ public function getServiceUrl($routePath = null, $routeParams = null, $htmlSpecialChars = false) { @@ -379,7 +380,8 @@ public function getServiceUrl($routePath = null, $routeParams = null, $htmlSpeci $uri = Zend_Uri_Http::fromString($url); $uri->setHost($request->getHttpHost()); if (!$urlModel->getRouteFrontName()) { - $uri->setPath('/' . trim($request->getBasePath() . '/' . basename(getenv('SCRIPT_FILENAME')), '/')); + $scriptFilename = (string) ($_SERVER['SCRIPT_FILENAME'] ?? $_SERVER['SCRIPT_NAME'] ?? ''); + $uri->setPath('/' . trim($request->getBasePath() . '/' . basename($scriptFilename), '/')); } else { $uri->setPath($request->getBaseUrl() . $request->getPathInfo()); } diff --git a/app/code/core/Mage/Api2/Model/Route/ApiType.php b/app/code/core/Mage/Api2/Model/Route/ApiType.php index c4016e815ad..3365b018888 100644 --- a/app/code/core/Mage/Api2/Model/Route/ApiType.php +++ b/app/code/core/Mage/Api2/Model/Route/ApiType.php @@ -1,5 +1,7 @@ str_replace('.php', '', basename(getenv('SCRIPT_FILENAME'))) . '/:api_type']); + parent::__construct([Mage_Api2_Model_Route_Abstract::PARAM_ROUTE => str_replace('.php', '', basename($scriptFilename)) . '/:api_type']); } }