Merge branch '9.2'

Author: sebastianbergmann

.php-cs-fixer.dist.php

@@ -119,9 +119,16 @@
         'multiline_whitespace_before_semicolons' => true,
         'native_constant_invocation' => false,
         'native_function_casing' => false,
-        'native_function_invocation' => false,
+        'native_function_invocation' => [
+            'include' => [
+                '@internal',
+            ],
+        ],
         'native_function_type_declaration_casing' => true,
-        'new_with_braces' => false,
+        'new_with_braces' => [
+            'named_class' => false,
+            'anonymous_class' => false,
+        ],
         'no_alias_functions' => true,
         'no_alias_language_construct_call' => true,
         'no_alternative_syntax' => true,
@@ -158,6 +165,7 @@
         'no_unneeded_control_parentheses' => true,
         'no_unneeded_curly_braces' => true,
         'no_unneeded_final_method' => true,
+        'no_unneeded_import_alias' => true,
         'no_unreachable_default_argument_value' => true,
         'no_unset_cast' => true,
         'no_unset_on_property' => true,

src/Data/RawCodeCoverageData.php

@@ -15,8 +15,12 @@
 use function array_intersect;
 use function array_intersect_key;
 use function count;
+use function explode;
+use function file_get_contents;
 use function in_array;
+use function is_file;
 use function range;
+use function trim;
 use SebastianBergmann\CodeCoverage\Driver\Driver;
 use SebastianBergmann\CodeCoverage\StaticAnalysis\FileAnalyser;
 

src/Filter.php

@@ -12,6 +12,8 @@
 use function array_keys;
 use function is_file;
 use function realpath;
+use function str_contains;
+use function str_starts_with;
 use SebastianBergmann\FileIterator\Facade as FileIteratorFacade;
 
 final class Filter

src/Node/AbstractNode.php

@@ -11,6 +11,7 @@
 
 use const DIRECTORY_SEPARATOR;
 use function array_merge;
+use function str_ends_with;
 use function str_replace;
 use function substr;
 use Countable;

src/Node/Builder.php

@@ -17,7 +17,9 @@
 use function explode;
 use function implode;
 use function is_file;
+use function str_ends_with;
 use function str_replace;
+use function str_starts_with;
 use function substr;
 use SebastianBergmann\CodeCoverage\CodeCoverage;
 use SebastianBergmann\CodeCoverage\Data\ProcessedCodeCoverageData;

src/Report/Cobertura.php

@@ -9,10 +9,13 @@
  */
 namespace SebastianBergmann\CodeCoverage\Report;
 
+use function basename;
 use function count;
 use function dirname;
 use function file_put_contents;
+use function preg_match;
 use function range;
+use function str_replace;
 use function time;
 use DOMImplementation;
 use SebastianBergmann\CodeCoverage\CodeCoverage;

src/Report/Html/CustomCssFile.php

@@ -9,6 +9,7 @@
  */
 namespace SebastianBergmann\CodeCoverage\Report\Html;
 
+use function is_file;
 use SebastianBergmann\CodeCoverage\InvalidArgumentException;
 
 /**

src/Report/Html/Renderer/File.php

@@ -80,6 +80,8 @@
 use const T_YIELD;
 use const T_YIELD_FROM;
 use function array_key_exists;
+use function array_keys;
+use function array_merge;
 use function array_pop;
 use function array_unique;
 use function constant;
@@ -89,7 +91,11 @@
 use function file_get_contents;
 use function htmlspecialchars;
 use function is_string;
+use function ksort;
+use function range;
+use function sort;
 use function sprintf;
+use function str_ends_with;
 use function str_replace;
 use function token_get_all;
 use function trim;

src/Report/Xml/Coverage.php

@@ -28,7 +28,7 @@ public function __construct(DOMElement $context, string $line)
     {
         $this->contextNode = $context;
 
-        $this->writer = new XMLWriter();
+        $this->writer = new XMLWriter;
         $this->writer->openMemory();
         $this->writer->startElementNS(null, $context->nodeName, 'https://schema.phpunit.de/coverage/1.0');
         $this->writer->writeAttribute('nr', $line);

src/Report/Xml/Report.php

@@ -20,7 +20,7 @@ final class Report extends File
 {
     public function __construct(string $name)
     {
-        $dom = new DOMDocument();
+        $dom = new DOMDocument;
         $dom->loadXML('<?xml version="1.0" ?><phpunit xmlns="https://schema.phpunit.de/coverage/1.0"><file /></phpunit>');
 
         $contextNode = $dom->getElementsByTagNameNS(