Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit b991e8b

Browse filesBrowse files
committed
Merge branch '3.4' into 4.2
* 3.4: [#11328] Restructured into a definition list Fix a typo for the range of allowed attack complexity score values Addressed issues raised in (#10798) Add Doctrine ORM installation instructions. Adds documentation for monolog processors.
2 parents a588a92 + b0fd087 commit b991e8b
Copy full SHA for b991e8b

File tree

3 files changed

+30
-2
lines changed
Filter options

3 files changed

+30
-2
lines changed

‎best_practices/business-logic.rst

Copy file name to clipboardExpand all lines: best_practices/business-logic.rst
+11-1Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,15 @@ library or strategy you want for this.
122122

123123
In practice, many Symfony applications rely on the independent
124124
`Doctrine project`_ to define their model using entities and repositories.
125+
126+
Doctrine support is not enabled by default in Symfony. So to use Doctrine
127+
as shown in the examples below you will need to install :doc:`Doctrine ORM support </doctrine>`
128+
by executing the following command:
129+
130+
.. code-block:: terminal
131+
132+
$ composer require symfony/orm-pack
133+
125134
Just like with business logic, we recommend storing Doctrine entities in the
126135
``src/Entity/`` directory.
127136

@@ -226,7 +235,7 @@ the following command to install the Doctrine fixtures bundle:
226235

227236
.. code-block:: terminal
228237
229-
$ composer require "doctrine/doctrine-fixtures-bundle"
238+
$ composer require doctrine/doctrine-fixtures-bundle
230239
231240
Then, this bundle is enabled automatically, but only for the ``dev`` and
232241
``test`` environments::
@@ -267,6 +276,7 @@ Next: :doc:`/best_practices/controllers`
267276

268277
.. _`full definition`: https://en.wikipedia.org/wiki/Business_logic
269278
.. _`Doctrine project`: http://www.doctrine-project.org/
279+
.. _`Doctrine ORM support`: https://symfony.com/doc/current/doctrine.html
270280
.. _`fixture class`: https://symfony.com/doc/current/bundles/DoctrineFixturesBundle/index.html#writing-simple-fixtures
271281
.. _`PSR-1`: https://www.php-fig.org/psr/psr-1/
272282
.. _`PSR-2`: https://www.php-fig.org/psr/psr-2/

‎contributing/code/security.rst

Copy file name to clipboardExpand all lines: contributing/code/security.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ score for Affected Projects is capped at 4.*
150150
Score Totals
151151
~~~~~~~~~~~~
152152

153-
* Attack Complexity: 1 - 4
153+
* Attack Complexity: 1 - 5
154154
* Impact: 1 - 6
155155
* Affected Projects: 1 - 4
156156

‎logging/processors.rst

Copy file name to clipboardExpand all lines: logging/processors.rst
+18Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,24 @@ If you use several handlers, you can also register a processor at the
159159
handler level or at the channel level instead of registering it globally
160160
(see the following sections).
161161

162+
Symfony's MonologBridge provides processors that can be registered inside your application.
163+
164+
:class:`Symfony\\Bridge\\Monolog\\Processor\\DebugProcessor`
165+
Adds additional information useful for debugging like a timestamp or an
166+
error message to the record.
167+
168+
:class:`Symfony\\Bridge\\Monolog\\Processor\\TokenProcessor`
169+
Adds information from the current user's token to the record namely
170+
username, roles and whether the user is authenticated.
171+
172+
:class:`Symfony\\Bridge\\Monolog\\Processor\\WebProcessor`
173+
Overrides data from the request using the data inside Symfony's request
174+
object.
175+
176+
.. versionadded:: 3.4
177+
178+
The ``TokenProcessor`` class was introduced in Symfony 3.4.
179+
162180
Registering Processors per Handler
163181
----------------------------------
164182

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.