Normalize usages of directory separators.

Wes1262 · sebastianbergmann · commit 41b3de2470eb · 2018-10-19T08:50:34.000+02:00
diff --git a/src/Node/AbstractNode.php b/src/Node/AbstractNode.php
@@ -43,7 +43,7 @@ abstract class AbstractNode implements \Countable
 
     public function __construct(string $name, self $parent = null)
     {
-        if (\substr($name, -1) == '/') {
+        if (\substr($name, -1) == \DIRECTORY_SEPARATOR) {
             $name = \substr($name, 0, -1);
         }
 
@@ -80,10 +80,14 @@ public function getId(): string
     public function getPath(): string
     {
         if ($this->path === null) {
-            if ($this->parent === null || $this->parent->getPath() === null || $this->parent->getPath() === false) {
+            if (
+                $this->parent === null ||
+                $this->parent->getPath() === null ||
+                $this->parent->getPath() === false
+            ) {
                 $this->path = $this->name;
             } else {
-                $this->path = $this->parent->getPath() . '/' . $this->name;
+                $this->path = $this->parent->getPath() . \DIRECTORY_SEPARATOR . $this->name;
             }
         }
 
diff --git a/src/Node/Builder.php b/src/Node/Builder.php
@@ -93,7 +93,7 @@ private function buildDirectoryStructure(array $files): array
         $result = [];
 
         foreach ($files as $path => $file) {
-            $path    = \explode('/', $path);
+            $path    = \explode(\DIRECTORY_SEPARATOR, $path);
             $pointer = &$result;
             $max     = \count($path);
 
@@ -160,7 +160,7 @@ private function reducePaths(array &$files): string
         $paths      = \array_keys($files);
 
         if (\count($files) === 1) {
-            $commonPath                  = \dirname($paths[0]) . '/';
+            $commonPath                  = \dirname($paths[0]) . \DIRECTORY_SEPARATOR;
             $files[\basename($paths[0])] = $files[$paths[0]];
 
             unset($files[$paths[0]]);
@@ -214,7 +214,7 @@ private function reducePaths(array &$files): string
         $max      = \count($original);
 
         for ($i = 0; $i < $max; $i++) {
-            $files[\implode('/', $paths[$i])] = $files[$original[$i]];
+            $files[\implode(\DIRECTORY_SEPARATOR, $paths[$i])] = $files[$original[$i]];
             unset($files[$original[$i]]);
         }
 
diff --git a/tests/_files/BankAccount-clover.xml b/tests/_files/BankAccount-clover.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <coverage generated="%i">
   <project timestamp="%i" name="BankAccount">
-    <file name="%s/BankAccount.php">
+    <file name="%s%eBankAccount.php">
       <class name="BankAccount" namespace="global">
         <metrics complexity="5" methods="4" coveredmethods="3" conditionals="0" coveredconditionals="0" statements="10" coveredstatements="5" elements="14" coveredelements="8"/>
       </class>
diff --git a/tests/_files/Report/HTML/CoverageForBankAccount/BankAccount.php.html b/tests/_files/Report/HTML/CoverageForBankAccount/BankAccount.php.html
@@ -2,7 +2,7 @@
 <html lang="en">
  <head>
   <meta charset="UTF-8">
-  <title>Code Coverage for %s/BankAccount.php</title>
+  <title>Code Coverage for %s%eBankAccount.php</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <link href=".css/bootstrap.min.css" rel="stylesheet" type="text/css">
   <link href=".css/octicons.css" rel="stylesheet" type="text/css">
diff --git a/tests/_files/Report/HTML/CoverageForClassWithAnonymousFunction/source_with_class_and_anonymous_function.php.html b/tests/_files/Report/HTML/CoverageForClassWithAnonymousFunction/source_with_class_and_anonymous_function.php.html
@@ -2,7 +2,7 @@
 <html lang="en">
  <head>
   <meta charset="UTF-8">
-  <title>Code Coverage for %s/source_with_class_and_anonymous_function.php</title>
+  <title>Code Coverage for %s%esource_with_class_and_anonymous_function.php</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <link href=".css/bootstrap.min.css" rel="stylesheet" type="text/css">
   <link href=".css/octicons.css" rel="stylesheet" type="text/css">
diff --git a/tests/_files/Report/XML/CoverageForBankAccount/BankAccount.php.xml b/tests/_files/Report/XML/CoverageForBankAccount/BankAccount.php.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <phpunit xmlns="https://schema.phpunit.de/coverage/1.0">
-  <file name="BankAccount.php" path="/">
+  <file name="BankAccount.php" path="%e">
     <totals>
       <lines total="33" comments="0" code="33" executable="10" executed="5" percent="50.00"/>
       <methods count="4" tested="3" percent="75.00"/>
diff --git a/tests/_files/Report/XML/CoverageForClassWithAnonymousFunction/source_with_class_and_anonymous_function.php.xml b/tests/_files/Report/XML/CoverageForClassWithAnonymousFunction/source_with_class_and_anonymous_function.php.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <phpunit xmlns="https://schema.phpunit.de/coverage/1.0">
-  <file name="source_with_class_and_anonymous_function.php" path="/">
+  <file name="source_with_class_and_anonymous_function.php" path="%e">
     <totals>
       <lines total="19" comments="2" code="17" executable="8" executed="7" percent="87.50"/>
       <methods count="1" tested="0" percent="0.00"/>
diff --git a/tests/_files/Report/XML/CoverageForFileWithIgnoredLines/source_with_ignore.php.xml b/tests/_files/Report/XML/CoverageForFileWithIgnoredLines/source_with_ignore.php.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <phpunit xmlns="https://schema.phpunit.de/coverage/1.0">
-  <file name="source_with_ignore.php" path="/">
+  <file name="source_with_ignore.php" path="%e">
     <totals>
       <lines total="37" comments="12" code="25" executable="2" executed="1" percent="50.00"/>
       <methods count="0" tested="0" percent="0"/>
diff --git a/tests/_files/class-with-anonymous-function-clover.xml b/tests/_files/class-with-anonymous-function-clover.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <coverage generated="%i">
   <project timestamp="%i">
-    <file name="%s/source_with_class_and_anonymous_function.php">
+    <file name="%s%esource_with_class_and_anonymous_function.php">
       <class name="CoveredClassWithAnonymousFunctionInStaticMethod" namespace="global">
         <metrics complexity="1" methods="1" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="8" coveredstatements="7" elements="9" coveredelements="7"/>
       </class>
diff --git a/tests/_files/ignored-lines-clover.xml b/tests/_files/ignored-lines-clover.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <coverage generated="%i">
   <project timestamp="%i">
-    <file name="%s/source_with_ignore.php">
+    <file name="%s%esource_with_ignore.php">
       <class name="Foo" namespace="global">
         <metrics complexity="1" methods="0" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="0" coveredstatements="0" elements="0" coveredelements="0"/>
       </class>
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -2,4 +2,7 @@
 require __DIR__ . '/../vendor/autoload.php';
 require __DIR__ . '/TestCase.php';
 
-define('TEST_FILES_PATH', __DIR__ . '/_files/');
+define(
+    'TEST_FILES_PATH',
+    __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR
+);
diff --git a/tests/tests/BuilderTest.php b/tests/tests/BuilderTest.php
@@ -145,6 +145,8 @@ public function testNotCrashParsing()
 
     public function testBuildDirectoryStructure()
     {
+        $s = \DIRECTORY_SEPARATOR;
+
         $method = new \ReflectionMethod(
             Builder::class,
             'buildDirectoryStructure'
@@ -156,12 +158,23 @@ public function testBuildDirectoryStructure()
             [
                 'src' => [
                     'Money.php/f'    => [],
-                    'MoneyBag.php/f' => []
+                    'MoneyBag.php/f' => [],
+                    'Foo' => [
+                        'Bar' => [
+                            'Baz' => [
+                                'Foo.php/f' => [],
+                            ],
+                        ],
+                    ],
                 ]
             ],
             $method->invoke(
                 $this->factory,
-                ['src/Money.php' => [], 'src/MoneyBag.php' => []]
+                [
+                    "src{$s}Money.php" => [],
+                    "src{$s}MoneyBag.php" => [],
+                    "src{$s}Foo{$s}Bar{$s}Baz{$s}Foo.php" => [],
+                ]
             )
         );
     }
@@ -186,45 +199,52 @@ public function testReducePaths($reducedPaths, $commonPath, $paths)
 
     public function reducePathsProvider()
     {
-        return [
-            [
+        $s = \DIRECTORY_SEPARATOR;
+
+        yield [
+            [],
+            ".",
+            []
+        ];
+
+        $prefixes = ["C:$s", "$s"];
+
+        foreach($prefixes as $p){
+            yield [
                 [
-                    'Money.php'    => [],
-                    'MoneyBag.php' => []
+                    "Money.php" => []
                 ],
-                '/home/sb/Money',
+                "{$p}home{$s}sb{$s}Money{$s}",
                 [
-                    '/home/sb/Money/Money.php'    => [],
-                    '/home/sb/Money/MoneyBag.php' => []
+                    "{$p}home{$s}sb{$s}Money{$s}Money.php" => []
                 ]
-            ],
-            [
+            ];
+
+            yield [
                 [
-                    'Money.php' => []
+                    "Money.php"    => [],
+                    "MoneyBag.php" => []
                 ],
-                '/home/sb/Money/',
+                "{$p}home{$s}sb{$s}Money",
                 [
-                    '/home/sb/Money/Money.php' => []
+                    "{$p}home{$s}sb{$s}Money{$s}Money.php"    => [],
+                    "{$p}home{$s}sb{$s}Money{$s}MoneyBag.php" => []
                 ]
-            ],
-            [
-                [],
-                '.',
-                []
-            ],
-            [
+            ];
+
+            yield [
                 [
-                    'Money.php'          => [],
-                    'MoneyBag.php'       => [],
-                    'Cash.phar/Cash.php' => [],
+                    "Money.php"          => [],
+                    "MoneyBag.php"       => [],
+                    "Cash.phar{$s}Cash.php" => [],
                 ],
-                '/home/sb/Money',
+                "{$p}home{$s}sb{$s}Money",
                 [
-                    '/home/sb/Money/Money.php'                 => [],
-                    '/home/sb/Money/MoneyBag.php'              => [],
-                    'phar:///home/sb/Money/Cash.phar/Cash.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" => [],
                 ],
-            ],
-        ];
+            ];
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ abstract class AbstractNode implements \Countable`
`43`	`43`
`44`	`44`	`public function __construct(string $name, self $parent = null)`
`45`	`45`	`{`
`46`		`- if (\substr($name, -1) == '/') {`
	`46`	`+ if (\substr($name, -1) == \DIRECTORY_SEPARATOR) {`
`47`	`47`	`$name = \substr($name, 0, -1);`
`48`	`48`	`}`
`49`	`49`
`@@ -80,10 +80,14 @@ public function getId(): string`
`80`	`80`	`public function getPath(): string`
`81`	`81`	`{`
`82`	`82`	`if ($this->path === null) {`
`83`		`- if ($this->parent === null \|\| $this->parent->getPath() === null \|\| $this->parent->getPath() === false) {`
	`83`	`+ if (`
	`84`	`+ $this->parent === null \|\|`
	`85`	`+ $this->parent->getPath() === null \|\|`
	`86`	`+ $this->parent->getPath() === false`
	`87`	`+ ) {`
`84`	`88`	`$this->path = $this->name;`
`85`	`89`	`} else {`
`86`		`- $this->path = $this->parent->getPath() . '/' . $this->name;`
	`90`	`+ $this->path = $this->parent->getPath() . \DIRECTORY_SEPARATOR . $this->name;`
`87`	`91`	`}`
`88`	`92`	`}`
`89`	`93`