Merge branch '2.7' into 2.8

* 2.7:
  [Form] fixed BC-break on grouped choice lists
  [WebProfilerBundle] add import for Twig macro
  made Symfony compatible with both Twig 1.x and 2.x
  [Debug/VarDumper] minor cleanups
  [Form] only use PropertyPath if not already callable
  [Form] fix reworked choice list phpdoc
  [DoctrineBridge][Form] Add old tests to legacy group
  Fixed warning when command alias is longer than command name
  removed _self usage when not needed
  Implement the support of timezone objects in the stub IntlDateFormatter
  typofix - https://github.com/vlajos/misspell_fixer
  make doctrine mappings compiler pass exception message more understandable
  fix debug-ext 003.phpt
  [Yaml] Nested merge keys
  [FrameworkBundle] [Command] removed unused variable.
  [Debug] Enhance DebugClassLoader performance on MacOSX
  Add support for variadic arguments in the GetSetNormalizer
  [DoctrineBridge][Form] Fix IdReader when indexing by primary foreign key
  [DoctrineBridge][Form] Fix EntityChoiceList when indexing by primary foreign key

Author: fabpot

CHANGELOG.md

@@ -20,7 +20,7 @@ CHANGELOG
 
  * Added 'host' option to firewall configuration
  * Added 'csrf_token_generator' and 'csrf_token_id' options to firewall logout
-   listener configuration to supercede/alias 'csrf_provider' and 'intention'
+   listener configuration to supersede/alias 'csrf_provider' and 'intention'
    respectively
  * Moved 'security.secure_random' service configuration to FrameworkBundle
 

composer.json

@@ -39,7 +39,7 @@
         "symfony/yaml": "~2.0,>=2.0.5|~3.0.0",
         "symfony/expression-language": "~2.6|~3.0.0",
         "doctrine/doctrine-bundle": "~1.2",
-        "twig/twig": "~1.12",
+        "twig/twig": "~1.20|~2.0",
         "ircmaxell/password-compat": "~1.0"
     },
     "autoload": {