Merge remote-tracking branch 'origin/MAGETWO-52923-Varnish-ssl' into pr

Author: Igor Melnikov

lib/internal/Magento/Framework/App/Config/ScopePool.php

@@ -92,7 +92,7 @@ public function getScope($scopeType, $scopeCode = null)
     {
         $scopeCode = $this->_getScopeCode($scopeType, $scopeCode);
 
-        //Key by url to support dynamic {{base_url}} and port assignments
+        // Key by url to support dynamic {{base_url}} and port assignments
         $host = $this->getRequest()->getHttpHost();
         $port = $this->getRequest()->getServer('SERVER_PORT');
         $path = $this->getRequest()->getBasePath();

lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php

@@ -91,9 +91,9 @@ private function getModel($uri = null, $mockAppConfig = true)
             ]
         );
 
-        if($mockAppConfig){
-            $MockAppConfig = $this->getMock(\Magento\Framework\App\Config::class, [], [], '' , false);
-            $this->objectManager->setBackwardCompatibleProperty($model, 'appConfig', $MockAppConfig );
+        if ($mockAppConfig) {
+            $mockConfig = $this->getMock(\Magento\Framework\App\Config::class, [], [], '' , false);
+            $this->objectManager->setBackwardCompatibleProperty($model, 'appConfig', $mockConfig );
         }
 
         return $model;
@@ -347,8 +347,8 @@ public function testIsSecure($isSecure, $serverHttps, $headerOffloadKey, $header
             ->with(\Magento\Framework\App\Request\Http::XML_PATH_OFFLOADER_HEADER, ScopeConfigInterface::SCOPE_TYPE_DEFAULT)
             ->willReturn($configOffloadHeader);
 
-        $this->objectManager->setBackwardCompatibleProperty($this->_model,'appConfig' ,$configMock);
-        $this->objectManager->setBackwardCompatibleProperty($this->_model, 'SSLOffloadHeader' ,null );
+        $this->objectManager->setBackwardCompatibleProperty($this->_model, 'appConfig', $configMock);
+        $this->objectManager->setBackwardCompatibleProperty($this->_model, 'SSLOffloadHeader', null );
 
         $this->_model->getServer()->set($headerOffloadKey, $headerOffloadValue);
         $this->_model->getServer()->set('HTTPS', $serverHttps);