Merge branch '2.7' into 2.8

* 2.7: (36 commits)
  [DoctrineBridge] Bypass the db when no valid identifier is provided in ORMQueryBuilderLoader
  [Serializer] Fixed typo in comment
  [Form] Fixed: Filter non-integers when selecting entities by int ID
  Fix merge
  Fix merge
  Add test for HHVM FatalErrors
  [2.6][Debug] Fix fatal-errors handling on HHVM
  [Debug] Fix log level of stacked errors
  [VarDumper] Fix uninitialized id in HtmlDumper
  Fixed fluent interface
  [Console] Fix tests on Windows
  [2.7] Fix unsilenced deprecation notices
  [2.3][Debug] Fix fatal-errors handling on HHVM
  [Debug] fix debug class loader case test on windows
  Standardize the name of the exception variables
  [Debug+VarDumper] Fix handling of PHP7 exception/error model
  Do not trigger deprecation error in ResolveParameterPlaceHoldersPass
  [2.3] Static Code Analysis for Components
  Added a small Upgrade note regarding security.context
  added missing deprecation in CHANGELOG
  ...

Conflicts:
	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig
	src/Symfony/Component/HttpKernel/Kernel.php

Author: nicolas-grekas

AbstractType.php

@@ -45,6 +45,10 @@ public function finishView(FormView $view, FormInterface $form, array $options)
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
+        if (!$resolver instanceof OptionsResolver) {
+            throw new \InvalidArgumentException(sprintf('Custom resolver "%s" must extend "Symfony\Component\OptionsResolver\OptionsResolver".', get_class($resolver)));
+        }
+
         $this->configureOptions($resolver);
     }
 

AbstractTypeExtension.php

@@ -45,6 +45,10 @@ public function finishView(FormView $view, FormInterface $form, array $options)
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
+        if (!$resolver instanceof OptionsResolver) {
+            throw new \InvalidArgumentException(sprintf('Custom resolver "%s" must extend "Symfony\Component\OptionsResolver\OptionsResolver".', get_class($resolver)));
+        }
+
         $this->configureOptions($resolver);
     }
 

Tests/AbstractExtensionTest.php

@@ -28,6 +28,17 @@ public function testGetType()
         $loader = new ConcreteExtension();
         $this->assertInstanceOf('Symfony\Component\Form\Tests\Fixtures\FooType', $loader->getType('foo'));
     }
+
+    /**
+     * @expectedException        \InvalidArgumentException
+     * @expectedExceptionMessage Custom resolver "Symfony\Component\Form\Tests\Fixtures\CustomOptionsResolver" must extend "Symfony\Component\OptionsResolver\OptionsResolver".
+     */
+    public function testCustomOptionsResolver()
+    {
+        $extension = new Fixtures\FooTypeBarExtension();
+        $resolver = new Fixtures\CustomOptionsResolver();
+        $extension->setDefaultOptions($resolver);
+    }
 }
 
 class ConcreteExtension extends AbstractExtension

Tests/Fixtures/CustomOptionsResolver.php

@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Tests\Fixtures;
+
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+
+class CustomOptionsResolver implements OptionsResolverInterface
+{
+    public function setDefaults(array $defaultValues)
+    {
+    }
+
+    public function replaceDefaults(array $defaultValues)
+    {
+    }
+
+    public function setOptional(array $optionNames)
+    {
+    }
+
+    public function setRequired($optionNames)
+    {
+    }
+
+    public function setAllowedValues($allowedValues)
+    {
+    }
+
+    public function addAllowedValues($allowedValues)
+    {
+    }
+
+    public function setAllowedTypes($allowedTypes)
+    {
+    }
+
+    public function addAllowedTypes($allowedTypes)
+    {
+    }
+
+    public function setNormalizers(array $normalizers)
+    {
+    }
+
+    public function isKnown($option)
+    {
+    }
+
+    public function isRequired($option)
+    {
+    }
+
+    public function resolve(array $options = array())
+    {
+    }
+}

Tests/SimpleFormTest.php

@@ -1057,6 +1057,17 @@ public function testInitializeFailsIfParent()
         $child->initialize();
     }
 
+    /**
+     * @expectedException        \InvalidArgumentException
+     * @expectedExceptionMessage Custom resolver "Symfony\Component\Form\Tests\Fixtures\CustomOptionsResolver" must extend "Symfony\Component\OptionsResolver\OptionsResolver".
+     */
+    public function testCustomOptionsResolver()
+    {
+        $fooType = new Fixtures\FooType();
+        $resolver = new Fixtures\CustomOptionsResolver();
+        $fooType->setDefaultOptions($resolver);
+    }
+
     protected function createForm()
     {
         return $this->getBuilder()->getForm();