Merge branch '3.4' into 4.2

OskarStark · OskarStark · commit 1702037a06cc · 2019-03-29T13:59:30.000+01:00
* 3.4:
  uncomment the "Before" code part
diff --git a/console/style.rst b/console/style.rst
@@ -366,10 +366,11 @@ of your commands to change their appearance::
         protected function execute(InputInterface $input, OutputInterface $output)
         {
             // Before
-            // $io = new SymfonyStyle($input, $output);
+            $io = new SymfonyStyle($input, $output);
 
             // After
             $io = new CustomStyle($input, $output);
+
             // ...
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -366,10 +366,11 @@ of your commands to change their appearance::`
`366`	`366`	`protected function execute(InputInterface $input, OutputInterface $output)`
`367`	`367`	`{`
`368`	`368`	`// Before`
`369`		`- // $io = new SymfonyStyle($input, $output);`
	`369`	`+ $io = new SymfonyStyle($input, $output);`
`370`	`370`
`371`	`371`	`// After`
`372`	`372`	`$io = new CustomStyle($input, $output);`
	`373`	`+`
`373`	`374`	`// ...`
`374`	`375`	`}`
`375`	`376`	`}`