#20968: Unit test fix.

Author: p-bystritsky

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

@@ -160,7 +160,7 @@ public function testGetWebsite()
         /** @var \Magento\Store\Model\Store $model */
         $model = $this->objectManagerHelper->getObject(
             \Magento\Store\Model\Store::class,
-            ['websiteRepository' => $websiteRepository,]
+            ['websiteRepository' => $websiteRepository]
         );
         $model->setWebsiteId($websiteId);
 
@@ -181,7 +181,7 @@ public function testGetWebsiteIfWebsiteIsNotExist()
         /** @var \Magento\Store\Model\Store $model */
         $model = $this->objectManagerHelper->getObject(
             \Magento\Store\Model\Store::class,
-            ['websiteRepository' => $websiteRepository,]
+            ['websiteRepository' => $websiteRepository]
         );
         $model->setWebsiteId(null);
 
@@ -207,7 +207,7 @@ public function testGetGroup()
         /** @var \Magento\Store\Model\Store $model */
         $model = $this->objectManagerHelper->getObject(
             \Magento\Store\Model\Store::class,
-            ['groupRepository' => $groupRepository,]
+            ['groupRepository' => $groupRepository]
         );
         $model->setGroupId($groupId);
 
@@ -228,7 +228,7 @@ public function testGetGroupIfGroupIsNotExist()
         /** @var \Magento\Store\Model\Store $model */
         $model = $this->objectManagerHelper->getObject(
             \Magento\Store\Model\Store::class,
-            ['groupRepository' => $groupRepository,]
+            ['groupRepository' => $groupRepository]
         );
         $model->setGroupId(null);
 
@@ -377,30 +377,31 @@ public function testGetBaseUrlEntryPoint()
         $configMock = $this->getMockForAbstractClass(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
         $configMock->expects($this->atLeastOnce())
             ->method('getValue')
-            ->will($this->returnCallback(
-                function ($path, $scope, $scopeCode) use ($expectedPath) {
-                    return $expectedPath == $path ? 'http://domain.com/' . $path . '/' : null;
-                }
-            ));
+            ->willReturnCallback(function ($path, $scope, $scopeCode) use ($expectedPath) {
+                return $expectedPath == $path ? 'http://domain.com/' . $path . '/' : null;
+            });
+        $this->requestMock->expects($this->once())
+            ->method('getServer')
+            ->with('SCRIPT_FILENAME')
+            ->willReturn('test_script.php');
+
         /** @var \Magento\Store\Model\Store $model */
         $model = $this->objectManagerHelper->getObject(
             \Magento\Store\Model\Store::class,
             [
                 'config' => $configMock,
                 'isCustomEntryPoint' => false,
+                'request' => $this->requestMock
             ]
         );
         $model->setCode('scopeCode');
 
         $this->setUrlModifier($model);
 
-        $server = $_SERVER;
-        $_SERVER['SCRIPT_FILENAME'] = 'test_script.php';
         $this->assertEquals(
             $expectedBaseUrl,
             $model->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_LINK, false)
         );
-        $_SERVER = $server;
     }
 
     /**
@@ -592,7 +593,7 @@ public function testGetAllowedCurrencies()
         /** @var \Magento\Store\Model\Store $model */
         $model = $this->objectManagerHelper->getObject(
             \Magento\Store\Model\Store::class,
-            ['config' => $configMock, 'currencyInstalled' => $currencyPath,]
+            ['config' => $configMock, 'currencyInstalled' => $currencyPath]
         );
 
         $this->assertEquals($expectedResult, $model->getAllowedCurrencies());
@@ -666,8 +667,7 @@ public function isCurrentlySecureDataProvider()
             'unsecure request, no secure base url registered' => [false, 443, false, true, null],
             'unsecure request, not using registered port' => [false, 80],
             'unsecure request, using registered port, not using secure in frontend' => [false, 443, false, false],
-            'unsecure request, no secure base url registered, not using secure in frontend' =>
-                [false, 443, false, false, null],
+            'unsecure request, no secure base url registered, 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],
         ];
     }