MAGETWO-52923: MAGETWO-52923: [Github] Switching to Varnish causes category menu to force HTTPS links #4540

Unit tests, code style

Author: Igor Melnikov

app/code/Magento/PageCache/Observer/ProcessLayoutRenderElement.php

@@ -59,8 +59,8 @@ protected function _wrapEsi(
                 'handles' => json_encode($layout->getUpdate()->getHandles())
             ]
         );
-        // Varnish does not support esi over https must change to http
-        $url = (substr($url, 0, 5) === 'https') ? 'http' . substr($url, 5) : $url;
+        // Varnish does not support ESI over HTTPS must change to HTTP
+        $url = substr($url, 0, 5) === 'https' ? 'http' . substr($url, 5) : $url;
         return sprintf('<esi:include src="%s" />', $url);
     }
 

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

@@ -32,15 +32,20 @@ class HttpTest extends \PHPUnit_Framework_TestCase
     protected $_infoProcessorMock;
 
     /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager  | \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager | \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $objectManager;
+    protected $objectManagerMock;
 
     /**
-     * @var \Magento\Framework\Stdlib\StringUtils  | \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Stdlib\StringUtils | \PHPUnit_Framework_MockObject_MockObject
      */
     protected $converterMock;
 
+    /**
+     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
+     */
+    private $objectManager;
+
     /**
      * @var array
      */
@@ -58,7 +63,7 @@ protected function setUp()
         );
         $this->_infoProcessorMock = $this->getMock('Magento\Framework\App\Request\PathInfoProcessorInterface');
         $this->_infoProcessorMock->expects($this->any())->method('process')->will($this->returnArgument(1));
-        $this->objectManager = $this->getMock('Magento\Framework\ObjectManagerInterface');
+        $this->objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface');
         $this->converterMock = $this->getMockBuilder('Magento\Framework\Stdlib\StringUtils')
             ->disableOriginalConstructor()
             ->setMethods(['cleanString'])
@@ -67,6 +72,8 @@ protected function setUp()
 
         // Stash the $_SERVER array to protect it from modification in test
         $this->serverArray = $_SERVER;
+
+        $this->objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
     }
 
     public function tearDown()
@@ -77,23 +84,23 @@ public function tearDown()
     /**
      * @return \Magento\Framework\App\Request\Http
      */
-    private function getModel($uri = null, $mockAppConfig = true)
+    private function getModel($uri = null, $appConfigMock = true)
     {
 
         $model = $this->objectManager->getObject(
             'Magento\Framework\App\Request\Http',
             [
                 'routeConfig' => $this->_routerListMock,
                 'pathInfoProcessor' => $this->_infoProcessorMock,
-                'objectManager' => $this->objectManager,
+                'objectManager' => $this->objectManagerMock,
                 'converter' => $this->converterMock,
                 'uri' => $uri,
             ]
         );
 
-        if ($mockAppConfig) {
-            $mockConfig = $this->getMock(\Magento\Framework\App\Config::class, [], [], '' , false);
-            $this->objectManager->setBackwardCompatibleProperty($model, 'appConfig', $mockConfig );
+        if ($appConfigMock) {
+            $configMock = $this->getMock(\Magento\Framework\App\Config::class, [], [], '' , false);
+            $this->objectManager->setBackwardCompatibleProperty($model, 'appConfig', $configMock);
         }
 
         return $model;
@@ -348,7 +355,7 @@ public function testIsSecure($isSecure, $serverHttps, $headerOffloadKey, $header
             ->willReturn($configOffloadHeader);
 
         $this->objectManager->setBackwardCompatibleProperty($this->_model, 'appConfig', $configMock);
-        $this->objectManager->setBackwardCompatibleProperty($this->_model, 'SSLOffloadHeader', null );
+        $this->objectManager->setBackwardCompatibleProperty($this->_model, 'sslOffloadHeader', null);
 
         $this->_model->getServer()->set($headerOffloadKey, $headerOffloadValue);
         $this->_model->getServer()->set('HTTPS', $serverHttps);

lib/internal/Magento/Framework/HTTP/PhpEnvironment/Request.php

@@ -98,7 +98,7 @@ class Request extends \Zend\Http\PhpEnvironment\Request
      *
      * @var string
      */
-    protected $SSLOffloadHeader;
+    protected $sslOffloadHeader;
 
     /**
      * @param CookieReaderInterface $cookieReader
@@ -415,41 +415,37 @@ public function isSecure()
             return true;
         }
 
-        return $this->initialRequestSecure($this->getSSLOffloadHeader());
+        return $this->initialRequestSecure($this->SslOffloadHeader());
     }
 
     /***
-     *
-     * Get value of SSL offload http header from configuration -- defaults to X-Forwarded-Proto
+     * Get value of SSL offload http header from configuration - defaults to X-Forwarded-Proto
      *
      * @return string
      */
-    private function getSSLOffloadHeader()
+    private function SslOffloadHeader()
     {
-        
         // Lets read from db only one time okay.
-        if ($this->SSLOffloadHeader === null) {
+        if ($this->sslOffloadHeader === null) {
 
-            /* TODO: Untangle Config dependence on Scope, so that this class can be instantiated even if app is not
-               installed MAGETWO-31756 */
+            // @todo: Untangle Config dependence on Scope, so that this class can be instantiated even if app is not
+            // installed MAGETWO-31756
             // Check if a proxy sent a header indicating an initial secure request
-            $this->SSLOffloadHeader = trim(
+            $this->sslOffloadHeader = trim(
                 (string)$this->getAppConfig()->getValue(
                     self::XML_PATH_OFFLOADER_HEADER,
                     \Magento\Framework\App\Config\ScopeConfigInterface::SCOPE_TYPE_DEFAULT
                 )
             );
         }
 
-        return $this->SSLOffloadHeader;
-
+        return $this->sslOffloadHeader;
     }
 
     /**
      * Create an instance of Magento\Framework\App\Config
      *
      * @return \Magento\Framework\App\Config
-     *
      * @deprecated
      */
     private function getAppConfig()