Merge branch '2.7' into 2.8

xabbuh · xabbuh · commit 2409a3a16ee0 · 2017-09-01T21:41:23.000+02:00
* 2.7: Update events.rst First parameter to uniqid must be a string fix #8321 minor changes in Serializer Component Update filesystem.rst Update create_custom_field_type.rst Use "impersonator user" instead of "impersonating user" Update dynamic_form_modification.rst Update data_transformers.rst
diff --git a/components/filesystem.rst b/components/filesystem.rst
@@ -68,6 +68,13 @@ On POSIX filesystems, directories are created with a default mode value
 
     This function ignores already existing directories.
 
+.. note::
+
+    The directory permissions are affected by the current `umask`_.
+    Set the umask for your webserver, use PHP's :phpfunction:`umask`
+    function or use the :phpfunction:`chmod` function after the
+    directory has been created.
+
 exists
 ~~~~~~
 
@@ -278,3 +285,4 @@ Learn More
     filesystem/*
 
 .. _`Packagist`: https://packagist.org/packages/symfony/filesystem
+.. _`umask`: https://en.wikipedia.org/wiki/Umask
diff --git a/components/serializer.rst b/components/serializer.rst
@@ -410,9 +410,9 @@ and :class:`Symfony\\Component\\Serializer\\Normalizer\\PropertyNormalizer`::
     $obj->name = 'Acme Inc.';
     $obj->address = '123 Main Street, Big City';
 
-    $json = $serializer->serialize($obj);
+    $json = $serializer->serialize($obj, 'json');
     // {"org_name": "Acme Inc.", "org_address": "123 Main Street, Big City"}
-    $objCopy = $serializer->deserialize($json);
+    $objCopy = $serializer->deserialize($json, Company::class, 'json');
     // Same data as $obj
 
 .. _using-camelized-method-names-for-underscored-attributes:
diff --git a/form/create_custom_field_type.rst b/form/create_custom_field_type.rst
@@ -412,7 +412,7 @@ registered as a service. Because you used the ``form.type`` tag in its configura
 your service will be used instead of creating a *new* ``ShippingType``. In other words,
 your controller *does not need to change*, it still looks like this::
 
-    // src/AppBundle/Form/Type/AuthorType.php
+    // src/AppBundle/Form/Type/OrderType.php
     namespace AppBundle\Form\Type;
 
     use Symfony\Component\Form\AbstractType;
diff --git a/form/data_transformers.rst b/form/data_transformers.rst
@@ -23,7 +23,7 @@ Simple Example: Transforming String Tags from User Input to an Array
 
 Suppose you have a Task form with a tags ``text`` type::
 
-    // src/AppBundle/Form/TaskType.php
+    // src/AppBundle/Form/Type/TaskType.php
     namespace AppBundle\Form\Type;
 
     use AppBundle\Entity\Task;
@@ -56,7 +56,7 @@ This is a *perfect* time to attach a custom data transformer to the ``tags``
 field. The easiest way to do this is with the :class:`Symfony\\Component\\Form\\CallbackTransformer`
 class::
 
-    // src/AppBundle/Form/TaskType.php
+    // src/AppBundle/Form/Type/TaskType.php
     namespace AppBundle\Form\Type;
 
     use Symfony\Component\Form\CallbackTransformer;
@@ -120,7 +120,7 @@ issue number.
 
 Start by setting up the text field like normal::
 
-    // src/AppBundle/Form/TaskType.php
+    // src/AppBundle/Form/Type/TaskType.php
     namespace AppBundle\Form\Type;
 
     use AppBundle\Entity\Task;
@@ -253,7 +253,7 @@ of the entity manager (because ``IssueToNumberTransformer`` needs this).
 No problem! Just add a ``__construct()`` function to ``TaskType`` and force this
 to be passed in by registering ``TaskType`` as a service::
 
-    // src/AppBundle/Form/TaskType.php
+    // src/AppBundle/Form/Type/TaskType.php
     namespace AppBundle\Form\Type;
 
     use AppBundle\Form\DataTransformer\IssueToNumberTransformer;
@@ -465,7 +465,7 @@ it's recognized as a custom field type:
 Now, whenever you need to use your special ``issue_selector`` field type,
 it's quite easy::
 
-    // src/AppBundle/Form/TaskType.php
+    // src/AppBundle/Form/Type/TaskType.php
     namespace AppBundle\Form\Type;
 
     use AppBundle\Form\DataTransformer\IssueToNumberTransformer;
diff --git a/form/dynamic_form_modification.rst b/form/dynamic_form_modification.rst
@@ -262,7 +262,7 @@ Customizing the Form Type
 Now that you have all the basics in place you can take advantage of the ``TokenStorageInterface``
 and fill in the listener logic::
 
-    // src/AppBundle/FormType/FriendMessageFormType.php
+    // src/AppBundle/Form/Type/FriendMessageFormType.php
 
     use AppBundle\Entity\User;
     use Doctrine\ORM\EntityRepository;
diff --git a/form/events.rst b/form/events.rst
@@ -317,6 +317,7 @@ callback for better readability::
 
     use Symfony\Component\Form\Extension\Core\Type\TextType;
     use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+    use Symfony\Component\Form\FormEvent;
     use Symfony\Component\Form\FormEvents;
 
     // ...
@@ -404,9 +405,9 @@ Event subscribers have different uses:
 
 To register the event subscriber, use the ``addEventSubscriber()`` method::
 
+    use AppBundle\Form\EventListener\AddEmailFieldListener;
     use Symfony\Component\Form\Extension\Core\Type\TextType;
     use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-        use AppBundle\Form\EventListener\AddEmailFieldListener;
 
     // ...
 
diff --git a/security/entity_provider.rst b/security/entity_provider.rst
@@ -85,7 +85,7 @@ For this entry, suppose that you already have a ``User`` entity inside an
         {
             $this->isActive = true;
             // may not be needed, see section on salt below
-            // $this->salt = md5(uniqid(null, true));
+            // $this->salt = md5(uniqid('', true));
         }
 
         public function getUsername()
diff --git a/security/impersonating_user.rst b/security/impersonating_user.rst
@@ -103,7 +103,7 @@ to show a link to exit impersonation:
             </a>
         <?php endif ?>
 
-In some cases you may need to get the object that represents the impersonating
+In some cases you may need to get the object that represents the impersonator
 user rather than the impersonated user. Use the following snippet to iterate
 over the user's roles until you find one that a ``SwitchUserRole`` object::
 
@@ -115,7 +115,7 @@ over the user's roles until you find one that a ``SwitchUserRole`` object::
     if ($authChecker->isGranted('ROLE_PREVIOUS_ADMIN')) {
         foreach ($tokenStorage->getToken()->getRoles() as $role) {
             if ($role instanceof SwitchUserRole) {
-                $impersonatingUser = $role->getSource()->getUser();
+                $impersonatorUser = $role->getSource()->getUser();
                 break;
             }
         }

Original file line number	Diff line number	Diff line change
@@ -85,7 +85,7 @@ For this entry, suppose that you already have a ``User`` entity inside an
`85`	`85`	`{`
`86`	`86`	`$this->isActive = true;`
`87`	`87`	`// may not be needed, see section on salt below`
`88`		`- // $this->salt = md5(uniqid(null, true));`
	`88`	`+ // $this->salt = md5(uniqid('', true));`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`public function getUsername()`