Skip to content

Commit f4b9666

Browse files
committed
Merge branch '4.1' into 4.2
* 4.1: Update installation.rst remove Symfony 2/3 versionadded directives remove Symfony 2.8 versionadded directive Removed a small article about console logging Describe things more precisely
2 parents 3baef87 + a8bd75f commit f4b9666

File tree

14 files changed

+19
-43
lines changed

14 files changed

+19
-43
lines changed

_build/redirection_map

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
/cookbook/console/commands_as_services /console/commands_as_services
120120
/cookbook/console/console_command /console
121121
/cookbook/console/index /console
122-
/cookbook/console/logging /console/logging
122+
/cookbook/console/logging /console
123123
/cookbook/console/request_context /console/request_context
124124
/cookbook/console/style /console/style
125125
/cookbook/console/usage /console
@@ -402,3 +402,4 @@
402402
/components/weblink /components/web_link
403403
/frontend/encore/installation-no-flex /frontend/encore/installation
404404
/http_cache/form_csrf_caching /security/csrf
405+
/console/logging /console

components/console/events.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@ Listeners receive a
114114
$event->setError(new \LogicException('Caught exception', $exitCode, $event->getError()));
115115
});
116116

117+
.. _console-events-terminate:
118+
117119
The ``ConsoleEvents::TERMINATE`` Event
118120
--------------------------------------
119121

components/serializer.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,6 @@ needs three parameters:
166166
#. The name of the class this information will be decoded to
167167
#. The encoder used to convert that information into an array
168168

169-
.. versionadded:: 3.3
170-
171-
Support for the ``allow_extra_attributes`` key in the context was introduced
172-
in Symfony 3.3.
173-
174169
By default, additional attributes that are not mapped to the denormalized object
175170
will be ignored by the Serializer component. If you prefer to throw an exception
176171
when this happens, set the ``allow_extra_attributes`` context option to

components/validator.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,6 @@ If you have lots of validation errors, you can filter them by error code::
6464
// handle this specific error (display some message, send an email, etc.)
6565
}
6666

67-
.. versionadded:: 3.3
68-
69-
The ``findByCodes()`` method was introduced in Symfony 3.3.
70-
7167
Retrieving a Validator Instance
7268
-------------------------------
7369

configuration/external_parameters.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,6 @@ the following:
137137
Environment Variable Processors
138138
-------------------------------
139139

140-
.. versionadded:: 3.4
141-
142-
Environment variable processors were introduced in Symfony 3.4.
143-
144140
The values of environment variables are considered strings by default.
145141
However, your code may expect other data types, like integers or booleans.
146142
Symfony solves this problem with *processors*, which modify the contents of the

console.rst

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,15 @@ console::
366366
:class:`Symfony\\Component\\Console\\Application <Symfony\\Component\\Console\\Application>`
367367
and extend the normal ``\PHPUnit\Framework\TestCase``.
368368

369+
Logging Command Errors
370+
----------------------
371+
372+
Whenever an exception is thrown while running commands, Symfony adds a log
373+
message for it including the entire failing command. In addition, Symfony
374+
registers an :doc:`event subscriber </event_dispatcher>` to listen to the
375+
:ref:`ConsoleEvents::TERMINATE event <console-events-terminate>` and adds a log
376+
message whenever a command doesn't finish with the ``0`` exit status.
377+
369378
Learn More
370379
----------
371380

console/request_context.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,6 @@ will override the defaults.
6565
$container->setParameter('asset.request_context.base_path', $container->getParameter('router.request_context.base_url'));
6666
$container->setParameter('asset.request_context.secure', true);
6767
68-
.. versionadded:: 3.4
69-
70-
The ``asset.request_context.*`` parameters were introduced in Symfony 3.4.
71-
7268
Configuring the Request Context per Command
7369
-------------------------------------------
7470

frontend/encore/installation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ is the main config file for both Webpack and Webpack Encore:
5757
5858
Encore
5959
// directory where compiled assets will be stored
60-
.setOutputPath('web/build/')
60+
.setOutputPath('public/build/')
6161
// public path used by the web server to access the output path
6262
.setPublicPath('/build')
6363
// only needed for CDN's or sub-directory deploy

reference/configuration/framework.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1647,10 +1647,6 @@ for translation files.
16471647
default_path
16481648
............
16491649

1650-
.. versionadded:: 3.4
1651-
1652-
The ``default_path`` option was introduced in Symfony 3.4.
1653-
16541650
**type**: ``string`` **default**: ``%kernel.project_dir%/translations``
16551651

16561652
This option allows to define the path where the application translations files

reference/forms/types/number.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ Field Options
4646
scale
4747
~~~~~
4848

49-
.. versionadded:: 2.7
50-
51-
The ``scale`` option was introduced in Symfony 2.7. Prior to Symfony 2.7,
52-
it was known as ``precision``.
53-
5449
**type**: ``integer`` **default**: Locale-specific (usually around ``3``)
5550

5651
This specifies how many decimals will be allowed until the field rounds

0 commit comments

Comments
 (0)