diff --git a/lib/internal/Magento/Framework/View/Asset/File/FallbackContext.php b/lib/internal/Magento/Framework/View/Asset/File/FallbackContext.php index cdfb1da76318a8c39e34e1ddf083b3552bce45c9..83356e26077d07e520c51fda160b8395f85f2d21 100644 --- a/lib/internal/Magento/Framework/View/Asset/File/FallbackContext.php +++ b/lib/internal/Magento/Framework/View/Asset/File/FallbackContext.php @@ -13,11 +13,6 @@ use Magento\Framework\App\Filesystem\DirectoryList; */ 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 @@ class FallbackContext extends Context */ public function getConfigPath() { - return $this->getPath() . ($this->isSecure ? '/' . self::SECURE_PATH : ''); + return $this->getPath(); } } diff --git a/lib/internal/Magento/Framework/View/Asset/Repository.php b/lib/internal/Magento/Framework/View/Asset/Repository.php index c898d57c11e7a6a26f205f1288097d4bb5a9a60c..5d0fc63010a3b177da303a6ae6d8a344ab05e6b7 100644 --- a/lib/internal/Magento/Framework/View/Asset/Repository.php +++ b/lib/internal/Magento/Framework/View/Asset/Repository.php @@ -268,8 +268,7 @@ class Repository 'baseUrl' => $url, 'areaType' => $area, 'themePath' => $themePath, - 'localeCode' => $locale, - 'isSecure' => $isSecure + 'localeCode' => $locale ] ); } diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/File/FallbackContextTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/File/FallbackContextTest.php index ca8d10cf8b7a1d6cc48781dd432bd1b61fc6d122..49bd30c459de8da0fd876f11c9db1f5f13059d9b 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/File/FallbackContextTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/File/FallbackContextTest.php @@ -31,7 +31,6 @@ class FallbackContextTest extends \PHPUnit_Framework_TestCase * @param string $areaType * @param string $themePath * @param string $localeCode - * @param bool $isSecure * @param string $expectedResult * @dataProvider getConfigPathDataProvider */ @@ -40,7 +39,6 @@ class FallbackContextTest extends \PHPUnit_Framework_TestCase $areaType, $themePath, $localeCode, - $isSecure, $expectedResult ) { $this->fallbackContext = $this->objectManager->getObject( @@ -49,8 +47,7 @@ class FallbackContextTest extends \PHPUnit_Framework_TestCase 'baseUrl' => $baseUrl, 'areaType' => $areaType, 'themePath' => $themePath, - 'localeCode' => $localeCode, - 'isSecure' => $isSecure + 'localeCode' => $localeCode ] ); $this->assertEquals($expectedResult, $this->fallbackContext->getConfigPath()); @@ -64,7 +61,6 @@ class FallbackContextTest extends \PHPUnit_Framework_TestCase 'areaType' => 'frontend', 'themePath' => 'Magento/blank', 'localeCode' => 'en_US', - 'isSecure' => false, 'expectedResult' => 'frontend/Magento/blank/en_US' ], 'https' => [ @@ -72,8 +68,7 @@ class FallbackContextTest extends \PHPUnit_Framework_TestCase 'areaType' => 'frontend', 'themePath' => 'Magento/blank', 'localeCode' => 'en_US', - 'isSecure' => true, - 'expectedResult' => 'frontend/Magento/blank/en_US/secure' + 'expectedResult' => 'frontend/Magento/blank/en_US' ] ]; } diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Asset/RepositoryTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Asset/RepositoryTest.php index 3b51f7cc3df2a278561f5007f6380e235226a750..50a3c3545a498dfcc3b92e8872fcec8849b4a2e7 100644 --- a/lib/internal/Magento/Framework/View/Test/Unit/Asset/RepositoryTest.php +++ b/lib/internal/Magento/Framework/View/Test/Unit/Asset/RepositoryTest.php @@ -185,8 +185,7 @@ class RepositoryTest extends \PHPUnit_Framework_TestCase 'baseUrl' => '', 'areaType' => '', 'themePath' => 'Default', - 'localeCode' => '', - 'isSecure' => '', + 'localeCode' => '' ] ) ->willReturn($fallbackContextMock); @@ -251,8 +250,7 @@ class RepositoryTest extends \PHPUnit_Framework_TestCase 'baseUrl' => '', 'areaType' => 'area', 'themePath' => '', - 'localeCode' => 'locale', - 'isSecure' => '', + 'localeCode' => 'locale' ] ) ->willReturn($fallbackContextMock);