More normalization

Author: swissspidy

src/Package_Command.php

@@ -531,7 +531,7 @@ public function path( $args ) {
 				WP_CLI::error( 'Invalid package name.' );
 			}
 		}
-		WP_CLI::line( $packages_dir );
+		WP_CLI::line( Path::normalize( $packages_dir ) );
 	}
 
 	/**
@@ -1158,7 +1158,7 @@ private function get_installed_package_by_name( $package_name ) {
 	 * @return array Two-element array containing package name and version.
 	 */
 	private static function get_package_name_and_version_from_dir_package( $dir_package ) {
-		$composer_file = $dir_package . '/composer.json';
+		$composer_file = Path::normalize( $dir_package . '/composer.json' );
 		if ( ! file_exists( $composer_file ) ) {
 			WP_CLI::error( sprintf( "Invalid package: composer.json file '%s' not found.", $composer_file ) );
 		}

tests/phpunit/ComposerJsonTest.php

@@ -198,8 +198,8 @@ public function test_get_composer_json_path_backup_decoded() {
 	}
 
 	private function mac_safe_path( $path ) {
+		$path = \WP_CLI\Path::normalize( $path );
 		$path = preg_replace( '#^/private/(var|tmp)/#i', '/$1/', $path );
-		$path = str_replace( '\\', '/', $path );
 		return $path;
 	}
 }

tests/phpunit/JsonManipulatorTest.php

@@ -25,7 +25,7 @@ public function testAddLink($json, $type, $package, $constraint, $expected)
     {
         $manipulator = new JsonManipulator($json);
         $this->assertTrue($manipulator->addLink($type, $package, $constraint));
-        $this->assertEquals($expected, $manipulator->getContents());
+        $this->assertJsonEquals($expected, $manipulator->getContents());
     }
 
     public static function linkProvider()
@@ -1297,7 +1297,7 @@ public function testAddLinkAndSortPackages($json, $type, $package, $constraint,
     {
         $manipulator = new JsonManipulator($json);
         $this->assertTrue($manipulator->addLink($type, $package, $constraint, $sortPackages));
-        $this->assertEquals($expected, $manipulator->getContents());
+        $this->assertJsonEquals($expected, $manipulator->getContents());
     }
 
     public static function providerAddLinkAndSortPackages()
@@ -1380,7 +1380,7 @@ public function testRemoveSubNode($json, $name, $expected, $expectedContent = nu
 
         $this->assertEquals($expected, $manipulator->removeSubNode('repositories', $name));
         if (null !== $expectedContent) {
-            $this->assertEquals($expectedContent, $manipulator->getContents());
+            $this->assertJsonEquals($expectedContent, $manipulator->getContents());
         }
     }
 
@@ -2578,4 +2578,7 @@ public static function providerRemoveSubNodeCaseInsensitive()
 	}
 	// WP_CLI: end caseInsensitive.
 
+	private function assertJsonEquals( $expected, $actual ) {
+		$this->assertEquals( preg_replace( '/\R/', "\n", $expected ), preg_replace( '/\R/', "\n", $actual ) );
+	}
 }