Fix emoji insertion in MySQL

Switch to utf8mb4 instead of utf8 because f*** MySQL
See https://github.com/doctrine/dbal/pull/851

diff --git a/app/config/config.yml b/app/config/config.yml
index b4760073b128111c9d9f815fb3fae0d516fc3aa2..9dbc9d7ccf9a0ad33998206f8144d81c6ec5894f 100644 (file)
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -75,7 +75,7 @@ doctrine:
         dbname: "%database_name%"
         user: "%database_user%"
         password: "%database_password%"
-        charset: UTF8
+        charset: "%database_charset%"
         path: "%database_path%"
         unix_socket: "%database_socket%"
         server_version: 5.6

diff --git a/app/config/config_test.yml b/app/config/config_test.yml
index 3eab6fb2848f5afccf9c8b6b76ded8a8b845aa93..f5e2c25ead1bca8ccb1b9980fa48657f5c864c76 100644 (file)
--- a/app/config/config_test.yml
+++ b/app/config/config_test.yml
@@ -28,7 +28,7 @@ doctrine:
         dbname: "%test_database_name%"
         user: "%test_database_user%"
         password: "%test_database_password%"
-        charset: UTF8
+        charset: "%test_database_charset%"
         path: "%test_database_path%"
     orm:
         metadata_cache_driver:

diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index ece4903a186ba8a3de077466fbac84a02e27b658..a33ea37bfb527d89117330c10ec050d5ac91576c 100644 (file)
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -19,16 +19,18 @@ parameters:
     database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
     database_table_prefix: wallabag_
     database_socket: null
+    # with MySQL, use "utf8mb4" if got problem with content with emojis
+    database_charset: utf8
 
-    mailer_transport:  smtp
-    mailer_host:       127.0.0.1
-    mailer_user:       ~
-    mailer_password:   ~
+    mailer_transport: smtp
+    mailer_host: 127.0.0.1
+    mailer_user: ~
+    mailer_password: ~
 
-    locale:            en
+    locale: en
 
     # A secret key that's used to generate certain security-related tokens
-    secret:            ovmpmAWXRCabNlMgzlzFXDYmCFfzGv
+    secret: ovmpmAWXRCabNlMgzlzFXDYmCFfzGv
 
     # two factor stuff
     twofactor_auth: true

diff --git a/app/config/parameters_test.yml b/app/config/parameters_test.yml
index 2943b27a75338643eac98b59b1e48d21146475ee..5f2e25bb9bb13ebe021a6e3ca6c00a7d11f51e6b 100644 (file)
--- a/app/config/parameters_test.yml
+++ b/app/config/parameters_test.yml
@@ -6,3 +6,4 @@ parameters:
     test_database_user: null
     test_database_password: null
     test_database_path: '%kernel.root_dir%/../data/db/wallabag_test.sqlite'
+    test_database_charset: utf8

diff --git a/app/config/tests/parameters_test.mysql.yml b/app/config/tests/parameters_test.mysql.yml
index d8512845fa6ca4f462dbe5a764ec20b7ed85d6fc..bca2d466364588c62dd13a4d2649d3708a2403d8 100644 (file)
--- a/app/config/tests/parameters_test.mysql.yml
+++ b/app/config/tests/parameters_test.mysql.yml
@@ -6,3 +6,4 @@ parameters:
     test_database_user: root
     test_database_password: ~
     test_database_path: ~
+    test_database_charset: utf8mb4

diff --git a/app/config/tests/parameters_test.pgsql.yml b/app/config/tests/parameters_test.pgsql.yml
index 41383868d5be06b2ffe9a931d61a9ee8cf957b61..3e18d4a0395f41fedced20f96fe9ee6241cb9e64 100644 (file)
--- a/app/config/tests/parameters_test.pgsql.yml
+++ b/app/config/tests/parameters_test.pgsql.yml
@@ -6,3 +6,4 @@ parameters:
     test_database_user: travis
     test_database_password: ~
     test_database_path: ~
+    test_database_charset: utf8

diff --git a/app/config/tests/parameters_test.sqlite.yml b/app/config/tests/parameters_test.sqlite.yml
index 1952e3a61135340aa66c461c53c53e0fbe1b3332..0efbe78622d00ec65c936de2776cdaf976c8f6c8 100644 (file)
--- a/app/config/tests/parameters_test.sqlite.yml
+++ b/app/config/tests/parameters_test.sqlite.yml
@@ -6,3 +6,4 @@ parameters:
     test_database_user: ~
     test_database_password: ~
     test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite"
+    test_database_charset: utf8mb4

diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php
index dd49acf0aa60427c5952e51a2273927d26f36715..dd0f7e67227b2f7d677888de72e30c57b90d0c04 100644 (file)
--- a/src/Wallabag/CoreBundle/Entity/Entry.php
+++ b/src/Wallabag/CoreBundle/Entity/Entry.php
@@ -19,7 +19,7 @@ use Wallabag\AnnotationBundle\Entity\Annotation;
  *
  * @XmlRoot("entry")
  * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\EntryRepository")
- * @ORM\Table(name="`entry`")
+ * @ORM\Table(name="`entry`", options={"collate"="utf8mb4_unicode_ci", "charset"="utf8mb4"})
  * @ORM\HasLifecycleCallbacks()
  * @Hateoas\Relation("self", href = "expr('/api/entries/' ~ object.getId())")
  */