AC-9755:Set default collation to utf8mb4 for MySQL

Author: glo17680

lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php

@@ -1268,7 +1268,7 @@ public function modifyColumn($tableName, $columnName, $definition, $flushData =
             $definition = $this->_getColumnDefinition($definition);
         }
         // Add charset and collation for DBC failures
-        if(!empty($definition)) {
+        if (!empty($definition)) {
             $type = explode(' ', trim($definition));
             $definition = $this->applyCharsetAndCollation($type[0], $definition, 1);
         }
@@ -2447,7 +2447,7 @@ protected function _getColumnsDefinition(Table $table)
             );
         }
         // Adding charset and collation for DBC failures
-        if(count($definition)) {
+        if (count($definition)) {
             foreach ($definition as $index => $columnDefinition) {
                 $type = explode(' ', trim($columnDefinition));
                 $definition[$index] = $this->applyCharsetAndCollation($type[1], $columnDefinition, 2);
@@ -4311,9 +4311,9 @@ public function __debugInfo()
     /***
      * Adding charset and collation for DBC failures
      *
-     * @param $columnType
-     * @param $definition
-     * @param $position
+     * @param string $columnType
+     * @param string $definition
+     * @param int $position
      * @return string
      */
     private function applyCharsetAndCollation($columnType, $definition, $position) : string

lib/internal/Magento/Framework/Mview/View/Changelog.php

@@ -17,6 +17,8 @@
 
 /**
  * Class Changelog for manipulations with the mview_state table.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Changelog implements ChangelogInterface
 {

lib/internal/Magento/Framework/Setup/Test/Unit/Declaration/Schema/Db/DbSchemaWriterTest.php

@@ -15,6 +15,7 @@
 use Magento\Framework\Setup\Declaration\Schema\Db\StatementFactory;
 use Magento\Framework\Setup\Declaration\Schema\DryRunLogger;
 use Magento\Framework\Setup\Declaration\Schema\Db\MySQL\DbSchemaWriter;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Table as DtoFactoriesTable;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -50,6 +51,11 @@ class DbSchemaWriterTest extends TestCase
      */
     private $model;
 
+    /***
+     * @var DtoFactoriesTable|MockObject
+     */
+    private $dtoFactoriesTable;
+
     protected function setUp(): void
     {
         $this->resourceConnection = $this->getMockBuilder(ResourceConnection::class)
@@ -70,12 +76,16 @@ protected function setUp(): void
         $this->resourceConnection->expects($this->any())
             ->method('getConnection')
             ->willReturn($this->adapter);
+        $this->dtoFactoriesTable = $this->getMockBuilder(DtoFactoriesTable::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->model = new DbSchemaWriter(
             $this->resourceConnection,
             $this->statementFactory,
             $this->dryRunLogger,
-            $this->sqlVersionProvider
+            $this->sqlVersionProvider,
+            $this->dtoFactoriesTable
         );
     }