Merge pull request #9325 from magento-gl/Hammer-Platform-Health-2.4.8-beta2-28Oct24v1

[Hammer][2.4.8-beta2] Platform Health Scope

Author: internal-magento-queue-manager[bot]

app/code/Magento/Theme/Model/Indexer/Design/IndexerHandler.php

@@ -1,13 +1,14 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
 
 namespace Magento\Theme\Model\Indexer\Design;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Indexer\IndexStructureInterface;
 use Magento\Framework\Indexer\SaveHandler\Batch;
@@ -16,6 +17,7 @@
 use Magento\Framework\Indexer\ScopeResolver\FlatScopeResolver;
 use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
 use Magento\Framework\Search\Request\Dimension;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Table as DtoFactoriesTable;
 
 class IndexerHandler extends Grid
 {
@@ -24,6 +26,21 @@ class IndexerHandler extends Grid
      */
     private $flatScopeResolver;
 
+    /***
+     * check for old collation
+     */
+    private const OLDCOLLATION = 'utf8_general_ci|utf8mb3_general_ci';
+
+    /***
+     * table design_config_grid_flat
+     */
+    private const DESIGN_CONFIG_GRID_FLAT = "design_config_grid_flat";
+
+    /***
+     * @var DtoFactoriesTable
+     */
+    private $columnConfig;
+
     /**
      * @param IndexStructureInterface $indexStructure
      * @param ResourceConnection $resource
@@ -32,6 +49,7 @@ class IndexerHandler extends Grid
      * @param FlatScopeResolver $flatScopeResolver
      * @param array $data
      * @param int $batchSize
+     * @param DtoFactoriesTable|null $dtoFactoriesTable
      */
     public function __construct(
         IndexStructureInterface $indexStructure,
@@ -40,7 +58,8 @@ public function __construct(
         IndexScopeResolver $indexScopeResolver,
         FlatScopeResolver $flatScopeResolver,
         array $data,
-        $batchSize = 100
+        $batchSize = 100,
+        ?DtoFactoriesTable $dtoFactoriesTable = null
     ) {
         parent::__construct(
             $indexStructure,
@@ -51,8 +70,8 @@ public function __construct(
             $data,
             $batchSize
         );
-
         $this->flatScopeResolver = $flatScopeResolver;
+        $this->columnConfig = $dtoFactoriesTable ?: ObjectManager::getInstance()->get(DtoFactoriesTable::class);
     }
 
     /**
@@ -67,6 +86,27 @@ public function cleanIndex($dimensions)
 
         if ($this->connection->isTableExists($tableName)) {
             $this->connection->delete($tableName);
+            // change the charset to utf8mb4
+            if ($tableName === self::DESIGN_CONFIG_GRID_FLAT) {
+                $getTableSchema = $this->connection->showTableStatus($tableName) ?? '';
+                if (isset($getTableSchema['Collation']) &&
+                    preg_match('/\b('. self::OLDCOLLATION .')\b/', $getTableSchema['Collation'])) {
+                    $charset = $this->columnConfig->getDefaultCharset();
+                    $collate = $this->columnConfig->getDefaultCollation();
+                    $columnEncoding = " CHARACTER SET ".$charset." COLLATE ".$collate;
+                    $this->connection->query(
+                        sprintf(
+                            'ALTER TABLE `%s` MODIFY COLUMN `theme_theme_id` varchar(255) %s %s,
+                             DEFAULT CHARSET=%s, DEFAULT COLLATE=%s',
+                            $tableName,
+                            $columnEncoding,
+                            "COMMENT 'Theme_theme_id'",
+                            $charset,
+                            $collate
+                        )
+                    );
+                }
+            }
         } else {
             $this->indexStructure->create($this->getIndexName(), $this->fields, $dimensions);
         }

app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/ConfigTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -22,6 +22,7 @@
 use Magento\Framework\Indexer\ScopeResolver\FlatScopeResolver;
 use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
 use Magento\Framework\Indexer\StructureFactory;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Table as DtoFactoriesTable;
 use Magento\Theme\Model\Data\Design\Config as DesignConfig;
 use Magento\Theme\Model\Indexer\Design\Config;
 use Magento\Theme\Model\ResourceModel\Design\Config\Scope\CollectionFactory;
@@ -91,6 +92,10 @@ class ConfigTest extends TestCase
      * @var CollectionFactory|MockObject
      */
     private $collectionFactory;
+    /***
+     * @var DtoFactoriesTable|MockObject
+     */
+    private $dtoFactoriesTable;
 
     protected function setUp(): void
     {
@@ -132,6 +137,9 @@ protected function setUp(): void
             ->getMock();
         $this->indexerFieldset = $this->getMockBuilder(FieldsetInterface::class)
             ->getMockForAbstractClass();
+        $this->dtoFactoriesTable = $this->getMockBuilder(DtoFactoriesTable::class)
+            ->disableOriginalConstructor()
+            ->getMock();
     }
 
     /**
@@ -171,7 +179,9 @@ private function getDesignConfigIndexerModel(): Config
             [
                 'fieldsets' => [],
                 'indexer_id' => DesignConfig::DESIGN_CONFIG_GRID_INDEXER_ID
-            ]
+            ],
+            [],
+            $this->dtoFactoriesTable
         );
 
         $this->saveHandlerFactory->expects($this->any())

dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/constraint_modification.mariadb10611.php

@@ -11,7 +11,7 @@
   `int_auto_increment_with_nullable` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `int_disabled_auto_increment` smallint(5) unsigned DEFAULT 0,
   UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci',
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci',
     'reference_table' => 'CREATE TABLE `reference_table` (
   `tinyint_ref` tinyint(4) NOT NULL AUTO_INCREMENT,
   `tinyint_without_padding` tinyint(4) NOT NULL DEFAULT 0,
@@ -27,7 +27,7 @@
   `smallint_ref` smallint(6) NOT NULL DEFAULT 0,
   PRIMARY KEY (`tinyint_ref`,`smallint_ref`),
   UNIQUE KEY `REFERENCE_TABLE_SMALLINT_REF` (`smallint_ref`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci',
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci',
     'test_table' => 'CREATE TABLE `test_table` (
   `smallint` smallint(6) DEFAULT NULL,
   `tinyint` tinyint(4) DEFAULT NULL,
@@ -55,5 +55,5 @@
   CONSTRAINT `FK_FB77604C299EB8612D01E4AF8D9931F2` FOREIGN KEY (`integer_main`) REFERENCES `auto_increment_test` (`int_auto_increment_with_nullable`) ON DELETE CASCADE,
   CONSTRAINT `TEST_TABLE_SMALLINT_MAIN_REFERENCE_TABLE_SMALLINT_REF` FOREIGN KEY (`smallint_main`) REFERENCES `reference_table` (`smallint_ref`) ON DELETE CASCADE,
   CONSTRAINT `TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF` FOREIGN KEY (`tinyint`) REFERENCES `reference_table` (`tinyint_ref`) ON DELETE SET NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci',
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci',
 ];

dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/constraint_modification.mysql829.php

@@ -11,7 +11,7 @@
   `int_auto_increment_with_nullable` int unsigned NOT NULL AUTO_INCREMENT,
   `int_disabled_auto_increment` smallint unsigned DEFAULT \'0\',
   UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci',
     'reference_table' => 'CREATE TABLE `reference_table` (
   `tinyint_ref` tinyint NOT NULL AUTO_INCREMENT,
   `tinyint_without_padding` tinyint NOT NULL DEFAULT \'0\',
@@ -27,7 +27,7 @@
   `smallint_ref` smallint NOT NULL DEFAULT \'0\',
   PRIMARY KEY (`tinyint_ref`,`smallint_ref`),
   UNIQUE KEY `REFERENCE_TABLE_SMALLINT_REF` (`smallint_ref`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci',
     'test_table' => 'CREATE TABLE `test_table` (
   `smallint` smallint DEFAULT NULL,
   `tinyint` tinyint DEFAULT NULL,
@@ -38,10 +38,10 @@
   `date` date DEFAULT NULL,
   `timestamp` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `datetime` datetime DEFAULT \'0000-00-00 00:00:00\',
-  `longtext` longtext,
-  `mediumtext` mediumtext,
-  `varchar` varchar(254) DEFAULT NULL,
-  `char` char(255) DEFAULT NULL,
+  `longtext` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
+  `mediumtext` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
+  `varchar` varchar(254) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `char` char(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
   `mediumblob` mediumblob,
   `blob` blob,
   `boolean` tinyint(1) DEFAULT NULL,
@@ -55,5 +55,5 @@
   CONSTRAINT `FK_FB77604C299EB8612D01E4AF8D9931F2` FOREIGN KEY (`integer_main`) REFERENCES `auto_increment_test` (`int_auto_increment_with_nullable`) ON DELETE CASCADE,
   CONSTRAINT `TEST_TABLE_SMALLINT_MAIN_REFERENCE_TABLE_SMALLINT_REF` FOREIGN KEY (`smallint_main`) REFERENCES `reference_table` (`smallint_ref`) ON DELETE CASCADE,
   CONSTRAINT `TEST_TABLE_TINYINT_REFERENCE_TABLE_TINYINT_REF` FOREIGN KEY (`tinyint`) REFERENCES `reference_table` (`tinyint_ref`) ON DELETE SET NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci',
 ];

dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/rollback.mariadb10611.php

@@ -12,16 +12,16 @@
   `store_owner_id` smallint(6) DEFAULT NULL COMMENT \'Store Owner Reference\',
   KEY `STORE_STORE_OWNER_ID_STORE_OWNER_OWNER_ID` (`store_owner_id`),
   CONSTRAINT `STORE_STORE_OWNER_ID_STORE_OWNER_OWNER_ID` FOREIGN KEY (`store_owner_id`) REFERENCES `store_owner` (`owner_id`) ON DELETE SET NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci',
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci',
         'store_owner' => 'CREATE TABLE `store_owner` (
   `owner_id` smallint(6) NOT NULL AUTO_INCREMENT,
   `store_owner_name` varchar(255) DEFAULT NULL COMMENT \'Store Owner Name\',
   PRIMARY KEY (`owner_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci COMMENT=\'Store owner information\''
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT=\'Store owner information\''
     ],
     'after' => [
         'store' => 'CREATE TABLE `store` (
   `store_owner` varchar(255) DEFAULT NULL COMMENT \'Store Owner Name\'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci'
     ]
-];
+];

dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/rollback.mysql829.php

@@ -12,16 +12,16 @@
   `store_owner_id` smallint DEFAULT NULL COMMENT \'Store Owner Reference\',
   KEY `STORE_STORE_OWNER_ID_STORE_OWNER_OWNER_ID` (`store_owner_id`),
   CONSTRAINT `STORE_STORE_OWNER_ID_STORE_OWNER_OWNER_ID` FOREIGN KEY (`store_owner_id`) REFERENCES `store_owner` (`owner_id`) ON DELETE SET NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci',
         'store_owner' => 'CREATE TABLE `store_owner` (
   `owner_id` smallint NOT NULL AUTO_INCREMENT,
-  `store_owner_name` varchar(255) DEFAULT NULL COMMENT \'Store Owner Name\',
+  `store_owner_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT \'Store Owner Name\',
   PRIMARY KEY (`owner_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT=\'Store owner information\''
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT=\'Store owner information\''
     ],
     'after' => [
         'store' => 'CREATE TABLE `store` (
-  `store_owner` varchar(255) DEFAULT NULL COMMENT \'Store Owner Name\'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3'
+  `store_owner` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT \'Store Owner Name\'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci'
     ]
 ];

dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/table_removal.mariadb10611.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -10,5 +10,5 @@
   `int_auto_increment_with_nullable` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `int_disabled_auto_increment` smallint(5) unsigned DEFAULT 0,
   UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci'
 ];

dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/table_removal.mysql829.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -10,5 +10,5 @@
   `int_auto_increment_with_nullable` int unsigned NOT NULL AUTO_INCREMENT,
   `int_disabled_auto_increment` smallint unsigned DEFAULT \'0\',
   UNIQUE KEY `AUTO_INCREMENT_TEST_INT_AUTO_INCREMENT_WITH_NULLABLE` (`int_auto_increment_with_nullable`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci'
 ];

dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/table_rename.mariadb10611.php

@@ -1,15 +1,15 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 return [
     'before' => 'CREATE TABLE `some_table` (
   `some_column` varchar(255) DEFAULT NULL COMMENT \'Some Column Name\'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci',
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci',
     'after' => 'CREATE TABLE `some_table_renamed` (
   `some_column` varchar(255) DEFAULT NULL COMMENT \'Some Column Name\'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci',
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci',
 ];

dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule1/fixture/declarative_installer/table_rename.mysql829.php

@@ -1,15 +1,15 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 return [
     'before' => 'CREATE TABLE `some_table` (
-  `some_column` varchar(255) DEFAULT NULL COMMENT \'Some Column Name\'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
+  `some_column` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT \'Some Column Name\'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci',
     'after' => 'CREATE TABLE `some_table_renamed` (
-  `some_column` varchar(255) DEFAULT NULL COMMENT \'Some Column Name\'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3',
+  `some_column` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT \'Some Column Name\'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci',
 ];