Merge branch '2.8' into 3.1

nicolas-grekas · nicolas-grekas · commit 053d5564e40d · 2016-08-19T08:48:39.000+02:00
* 2.8:
  Disable CLI color for Windows 10 greater than 10.0.10586
  Exception details break the layout
  [HttpKernel] Remove wrong docblock
  [HttpKernel] Fix HttpCache validation HTTP method
  Move space from the before 'if' to the after 'if'
  [TwigBundle] Add a check for choice's attributes emptiness before calling block('attributes')
diff --git a/ExceptionHandler.php b/ExceptionHandler.php
@@ -299,6 +299,7 @@ public function getStylesheet(FlattenException $exception)
                 border-bottom:1px solid #ccc;
                 border-right:1px solid #ccc;
                 border-left:1px solid #ccc;
+                word-wrap: break-word;
             }
             .sf-reset .block_exception { background-color:#ddd; color: #333; padding:20px;
                 -webkit-border-top-left-radius: 16px;

Original file line number	Diff line number	Diff line change
`@@ -299,6 +299,7 @@ public function getStylesheet(FlattenException $exception)`
`299`	`299`	`border-bottom:1px solid #ccc;`
`300`	`300`	`border-right:1px solid #ccc;`
`301`	`301`	`border-left:1px solid #ccc;`
	`302`	`+ word-wrap: break-word;`
`302`	`303`	`}`
`303`	`304`	`.sf-reset .block_exception { background-color:#ddd; color: #333; padding:20px;`
`304`	`305`	`-webkit-border-top-left-radius: 16px;`