Merge remote-tracking branch '38554/patch-18' into commpr_787643004

Author: engcom-Charlie

app/code/Magento/Backend/App/Area/FrontNameResolver.php

@@ -107,11 +107,10 @@ public function getFrontName($checkHost = false)
         if ($checkHost && !$this->isHostBackend()) {
             return false;
         }
-        $isCustomPathUsed = (bool)(string)$this->config->getValue(self::XML_PATH_USE_CUSTOM_ADMIN_PATH);
-        if ($isCustomPathUsed) {
-            return (string)$this->config->getValue(self::XML_PATH_CUSTOM_ADMIN_PATH);
-        }
-        return $this->defaultFrontName;
+
+        return $this->config->isSetFlag(self::XML_PATH_USE_CUSTOM_ADMIN_PATH)
+            ? (string)$this->config->getValue(self::XML_PATH_CUSTOM_ADMIN_PATH)
+            : $this->defaultFrontName;
     }
 
     /**
@@ -127,9 +126,8 @@ public function isHostBackend()
         if (!$this->request->getServer('HTTP_HOST')) {
             return false;
         }
-
-        if ($this->scopeConfig->getValue(self::XML_PATH_USE_CUSTOM_ADMIN_URL, ScopeInterface::SCOPE_STORE)) {
-            $backendUrl = $this->scopeConfig->getValue(self::XML_PATH_CUSTOM_ADMIN_URL, ScopeInterface::SCOPE_STORE);
+        if ($this->scopeConfig->isSetFlag(self::XML_PATH_USE_CUSTOM_ADMIN_URL)) {
+            $backendUrl = $this->scopeConfig->getValue(self::XML_PATH_CUSTOM_ADMIN_URL);
         } else {
             $xmlPath = $this->request->isSecure() ? Store::XML_PATH_SECURE_BASE_URL : Store::XML_PATH_UNSECURE_BASE_URL;
             $backendUrl = $this->config->getValue($xmlPath);

app/code/Magento/Backend/Test/Unit/App/Area/FrontNameResolverTest.php

@@ -80,12 +80,16 @@ protected function setUp(): void
      */
     public function testIfCustomPathUsed(): void
     {
-        $this->configMock
+        $this->configMock->expects($this->once())
+            ->method('isSetFlag')
+            ->with(FrontNameResolver::XML_PATH_USE_CUSTOM_ADMIN_PATH)
+            ->willReturn(true);
+
+        $this->configMock->expects($this->once())
             ->method('getValue')
-            ->willReturnCallback(fn($param) => match ([$param]) {
-                ['admin/url/use_custom_path'] => true,
-                ['admin/url/custom_path'] => 'expectedValue'
-            });
+            ->with(FrontNameResolver::XML_PATH_CUSTOM_ADMIN_PATH)
+            ->willReturn('expectedValue');
+
         $this->assertEquals('expectedValue', $this->model->getFrontName());
     }
 
@@ -94,15 +98,11 @@ public function testIfCustomPathUsed(): void
      */
     public function testIfCustomPathNotUsed(): void
     {
-        $this->configMock->expects(
-            $this->once()
-        )->method(
-            'getValue'
-        )->with(
-            'admin/url/use_custom_path'
-        )->willReturn(
-            false
-        );
+        $this->configMock->expects($this->once())
+            ->method('isSetFlag')
+            ->with(FrontNameResolver::XML_PATH_USE_CUSTOM_ADMIN_PATH)
+            ->willReturn(false);
+
         $this->assertEquals($this->_defaultFrontName, $this->model->getFrontName());
     }
 
@@ -125,7 +125,12 @@ public function testIsHostBackend(
         string $customAdminUrl,
         bool $expectedValue
     ): void {
-        $this->scopeConfigMock->method('getValue')
+        $this->scopeConfigMock
+            ->method('isSetFlag')
+            ->willReturn($useCustomAdminUrl);
+
+        $this->scopeConfigMock
+            ->method('getValue')
             ->willReturnMap(
                 [
                     [Store::XML_PATH_UNSECURE_BASE_URL, ScopeInterface::SCOPE_STORE, null, $url],
@@ -138,7 +143,7 @@ public function testIsHostBackend(
                     ],
                     [
                         FrontNameResolver::XML_PATH_CUSTOM_ADMIN_URL,
-                        ScopeInterface::SCOPE_STORE,
+                        ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
                         null,
                         $customAdminUrl
                     ]