normalize slashes & mac paths

Author: swissspidy

tests/phpunit/ComposerJsonTest.php

@@ -85,7 +85,7 @@ public function test_create_default_composer_json() {
 		// Succeed.
 		$expected = $this->temp_dir . 'packages/composer.json';
 		$actual   = $create_default_composer_json->invoke( $package, $expected );
-		$this->assertSame( $expected, $this->mac_safe_path( $actual ) );
+		$this->assertSame( $this->mac_safe_path( realpath( $expected ) ?: $expected ), $this->mac_safe_path( realpath( $actual ) ?: $actual ) );
 		$this->assertTrue( false !== strpos( file_get_contents( $actual ), 'wp-cli/wp-cli' ) );
 		unlink( $actual );
 		rmdir( dirname( $actual ) );
@@ -110,7 +110,7 @@ public function test_get_composer_json_path() {
 		putenv( 'WP_CLI_PACKAGES_DIR' );
 		$expected = $this->temp_dir . '.wp-cli/packages/composer.json';
 		$actual   = $get_composer_json_path->invoke( $package );
-		$this->assertSame( $expected, $this->mac_safe_path( $actual ) );
+		$this->assertSame( $this->mac_safe_path( realpath( $expected ) ?: $expected ), $this->mac_safe_path( realpath( $actual ) ?: $actual ) );
 		$this->assertTrue( false !== strpos( file_get_contents( $actual ), 'wp-cli/wp-cli' ) );
 		unlink( $actual );
 		rmdir( dirname( $actual ) );
@@ -120,7 +120,7 @@ public function test_get_composer_json_path() {
 		putenv( 'WP_CLI_PACKAGES_DIR=' . $this->temp_dir . 'packages' );
 		$expected = $this->temp_dir . 'packages/composer.json';
 		$actual   = $get_composer_json_path->invoke( $package );
-		$this->assertSame( $expected, $this->mac_safe_path( $actual ) );
+		$this->assertSame( $this->mac_safe_path( realpath( $expected ) ?: $expected ), $this->mac_safe_path( realpath( $actual ) ?: $actual ) );
 		$this->assertTrue( false !== strpos( file_get_contents( $actual ), 'wp-cli/wp-cli' ) );
 		unlink( $actual );
 		rmdir( dirname( $actual ) );
@@ -131,7 +131,7 @@ public function test_get_composer_json_path() {
 		mkdir( $this->temp_dir . 'packages' );
 		touch( $expected );
 		$actual = $get_composer_json_path->invoke( $package );
-		$this->assertSame( $expected, $this->mac_safe_path( $actual ) );
+		$this->assertSame( $this->mac_safe_path( realpath( $expected ) ?: $expected ), $this->mac_safe_path( realpath( $actual ) ?: $actual ) );
 		$this->assertSame( 0, filesize( $actual ) );
 		unlink( $actual );
 		rmdir( dirname( $actual ) );
@@ -175,7 +175,7 @@ public function test_get_composer_json_path_backup_decoded() {
 		// Succeed with newly created.
 		$expected                           = $this->temp_dir . 'packages/composer.json';
 		list( $actual, $content, $decoded ) = $get_composer_json_path_backup_decoded->invoke( $package );
-		$this->assertSame( $expected, $this->mac_safe_path( $actual ) );
+		$this->assertSame( $this->mac_safe_path( realpath( $expected ) ?: $expected ), $this->mac_safe_path( realpath( $actual ) ?: $actual ) );
 		$this->assertTrue( false !== strpos( file_get_contents( $actual ), 'wp-cli/wp-cli' ) );
 		$this->assertSame( file_get_contents( $actual ), $content );
 		$this->assertFalse( empty( $decoded ) );
@@ -187,7 +187,7 @@ public function test_get_composer_json_path_backup_decoded() {
 		mkdir( $this->temp_dir . 'packages' );
 		file_put_contents( $expected, '{}' );
 		list( $actual, $content, $decoded ) = $get_composer_json_path_backup_decoded->invoke( $package );
-		$this->assertSame( $expected, $this->mac_safe_path( $actual ) );
+		$this->assertSame( $this->mac_safe_path( realpath( $expected ) ?: $expected ), $this->mac_safe_path( realpath( $actual ) ?: $actual ) );
 		$this->assertSame( '{}', $content );
 		$this->assertTrue( empty( $decoded ) );
 		unlink( $expected );
@@ -199,9 +199,7 @@ public function test_get_composer_json_path_backup_decoded() {
 
 	private function mac_safe_path( $path ) {
 		$path = preg_replace( '#^/private/(var|tmp)/#i', '/$1/', $path );
-		if ( Utils\is_windows() ) {
-			$path = str_replace( '\\', '/', $path );
-		}
+		$path = str_replace( '\\', '/', $path );
 		return $path;
 	}
 }