Fix CS/WS issues

Author: sebastianbergmann

tests/tests/BuilderTest.php

@@ -7,29 +7,25 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace SebastianBergmann\CodeCoverage\Report;
 
-use SebastianBergmann\CodeCoverage\Driver\Driver;
-use SebastianBergmann\CodeCoverage\CodeCoverage;
-use SebastianBergmann\CodeCoverage\Filter;
-use SebastianBergmann\CodeCoverage\TestCase;
 use SebastianBergmann\CodeCoverage\Node\Builder;
+use SebastianBergmann\CodeCoverage\TestCase;
 
 class BuilderTest extends TestCase
 {
     protected $factory;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->factory = new Builder;
     }
 
-    public function testSomething()
+    public function testSomething(): void
     {
         $root = $this->getCoverageForBankAccount()->getReport();
 
-        $expectedPath = rtrim(TEST_FILES_PATH, DIRECTORY_SEPARATOR);
+        $expectedPath = \rtrim(TEST_FILES_PATH, \DIRECTORY_SEPARATOR);
         $this->assertEquals($expectedPath, $root->getName());
         $this->assertEquals($expectedPath, $root->getPath());
         $this->assertEquals(10, $root->getNumExecutableLines());
@@ -116,34 +112,34 @@ public function testSomething()
                         'fullPackage' => '',
                         'category'    => '',
                         'package'     => '',
-                        'subpackage'  => ''
+                        'subpackage'  => '',
                     ],
                     'link'      => 'BankAccount.php.html#2',
-                    'className' => 'BankAccount'
-                ]
+                    'className' => 'BankAccount',
+                ],
             ],
             $root->getClasses()
         );
 
         $this->assertEquals([], $root->getFunctions());
     }
 
-    public function testNotCrashParsing()
+    public function testNotCrashParsing(): void
     {
         $coverage = $this->getCoverageForCrashParsing();
-        $root = $coverage->getReport();
+        $root     = $coverage->getReport();
 
-        $expectedPath = rtrim(TEST_FILES_PATH, DIRECTORY_SEPARATOR);
+        $expectedPath = \rtrim(TEST_FILES_PATH, \DIRECTORY_SEPARATOR);
         $this->assertEquals($expectedPath, $root->getName());
         $this->assertEquals($expectedPath, $root->getPath());
         $this->assertEquals(2, $root->getNumExecutableLines());
         $this->assertEquals(0, $root->getNumExecutedLines());
-        $data = $coverage->getData();
-        $expectedFile = $expectedPath . DIRECTORY_SEPARATOR . 'Crash.php';
+        $data         = $coverage->getData();
+        $expectedFile = $expectedPath . \DIRECTORY_SEPARATOR . 'Crash.php';
         $this->assertSame([$expectedFile => [1 => [], 2 => []]], $data);
     }
 
-    public function testBuildDirectoryStructure()
+    public function testBuildDirectoryStructure(): void
     {
         $s = \DIRECTORY_SEPARATOR;
 
@@ -159,20 +155,20 @@ public function testBuildDirectoryStructure()
                 'src' => [
                     'Money.php/f'    => [],
                     'MoneyBag.php/f' => [],
-                    'Foo' => [
+                    'Foo'            => [
                         'Bar' => [
                             'Baz' => [
                                 'Foo.php/f' => [],
                             ],
                         ],
                     ],
-                ]
+                ],
             ],
             $method->invoke(
                 $this->factory,
                 [
-                    "src{$s}Money.php" => [],
-                    "src{$s}MoneyBag.php" => [],
+                    "src{$s}Money.php"                    => [],
+                    "src{$s}MoneyBag.php"                 => [],
                     "src{$s}Foo{$s}Bar{$s}Baz{$s}Foo.php" => [],
                 ]
             )
@@ -182,7 +178,7 @@ public function testBuildDirectoryStructure()
     /**
      * @dataProvider reducePathsProvider
      */
-    public function testReducePaths($reducedPaths, $commonPath, $paths)
+    public function testReducePaths($reducedPaths, $commonPath, $paths): void
     {
         $method = new \ReflectionMethod(
             Builder::class,
@@ -203,45 +199,45 @@ public function reducePathsProvider()
 
         yield [
             [],
-            ".",
-            []
+            '.',
+            [],
         ];
 
         $prefixes = ["C:$s", "$s"];
 
-        foreach($prefixes as $p){
+        foreach ($prefixes as $p) {
             yield [
                 [
-                    "Money.php" => []
+                    'Money.php' => [],
                 ],
                 "{$p}home{$s}sb{$s}Money{$s}",
                 [
-                    "{$p}home{$s}sb{$s}Money{$s}Money.php" => []
-                ]
+                    "{$p}home{$s}sb{$s}Money{$s}Money.php" => [],
+                ],
             ];
 
             yield [
                 [
-                    "Money.php"    => [],
-                    "MoneyBag.php" => []
+                    'Money.php'    => [],
+                    'MoneyBag.php' => [],
                 ],
                 "{$p}home{$s}sb{$s}Money",
                 [
                     "{$p}home{$s}sb{$s}Money{$s}Money.php"    => [],
-                    "{$p}home{$s}sb{$s}Money{$s}MoneyBag.php" => []
-                ]
+                    "{$p}home{$s}sb{$s}Money{$s}MoneyBag.php" => [],
+                ],
             ];
 
             yield [
                 [
-                    "Money.php"          => [],
-                    "MoneyBag.php"       => [],
+                    'Money.php'             => [],
+                    'MoneyBag.php'          => [],
                     "Cash.phar{$s}Cash.php" => [],
                 ],
                 "{$p}home{$s}sb{$s}Money",
                 [
-                    "{$p}home{$s}sb{$s}Money{$s}Money.php"                 => [],
-                    "{$p}home{$s}sb{$s}Money{$s}MoneyBag.php"              => [],
+                    "{$p}home{$s}sb{$s}Money{$s}Money.php"                    => [],
+                    "{$p}home{$s}sb{$s}Money{$s}MoneyBag.php"                 => [],
                     "phar://{$p}home{$s}sb{$s}Money{$s}Cash.phar{$s}Cash.php" => [],
                 ],
             ];

tests/tests/CloverTest.php

@@ -7,7 +7,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-
 namespace SebastianBergmann\CodeCoverage\Report;
 
 use SebastianBergmann\CodeCoverage\TestCase;
@@ -17,7 +16,7 @@
  */
 class CloverTest extends TestCase
 {
-    public function testCloverForBankAccountTest()
+    public function testCloverForBankAccountTest(): void
     {
         $clover = new Clover;
 
@@ -27,7 +26,7 @@ public function testCloverForBankAccountTest()
         );
     }
 
-    public function testCloverForFileWithIgnoredLines()
+    public function testCloverForFileWithIgnoredLines(): void
     {
         $clover = new Clover;
 
@@ -37,7 +36,7 @@ public function testCloverForFileWithIgnoredLines()
         );
     }
 
-    public function testCloverForClassWithAnonymousFunction()
+    public function testCloverForClassWithAnonymousFunction(): void
     {
         $clover = new Clover;