MAGETWO-60185: Remove distinction in http/https for requirejs-config.js

Author: eug123

lib/internal/Magento/Framework/View/Asset/File/FallbackContext.php

@@ -13,11 +13,6 @@
  */
 class FallbackContext extends Context
 {
-    /**
-     * Secure path
-     */
-    const SECURE_PATH = 'secure';
-
     /**
      * @var string
      */
@@ -33,24 +28,17 @@ class FallbackContext extends Context
      */
     private $locale;
 
-    /**
-     * @var bool
-     */
-    private $isSecure;
-
     /**
      * @param string $baseUrl
      * @param string $areaType
      * @param string $themePath
      * @param string $localeCode
-     * @param bool $isSecure
      */
-    public function __construct($baseUrl, $areaType, $themePath, $localeCode, $isSecure = false)
+    public function __construct($baseUrl, $areaType, $themePath, $localeCode)
     {
         $this->area = $areaType;
         $this->theme = $themePath;
         $this->locale = $localeCode;
-        $this->isSecure = $isSecure;
         parent::__construct($baseUrl, DirectoryList::STATIC_VIEW, $this->generatePath());
     }
 
@@ -103,6 +91,6 @@ private function generatePath()
      */
     public function getConfigPath()
     {
-        return $this->getPath() . ($this->isSecure ? '/' . self::SECURE_PATH : '');
+        return $this->getPath();
     }
 }

lib/internal/Magento/Framework/View/Asset/Repository.php

@@ -268,8 +268,7 @@ private function getFallbackContext($urlType, $isSecure, $area, $themePath, $loc
                     'baseUrl' => $url,
                     'areaType' => $area,
                     'themePath' => $themePath,
-                    'localeCode' => $locale,
-                    'isSecure' => $isSecure
+                    'localeCode' => $locale
                 ]
             );
         }

lib/internal/Magento/Framework/View/Test/Unit/Asset/File/FallbackContextTest.php

@@ -31,7 +31,6 @@ protected function setUp()
      * @param string $areaType
      * @param string $themePath
      * @param string $localeCode
-     * @param bool $isSecure
      * @param string $expectedResult
      * @dataProvider getConfigPathDataProvider
      */
@@ -40,7 +39,6 @@ public function testGetConfigPath(
         $areaType,
         $themePath,
         $localeCode,
-        $isSecure,
         $expectedResult
     ) {
         $this->fallbackContext = $this->objectManager->getObject(
@@ -49,8 +47,7 @@ public function testGetConfigPath(
                 'baseUrl' => $baseUrl,
                 'areaType' => $areaType,
                 'themePath' => $themePath,
-                'localeCode' => $localeCode,
-                'isSecure' => $isSecure
+                'localeCode' => $localeCode
             ]
         );
         $this->assertEquals($expectedResult, $this->fallbackContext->getConfigPath());
@@ -64,16 +61,14 @@ public function getConfigPathDataProvider()
                 'areaType' => 'frontend',
                 'themePath' => 'Magento/blank',
                 'localeCode' => 'en_US',
-                'isSecure' => false,
                 'expectedResult' => 'frontend/Magento/blank/en_US'
             ],
             'https' => [
                 'baseUrl' => 'https://some-name.com/pub/static/',
                 'areaType' => 'frontend',
                 'themePath' => 'Magento/blank',
                 'localeCode' => 'en_US',
-                'isSecure' => true,
-                'expectedResult' => 'frontend/Magento/blank/en_US/secure'
+                'expectedResult' => 'frontend/Magento/blank/en_US'
             ]
         ];
     }

lib/internal/Magento/Framework/View/Test/Unit/Asset/RepositoryTest.php

@@ -185,8 +185,7 @@ public function testCreateAsset()
                     'baseUrl' => '',
                     'areaType' => '',
                     'themePath' => 'Default',
-                    'localeCode' => '',
-                    'isSecure' => '',
+                    'localeCode' => ''
                 ]
             )
             ->willReturn($fallbackContextMock);
@@ -251,8 +250,7 @@ public function testGetStaticViewFileContext()
                     'baseUrl' => '',
                     'areaType' => 'area',
                     'themePath' => '',
-                    'localeCode' => 'locale',
-                    'isSecure' => '',
+                    'localeCode' => 'locale'
                 ]
             )
             ->willReturn($fallbackContextMock);