Merge branch '4.0'

nicolas-grekas · nicolas-grekas · commit 6470380c22c7 · 2017-12-29T22:31:52.000+01:00
* 4.0:
  fix merge
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1.txt
@@ -1,5 +1,5 @@
 
-In ApplicationTest.php line 715:
+In ApplicationTest.php line 725:
                     
   エラーメッセージ  
                     
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1decorated.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1decorated.txt
@@ -1,5 +1,5 @@
 
-[33mIn ApplicationTest.php line 715:[39m
+[33mIn ApplicationTest.php line 725:[39m
 [37;41m                    [39;49m
 [37;41m  エラーメッセージ  [39;49m
 [37;41m                    [39;49m
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth2.txt
@@ -1,5 +1,5 @@
 
-In ApplicationTest.php line 729:
+In ApplicationTest.php line 739:
                               
   コマンドの実行中にエラーが  
   発生しました。              
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_escapeslines.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_escapeslines.txt
@@ -1,5 +1,5 @@
 
-In ApplicationTest.php line 743:
+In ApplicationTest.php line 753:
                      
   dont break here <  
   info>!</info>      
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_linebreaks.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_linebreaks.txt
@@ -1,5 +1,5 @@
 
-In ApplicationTest.php line 760:
+In ApplicationTest.php line 770:
                                     
   line 1 with extra spaces          
   line 2                            

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`
`2`		`-In ApplicationTest.php line 715:`
	`2`	`+In ApplicationTest.php line 725:`
`3`	`3`
`4`	`4`	`エラーメッセージ`
`5`	`5`
-Original file line number
+Diff line change
@@ @@ -1,5 +1,5 @@ @@
 -[33mIn ApplicationTest.php line 715:[39m
 +[33mIn ApplicationTest.php line 725:[39m
 [37;41m                    [39;49m
 [37;41m  エラーメッセージ  [39;49m
 [37;41m                    [39;49m