Fix CS/WS issue

sebastianbergmann · sebastianbergmann · commit 7034f36de4a5 · 2020-07-31T08:33:16.000+02:00
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -9,7 +9,8 @@ file that was distributed with this source code.
 EOF;
 
 $finder = PhpCsFixer\Finder::create()
-    ->in('src');
+    ->in(__DIR__)
+    ->exclude('tests/_files');
 
 return PhpCsFixer\Config::create()
     ->setFinder($finder)
diff --git a/src/StaticAnalysis/CodeUnitFindingVisitor.php b/src/StaticAnalysis/CodeUnitFindingVisitor.php
@@ -11,6 +11,7 @@
 
 use function implode;
 use function str_replace;
+use function trim;
 use PhpParser\Node;
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Name;
@@ -274,7 +275,7 @@ private function processFunction(Function_ $node): void
 
     private function namespace(string $namespacedName, string $name): string
     {
-        return \trim(
+        return trim(
             str_replace(
                 $name,
                 '',
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -1122,48 +1122,48 @@ protected function getXdebugDataForNamespacedBankAccount()
         return [
             RawCodeCoverageData::fromXdebugWithoutPathCoverage([
                 TEST_FILES_PATH . 'NamespacedBankAccount.php' => [
-                    14  => 1,
-                    15  => -2,
-                    19  => -1,
-                    20  => -1,
-                    21  => -1,
-                    22  => -1,
-                    24  => -1,
-                    28  => -1,
-                    30  => -1,
-                    31  => -2,
-                    35  => -1,
-                    37  => -1,
-                    38  => -2,
+                    14 => 1,
+                    15 => -2,
+                    19 => -1,
+                    20 => -1,
+                    21 => -1,
+                    22 => -1,
+                    24 => -1,
+                    28 => -1,
+                    30 => -1,
+                    31 => -2,
+                    35 => -1,
+                    37 => -1,
+                    38 => -2,
                 ],
             ]),
             RawCodeCoverageData::fromXdebugWithoutPathCoverage([
                 TEST_FILES_PATH . 'NamespacedBankAccount.php' => [
-                    14  => 1,
-                    19  => 1,
-                    22  => 1,
-                    35  => 1,
+                    14 => 1,
+                    19 => 1,
+                    22 => 1,
+                    35 => 1,
                 ],
             ]),
             RawCodeCoverageData::fromXdebugWithoutPathCoverage([
                 TEST_FILES_PATH . 'NamespacedBankAccount.php' => [
-                    14  => 1,
-                    19  => 1,
-                    22  => 1,
-                    28  => 1,
+                    14 => 1,
+                    19 => 1,
+                    22 => 1,
+                    28 => 1,
                 ],
             ]),
             RawCodeCoverageData::fromXdebugWithoutPathCoverage([
                 TEST_FILES_PATH . 'NamespacedBankAccount.php' => [
-                    14  => 1,
-                    19  => 1,
-                    20  => 1,
-                    21  => 1,
-                    24  => 1,
-                    28  => 1,
-                    30  => 1,
-                    35  => 1,
-                    37  => 1,
+                    14 => 1,
+                    19 => 1,
+                    20 => 1,
+                    21 => 1,
+                    24 => 1,
+                    28 => 1,
+                    30 => 1,
+                    35 => 1,
+                    37 => 1,
                 ],
             ]),
         ];
diff --git a/tests/tests/BuilderTest.php b/tests/tests/BuilderTest.php
@@ -156,15 +156,15 @@ public function testBuildDirectoryStructure(): void
         $this->assertEquals(
             [
                 'src' => [
-                    'Money.php/f'    => [
+                    'Money.php/f' => [
                         'lineCoverage'     => [],
                         'functionCoverage' => [],
                     ],
                     'MoneyBag.php/f' => [
                         'lineCoverage'     => [],
                         'functionCoverage' => [],
                     ],
-                    'Foo'            => [
+                    'Foo' => [
                         'Bar' => [
                             'Baz' => [
                                 'Foo.php/f' => [
@@ -215,7 +215,7 @@ public function reducePathsProvider()
             $this->pathsToProcessedDataObjectHelper([]),
         ];
 
-        foreach (["C:$s", "$s"] as $p) {
+        foreach (["C:{$s}", "{$s}"] as $p) {
             yield [
                 [
                     'Money.php' => [],
diff --git a/tests/tests/Exception/UnintentionallyCoveredCodeExceptionTest.php b/tests/tests/Exception/UnintentionallyCoveredCodeExceptionTest.php
@@ -36,7 +36,7 @@ public function testCanConstructWithNonEmptyArray(): void
 
         $this->assertSame($unintentionallyCoveredUnits, $exception->getUnintentionallyCoveredUnits());
 
-        $expected = <<<TXT
+        $expected = <<<'TXT'
 - foo
 - bar
 - baz
diff --git a/tests/tests/FilterTest.php b/tests/tests/FilterTest.php
@@ -82,7 +82,7 @@ protected function setUp(): void
         ];
     }
 
-    public function testAddingAFileToTheWhitelistWorks(): void
+    public function testSingleFileCanBeAdded(): void
     {
         $this->filter->includeFile($this->files[0]);
 
@@ -92,54 +92,48 @@ public function testAddingAFileToTheWhitelistWorks(): void
         );
     }
 
-    public function testRemovingAFileFromTheWhitelistWorks(): void
+    public function testMultipleFilesCanBeAdded(): void
     {
-        $this->filter->includeFile($this->files[0]);
-        $this->filter->excludeFile($this->files[0]);
+        $files = (new FileIteratorFacade)->getFilesAsArray(
+            TEST_FILES_PATH,
+            $suffixes = '.php'
+        );
 
-        $this->assertEquals([], $this->filter->files());
+        $this->filter->includeFiles($files);
+
+        $files = $this->filter->files();
+        sort($files);
+
+        $this->assertEquals($this->files, $files);
     }
 
-    /**
-     * @depends testAddingAFileToTheWhitelistWorks
-     */
-    public function testAddingADirectoryToTheWhitelistWorks(): void
+    public function testDirectoryCanBeAdded(): void
     {
         $this->filter->includeDirectory(TEST_FILES_PATH);
 
-        $whitelist = $this->filter->files();
-        sort($whitelist);
+        $files = $this->filter->files();
+        sort($files);
 
-        $this->assertEquals($this->files, $whitelist);
+        $this->assertEquals($this->files, $files);
     }
 
-    public function testAddingFilesToTheWhitelistWorks(): void
+    public function testSingleFileCanBeRemoved(): void
     {
-        $files = (new FileIteratorFacade)->getFilesAsArray(
-            TEST_FILES_PATH,
-            $suffixes = '.php'
-        );
-
-        $this->filter->includeFiles($files);
-
-        $whitelist = $this->filter->files();
-        sort($whitelist);
+        $this->filter->includeFile($this->files[0]);
+        $this->filter->excludeFile($this->files[0]);
 
-        $this->assertEquals($this->files, $whitelist);
+        $this->assertEquals([], $this->filter->files());
     }
 
-    /**
-     * @depends testAddingADirectoryToTheWhitelistWorks
-     */
-    public function testRemovingADirectoryFromTheWhitelistWorks(): void
+    public function testDirectoryCanBeRemoved(): void
     {
         $this->filter->includeDirectory(TEST_FILES_PATH);
         $this->filter->excludeDirectory(TEST_FILES_PATH);
 
         $this->assertEquals([], $this->filter->files());
     }
 
-    public function testIsFile(): void
+    public function testDeterminesWhetherStringContainsNameOfRealFileThatExists(): void
     {
         $this->assertFalse($this->filter->isFile('vfs://root/a/path'));
         $this->assertFalse($this->filter->isFile('xdebug://debug-eval'));
@@ -150,15 +144,17 @@ public function testIsFile(): void
         $this->assertTrue($this->filter->isFile(__FILE__));
     }
 
-    public function testWhitelistedFileIsNotFiltered(): void
+    public function testIncludedFileIsNotFiltered(): void
     {
         $this->filter->includeFile($this->files[0]);
+
         $this->assertFalse($this->filter->isExcluded($this->files[0]));
     }
 
-    public function testNotWhitelistedFileIsFiltered(): void
+    public function testNotIncludedFileIsFiltered(): void
     {
         $this->filter->includeFile($this->files[0]);
+
         $this->assertTrue($this->filter->isExcluded($this->files[1]));
     }
 
diff --git a/tests/tests/HtmlTest.php b/tests/tests/HtmlTest.php
@@ -78,8 +78,7 @@ public function testForFileWithIgnoredLines(): void
 
     public function testForClassWithAnonymousFunction(): void
     {
-        $expectedFilesPath =
-            self::$TEST_REPORT_PATH_SOURCE . DIRECTORY_SEPARATOR . 'CoverageForClassWithAnonymousFunction';
+        $expectedFilesPath = self::$TEST_REPORT_PATH_SOURCE . DIRECTORY_SEPARATOR . 'CoverageForClassWithAnonymousFunction';
 
         $report = new Facade;
         $report->process($this->getCoverageForClassWithAnonymousFunction(), self::$TEST_TMP_PATH);
@@ -109,7 +108,7 @@ private function assertFilesEquals(string $expectedFilesPath, string $actualFile
             $this->assertStringMatchesFormatFile(
                 $fileInfo->getPathname(),
                 str_replace(PHP_EOL, "\n", file_get_contents($actualFile)),
-                "${filename} not match"
+                "{$filename} not match"
             );
         }
     }
diff --git a/tests/tests/ProcessedCodeCoverageDataTest.php b/tests/tests/ProcessedCodeCoverageDataTest.php
@@ -54,8 +54,8 @@ public function testMergeOfAPreviouslyUnseenLine(): void
         $newCoverage->setLineCoverage(
             [
                 '/some/path/SomeClass.php' => [
-                    12  => [],
-                    34  => null,
+                    12 => [],
+                    34 => null,
                 ],
             ]
         );
diff --git a/tests/tests/RawCodeCoverageDataTest.php b/tests/tests/RawCodeCoverageDataTest.php
@@ -204,7 +204,7 @@ public function testKeepCoverageDataOnlyForLines(): void
             '/some/path/SomeOtherClass.php' => [
             ],
             '/some/path/AnotherClass.php' => [
-                28  => 1,
+                28 => 1,
             ],
         ];
 
@@ -239,7 +239,7 @@ public function testRemoveCoverageDataForLines(): void
 
         $expectedFilterResult = [
             '/some/path/SomeClass.php' => [
-                8  => 1,
+                8 => 1,
             ],
             '/some/path/SomeOtherClass.php' => [
                 18  => 1,
diff --git a/tests/tests/XmlTest.php b/tests/tests/XmlTest.php
@@ -93,7 +93,7 @@ private function assertFilesEquals($expectedFilesPath, $actualFilesPath): void
             $this->assertStringMatchesFormatFile(
                 $fileInfo->getPathname(),
                 file_get_contents($actualFile),
-                "${filename} not match"
+                "{$filename} not match"
             );
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ protected function setUp(): void`
`82`	`82`	`];`
`83`	`83`	`}`
`84`	`84`
`85`		`- public function testAddingAFileToTheWhitelistWorks(): void`
	`85`	`+ public function testSingleFileCanBeAdded(): void`
`86`	`86`	`{`
`87`	`87`	`$this->filter->includeFile($this->files[0]);`
`88`	`88`
`@@ -92,54 +92,48 @@ public function testAddingAFileToTheWhitelistWorks(): void`
`92`	`92`	`);`
`93`	`93`	`}`
`94`	`94`
`95`		`- public function testRemovingAFileFromTheWhitelistWorks(): void`
	`95`	`+ public function testMultipleFilesCanBeAdded(): void`
`96`	`96`	`{`
`97`		`- $this->filter->includeFile($this->files[0]);`
`98`		`- $this->filter->excludeFile($this->files[0]);`
	`97`	`+ $files = (new FileIteratorFacade)->getFilesAsArray(`
	`98`	`+ TEST_FILES_PATH,`
	`99`	`+ $suffixes = '.php'`
	`100`	`+ );`
`99`	`101`
`100`		`- $this->assertEquals([], $this->filter->files());`
	`102`	`+ $this->filter->includeFiles($files);`
	`103`	`+`
	`104`	`+ $files = $this->filter->files();`
	`105`	`+ sort($files);`
	`106`	`+`
	`107`	`+ $this->assertEquals($this->files, $files);`
`101`	`108`	`}`
`102`	`109`
`103`		`- /**`
`104`		`- * @depends testAddingAFileToTheWhitelistWorks`
`105`		`- */`
`106`		`- public function testAddingADirectoryToTheWhitelistWorks(): void`
	`110`	`+ public function testDirectoryCanBeAdded(): void`
`107`	`111`	`{`
`108`	`112`	`$this->filter->includeDirectory(TEST_FILES_PATH);`
`109`	`113`
`110`		`- $whitelist = $this->filter->files();`
`111`		`- sort($whitelist);`
	`114`	`+ $files = $this->filter->files();`
	`115`	`+ sort($files);`
`112`	`116`
`113`		`- $this->assertEquals($this->files, $whitelist);`
	`117`	`+ $this->assertEquals($this->files, $files);`
`114`	`118`	`}`
`115`	`119`
`116`		`- public function testAddingFilesToTheWhitelistWorks(): void`
	`120`	`+ public function testSingleFileCanBeRemoved(): void`
`117`	`121`	`{`
`118`		`- $files = (new FileIteratorFacade)->getFilesAsArray(`
`119`		`- TEST_FILES_PATH,`
`120`		`- $suffixes = '.php'`
`121`		`- );`
`122`		`-`
`123`		`- $this->filter->includeFiles($files);`
`124`		`-`
`125`		`- $whitelist = $this->filter->files();`
`126`		`- sort($whitelist);`
	`122`	`+ $this->filter->includeFile($this->files[0]);`
	`123`	`+ $this->filter->excludeFile($this->files[0]);`
`127`	`124`
`128`		`- $this->assertEquals($this->files, $whitelist);`
	`125`	`+ $this->assertEquals([], $this->filter->files());`
`129`	`126`	`}`
`130`	`127`
`131`		`- /**`
`132`		`- * @depends testAddingADirectoryToTheWhitelistWorks`
`133`		`- */`
`134`		`- public function testRemovingADirectoryFromTheWhitelistWorks(): void`
	`128`	`+ public function testDirectoryCanBeRemoved(): void`
`135`	`129`	`{`
`136`	`130`	`$this->filter->includeDirectory(TEST_FILES_PATH);`
`137`	`131`	`$this->filter->excludeDirectory(TEST_FILES_PATH);`
`138`	`132`
`139`	`133`	`$this->assertEquals([], $this->filter->files());`
`140`	`134`	`}`
`141`	`135`
`142`		`- public function testIsFile(): void`
	`136`	`+ public function testDeterminesWhetherStringContainsNameOfRealFileThatExists(): void`
`143`	`137`	`{`
`144`	`138`	`$this->assertFalse($this->filter->isFile('vfs://root/a/path'));`
`145`	`139`	`$this->assertFalse($this->filter->isFile('xdebug://debug-eval'));`
`@@ -150,15 +144,17 @@ public function testIsFile(): void`
`150`	`144`	`$this->assertTrue($this->filter->isFile(__FILE__));`
`151`	`145`	`}`
`152`	`146`
`153`		`- public function testWhitelistedFileIsNotFiltered(): void`
	`147`	`+ public function testIncludedFileIsNotFiltered(): void`
`154`	`148`	`{`
`155`	`149`	`$this->filter->includeFile($this->files[0]);`
	`150`	`+`
`156`	`151`	`$this->assertFalse($this->filter->isExcluded($this->files[0]));`
`157`	`152`	`}`
`158`	`153`
`159`		`- public function testNotWhitelistedFileIsFiltered(): void`
	`154`	`+ public function testNotIncludedFileIsFiltered(): void`
`160`	`155`	`{`
`161`	`156`	`$this->filter->includeFile($this->files[0]);`
	`157`	`+`
`162`	`158`	`$this->assertTrue($this->filter->isExcluded($this->files[1]));`
`163`	`159`	`}`
`164`	`160`
Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,7 @@ public function testForFileWithIgnoredLines(): void`
`78`	`78`
`79`	`79`	`public function testForClassWithAnonymousFunction(): void`
`80`	`80`	`{`
`81`		`- $expectedFilesPath =`
`82`		`- self::$TEST_REPORT_PATH_SOURCE . DIRECTORY_SEPARATOR . 'CoverageForClassWithAnonymousFunction';`
	`81`	`+ $expectedFilesPath = self::$TEST_REPORT_PATH_SOURCE . DIRECTORY_SEPARATOR . 'CoverageForClassWithAnonymousFunction';`
`83`	`82`
`84`	`83`	`$report = new Facade;`
`85`	`84`	`$report->process($this->getCoverageForClassWithAnonymousFunction(), self::$TEST_TMP_PATH);`
`@@ -109,7 +108,7 @@ private function assertFilesEquals(string $expectedFilesPath, string $actualFile`
`109`	`108`	`$this->assertStringMatchesFormatFile(`
`110`	`109`	`$fileInfo->getPathname(),`
`111`	`110`	`str_replace(PHP_EOL, "\n", file_get_contents($actualFile)),`
`112`		`- "${filename} not match"`
	`111`	`+ "{$filename} not match"`
`113`	`112`	`);`
`114`	`113`	`}`
`115`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,8 @@ public function testMergeOfAPreviouslyUnseenLine(): void`
`54`	`54`	`$newCoverage->setLineCoverage(`
`55`	`55`	`[`
`56`	`56`	`'/some/path/SomeClass.php' => [`
`57`		`- 12 => [],`
`58`		`- 34 => null,`
	`57`	`+ 12 => [],`
	`58`	`+ 34 => null,`
`59`	`59`	`],`
`60`	`60`	`]`
`61`	`61`	`);`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ private function assertFilesEquals($expectedFilesPath, $actualFilesPath): void`
`93`	`93`	`$this->assertStringMatchesFormatFile(`
`94`	`94`	`$fileInfo->getPathname(),`
`95`	`95`	`file_get_contents($actualFile),`
`96`		`- "${filename} not match"`
	`96`	`+ "{$filename} not match"`
`97`	`97`	`);`
`98`	`98`	`}`
`99`	`99`	`}`