Fix twig deprecation for spaceless tag (#652)

* Add composer conflict

* Fix deprecation

* Add changelog

Author: deguif

CHANGELOG-2.0.md

@@ -6,6 +6,7 @@ This changelog references the relevant changes done in 6.0 versions.
 ### 2.0.0-ALPHA1 (unreleased)
 
 * Added `NL` translations [[#631](https://github.com/FriendsOfSymfony/FOSOAuthServerBundle/pull/631)]
+* Bumped `twig/twig` supported versions to `1.40` for `1.x` and `2.9` for `2.x` [[#652](https://github.com/FriendsOfSymfony/FOSOAuthServerBundle/pull/652)]
 * Dropped support for PHP 7.1 [[#651](https://github.com/FriendsOfSymfony/FOSOAuthServerBundle/pull/651)]
 * Dropped support for Symfony versions anterior to `4.4` [[#648](https://github.com/FriendsOfSymfony/FOSOAuthServerBundle/pull/648)]
 * Fixed form submission/validation [[#643](https://github.com/FriendsOfSymfony/FOSOAuthServerBundle/pull/643)]

Resources/views/form.html.twig

@@ -1,6 +1,6 @@
 
 {% block field_label %}
-{% spaceless %}
+{% apply spaceless %}
     <label for="{{ id }}">{{ id|trans([], 'FOSOAuthServerBundle') }}</label>
-{% endspaceless %}
+{% endapply %}
 {% endblock field_label %}

composer.json

@@ -26,6 +26,9 @@
         "symfony/framework-bundle": "^4.4",
         "symfony/security-bundle": "^4.4"
     },
+    "conflict": {
+        "twig/twig": "<1.40 || >=2.0,<2.9"
+    },
     "require-dev": {
         "doctrine/doctrine-bundle": "~1.0",
         "doctrine/mongodb-odm": "~1.0",