Merge pull request lkwdwrd#4 from johnpbloch/normalize-paths

Normalize paths

Author: lkwdwrd

src/lkwdwrd/util/util.php

@@ -23,8 +23,8 @@
  */
 function rel_path( $from, $to, $ps = PS ) {
 	// Turn paths into array.
-	$arFrom = explode($ps, rtrim( $from, $ps ) );
-	$arTo = explode( $ps, rtrim( $to, $ps ) );
+	$arFrom = explode($ps, rtrim( normalize( $from, $ps ), $ps ) );
+	$arTo = explode( $ps, rtrim( normalize( $to, $ps ), $ps ) );
 	// Strip the common roots from both arrays.
 	while( count( $arFrom ) && count( $arTo ) && ( $arFrom[0] == $arTo[0] ) ) {
 		array_shift( $arFrom );
@@ -34,3 +34,14 @@ function rel_path( $from, $to, $ps = PS ) {
 	// to items.
 	return str_pad( '', count( $arFrom ) * 3, '..' . $ps ) . implode( $ps, $arTo );
 }
+
+/**
+ * Convert all different directory separators into one unified style
+ *
+ * @param  string $path The path to normalize
+ * @param  string $ds   The directory separator to standardize on
+ * @return string       The normalized path
+ */
+function normalize( $path, $ds ) {
+	return str_replace( array( '/', "\\" ), $ds, $path );
+}

tests/phpunit/util_Tests.php

@@ -28,12 +28,38 @@ public function setUp() {
 
 	/**
 	 * Make sure the rel_path function makes relative paths.
+	 * @dataProvider data_rel_path
 	 */
-	public function test_rel_path() {
-		$abspath1 = '/a/random/path/to/a/place';
-		$abspath2 = '/a/random/path/to/another/place';
+	public function test_rel_path( $path1, $path2, $sep, $expected) {
+		$this->assertEquals( Util\rel_path( $path1, $path2, $sep ), $expected );
+	}
 
-		$calculatedRel = Util\rel_path( $abspath1, $abspath2, '/' );
-		$this->assertEquals( $calculatedRel, '../../another/place' );
+	public function data_rel_path(){
+		return array(
+			array(
+				'/a/random/path/to/a/place',
+				'/a/random/path/to/another/place',
+				'/',
+				'../../another/place',
+			),
+			array(
+				'/somewhere/over/the/rainbow',
+				'/somewhere/over/the/rainbow/bluebirds/sing',
+				'/',
+				'bluebirds/sing',
+			),
+			array(
+				'/just/some/test',
+				'/just\some\mixed\slash\example',
+				'/',
+				'../mixed/slash/example',
+			),
+			array(
+				'/testing/inverse/directory/separators',
+				'/unix/to/windows',
+				'\\',
+				'..\..\..\..\unix\to\windows',
+			),
+		);
 	}
 }