Merge a9204ea into bf65b11

kilhage · Dec 3, 2019 · e108d4d · e108d4d
2 parents bf65b11 + a9204ea
commit e108d4d
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git 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"
     },

diff --git 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');
     }

diff --git 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
@@ -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"})
  *   }