Merge branch '2.8' into 3.3

nicolas-grekas · nicolas-grekas · commit 7d590ad82f6b · 2017-12-20T12:04:02.000+01:00
* 2.8:
  [2.7] Fix issues found by PHPStan
  Add php_unit_dedicate_assert to PHPCS
  improve FormType::getType exception message details
  [Intl] Update ICU data to 60.2
  [Console] fix a bug when you are passing a default value and passing -n would ouput the index
diff --git a/Templating/Helper/CodeHelper.php b/Templating/Helper/CodeHelper.php
@@ -116,7 +116,7 @@ public function fileExcerpt($file, $line)
     {
         if (is_readable($file)) {
             if (extension_loaded('fileinfo')) {
-                $finfo = new \Finfo();
+                $finfo = new \finfo();
 
                 // Check if the file is an application/octet-stream (eg. Phar file) because highlight_file cannot parse these files
                 if ('application/octet-stream' === $finfo->file($file, FILEINFO_MIME_TYPE)) {

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ public function fileExcerpt($file, $line)`
`116`	`116`	`{`
`117`	`117`	`if (is_readable($file)) {`
`118`	`118`	`if (extension_loaded('fileinfo')) {`
`119`		`- $finfo = new \Finfo();`
	`119`	`+ $finfo = new \finfo();`
`120`	`120`
`121`	`121`	`// Check if the file is an application/octet-stream (eg. Phar file) because highlight_file cannot parse these files`
`122`	`122`	`if ('application/octet-stream' === $finfo->file($file, FILEINFO_MIME_TYPE)) {`