Merge branch '3.0' into 3.1

Author: wouterj

book/security.rst

@@ -189,6 +189,7 @@ example, if you use annotations, create something like this::
     // ...
 
     use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+    use Symfony\Bundle\FrameworkBundle\Controller\Controller;
     use Symfony\Component\HttpFoundation\Response;
 
     class DefaultController extends Controller

changelog.rst

@@ -13,6 +13,94 @@ documentation.
     Do you also want to participate in the Symfony Documentation? Take a look
     at the ":doc:`/contributing/documentation/overview`" article.
 
+May, 2016
+---------
+
+New Documentation
+~~~~~~~~~~~~~~~~~
+
+* `#6402 <https://github.com/symfony/symfony-docs/pull/6402>`_ [RFR] Documentation for the Ldap component (csarrazi)
+* `#6040 <https://github.com/symfony/symfony-docs/pull/6040>`_ Remove old File Upload article + improve the new one (WouterJ)
+* `#6412 <https://github.com/symfony/symfony-docs/pull/6412>`_ added a maintenance document (fabpot)
+* `#6554 <https://github.com/symfony/symfony-docs/pull/6554>`_ Adding information about using the date type as usable date picker field (weaverryan)
+* `#6590 <https://github.com/symfony/symfony-docs/pull/6590>`_ Added note on YAML mappings as objects (dantleech)
+* `#6378 <https://github.com/symfony/symfony-docs/pull/6378>`_ refs #5898 Fix updates of testing.rst for 3.0 (guilliamxavier)
+* `#6583 <https://github.com/symfony/symfony-docs/pull/6583>`_ Adding a description for the use_microseconds parameter introduced in MonologBundle v2.11 (jorgelbg)
+* `#6582 <https://github.com/symfony/symfony-docs/pull/6582>`_ Advanced YAML component usage (dantleech)
+* `#6594 <https://github.com/symfony/symfony-docs/pull/6594>`_  Allowed to return null for query_builder (JonEastman)
+* `#6405 <https://github.com/symfony/symfony-docs/pull/6405>`_ Added the explanation about addClassesToCompile() method (javiereguiluz)
+* `#6539 <https://github.com/symfony/symfony-docs/pull/6539>`_ Documented the "autoescape" TwigBundle config option (javiereguiluz)
+* `#5574 <https://github.com/symfony/symfony-docs/pull/5574>`_ [2.7] Update Twig docs for asset features (javiereguiluz, WouterJ)
+* `#6302 <https://github.com/symfony/symfony-docs/pull/6302>`_ [Form] add ``choice_translation_domain`` option to date types (HeahDude)
+
+Fixed Documentation
+~~~~~~~~~~~~~~~~~~~
+
+* `#6619 <https://github.com/symfony/symfony-docs/pull/6619>`_ Fix wrong variable name in comment (zanardigit)
+* `#6608 <https://github.com/symfony/symfony-docs/pull/6608>`_ deprecated 'datettime' Form Type (dsmink)
+* `#6606 <https://github.com/symfony/symfony-docs/pull/6606>`_ fix #6602 (yamiko-ninja)
+* `#6578 <https://github.com/symfony/symfony-docs/pull/6578>`_ [Cookbook][Profiler] Fix arguments for Profiler::find() (hason)
+* `#6546 <https://github.com/symfony/symfony-docs/pull/6546>`_ Make ClockMock Tests\\ namespace matching less specific (teohhanhui)
+* `#6564 <https://github.com/symfony/symfony-docs/pull/6564>`_ [PhpUnitBridge] Remove section about clock mocking (z38)
+* `#6552 <https://github.com/symfony/symfony-docs/pull/6552>`_ Typo fix in the Serializer deserialization example for existing object (fre5h)
+* `#6545 <https://github.com/symfony/symfony-docs/pull/6545>`_ Replace property_accessor by property_access (jbenoit2011)
+* `#6561 <https://github.com/symfony/symfony-docs/pull/6561>`_ About Templating Naming Pattern (raulconti)
+
+Minor Documentation Changes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* `#6601 <https://github.com/symfony/symfony-docs/pull/6601>`_ Deprecated usage of AsseticBundle removed from bundles.rst (Vehsamrak)
+* `#6624 <https://github.com/symfony/symfony-docs/pull/6624>`_ remove versionadded directive for 2.x features (xabbuh)
+* `#6620 <https://github.com/symfony/symfony-docs/pull/6620>`_ Move PSR to correct place on index page (WouterJ)
+* `#6609 <https://github.com/symfony/symfony-docs/pull/6609>`_ Use a better escaping mechanism for data-prototype attr (javiereguiluz)
+* `#6380 <https://github.com/symfony/symfony-docs/pull/6380>`_ [book] [validation] Constraints can be applied to an entire class too (sustmi)
+* `#6459 <https://github.com/symfony/symfony-docs/pull/6459>`_ Remove choices as values in 3.0 (weaverryan)
+* `#6444 <https://github.com/symfony/symfony-docs/pull/6444>`_ [Form] fixed EntityType choice options (HeahDude)
+* `#6367 <https://github.com/symfony/symfony-docs/pull/6367>`_ Simplified the contribution article for Symfony Docs (javiereguiluz)
+* `#6419 <https://github.com/symfony/symfony-docs/pull/6419>`_ Update routing.rst (tamtamchik)
+* `#6598 <https://github.com/symfony/symfony-docs/pull/6598>`_ [Yaml] use static Yaml API (xabbuh)
+* `#6589 <https://github.com/symfony/symfony-docs/pull/6589>`_ Clarify signed requests in the ESI renderer (WouterJ)
+* `#6596 <https://github.com/symfony/symfony-docs/pull/6596>`_ Fixed query_builder option (HeahDude)
+* `#6595 <https://github.com/symfony/symfony-docs/pull/6595>`_ Added a note about "encoding vs. hashing" passwords (javiereguiluz)
+* `#6581 <https://github.com/symfony/symfony-docs/pull/6581>`_ [#6431] changing "Simple Example" to use implode/explode (mccullagh)
+* `#6585 <https://github.com/symfony/symfony-docs/pull/6585>`_ 6555 link to Download instructions page & Windows executable (snoek09)
+* `#6588 <https://github.com/symfony/symfony-docs/pull/6588>`_ Update configuration.rst (superhaggis)
+* `#6591 <https://github.com/symfony/symfony-docs/pull/6591>`_ 5953 use kernel events constants (snoek09)
+* `#6592 <https://github.com/symfony/symfony-docs/pull/6592>`_ [Form] Making the name property private to be more realistic (weaverryan)
+* `#6541 <https://github.com/symfony/symfony-docs/pull/6541>`_ Trusted proxies were removed when URL signing took over (rawkode)
+* `#6586 <https://github.com/symfony/symfony-docs/pull/6586>`_ 6338 use csrfManager instead of csrfProvider (snoek09)
+* `#6401 <https://github.com/symfony/symfony-docs/pull/6401>`_ Added Link to Cmder (c33s)
+* `#6391 <https://github.com/symfony/symfony-docs/pull/6391>`_ Fix mem leak in example doctrine testing (nicolas-grekas)
+* `#6087 <https://github.com/symfony/symfony-docs/pull/6087>`_ Add a note about needing to install proxy-manager (mcfedr)
+* `#6553 <https://github.com/symfony/symfony-docs/pull/6553>`_ EntityType: query_builder link to usage (weaverryan)
+* `#6572 <https://github.com/symfony/symfony-docs/pull/6572>`_ Edited BowerPHP tip (SecondeJK)
+* `#6575 <https://github.com/symfony/symfony-docs/pull/6575>`_ Rename command logging services (sroze)
+* `#6577 <https://github.com/symfony/symfony-docs/pull/6577>`_ [Cookbook][Profiler] Remove mention of import/export (hason)
+* `#6571 <https://github.com/symfony/symfony-docs/pull/6571>`_ [Cookbook][Console] Minor: Fix typo (andreia)
+* `#6570 <https://github.com/symfony/symfony-docs/pull/6570>`_ Fix typo (jdreesen)
+* `#6568 <https://github.com/symfony/symfony-docs/pull/6568>`_ fix RequestDataCollector class namespace (xabbuh)
+* `#6566 <https://github.com/symfony/symfony-docs/pull/6566>`_ Update options_resolver.rst (snake77se)
+* `#6548 <https://github.com/symfony/symfony-docs/pull/6548>`_ merge choice_translation_domain files (xabbuh)
+* `#6547 <https://github.com/symfony/symfony-docs/pull/6547>`_ remove 2.x versionadded directives (xabbuh)
+* `#6563 <https://github.com/symfony/symfony-docs/pull/6563>`_ [PhpUnitBridge] Add versionadded directive to clock mocking section (z38)
+* `#6549 <https://github.com/symfony/symfony-docs/pull/6549>`_ drop AppBundle examples in components section (xabbuh)
+* `#6562 <https://github.com/symfony/symfony-docs/pull/6562>`_ Remove extra spaces in Nginx template (bocharsky-bw)
+* `#6557 <https://github.com/symfony/symfony-docs/pull/6557>`_ [ClassLoader] Add missed link to the external PSR-4 specification (nicolas-grekas, fre5h)
+* `#6511 <https://github.com/symfony/symfony-docs/pull/6511>`_ [DependencyInjection] Improved "optional argument" documentation (dantleech)
+* `#6455 <https://github.com/symfony/symfony-docs/pull/6455>`_ Editing the Doctrine section to improve accuracy and readability (natechicago)
+* `#6526 <https://github.com/symfony/symfony-docs/pull/6526>`_ Documented how to configure Symfony correctly with regards to the Forwarded header (magnusnordlander)
+* `#6535 <https://github.com/symfony/symfony-docs/pull/6535>`_ Improved the description of the Twig global variables (javiereguiluz)
+* `#6536 <https://github.com/symfony/symfony-docs/pull/6536>`_ [DomCrawler] Removed references to CssSelector (aerialls)
+* `#6529 <https://github.com/symfony/symfony-docs/pull/6529>`_ [DependencyInjection] Unquote services FQCN in autowiring examples (chalasr)
+* `#6530 <https://github.com/symfony/symfony-docs/pull/6530>`_ [DependencyInjection] Unquote services FQCN in parent-services examples (chalasr)
+* `#6517 <https://github.com/symfony/symfony-docs/pull/6517>`_ Add a warning about using same user for cli and web server (pasdeloup)
+* `#6504 <https://github.com/symfony/symfony-docs/pull/6504>`_ Improved the docs for the DependencyInjection component (javiereguiluz)
+* `#6506 <https://github.com/symfony/symfony-docs/pull/6506>`_ Added a tip about routes and container parameters (javiereguiluz)
+* `#6518 <https://github.com/symfony/symfony-docs/pull/6518>`_ Add details about chmod +a vs setfacl (pasdeloup)
+* `#6525 <https://github.com/symfony/symfony-docs/pull/6525>`_ [Contributing] use more precise version checker URL (xabbuh)
+* `#6528 <https://github.com/symfony/symfony-docs/pull/6528>`_ Fixed a minor indentation issue (javiereguiluz)
+
+
 April, 2016
 -----------
 

components/console/helpers/questionhelper.rst

@@ -290,7 +290,7 @@ from the command line, you need to set the helper input stream::
         $commandTester = new CommandTester($command);
 
         $helper = $command->getHelper('question');
-        $helper->setInputStream($this->getInputStream('Test\\n'));
+        $helper->setInputStream($this->getInputStream("Test\n"));
         // Equals to a user inputting "Test" and hitting ENTER
         // If you need to enter a confirmation, "yes\n" will work
 

cookbook/form/form_customization.rst

@@ -1062,7 +1062,7 @@ form, modify the ``use`` tag and add the following:
         {{ block('base_form_widget_simple') }}
 
         {% if help is defined %}
-            <span class="help">{{ help }}</span>
+            <span class="help-block">{{ help }}</span>
         {% endif %}
     {% endblock %}
 
@@ -1077,7 +1077,7 @@ the following:
         {{ parent() }}
 
         {% if help is defined %}
-            <span class="help">{{ help }}</span>
+            <span class="help-block">{{ help }}</span>
         {% endif %}
     {% endblock %}
 

cookbook/security/entity_provider.rst

@@ -429,7 +429,6 @@ interface only requires one method: ``loadUserByUsername($username)``::
     namespace AppBundle\Entity;
 
     use Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface;
-    use Symfony\Component\Security\Core\User\UserInterface;
     use Doctrine\ORM\EntityRepository;
 
     class UserRepository extends EntityRepository implements UserLoaderInterface