Merge branch '2.7'

* 2.7: (61 commits)
  fixxed order of usage
  [2.7] [Form] Replaced calls to array_search() by in_array() where is no need to get the index
  removed the last deprecation notice
  [Serializer] Silent deprecation notice
  removed deprecation notice
  [PropertyAccess] Show property path in all exception messages
  added deprecation notice for HttpCache::createEsi()
  added missing deprecation notice when using the form_enctype function
  [Process] Make test AbstractProcessTest::testStartAfterATimeout useful again
  removed non-sense example
  Fixes small typo.
  [Validator] Remove unnecessary include in tests
  [HttpFoundation] minor: clarify Request::getUrlencodedPrefix() regex
  fixed typo
  [Serializer] Use Serializer's LogicException when applicable
  [Serializer] Use autoloader for annotations in tests
  [Validator] fix DOS-style line endings
  Drop useless execution bit
  bumped Symfony version to 2.6.5
  [Serializer] update changelog
  ...

Conflicts:
	CHANGELOG-2.3.md
	CHANGELOG-2.5.md
	CHANGELOG-2.6.md
	src/Symfony/Bridge/Twig/Node/FormEnctypeNode.php
	src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
	src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSessionHandler.php

Author: fabpot

Tests/OptionsResolver2Dot6Test.php

@@ -504,7 +504,19 @@ public function testFailIfSetAllowedTypesFromLazyOption()
      */
     public function testResolveFailsIfInvalidType()
     {
-        $this->resolver->setDefault('foo', 42);
+        $this->resolver->setDefined('foo');
+        $this->resolver->setAllowedTypes('foo', 'string');
+
+        $this->resolver->resolve(array('foo' => 42));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     * @expectedExceptionMessage The option "foo" with value null is expected to be of type "string", but is of type "NULL".
+     */
+    public function testResolveFailsIfInvalidTypeIsNull()
+    {
+        $this->resolver->setDefault('foo', null);
         $this->resolver->setAllowedTypes('foo', 'string');
 
         $this->resolver->resolve();
@@ -675,7 +687,19 @@ public function testFailIfSetAllowedValuesFromLazyOption()
      */
     public function testResolveFailsIfInvalidValue()
     {
-        $this->resolver->setDefault('foo', 42);
+        $this->resolver->setDefined('foo');
+        $this->resolver->setAllowedValues('foo', 'bar');
+
+        $this->resolver->resolve(array('foo' => 42));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     * @expectedExceptionMessage The option "foo" with value null is invalid. Accepted values are: "bar".
+     */
+    public function testResolveFailsIfInvalidValueIsNull()
+    {
+        $this->resolver->setDefault('foo', null);
         $this->resolver->setAllowedValues('foo', 'bar');
 
         $this->resolver->resolve();