Merge branch '2.7'

* 2.7:
  fixed tests
  [OptionsResolver] replaced some exception messages
  Added i18n support to ConfirmationQuestion
  [HttpKernel] [WebProfilerBundle] added HTTP status to profiler search result
  [Form] fixed form tests when using 2.7 deps
  [2.3] [HttpFoundation] [MimeTypeGuesser]
  [Routing] merge instead of replace class and method scheme/method annotations
  [TwigBridge] Fix bootstrap rendering when user explicitly use form_label
  Removed dead code and various cleaning
  Removed dead code and various cleaning
  Fixed HtmlDumper with long string
  Removed dead code and various cleaning
  [FrameworkBundle][xsd] added missing logging attribute.
  [Console] Make it clear that the second argument is not about command options.
  Added the '-' character for spaceless on tag start and end to be consistent for block, if, set and for nodes
  [Yaml] fixed parse shortcut Key after unindented collection.
  [Console] fixed #10531
  Make the container considered non-fresh if the environment parameters are changed

Conflicts:
	src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
	src/Symfony/Component/HttpKernel/CHANGELOG.md
	src/Symfony/Component/Process/Process.php

Author: fabpot

OptionsResolver.php

@@ -409,7 +409,7 @@ public function setNormalizer($option, \Closure $normalizer)
 
         if (!isset($this->defined[$option])) {
             throw new UndefinedOptionsException(sprintf(
-                'The option "%s" does not exist. Known options are: "%s".',
+                'The option "%s" does not exist. Defined options are: "%s".',
                 $option,
                 implode('", "', array_keys($this->defined))
             ));
@@ -473,7 +473,7 @@ public function setAllowedValues($option, $allowedValues = null)
 
         if (!isset($this->defined[$option])) {
             throw new UndefinedOptionsException(sprintf(
-                'The option "%s" does not exist. Known options are: "%s".',
+                'The option "%s" does not exist. Defined options are: "%s".',
                 $option,
                 implode('", "', array_keys($this->defined))
             ));
@@ -527,7 +527,7 @@ public function addAllowedValues($option, $allowedValues = null)
 
         if (!isset($this->defined[$option])) {
             throw new UndefinedOptionsException(sprintf(
-                'The option "%s" does not exist. Known options are: "%s".',
+                'The option "%s" does not exist. Defined options are: "%s".',
                 $option,
                 implode('", "', array_keys($this->defined))
             ));
@@ -579,7 +579,7 @@ public function setAllowedTypes($option, $allowedTypes = null)
 
         if (!isset($this->defined[$option])) {
             throw new UndefinedOptionsException(sprintf(
-                'The option "%s" does not exist. Known options are: "%s".',
+                'The option "%s" does not exist. Defined options are: "%s".',
                 $option,
                 implode('", "', array_keys($this->defined))
             ));
@@ -627,7 +627,7 @@ public function addAllowedTypes($option, $allowedTypes = null)
 
         if (!isset($this->defined[$option])) {
             throw new UndefinedOptionsException(sprintf(
-                'The option "%s" does not exist. Known options are: "%s".',
+                'The option "%s" does not exist. Defined options are: "%s".',
                 $option,
                 implode('", "', array_keys($this->defined))
             ));
@@ -742,7 +742,7 @@ public function resolve(array $options = array())
             ksort($diff);
 
             throw new UndefinedOptionsException(sprintf(
-                (count($diff) > 1 ? 'The options "%s" do not exist.' : 'The option "%s" does not exist.').' Known options are: "%s".',
+                (count($diff) > 1 ? 'The options "%s" do not exist.' : 'The option "%s" does not exist.').' Defined options are: "%s".',
                 implode('", "', array_keys($diff)),
                 implode('", "', array_keys($clone->defined))
             ));
@@ -808,7 +808,7 @@ public function offsetGet($option)
         if (!array_key_exists($option, $this->defaults)) {
             if (!isset($this->defined[$option])) {
                 throw new NoSuchOptionException(sprintf(
-                    'The option "%s" does not exist. Known options are: "%s".',
+                    'The option "%s" does not exist. Defined options are: "%s".',
                     $option,
                     implode('", "', array_keys($this->defined))
                 ));

Tests/LegacyOptionsResolverTest.php

@@ -197,7 +197,8 @@ public function testResolveLazyReplaceDefaults()
     }
 
     /**
-     * @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
+     * @expectedException        \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
+     * @expectedExceptionMessage The option "foo" does not exist. Defined options are: "one", "three", "two".
      */
     public function testResolveFailsIfNonExistingOption()
     {

Tests/OptionsResolver2Dot6Test.php

@@ -33,7 +33,7 @@ protected function setUp()
 
     /**
      * @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
-     * @expectedExceptionMessage The option "foo" does not exist. Known options are: "a", "z".
+     * @expectedExceptionMessage The option "foo" does not exist. Defined options are: "a", "z".
      */
     public function testResolveFailsIfNonExistingOption()
     {
@@ -45,7 +45,7 @@ public function testResolveFailsIfNonExistingOption()
 
     /**
      * @expectedException \Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException
-     * @expectedExceptionMessage The options "baz", "foo", "ping" do not exist. Known options are: "a", "z".
+     * @expectedExceptionMessage The options "baz", "foo", "ping" do not exist. Defined options are: "a", "z".
      */
     public function testResolveFailsIfMultipleNonExistingOptions()
     {
@@ -1389,7 +1389,7 @@ public function testArrayAccessUnsetNotSupported()
 
     /**
      * @expectedException \Symfony\Component\OptionsResolver\Exception\NoSuchOptionException
-     * @expectedExceptionMessage The option "undefined" does not exist. Known options are: "foo", "lazy".
+     * @expectedExceptionMessage The option "undefined" does not exist. Defined options are: "foo", "lazy".
      */
     public function testFailIfGetNonExisting()
     {