Merge branch '2.7' into 2.8

wouterj · wouterj · commit 6d951ea064b7 · 2016-11-10T21:32:53.000+01:00
diff --git a/bundles/extension.rst b/bundles/extension.rst
@@ -142,7 +142,7 @@ their fully qualified class names::
     {
         // ...
 
-         $this->addClassesToCompile(array(
+        $this->addClassesToCompile(array(
             'AppBundle\\Manager\\UserManager',
             'AppBundle\\Utils\\Slugger',
             // ...
diff --git a/changelog.rst b/changelog.rst
@@ -13,6 +13,59 @@ documentation.
     Do you also want to participate in the Symfony Documentation? Take a look
     at the ":doc:`/contributing/documentation/overview`" article.
 
+October, 2016
+-------------
+
+New Documentation
+~~~~~~~~~~~~~~~~~
+
+* `#7023 <https://github.com/symfony/symfony-docs/pull/7023>`_ Added useful debug commands in the debug documentation (hiddewie)
+
+Fixed Documentation
+~~~~~~~~~~~~~~~~~~~
+
+* `#7049 <https://github.com/symfony/symfony-docs/pull/7049>`_ Fix the platform.sh builds (wouterj)
+
+Minor Documentation Changes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* `#7090 <https://github.com/symfony/symfony-docs/pull/7090>`_ Remove suggestion to change the `.class` parameters (mpdude)
+* `#7095 <https://github.com/symfony/symfony-docs/pull/7095>`_ Also mention "hasXXX" methods as validation targets (mpdude)
+* `#7091 <https://github.com/symfony/symfony-docs/pull/7091>`_ A bracket was missed (hpatoio)
+* `#7097 <https://github.com/symfony/symfony-docs/pull/7097>`_ link to specific HTTP Cache RFC (snoek09)
+* `#7098 <https://github.com/symfony/symfony-docs/pull/7098>`_ Improved Redirecting paragraph of Testing page (ShinDarth)
+* `#7020 <https://github.com/symfony/symfony-docs/pull/7020>`_ Added jQuery symfony-collection plugin to Form collection docs (hiddewie)
+* `#7086 <https://github.com/symfony/symfony-docs/pull/7086>`_ Update bug documentation input console /console/input.rst (Quiss)
+* `#7085 <https://github.com/symfony/symfony-docs/pull/7085>`_ Update custom_authentication_provider.rst (BatsaxIV)
+* `#7083 <https://github.com/symfony/symfony-docs/pull/7083>`_ update github example (hootlex)
+* `#7082 <https://github.com/symfony/symfony-docs/pull/7082>`_ Update metadata.rst (fberthereau)
+* `#7061 <https://github.com/symfony/symfony-docs/pull/7061>`_ Change link to docs instead repo (mik-laj)
+* `#7066 <https://github.com/symfony/symfony-docs/pull/7066>`_ Remove erroneous placeholder text (regularjack)
+* `#7068 <https://github.com/symfony/symfony-docs/pull/7068>`_ Remove double spaces in some YAML configuration (michaelperrin)
+* `#6785 <https://github.com/symfony/symfony-docs/pull/6785>`_ Twig reference: Add links from routing functions to special routing parameters (alexislefebvre)
+* `#7043 <https://github.com/symfony/symfony-docs/pull/7043>`_ [Serializer] Move the see also block in the Learn More section (dunglas)
+* `#7035 <https://github.com/symfony/symfony-docs/pull/7035>`_ Redirect /form to /forms for consistency (wouterj)
+* `#7054 <https://github.com/symfony/symfony-docs/pull/7054>`_ Fix IS_AUTHENTICATED_FULLY annotation (mschobner)
+* `#7044 <https://github.com/symfony/symfony-docs/pull/7044>`_ Add Nginx configuration to environment variables (peterkokot)
+* `#7053 <https://github.com/symfony/symfony-docs/pull/7053>`_ Minor improvements for the contribution guide (javiereguiluz)
+* `#7050 <https://github.com/symfony/symfony-docs/pull/7050>`_ use single quotes for YAML strings (snoek09)
+* `#7047 <https://github.com/symfony/symfony-docs/pull/7047>`_ Fix typo in doctrine.rst (to manage) (lacyrhoades)
+* `#7046 <https://github.com/symfony/symfony-docs/pull/7046>`_ Fix incorrect callback validation example (mvar)
+* `#7034 <https://github.com/symfony/symfony-docs/pull/7034>`_ Changed RFC links from drafts to proposed standarts (a-ast)
+* `#7038 <https://github.com/symfony/symfony-docs/pull/7038>`_ Remove a dead link to the old PR header (dunglas)
+* `#7037 <https://github.com/symfony/symfony-docs/pull/7037>`_ Fix a typo in the serializer doc (dunglas)
+* `#7036 <https://github.com/symfony/symfony-docs/pull/7036>`_ Fix 404 error link for American English Oxford Dictionary (peterkokot)
+* `#6980 <https://github.com/symfony/symfony-docs/pull/6980>`_ Use strict comparison (greg0ire)
+* `#7025 <https://github.com/symfony/symfony-docs/pull/7025>`_ Update buisness-logic (zairigimad)
+* `#7027 <https://github.com/symfony/symfony-docs/pull/7027>`_ Remove dash prefix from route name (bocharsky-bw)
+* `#7028 <https://github.com/symfony/symfony-docs/pull/7028>`_ A few minor tweaks (bocharsky-bw)
+* `#7029 <https://github.com/symfony/symfony-docs/pull/7029>`_ refer to Symfony instead of Symfony2 (snoek09)
+* `#7031 <https://github.com/symfony/symfony-docs/pull/7031>`_ Capitalize the time designator (simoheinonen)
+* `#7018 <https://github.com/symfony/symfony-docs/pull/7018>`_ Reorder arguments: $request as the first argument (bocharsky-bw)
+* `#7014 <https://github.com/symfony/symfony-docs/pull/7014>`_ Add a note about Filesystem:mkdir behavior (mickaelandrieu)
+* `#6886 <https://github.com/symfony/symfony-docs/pull/6886>`_ Update controllers.rst (asandjivy)
+
+
 September, 2016
 ---------------
 
diff --git a/components/form.rst b/components/form.rst
@@ -581,7 +581,7 @@ method:
 
         $form->handleRequest($request);
 
-        if ($form->isValid()) {
+        if ($form->isSubmitted() && $form->isValid()) {
             $data = $form->getData();
 
             // ... perform some action, such as saving the data to the database
@@ -610,7 +610,7 @@ method:
 
             $form->handleRequest($request);
 
-            if ($form->isValid()) {
+            if ($form->isSubmitted() && $form->isValid()) {
                 $data = $form->getData();
 
                 // ... perform some action, such as saving the data to the database
diff --git a/console/commands_as_services.rst b/console/commands_as_services.rst
@@ -11,7 +11,7 @@ Symfony will even inject the container.
 While making life easier, this has some limitations:
 
 * Your command must live in the ``Command`` directory;
-* There's no way to conditionally register your service based on the environment
+* There's no way to conditionally register your command based on the environment
   or availability of some dependencies;
 * You can't access the container in the ``configure()`` method (because
   ``setContainer`` hasn't been called yet);
diff --git a/controller.rst b/controller.rst
@@ -388,7 +388,7 @@ For example, imagine you're processing a :doc:`form </forms>` submission::
     {
         // ...
 
-        if ($form->isValid()) {
+        if ($form->isSubmitted() && $form->isValid()) {
             // do some sort of processing
 
             $this->addFlash(
diff --git a/controller/upload_file.rst b/controller/upload_file.rst
@@ -293,7 +293,7 @@ Now you're ready to use this service in the controller::
     {
         // ...
 
-        if ($form->isValid()) {
+        if ($form->isSubmitted() && $form->isValid()) {
             $file = $product->getBrochure();
             $fileName = $this->get('app.brochure_uploader')->upload($file);
 
diff --git a/doctrine/associations.rst b/doctrine/associations.rst
@@ -316,7 +316,7 @@ You can also query in the other direction::
 
 In this case, the same things occur: you first query out for a single ``Category``
 object, and then Doctrine makes a second query to retrieve the related ``Product``
-objects, but only once/if you ask for them (i.e. when you call ``->getProducts()``).
+objects, but only once/if you ask for them (i.e. when you call ``getProducts()``).
 The ``$products`` variable is an array of all ``Product`` objects that relate
 to the given ``Category`` object via their ``category_id`` value.
 
@@ -365,7 +365,7 @@ Of course, if you know up front that you'll need to access both objects, you
 can avoid the second query by issuing a join in the original query. Add the
 following method to the ``ProductRepository`` class::
 
-    // src/AppBundle/Entity/ProductRepository.php
+    // src/AppBundle/Repository/ProductRepository.php
     public function findOneByIdJoinedToCategory($productId)
     {
         $query = $this->getEntityManager()
@@ -407,7 +407,7 @@ Doctrine's `Association Mapping Documentation`_.
 .. note::
 
     If you're using annotations, you'll need to prepend all annotations with
-    ``ORM\`` (e.g. ``ORM\OneToMany``), which is not reflected in Doctrine's
+    ``@ORM\`` (e.g. ``@ORM\OneToMany``), which is not reflected in Doctrine's
     documentation. You'll also need to include the ``use Doctrine\ORM\Mapping as ORM;``
     statement, which *imports* the ``ORM`` annotations prefix.
 
diff --git a/doctrine/repository.rst b/doctrine/repository.rst
@@ -21,7 +21,7 @@ To do this, add the repository class name to your entity's mapping definition:
         use Doctrine\ORM\Mapping as ORM;
 
         /**
-         * @ORM\Entity(repositoryClass="AppBundle\Entity\ProductRepository")
+         * @ORM\Entity(repositoryClass="AppBundle\Repository\ProductRepository")
          */
         class Product
         {
@@ -33,7 +33,7 @@ To do this, add the repository class name to your entity's mapping definition:
         # src/AppBundle/Resources/config/doctrine/Product.orm.yml
         AppBundle\Entity\Product:
             type: entity
-            repositoryClass: AppBundle\Entity\ProductRepository
+            repositoryClass: AppBundle\Repository\ProductRepository
             # ...
 
     .. code-block:: xml
@@ -47,7 +47,7 @@ To do this, add the repository class name to your entity's mapping definition:
 
             <entity
                 name="AppBundle\Entity\Product"
-                repository-class="AppBundle\Entity\ProductRepository">
+                repository-class="AppBundle\Repository\ProductRepository">
 
                 <!-- ... -->
             </entity>
@@ -72,8 +72,8 @@ entities, ordered alphabetically by name.
 
 .. code-block:: php
 
-    // src/AppBundle/Entity/ProductRepository.php
-    namespace AppBundle\Entity;
+    // src/AppBundle/Repository/ProductRepository.php
+    namespace AppBundle\Repository;
 
     use Doctrine\ORM\EntityRepository;
 
diff --git a/form/direct_submit.rst b/form/direct_submit.rst
@@ -22,7 +22,7 @@ submissions::
 
         $form->handleRequest($request);
 
-        if ($form->isValid()) {
+        if ($form->isSubmitted() && $form->isValid()) {
             // perform some action...
 
             return $this->redirectToRoute('task_success');
@@ -63,7 +63,7 @@ method, pass the submitted data directly to
         if ($request->isMethod('POST')) {
             $form->submit($request->request->get($form->getName()));
 
-            if ($form->isValid()) {
+            if ($form->isSubmitted() && $form->isValid()) {
                 // perform some action...
 
                 return $this->redirectToRoute('task_success');
@@ -115,7 +115,7 @@ a convenient shortcut to the previous example::
         if ($request->isMethod('POST')) {
             $form->submit($request);
 
-            if ($form->isValid()) {
+            if ($form->isSubmitted() && $form->isValid()) {
                 // perform some action...
 
                 return $this->redirectToRoute('task_success');
diff --git a/form/dynamic_form_modification.rst b/form/dynamic_form_modification.rst
@@ -559,7 +559,7 @@ your application. Assume that you have a sport meetup creation controller::
             $meetup = new SportMeetup();
             $form = $this->createForm(SportMeetupType::class, $meetup);
             $form->handleRequest($request);
-            if ($form->isValid()) {
+            if ($form->isSubmitted() && $form->isValid()) {
                 // ... save the meetup, redirect etc.
             }
 
diff --git a/form/form_collections.rst b/form/form_collections.rst
@@ -171,7 +171,7 @@ In your controller, you'll create a new form from the ``TaskType``::
 
             $form->handleRequest($request);
 
-            if ($form->isValid()) {
+            if ($form->isSubmitted() && $form->isValid()) {
                 // ... maybe do some form processing, like saving the Task and Tag objects
             }
 
diff --git a/form/multiple_buttons.rst b/form/multiple_buttons.rst
@@ -22,7 +22,7 @@ In your controller, use the button's
 :method:`Symfony\\Component\\Form\\ClickableInterface::isClicked` method for
 querying if the "Save and add" button was clicked::
 
-    if ($form->isValid()) {
+    if ($form->isSubmitted() && $form->isValid()) {
         // ... perform some action, such as saving the task to the database
 
         $nextAction = $form->get('saveAndAdd')->isClicked()
diff --git a/form/without_class.rst b/form/without_class.rst
@@ -27,7 +27,7 @@ an array of the submitted data. This is actually really easy::
 
         $form->handleRequest($request);
 
-        if ($form->isValid()) {
+        if ($form->isSubmitted() && $form->isValid()) {
             // data is an array with "name", "email", and "message" keys
             $data = $form->getData();
         }
diff --git a/quick_tour/the_big_picture.rst b/quick_tour/the_big_picture.rst
@@ -80,7 +80,7 @@ information and then they render a template to show the results to the user.
 
 In this example, the ``index`` action is practically empty because it doesn't
 need to call any other method. The action just renders a template with the
-*Homepage.* content.
+*Homepage* content.
 
 Routing
 ~~~~~~~
diff --git a/reference/configuration/twig.rst b/reference/configuration/twig.rst
@@ -65,7 +65,7 @@ TwigBundle Configuration ("twig")
 
             <twig:config
                 auto-reload="%kernel.debug%"
-                autoescape="filename"
+                autoescape="name"
                 base-template-class="Twig_Template"
                 cache="%kernel.cache_dir%/twig"
                 charset="%kernel.charset%"
@@ -96,7 +96,7 @@ TwigBundle Configuration ("twig")
                  'pi'  => 3.14,
              ),
              'auto_reload'          => '%kernel.debug%',
-             'autoescape'           => 'filename',
+             'autoescape'           => 'name',
              'base_template_class'  => 'Twig_Template',
              'cache'                => '%kernel.cache_dir%/twig',
              'charset'              => '%kernel.charset%',
@@ -130,7 +130,7 @@ compiled again automatically.
 autoescape
 ~~~~~~~~~~
 
-**type**: ``boolean`` or ``string`` **default**: ``'filename'``
+**type**: ``boolean`` or ``string`` **default**: ``'name'``
 
 If set to ``false``, automatic escaping is disabled (you can still escape each content
 individually in the templates).
@@ -144,9 +144,9 @@ individually in the templates).
 
 If set to a string, the template contents are escaped using the strategy with
 that name. Allowed values are ``html``, ``js``, ``css``, ``url``, ``html_attr``
-and ``filename``. The default value is ``filename``. This strategy escapes
-contents according to the filename extension (e.g. it uses ``html`` for
-``*.html.twig`` templates and ``js`` for ``*.js.html`` templates).
+and ``name``. The default value is ``name``. This strategy escapes contents
+according to the template name extension (e.g. it uses ``html`` for ``*.html.twig``
+templates and ``js`` for ``*.js.html`` templates).
 
 .. tip::
 
diff --git a/reference/constraints/Type.rst b/reference/constraints/Type.rst
@@ -72,7 +72,7 @@ This will check if ``firstName`` is of type ``string`` and that ``age`` is an
             <class name="AppBundle\Entity\Author">
                 <property name="firstName">
                     <constraint name="Type">
-                        <type>string</type>
+                        <option name="type">string</option>
                     </constraint>
                 </property>
                 <property name="age">
diff --git a/reference/forms/types/file.rst b/reference/forms/types/file.rst
@@ -50,7 +50,7 @@ be used to move the ``attachment`` file to a permanent location::
     {
         // ...
 
-        if ($form->isValid()) {
+        if ($form->isSubmitted() && $form->isValid()) {
             $someNewFilename = ...
 
             $form['attachment']->getData()->move($dir, $someNewFilename);
diff --git a/security/acl.rst b/security/acl.rst
@@ -132,7 +132,7 @@ Creating an ACL and Adding an ACE
 
             // ... setup $form, and submit data
 
-            if ($form->isValid()) {
+            if ($form->isSubmitted() && $form->isValid()) {
                 $entityManager = $this->getDoctrine()->getManager();
                 $entityManager->persist($comment);
                 $entityManager->flush();
diff --git a/security/entity_provider.rst b/security/entity_provider.rst
@@ -50,7 +50,7 @@ For this entry, suppose that you already have a ``User`` entity inside an
 
     /**
      * @ORM\Table(name="app_users")
-     * @ORM\Entity(repositoryClass="AppBundle\Entity\UserRepository")
+     * @ORM\Entity(repositoryClass="AppBundle\Repository\UserRepository")
      */
     class User implements UserInterface, \Serializable
     {
@@ -427,8 +427,8 @@ To do this, make your ``UserRepository`` implement a special
 :class:`Symfony\\Bridge\\Doctrine\\Security\\User\\UserLoaderInterface`. This
 interface only requires one method: ``loadUserByUsername($username)``::
 
-    // src/AppBundle/Entity/UserRepository.php
-    namespace AppBundle\Entity;
+    // src/AppBundle/Repository/UserRepository.php
+    namespace AppBundle\Repository;
 
     use Symfony\Bridge\Doctrine\Security\User\UserLoaderInterface;
     use Doctrine\ORM\EntityRepository;
diff --git a/service_container/parent_services.rst b/service_container/parent_services.rst
diff --git a/testing/doctrine.rst b/testing/doctrine.rst

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ their fully qualified class names::`
`142`	`142`	`{`
`143`	`143`	`// ...`
`144`	`144`
`145`		`- $this->addClassesToCompile(array(`
	`145`	`+ $this->addClassesToCompile(array(`
`146`	`146`	`'AppBundle\\Manager\\UserManager',`
`147`	`147`	`'AppBundle\\Utils\\Slugger',`
`148`	`148`	`// ...`
Original file line number	Diff line number	Diff line change
@@ -388,7 +388,7 @@ For example, imagine you're processing a :doc:`form </forms>` submission::
`388`	`388`	`{`
`389`	`389`	`// ...`
`390`	`390`
`391`		`- if ($form->isValid()) {`
	`391`	`+ if ($form->isSubmitted() && $form->isValid()) {`
`392`	`392`	`// do some sort of processing`
`393`	`393`
`394`	`394`	`$this->addFlash(`
Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ Now you're ready to use this service in the controller::`
`293`	`293`	`{`
`294`	`294`	`// ...`
`295`	`295`
`296`		`- if ($form->isValid()) {`
	`296`	`+ if ($form->isSubmitted() && $form->isValid()) {`
`297`	`297`	`$file = $product->getBrochure();`
`298`	`298`	`$fileName = $this->get('app.brochure_uploader')->upload($file);`
`299`	`299`
Original file line number	Diff line number	Diff line change
`@@ -559,7 +559,7 @@ your application. Assume that you have a sport meetup creation controller::`
`559`	`559`	`$meetup = new SportMeetup();`
`560`	`560`	`$form = $this->createForm(SportMeetupType::class, $meetup);`
`561`	`561`	`$form->handleRequest($request);`
`562`		`- if ($form->isValid()) {`
	`562`	`+ if ($form->isSubmitted() && $form->isValid()) {`
`563`	`563`	`// ... save the meetup, redirect etc.`
`564`	`564`	`}`
`565`	`565`