Merge pull request #159 from ewallah/issue#37

Use utf8mb4 for mysql and mariadb

Author: stronk7

gha.dist.yml

@@ -20,6 +20,9 @@ jobs:
         env:
           MYSQL_USER: 'root'
           MYSQL_ALLOW_EMPTY_PASSWORD: "true"
+          MYSQL_CHARACTER_SET_SERVER: "utf8mb4"
+          MYSQL_COLLATION_SERVER: "utf8mb4_unicode_ci"
+
         ports:
           - 3306:3306
         options: --health-cmd="mysqladmin ping" --health-interval 10s --health-timeout 5s --health-retries 3

src/Installer/Database/MySQLDatabase.php

@@ -24,7 +24,7 @@ public function getCreateDatabaseCommand()
         $passOpt  = !empty($this->pass) ? ' --password='.escapeshellarg($this->pass) : '';
         $user     = escapeshellarg($this->user);
         $host     = escapeshellarg($this->host);
-        $createDB = escapeshellarg(sprintf('CREATE DATABASE `%s` DEFAULT CHARACTER SET UTF8 COLLATE utf8_general_ci;', $this->name));
+        $createDB = escapeshellarg(sprintf('CREATE DATABASE `%s` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;', $this->name));
 
         return sprintf('mysql -u %s%s -h %s -e %s', $user, $passOpt, $host, $createDB);
     }

tests/Installer/Database/MariaDBDatabaseTest.php

@@ -24,7 +24,7 @@ public function testGetCreateDatabaseCommand()
         $database->pass = 'TestPass';
         $database->host = 'TestHost';
 
-        $expected = 'mysql -u \'TestUser\' --password=\'TestPass\' -h \'TestHost\' -e \'CREATE DATABASE `TestName` DEFAULT CHARACTER SET UTF8 COLLATE utf8_general_ci;\'';
+        $expected = 'mysql -u \'TestUser\' --password=\'TestPass\' -h \'TestHost\' -e \'CREATE DATABASE `TestName` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;\'';
         $this->assertSame($expected, $database->getCreateDatabaseCommand());
     }
 }

tests/Installer/Database/MySQLDatabaseTest.php

@@ -24,7 +24,7 @@ public function testGetCreateDatabaseCommand()
         $database->pass = 'TestPass';
         $database->host = 'TestHost';
 
-        $expected = 'mysql -u \'TestUser\' --password=\'TestPass\' -h \'TestHost\' -e \'CREATE DATABASE `TestName` DEFAULT CHARACTER SET UTF8 COLLATE utf8_general_ci;\'';
+        $expected = 'mysql -u \'TestUser\' --password=\'TestPass\' -h \'TestHost\' -e \'CREATE DATABASE `TestName` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;\'';
         $this->assertSame($expected, $database->getCreateDatabaseCommand());
     }
 }