Merge remote-tracking branch 'origin/AC-3036-fix-deprecation-error-for-admin-url' into delivery-bunch-w20

Author: andrewbess

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

@@ -1,41 +1,42 @@
 <?php
 /**
- * Backend area front name resolver. Reads front name from configuration
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Backend\App\Area;
 
+use Laminas\Uri\Uri;
+use Magento\Backend\App\Config;
 use Magento\Backend\Setup\ConfigOptionsList;
+use Magento\Framework\App\Area\FrontNameResolverInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\RequestInterface;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\Store;
-use Laminas\Uri\Uri;
 
 /**
- * Class to get area front name.
+ * Front name resolver for backend area.
  *
  * @api
  * @since 100.0.2
  */
-class FrontNameResolver implements \Magento\Framework\App\Area\FrontNameResolverInterface
+class FrontNameResolver implements FrontNameResolverInterface
 {
-    const XML_PATH_USE_CUSTOM_ADMIN_PATH = 'admin/url/use_custom_path';
+    public const XML_PATH_USE_CUSTOM_ADMIN_PATH = 'admin/url/use_custom_path';
 
-    const XML_PATH_CUSTOM_ADMIN_PATH = 'admin/url/custom_path';
+    public const XML_PATH_CUSTOM_ADMIN_PATH = 'admin/url/custom_path';
 
-    const XML_PATH_USE_CUSTOM_ADMIN_URL = 'admin/url/use_custom';
+    public const XML_PATH_USE_CUSTOM_ADMIN_URL = 'admin/url/use_custom';
 
-    const XML_PATH_CUSTOM_ADMIN_URL = 'admin/url/custom';
+    public const XML_PATH_CUSTOM_ADMIN_URL = 'admin/url/custom';
 
     /**
      * Backend area code
      */
-    const AREA_CODE = 'adminhtml';
+    public const AREA_CODE = 'adminhtml';
 
     /**
      * @var array
@@ -75,14 +76,14 @@ class FrontNameResolver implements \Magento\Framework\App\Area\FrontNameResolver
     private $request;
 
     /**
-     * @param \Magento\Backend\App\Config $config
+     * @param Config $config
      * @param DeploymentConfig $deploymentConfig
      * @param ScopeConfigInterface $scopeConfig
      * @param Uri $uri
      * @param RequestInterface $request
      */
     public function __construct(
-        \Magento\Backend\App\Config $config,
+        Config $config,
         DeploymentConfig $deploymentConfig,
         ScopeConfigInterface $scopeConfig,
         Uri $uri = null,
@@ -131,8 +132,10 @@ public function isHostBackend()
                 );
             }
         }
-        $host = $this->request->getServer('HTTP_HOST', '');
-        return stripos($this->getHostWithPort($backendUrl), (string) $host) !== false;
+        $host = (string) $this->request->getServer('HTTP_HOST', '');
+        $hostWithPort = $this->getHostWithPort($backendUrl);
+
+        return !($hostWithPort === null || $host === '') && stripos($hostWithPort, $host) !== false;
     }
 
     /**
@@ -149,8 +152,8 @@ private function getHostWithPort($url)
         $port = $this->uri->getPort();
 
         if (!$port) {
-            $port = isset($this->standardPorts[$scheme]) ? $this->standardPorts[$scheme] : null;
+            $port = $this->standardPorts[$scheme] ?? null;
         }
-        return isset($port) ? $host . ':' . $port : $host;
+        return $port !== null ? $host . ':' . $port : $host;
     }
 }

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

@@ -108,7 +108,7 @@ public function testIfCustomPathNotUsed(): void
 
     /**
      * @param string $url
-     * @param string $host
+     * @param string|null $host
      * @param string $useCustomAdminUrl
      * @param string $customAdminUrl
      * @param bool $expectedValue
@@ -118,7 +118,7 @@ public function testIfCustomPathNotUsed(): void
      */
     public function testIsHostBackend(
         string $url,
-        string $host,
+        ?string $host,
         string $useCustomAdminUrl,
         string $customAdminUrl,
         bool $expectedValue
@@ -180,6 +180,23 @@ function () use (&$urlParts) {
         $this->assertEquals($this->model->isHostBackend(), $expectedValue);
     }
 
+    /**
+     * Test the case when backend url is not set.
+     *
+     * @return void
+     */
+    public function testIsHostBackendWithEmptyHost(): void
+    {
+        $this->request->expects($this->any())
+            ->method('getServer')
+            ->willReturn('magento2.loc');
+        $this->uri->expects($this->once())
+            ->method('getHost')
+            ->willReturn(null);
+
+        $this->assertEquals($this->model->isHostBackend(), false);
+    }
+
     /**
      * @return array
      */
@@ -241,6 +258,13 @@ public function hostsDataProvider(): array
                 'useCustomAdminUrl' => '1',
                 'customAdminUrl' => 'https://myhost.loc/',
                 'expectedValue' => false
+            ],
+            'withEmptyHost' => [
+                'url' => 'http://magento2.loc/',
+                'host' => null,
+                'useCustomAdminUrl' => '0',
+                'customAdminUrl' => '',
+                'expectedValue' => false
             ]
         ];
     }