Merge remote-tracking branch 'upstream/master'

Author: mpiot

.travis.yml

@@ -16,6 +16,7 @@ matrix:
   include:
     - php: 7.1.18
     - php: 7.2
+    - php: 7.3
     - php: nightly
   allow_failures:
     - php: nightly

composer.json

@@ -10,24 +10,27 @@
         "doctrine/doctrine-migrations-bundle": "^1.3",
         "doctrine/orm": "^2.5.11",
         "erusev/parsedown": "^1.6",
-        "ezyang/htmlpurifier": "^4.9",
         "sensio/framework-extra-bundle": "^5.1",
         "sensiolabs/security-checker": "^5.0",
         "symfony/asset": "*",
+        "symfony/console": "*",
         "symfony/expression-language": "*",
         "symfony/flex": "^1.1",
         "symfony/form": "*",
         "symfony/framework-bundle": "*",
+        "symfony/intl": "*",
         "symfony/monolog-bundle": "^3.1",
         "symfony/polyfill-php72": "^1.8",
         "symfony/security-bundle": "*",
         "symfony/swiftmailer-bundle": "^3.1",
         "symfony/translation": "*",
         "symfony/twig-bundle": "*",
         "symfony/validator": "*",
-        "symfony/webpack-encore-bundle": "dev-master",
+        "symfony/webpack-encore-bundle": "^1.1",
         "symfony/yaml": "*",
+        "tgalopin/html-sanitizer-bundle": "^1.1",
         "twig/extensions": "^1.5",
+        "twig/twig": "^2.6",
         "white-october/pagerfanta-bundle": "^1.1"
     },
     "require-dev": {