From 1915f2bbedc02968604bef615c82f2c856a026d4 Mon Sep 17 00:00:00 2001 From: Maxime Corson Date: Thu, 28 Nov 2019 14:57:39 +0100 Subject: [PATCH 1/3] Change entity collation to utf8mb4_unicode_ci and add charset utf8mb4 --- src/Entity/QueuedTask.php | 2 +- src/Entity/Schedule.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Entity/QueuedTask.php b/src/Entity/QueuedTask.php index 9c65e5e..31caf5c 100644 --- a/src/Entity/QueuedTask.php +++ b/src/Entity/QueuedTask.php @@ -7,7 +7,7 @@ /** * @ORM\Table( * name="task_queue", - * options={"collate"="utf8_swedish_ci"}, + * options={"collate"="utf8mb4_unicode_ci", "charset"="utf8mb4"}, * indexes={ * @ORM\Index(name="execute_at_idx", columns={"execute_at"}), * @ORM\Index(name="status_idx", columns={"status"}), diff --git a/src/Entity/Schedule.php b/src/Entity/Schedule.php index aabbc68..c01931c 100644 --- a/src/Entity/Schedule.php +++ b/src/Entity/Schedule.php @@ -8,7 +8,7 @@ /** * @ORM\Table( * name="task_schedules", - * options={"collate"="utf8_swedish_ci"}, + * options={"collate"="utf8mb4_unicode_ci", "charset"="utf8mb4"}, * indexes={ * @ORM\Index(name="active_idx", columns={"active"}) * } From 02a1b6e041cd5b81f600e2a8b9e3d0ff3f6380cd Mon Sep 17 00:00:00 2001 From: Maxime Corson Date: Tue, 3 Dec 2019 17:40:48 +0100 Subject: [PATCH 2/3] Allow installation on Symfony v3 projects and not only v4 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 52601b8..bc905ec 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ }, "require": { "php": ">=7.1", - "symfony/framework-bundle": "~4.3", + "symfony/framework-bundle": "^3.0|^4.0", "doctrine/orm": "~2.6", "dragonmantank/cron-expression": "~2.0" }, From a9204ead9d940d876102cb01272a3ebd69f25ce7 Mon Sep 17 00:00:00 2001 From: Maxime Corson Date: Tue, 3 Dec 2019 18:43:26 +0100 Subject: [PATCH 3/3] Remove unused bundle configuration processing --- src/DependencyInjection/GloobyTaskExtension.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/DependencyInjection/GloobyTaskExtension.php b/src/DependencyInjection/GloobyTaskExtension.php index c06e501..ed9230e 100644 --- a/src/DependencyInjection/GloobyTaskExtension.php +++ b/src/DependencyInjection/GloobyTaskExtension.php @@ -19,9 +19,6 @@ class GloobyTaskExtension extends Extension */ public function load(array $configs, ContainerBuilder $container) { - $configuration = new Configuration(); - $this->processConfiguration($configuration, $configs); - $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); $loader->load('services.yml'); }