Merge branch '2.4.7-beta1-develop' into application-server-part3

Author: andimov

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
 

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

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;

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);
     }
 
     /**

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']);
-        }
     }
 }

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()
         );

app/code/Magento/Store/Test/Unit/Model/Config/Processor/FallbackTest.php

@@ -54,7 +54,7 @@ protected function setUp(): void
     public function testValidate(): void
     {
         $this->expectException(LocalizedException::class);
-        $this->expectErrorMessage((string)__('Please enter a valid number in this field.'));
+        $this->expectExceptionMessage((string)__('Please enter a valid number in this field.'));
         $product = $this->productFactory->create();
         $product->setQuantityAndStockStatus(['qty' => 'string']);
         $this->model->validate($product);

dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/StockTest.php

@@ -136,7 +136,7 @@ public function postRequestData(): array
     public function testAuthorizedSavingOfWithException(array $data): void
     {
         $this->expectException(AuthorizationException::class);
-        $this->expectErrorMessage('Not allowed to edit the product\'s design attributes');
+        $this->expectExceptionMessage('Not allowed to edit the product\'s design attributes');
         $this->request->setPost(new Parameters($data));
 
         /** @var Product $product */

dev/tests/integration/testsuite/Magento/Catalog/Model/Product/AuthorizationTest.php

@@ -65,7 +65,7 @@ public function testSaveWithoutWebsiteId(): void
         $productWebsiteLink = $this->productWebsiteLinkFactory->create();
         $productWebsiteLink->setSku('unique-simple-azaza');
         $this->expectException(InputException::class);
-        $this->expectErrorMessage((string)__('There are not websites for assign to product'));
+        $this->expectExceptionMessage((string)__('There are not websites for assign to product'));
         $this->productWebsiteLinkRepository->save($productWebsiteLink);
     }