Skip to content

Commit b8a153d

Browse files
committed
Merge branch '7.1' into 7.2
* 7.1: [Doctrine] Delete the article about reverse engineering Update templates.rst: Adding installation command
2 parents 674f323 + 1fb28d5 commit b8a153d

File tree

4 files changed

+13
-18
lines changed

4 files changed

+13
-18
lines changed

_build/redirection_map

+1
Original file line numberDiff line numberDiff line change
@@ -571,3 +571,4 @@
571571
/testing/http_authentication /testing#testing_logging_in_users
572572
/doctrine/registration_form /security#security-make-registration-form
573573
/form/form_dependencies /form/create_custom_field_type
574+
/doctrine/reverse_engineering /doctrine#doctrine-adding-mapping

doctrine.rst

+2-3
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@ affect how Doctrine functions.
8484
There are many other Doctrine commands. Run ``php bin/console list doctrine``
8585
to see a full list.
8686

87+
.. _doctrine-adding-mapping:
88+
8789
Creating an Entity Class
8890
------------------------
8991

9092
Suppose you're building an application where products need to be displayed.
9193
Without even thinking about Doctrine or databases, you already know that
9294
you need a ``Product`` object to represent those products.
9395

94-
.. _doctrine-adding-mapping:
95-
9696
You can use the ``make:entity`` command to create this class and any fields you
9797
need. The command will ask you some questions - answer them like done below:
9898

@@ -1107,7 +1107,6 @@ Learn more
11071107
doctrine/dbal
11081108
doctrine/multiple_entity_managers
11091109
doctrine/resolve_target_entity
1110-
doctrine/reverse_engineering
11111110
testing/database
11121111

11131112
.. _`Doctrine`: https://www.doctrine-project.org/

doctrine/reverse_engineering.rst

-15
This file was deleted.

templates.rst

+10
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@ whether you need to render HTML from a :doc:`controller </controller>` or genera
66
the :doc:`contents of an email </mailer>`. Templates in Symfony are created with
77
Twig: a flexible, fast, and secure template engine.
88

9+
Installation
10+
------------
11+
12+
In applications using :ref:`Symfony Flex <symfony-flex>`, run the following command
13+
to install both Twig language support and its integration with Symfony applications:
14+
15+
.. code-block:: terminal
16+
17+
$ composer require symfony/twig-bundle
18+
919
.. _twig-language:
1020

1121
Twig Templating Language

0 commit comments

Comments
 (0)