Commite7d1a58

committed

Merge branch '2.2'

Conflicts:components/console/helpers/progresshelper.rstreference/configuration/framework.rst

2 parents98c0ff6 +880dd44 commite7d1a58Copy full SHA for e7d1a58

File tree

+14

-10

lines changed

+14

-10

lines changed

Lines changed: 11 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -65,18 +65,20 @@ To see other available options, check the API documentation for`
`65`	`65`
`66`	`66`	`..caution::`
`67`	`67`
`68`		`- For performance reasons, be careful to not set the total number of steps`
`69`		`- to a high number. For example, if you're iterating over a large number`
`70`		`- of items, consider a smaller "step" number that updates on only some`
`71`		`- iterations::`
	`68`	`+ For performance reasons, be careful if you set the total number of steps`
	`69`	`+ to a high number. For example, if you're iterating over a large number of`
	`70`	`+ items, consider setting the redraw frequency to a higher value by calling`
	`71`	+:method:`Symfony\\Component\\Console\\Helper\\ProgressHelper::setRedrawFrequency`,
	`72`	`+ so it updates on only some iterations::`
	`73`	`+`
	`74`	`+ $progress->start($output, 50000);`
	`75`	`+`
	`76`	`+ // update every 100 iterations`
	`77`	`+ $progress->setRedrawFrequency(100);`
`72`	`78`
`73`		`- $progress->start($output, 500);`
`74`	`79`	`$i = 0;`
`75`	`80`	`while ($i++ < 50000) {`
`76`	`81`	`// ... do some work`
`77`	`82`
`78`		`- // advance every 100 iterations`
`79`		`- if ($i % 100 == 0) {`
`80`		`- $progress->advance();`
`81`		`- }`
	`83`	`+ $progress->advance();`
`82`	`84`	`}`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ Configuration`
`44`	`44`	* `assets_version_format`_
`45`	`45`	* `profiler`_
`46`	`46`	* `collect`_
`47`		- * `enabled`_
	`47`	+ *:ref:`enabled<profiler.enabled>`
`48`	`48`
`49`	`49`	`secret`
`50`	`50`	`~~~~~~`
`@@ -404,6 +404,8 @@ profiler`
`404`	`404`	could only be disabled by omitting the ``framework.profiler`` configuration
`405`	`405`	`entirely.`
`406`	`406`
	`407`	`+.. _profiler.enabled:`
	`408`	`+`
`407`	`409`	`enabled`
`408`	`410`	`.......`
`409`	`411`

Comments

(0)