Merge branch '2.3' into 2.6

Conflicts:
	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig
	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
	src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
	src/Symfony/Component/Validator/Tests/Mapping/Loader/XmlFileLoaderTest.php

Author: Tobion

Definition/Builder/EnumNodeDefinition.php

@@ -22,6 +22,11 @@ class EnumNodeDefinition extends ScalarNodeDefinition
 {
     private $values;
 
+    /**
+     * @param array $values
+     *
+     * @return EnumNodeDefinition|$this
+     */
     public function values(array $values)
     {
         $values = array_unique($values);

Definition/Builder/NodeDefinition.php

@@ -56,7 +56,7 @@ public function __construct($name, NodeParentInterface $parent = null)
      *
      * @param NodeParentInterface $parent The parent
      *
-     * @return NodeDefinition
+     * @return NodeDefinition|$this
      */
     public function setParent(NodeParentInterface $parent)
     {
@@ -70,7 +70,7 @@ public function setParent(NodeParentInterface $parent)
      *
      * @param string $info The info text
      *
-     * @return NodeDefinition
+     * @return NodeDefinition|$this
      */
     public function info($info)
     {
@@ -82,7 +82,7 @@ public function info($info)
      *
      * @param string|array $example
      *
-     * @return NodeDefinition
+     * @return NodeDefinition|$this
      */
     public function example($example)
     {
@@ -95,7 +95,7 @@ public function example($example)
      * @param string $key
      * @param mixed  $value
      *
-     * @return NodeDefinition
+     * @return NodeDefinition|$this
      */
     public function attribute($key, $value)
     {
@@ -146,7 +146,7 @@ public function getNode($forceRootNode = false)
      *
      * @param mixed $value The default value
      *
-     * @return NodeDefinition
+     * @return NodeDefinition|$this
      */
     public function defaultValue($value)
     {
@@ -159,7 +159,7 @@ public function defaultValue($value)
     /**
      * Sets the node as required.
      *
-     * @return NodeDefinition
+     * @return NodeDefinition|$this
      */
     public function isRequired()
     {
@@ -173,7 +173,7 @@ public function isRequired()
      *
      * @param mixed $value
      *
-     * @return NodeDefinition
+     * @return NodeDefinition|$this
      */
     public function treatNullLike($value)
     {
@@ -187,7 +187,7 @@ public function treatNullLike($value)
      *
      * @param mixed $value
      *
-     * @return NodeDefinition
+     * @return NodeDefinition|$this
      */
     public function treatTrueLike($value)
     {
@@ -201,7 +201,7 @@ public function treatTrueLike($value)
      *
      * @param mixed $value
      *
-     * @return NodeDefinition
+     * @return NodeDefinition|$this
      */
     public function treatFalseLike($value)
     {
@@ -213,7 +213,7 @@ public function treatFalseLike($value)
     /**
      * Sets null as the default value.
      *
-     * @return NodeDefinition
+     * @return NodeDefinition|$this
      */
     public function defaultNull()
     {
@@ -223,7 +223,7 @@ public function defaultNull()
     /**
      * Sets true as the default value.
      *
-     * @return NodeDefinition
+     * @return NodeDefinition|$this
      */
     public function defaultTrue()
     {
@@ -233,7 +233,7 @@ public function defaultTrue()
     /**
      * Sets false as the default value.
      *
-     * @return NodeDefinition
+     * @return NodeDefinition|$this
      */
     public function defaultFalse()
     {
@@ -253,7 +253,7 @@ public function beforeNormalization()
     /**
      * Denies the node value being empty.
      *
-     * @return NodeDefinition
+     * @return NodeDefinition|$this
      */
     public function cannotBeEmpty()
     {
@@ -281,7 +281,7 @@ public function validate()
      *
      * @param bool $deny Whether the overwriting is forbidden or not
      *
-     * @return NodeDefinition
+     * @return NodeDefinition|$this
      */
     public function cannotBeOverwritten($deny = true)
     {