Merge remote-tracking branch '38717/patch-21' into commpr-10131-1706

Author: del10131

app/code/Magento/Store/Model/Store.php

@@ -1,8 +1,10 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
+declare(strict_types=1);
+
 namespace Magento\Store\Model;
 
 use Laminas\Uri\UriFactory;
@@ -809,8 +811,16 @@ public function isCurrentlySecure()
             return true;
         }
 
-        $secureBaseUrl = $this->_config->getValue(self::XML_PATH_SECURE_BASE_URL, ScopeInterface::SCOPE_STORE);
-        $secureFrontend = $this->_config->getValue(self::XML_PATH_SECURE_IN_FRONTEND, ScopeInterface::SCOPE_STORE);
+        $secureBaseUrl = $this->_config->getValue(
+            self::XML_PATH_SECURE_BASE_URL,
+            ScopeInterface::SCOPE_STORE,
+            $this->getId()
+        );
+        $secureFrontend = $this->_config->getValue(
+            self::XML_PATH_SECURE_IN_FRONTEND,
+            ScopeInterface::SCOPE_STORE,
+            $this->getId()
+        );
 
         if (!$secureBaseUrl || !$secureFrontend) {
             return false;
@@ -819,8 +829,8 @@ public function isCurrentlySecure()
         $uri = UriFactory::factory($secureBaseUrl);
         $port = $uri->getPort();
         $serverPort = $this->_request->getServer('SERVER_PORT');
-        $isSecure = $uri->getScheme() == 'https' && isset($serverPort) && $port == $serverPort;
-        return $isSecure;
+
+        return $uri->getScheme() === 'https' && $serverPort !== null && $port == $serverPort;
     }
 
     /*************************************************************************************

app/code/Magento/Store/Test/Unit/Model/StoreTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -624,33 +624,35 @@ public function testGetAllowedCurrencies()
      * @dataProvider isCurrentlySecureDataProvider
      *
      * @param bool $expected
-     * @param array $value
+     * @param array|int|null $value
      * @param bool $requestSecure
      * @param bool $useSecureInFrontend
      * @param string|null $secureBaseUrl
      */
     public function testIsCurrentlySecure(
-        $expected,
-        $value,
-        $requestSecure = false,
-        $useSecureInFrontend = true,
-        $secureBaseUrl = 'https://example.com:443'
+        bool        $expected,
+        array|int|null   $value,
+        bool        $requestSecure = false,
+        bool        $useSecureInFrontend = true,
+        ?string     $secureBaseUrl = 'https://example.com:443'
     ) {
         /* @var ReinitableConfigInterface|MockObject $configMock */
-        $configMock = $this->getMockForAbstractClass(ReinitableConfigInterface::class);
+        $configMock = $this->getMockBuilder(ReinitableConfigInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $configMock->expects($this->any())
             ->method('getValue')
             ->willReturnMap([
                 [
                     Store::XML_PATH_SECURE_BASE_URL,
                     ScopeInterface::SCOPE_STORE,
-                    null,
+                    2,
                     $secureBaseUrl
                 ],
                 [
                     Store::XML_PATH_SECURE_IN_FRONTEND,
                     ScopeInterface::SCOPE_STORE,
-                    null,
+                    2,
                     $useSecureInFrontend
                 ]
             ]);
@@ -670,6 +672,8 @@ public function testIsCurrentlySecure(
             ['config' => $configMock, 'request' => $this->requestMock]
         );
 
+        $model->setStoreId(2);
+
         if ($expected) {
             $this->assertTrue($model->isCurrentlySecure(), "Was expecting this test to show as secure, but it wasn't");
         } else {
@@ -690,6 +694,7 @@ public static function isCurrentlySecureDataProvider()
             'unsecure request, using registered port, not using secure in frontend' => [false, 443, false, false],
             'unsecure request, no secure base url, not using secure in frontend' => [false, 443, false, false, null],
             'unsecure request, not using registered port, not using secure in frontend' => [false, 80, false, false],
+            'unsecure request, no server setting' => [false, null, false],
         ];
     }