Skip to content

Commit 06e5532

Browse files
committed
Merge branch '3.4' into 4.2
* 3.4: Fixed typo in reference Update dotenv.rst [Form] Add example for createNamed Form Update Traverse.rst
2 parents 285fd1b + 0707074 commit 06e5532

File tree

3 files changed

+23
-7
lines changed

3 files changed

+23
-7
lines changed

components/dotenv.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The Dotenv Component
66
====================
77

88
The Dotenv Component parses ``.env`` files to make environment variables
9-
stored in them accessible via ``getenv()``, ``$_ENV`` or ``$_SERVER``.
9+
stored in them accessible via ``$_ENV`` or ``$_SERVER``.
1010

1111
Installation
1212
------------
@@ -51,10 +51,10 @@ Given the following ``.env`` file content:
5151
DB_USER=root
5252
DB_PASS=pass
5353
54-
Access the value with ``getenv()`` in your code::
54+
Access the value with ``$_ENV`` in your code::
5555

56-
$dbUser = getenv('DB_USER');
57-
// you can also use ``$_ENV`` or ``$_SERVER``
56+
$dbUser = $_ENV['DB_USER'];
57+
// you can also use ``$_SERVER``
5858

5959
The ``load()`` method never overwrites existing environment variables. Use the
6060
``overload()`` method if you need to overwrite them::

forms.rst

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,23 @@ the choice is ultimately up to you.
691691
.. note::
692692

693693
The form name is automatically generated from the type class name. If you want
694-
to modify it, use the :method:`Symfony\\Component\\Form\\FormFactoryInterface::createNamed` method.
694+
to modify it, use the :method:`Symfony\\Component\\Form\\FormFactoryInterface::createNamed` method::
695+
696+
// src/AppBundle/Controller/DefaultController.php
697+
use AppBundle\Form\TaskType;
698+
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
699+
700+
class DefaultController extends AbstractController
701+
{
702+
public function newAction()
703+
{
704+
$task = ...;
705+
$form = $this->get('form.factory')->createNamed('name', TaskType::class, $task);
706+
707+
// ...
708+
}
709+
}
710+
695711
You can even suppress the name completely by setting it to an empty string.
696712

697713
Final Thoughts

reference/constraints/Traverse.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ Traverse
44
Objects do not validate nested objects by default unless explicitly using
55
this constraint.
66
If only specific nested objects should be validated by cascade, consider
7-
using the :doc:`references/constraints/Valid` instead.
7+
using the :doc:`reference/constraints/Valid` instead.
88

99
+----------------+-------------------------------------------------------------------------------------+
1010
| Applies to | :ref:`class <validation-class-target>` |
1111
+----------------+-------------------------------------------------------------------------------------+
1212
| Options | - `payload`_ |
1313
+----------------+-------------------------------------------------------------------------------------+
14-
| Class | :class:`Symfony\\Bridge\\Doctrine\\Validator\\Constraints\\Traverse` |
14+
| Class | :class:`Symfony\Component\Validator\Constraints\Traverse` |
1515
+----------------+-------------------------------------------------------------------------------------+
1616

1717
Basic Usage

0 commit comments

Comments
 (0)