Merge branch 'ACP2E-1512' with reverted fix into AC-8862

alzota · alzota · commit 71ce3e498c0c · 2023-05-29T16:32:15.000+03:00
diff --git a/app/code/Magento/Config/Model/Config/Reader/Source/Deployed/SettingChecker.php b/app/code/Magento/Config/Model/Config/Reader/Source/Deployed/SettingChecker.php
@@ -102,12 +102,8 @@ public function getPlaceholderValue($path, $scope, $scopeCode = null)
     public function getEnvValue($placeholder)
     {
         // phpcs:disable Magento2.Security.Superglobal
-        $environment = [];
-        foreach ($_ENV as $key => $value) {
-            $environment[strtolower($key)] = $value;
-        }
-        if ($this->placeholder->isApplicable($placeholder) && isset($environment[strtolower($placeholder)])) {
-            return $environment[strtolower($placeholder)];
+        if ($this->placeholder->isApplicable($placeholder) && isset($_ENV[$placeholder])) {
+            return $_ENV[$placeholder];
         }
         // phpcs:enable
 
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Reader/Source/Deployed/SettingCheckerTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Reader/Source/Deployed/SettingCheckerTest.php
@@ -69,16 +69,6 @@ protected function setUp(): void
         $this->checker = new SettingChecker($this->configMock, $placeholderFactoryMock, $this->scopeCodeResolverMock);
     }
 
-    public function testGetEnvValue(): void
-    {
-        $_ENV = array_merge($this->env, ['SOME_PLACEHOLDER' => 0, 'another_placeholder' => 1, 'some_placeholder' => 1]);
-        $this->placeholderMock->expects($this->any())
-            ->method('isApplicable')
-            ->willReturn(true);
-        $this->assertSame($this->checker->getEnvValue('SOME_PLACEHOLDER'), 1);
-        $this->assertSame($this->checker->getEnvValue('another_placeholder'), 1);
-    }
-
     /**
      * @param string $path
      * @param string $scope
diff --git a/app/code/Magento/Store/App/Config/Source/RuntimeConfigSource.php b/app/code/Magento/Store/App/Config/Source/RuntimeConfigSource.php
@@ -102,7 +102,7 @@ private function getEntities($table, $keyField)
         );
 
         foreach ($entities as $entity) {
-            $data[strtolower($entity[$keyField])] = $entity;
+            $data[$entity[$keyField]] = $entity;
         }
 
         return $data;
diff --git a/app/code/Magento/Store/App/Config/Type/Scopes.php b/app/code/Magento/Store/App/Config/Type/Scopes.php
@@ -72,7 +72,7 @@ public function get($path = '')
             $path = $this->convertIdPathToCodePath($patchChunks);
         }
 
-        return $this->data->getData(strtolower($path));
+        return $this->data->getData($path);
     }
 
     /**
diff --git a/app/code/Magento/Store/Model/Config/Processor/Fallback.php b/app/code/Magento/Store/Model/Config/Processor/Fallback.php
@@ -11,7 +11,10 @@
 use Magento\Framework\DB\Adapter\TableNotFoundException;
 use Magento\Store\App\Config\Type\Scopes;
 use Magento\Store\Model\ResourceModel\Store;
+use Magento\Store\Model\ResourceModel\Store\AllStoresCollectionFactory;
 use Magento\Store\Model\ResourceModel\Website;
+use Magento\Store\Model\ResourceModel\Website\AllWebsitesCollection;
+use Magento\Store\Model\ResourceModel\Website\AllWebsitesCollectionFactory;
 
 /**
  * Fallback through different scopes and merge them
@@ -111,13 +114,6 @@ private function prepareWebsitesConfig(
         array $websitesConfig
     ) {
         $result = [];
-
-        foreach ($websitesConfig as $websiteCode => $webConfiguration) {
-            if (!isset($websitesConfig[strtolower($websiteCode)])) {
-                $websitesConfig[strtolower($websiteCode)] = $webConfiguration;
-                unset($websitesConfig[$websiteCode]);
-            }
-        }
         foreach ((array)$this->websiteData as $website) {
             $code = $website['code'];
             $id = $website['website_id'];
@@ -143,12 +139,6 @@ private function prepareStoresConfig(
     ) {
         $result = [];
 
-        foreach ($storesConfig as $storeCode => $storeConfiguration) {
-            if (!isset($storesConfig[strtolower($storeCode)])) {
-                $storesConfig[strtolower($storeCode)] = $storeConfiguration;
-                unset($storesConfig[$storeCode]);
-            }
-        }
         foreach ((array)$this->storeData as $store) {
             $code = $store['code'];
             $id = $store['store_id'];
@@ -201,18 +191,5 @@ private function loadScopes(): void
             $this->storeData = [];
             $this->websiteData = [];
         }
-        $this->normalizeStoreData();
-    }
-
-    /**
-     * Sets stores code to lower case
-     *
-     * @return void
-     */
-    private function normalizeStoreData(): void
-    {
-        foreach ($this->storeData as $key => $store) {
-            $this->storeData[$key]['code'] = strtolower($store['code']);
-        }
     }
 }
diff --git a/app/code/Magento/Store/Test/Unit/App/Config/Source/RuntimeConfigSourceTest.php b/app/code/Magento/Store/Test/Unit/App/Config/Source/RuntimeConfigSourceTest.php
@@ -68,73 +68,12 @@ public function testGet()
             ->getMock();
         $selectMock->expects($this->any())->method('from')->willReturnSelf();
         $this->connection->expects($this->any())->method('select')->willReturn($selectMock);
-        $this->connection->expects($this->exactly(3))->method('fetchAll')
-            ->willReturnOnConsecutiveCalls(
-                [
-                    'WebsiteCode' => [
-                        'website_id' => '3',
-                        'code' => 'WebsiteCode',
-                        'name' => 'website',
-                        'sort_order' => '0',
-                        'default_group_id' => '4',
-                        'is_default' => '0'
-                    ]
-                ],
-                [
-                    0 => [
-                        'group_id' => '4',
-                        'website_id' => '3',
-                        'name' => 'store',
-                        'root_category_id' => '2',
-                        'default_store_id' => '11',
-                        'code' => 'second_website'
-                    ]
-                ],
-                [
-                    'SecondWebsite' => [
-                        'store_id' => '11',
-                        'code' => 'SECOND_WEBSITE',
-                        'website_id' => '3',
-                        'group_id' => '4',
-                        'name' => 'second',
-                        'sort_order' => '0',
-                        'is_active' => '1'
-                    ]
-                ]
-            );
+        $this->connection->expects($this->any())->method('fetchAll')->willReturn([]);
         $this->assertEquals(
             [
-                'websites' => [
-                    'websitecode' => [
-                        'website_id' => '3',
-                        'code' => 'WebsiteCode',
-                        'name' => 'website',
-                        'sort_order' => '0',
-                        'default_group_id' => '4',
-                        'is_default' => '0'
-                    ]
-                ],
-                'groups' => [
-                    4 => [
-                        'group_id' => '4',
-                        'website_id' => '3',
-                        'name' => 'store',
-                        'root_category_id' => '2',
-                        'default_store_id' => '11',
-                        'code' => 'second_website'
-                    ]
-                ],
-                'stores' => [
-                    'second_website' => [
-                        'store_id' => '11',
-                        'code' => 'SECOND_WEBSITE',
-                        'website_id' => '3',
-                        'group_id' => '4',
-                        'name' => 'second',
-                        'sort_order' => '0',
-                        'is_active' => '1'
-                    ]
-                ],
+                'websites' => [],
+                'groups' => [],
+                'stores' => [],
             ],
             $this->configSource->get()
         );
diff --git a/app/code/Magento/Store/Test/Unit/Model/Config/Processor/FallbackTest.php b/app/code/Magento/Store/Test/Unit/Model/Config/Processor/FallbackTest.php
diff --git a/lib/internal/Magento/Framework/App/Config.php b/lib/internal/Magento/Framework/App/Config.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * Application configuration object. Used to access configuration when application is initialized and installed.
+ *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -10,14 +12,14 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 
 /**
- * Application configuration object. Used to access configuration when application is initialized and installed.
+ * Class Config
  */
 class Config implements ScopeConfigInterface
 {
     /**
      * Config cache tag
      */
-    public const CACHE_TAG = 'CONFIG';
+    const CACHE_TAG = 'CONFIG';
 
     /**
      * @var ScopeCodeResolver
diff --git a/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php b/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php
@@ -59,10 +59,9 @@ public function resolve($scopeType, $scopeCode)
             $scopeCode = $resolverScopeCode;
         }
 
-        $this->resolvedScopeCodes[$scopeType][$scopeCode] =
-            is_null($resolverScopeCode) ? null : strtolower($resolverScopeCode);
+        $this->resolvedScopeCodes[$scopeType][$scopeCode] = $resolverScopeCode;
 
-        return $this->resolvedScopeCodes[$scopeType][$scopeCode];
+        return $resolverScopeCode;
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Config/ScopeCodeResolverTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Config/ScopeCodeResolverTest.php
@@ -67,6 +67,6 @@ public function testResolve()
         $this->scope->expects($this->once())
             ->method('getCode')
             ->willReturn($scopeCode);
-        $this->assertEquals(strtolower($scopeCode), $this->scopeCodeResolver->resolve($scopeType, $scopeId));
+        $this->assertEquals($scopeCode, $this->scopeCodeResolver->resolve($scopeType, $scopeId));
     }
 }
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/ConfigTest.php b/lib/internal/Magento/Framework/App/Test/Unit/ConfigTest.php
@@ -84,7 +84,7 @@ public function getValueDataProvider()
     {
         return [
             ['store', 1],
-            ['website']
+            ['website'],
         ];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -102,12 +102,8 @@ public function getPlaceholderValue($path, $scope, $scopeCode = null)`
`102`	`102`	`public function getEnvValue($placeholder)`
`103`	`103`	`{`
`104`	`104`	`// phpcs:disable Magento2.Security.Superglobal`
`105`		`- $environment = [];`
`106`		`- foreach ($_ENV as $key => $value) {`
`107`		`- $environment[strtolower($key)] = $value;`
`108`		`- }`
`109`		`- if ($this->placeholder->isApplicable($placeholder) && isset($environment[strtolower($placeholder)])) {`
`110`		`- return $environment[strtolower($placeholder)];`
	`105`	`+ if ($this->placeholder->isApplicable($placeholder) && isset($_ENV[$placeholder])) {`
	`106`	`+ return $_ENV[$placeholder];`
`111`	`107`	`}`
`112`	`108`	`// phpcs:enable`
`113`	`109`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ private function getEntities($table, $keyField)`
`102`	`102`	`);`
`103`	`103`
`104`	`104`	`foreach ($entities as $entity) {`
`105`		`- $data[strtolower($entity[$keyField])] = $entity;`
	`105`	`+ $data[$entity[$keyField]] = $entity;`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`return $data;`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function get($path = '')`
`72`	`72`	`$path = $this->convertIdPathToCodePath($patchChunks);`
`73`	`73`	`}`
`74`	`74`
`75`		`- return $this->data->getData(strtolower($path));`
	`75`	`+ return $this->data->getData($path);`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -59,10 +59,9 @@ public function resolve($scopeType, $scopeCode)`
`59`	`59`	`$scopeCode = $resolverScopeCode;`
`60`	`60`	`}`
`61`	`61`
`62`		`- $this->resolvedScopeCodes[$scopeType][$scopeCode] =`
`63`		`- is_null($resolverScopeCode) ? null : strtolower($resolverScopeCode);`
	`62`	`+ $this->resolvedScopeCodes[$scopeType][$scopeCode] = $resolverScopeCode;`
`64`	`63`
`65`		`- return $this->resolvedScopeCodes[$scopeType][$scopeCode];`
	`64`	`+ return $resolverScopeCode;`
`66`	`65`	`}`
`67`	`66`
`68`	`67`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,6 @@ public function testResolve()`
`67`	`67`	`$this->scope->expects($this->once())`
`68`	`68`	`->method('getCode')`
`69`	`69`	`->willReturn($scopeCode);`
`70`		`- $this->assertEquals(strtolower($scopeCode), $this->scopeCodeResolver->resolve($scopeType, $scopeId));`
	`70`	`+ $this->assertEquals($scopeCode, $this->scopeCodeResolver->resolve($scopeType, $scopeId));`
`71`	`71`	`}`
`72`	`72`	`}`