NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commita5d1539

committed

Merge remote-tracking branch 'origin/2.4' into 2.4

2 parents16f0226 +c2b3ecd commita5d1539Copy full SHA for a5d1539

File tree

3 files changed

+15

-14

lines changed

components
- console
  - introduction.rst
- process.rst
cookbook/logging
- monolog_console.rst

3 files changed

+15

-14

lines changed

`‎components/console/introduction.rst‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ You can also set these colors and options inside the tagname::`
`160`	`160`	`// bold text on a yellow background`
`161`	`161`	`$output->writeln('<bg=yellow;options=bold>foo</bg=yellow;options=bold>');`
`162`	`162`
`163`		`-..verbosity-levels:`
	`163`	`+.._verbosity-levels:`
`164`	`164`
`165`	`165`	`Verbosity Levels`
`166`	`166`	`~~~~~~~~~~~~~~~~`

`‎components/process.rst‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -46,11 +46,11 @@ and :method:`Symfony\\Component\\Process\\Process::getIncrementalErrorOutput`
`46`	`46`	`methods returns the new outputs since the last call.`
`47`	`47`
`48`	`48`	`..versionadded::2.4`
`49`		- The ``flushOutput()`` and ``flushErrorOutput()`` methods were added in Symfony 2.4.
	`49`	+ The ``clearOutput()`` and ``clearErrorOutput()`` methods were added in Symfony 2.4.
`50`	`50`
`51`		-The:method:`Symfony\\Component\\Process\\Process::flushOutput` methodflushes
	`51`	+The:method:`Symfony\\Component\\Process\\Process::clearOutput` methodclears
`52`	`52`	`the contents of the output and`
`53`		-:method:`Symfony\\Component\\Process\\Process::flushErrorOutput` flushes
	`53`	+:method:`Symfony\\Component\\Process\\Process::clearErrorOutput` clears
`54`	`54`	`the contents of the error output.`
`55`	`55`
`56`	`56`	`Getting real-time Process Output`

`‎cookbook/logging/monolog_console.rst‎`

Lines changed: 11 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,13 @@`
`4`	`4`	`How to Configure Monolog to Display Console Messages`
`5`	`5`	`====================================================`
`6`	`6`
`7`		`-..versionadded::2.3`
`8`		`- This feature was introduced to the MonologBundle in version 2.4, which`
`9`		`- was first packaged with Symfony at version 2.4 (but compatible with Symfony 2.3).`
	`7`	`+..versionadded::2.4`
	`8`	`+ This feature was introduced to the MonologBridge in Symfony 2.4.`
`10`	`9`
`11`		-It is possible to use the console to print messages for certain:ref:`verbosity-levels`
`12`		-using the:class:`Symfony\\Component\\Console\\Output\\OutputInterface`
`13`		`-instance that is passed when a command gets executed.`
	`10`	`+It is possible to use the console to print messages for certain`
	`11`	+:ref:`verbosity levels<verbosity-levels>` using the
	`12`	+:class:`Symfony\\Component\\Console\\Output\\OutputInterface` instance that
	`13`	`+is passed when a command gets executed.`
`14`	`14`
`15`	`15`	`When a lot of logging has to happen, it's cumbersome to print information`
`16`	`16`	depending on the verbosity settings (``-v``, ``-vv``, ``-vvv``) because the
`@@ -32,7 +32,7 @@ For example::`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`Instead of using these semantic methods to test for each of the verbosity`
`35`		-levels,`MonologBundle`_ 2.4 provides a `ConsoleHandler`_ that listens to
	`35`	+levels,the `MonologBridge`_ provides a `ConsoleHandler`_ that listens to
`36`	`36`	`console events and writes log messages to the console output depending on the`
`37`	`37`	`current log level and the console verbosity.`
`38`	`38`
@@ -96,8 +96,9 @@ With the ``verbosity_levels`` option you can adapt the mapping between
`96`	`96`	`verbosity and log level. In the given example it will also show notices in`
`97`	`97`	`normal verbosity mode (instead of warnings only). Additionally, it will only`
`98`	`98`	use messages logged with the custom ``my_channel`` channel and it changes the
`99`		-display style via a custom formatter. See also the:doc:`reference/configuration/monolog`
`100`		`-for more information:`
	`99`	`+display style via a custom formatter (see the`
	`100`	+:doc:`MonologBundle reference</reference/configuration/monolog>` for more
	`101`	`+information):`
`101`	`102`
`102`	`103`	`..configuration-block::`
`103`	`104`
`@@ -180,4 +181,4 @@ for more information:`
`180`	`181`	`;`
`181`	`182`
`182`	`183`	`.. _ConsoleHandler:https://github.com/symfony/MonologBridge/blob/master/Handler/ConsoleHandler.php`
`183`		`-.._MonologBundle:https://github.com/symfony/MonologBundle`
	`184`	`+.._MonologBridge:https://github.com/symfony/MonologBridge`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commita5d1539

File tree

3 files changed

3 files changed

`‎components/console/introduction.rst‎`

`‎components/process.rst‎`

`‎cookbook/logging/monolog_console.rst‎`

0 commit comments