Merge branch '5.2' into 5.x

nicolas-grekas · nicolas-grekas · commit 81a7d0f5b27d · 2021-03-23T22:05:31.000+01:00
* 5.2:
  [travis] remove cache of composer.lock for deps=low
  Fix comment with typo
diff --git a/Tests/FilesystemTest.php b/Tests/FilesystemTest.php
@@ -1762,7 +1762,7 @@ public function testCopyShouldKeepExecutionPermission()
     }
 
     /**
-     * Normalize the given path (transform each blackslash into a real directory separator).
+     * Normalize the given path (transform each forward slash into a real directory separator).
      */
     private function normalize(string $path): string
     {

Original file line number	Diff line number	Diff line change
`@@ -1762,7 +1762,7 @@ public function testCopyShouldKeepExecutionPermission()`
`1762`	`1762`	`}`
`1763`	`1763`
`1764`	`1764`	`/**`
`1765`		`- * Normalize the given path (transform each blackslash into a real directory separator).`
	`1765`	`+ * Normalize the given path (transform each forward slash into a real directory separator).`
`1766`	`1766`	`*/`
`1767`	`1767`	`private function normalize(string $path): string`
`1768`	`1768`	`{`