Merge branch '2.7' into 2.8

wouterj · wouterj · commit 32eddf792e70 · 2016-01-08T00:10:47.000+01:00
Conflicts:
	components/config/definition.rst
diff --git a/components/config/definition.rst b/components/config/definition.rst
@@ -418,9 +418,38 @@ All options can be documented using the
 :method:`Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition::info`
 method.
 
+.. code-block:: php
+
+    $rootNode
+        ->children()
+            ->integerNode('entries_per_page')
+                ->info('This value is only used for the search results page.')
+                ->defaultValue(25)
+            ->end()
+        ->end()
+    ;
+
 The info will be printed as a comment when dumping the configuration tree
 with the ``config:dump-reference`` command.
 
+In YAML you may have:
+
+.. code-block:: yaml
+
+    # This value is only used for the search results page.
+    entries_per_page:     25
+
+and in XML:
+
+.. code-block:: xml
+
+    <!-- entries-per-page: This value is only used for the search results page. -->
+    <config entries-per-page="25" />
+
+.. versionadded:: 2.6
+    Since Symfony 2.6, the info will also be added to the exception message
+    when an invalid type is given.
+
 Optional Sections
 -----------------
 
diff --git a/contributing/code/license.rst b/contributing/code/license.rst
@@ -16,7 +16,7 @@ According to `Wikipedia`_:
 The License
 -----------
 
-Copyright (c) 2004-2015 Fabien Potencier
+Copyright (c) 2004-2016 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/cookbook/testing/doctrine.rst b/cookbook/testing/doctrine.rst
@@ -35,7 +35,7 @@ which makes all of this quite easy::
         /**
          * {@inheritDoc}
          */
-        public function setUp()
+        protected function setUp()
         {
             self::bootKernel();
             $this->em = static::$kernel->getContainer()

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ which makes all of this quite easy::`
`35`	`35`	`/**`
`36`	`36`	`* {@inheritDoc}`
`37`	`37`	`*/`
`38`		`- public function setUp()`
	`38`	`+ protected function setUp()`
`39`	`39`	`{`
`40`	`40`	`self::bootKernel();`
`41`	`41`	`$this->em = static::$kernel->getContainer()`