Merge pull request lkwdwrd#5 from johnpbloch/force-unix-separator

Add ability to force unix separators in the mu plugin loader

Author: lkwdwrd

.gitignore

@@ -2,3 +2,4 @@
 /vendor
 /phpunit.xml
 /bootstrap.php
+/build

src/lkwdwrd/Composer/MULoaderPlugin.php

@@ -134,8 +134,9 @@ public function dumpRequireFile() {
 
 		// Find the relative path from the mu-plugins dir to the mu-loader file.
 		$muPath = $this->resolveMURelPath( $muRelPath );
-		$loadFile = dirname( __DIR__ ) . DIRECTORY_SEPARATOR . 'mu-loader.php';
-		$toLoader = DIRECTORY_SEPARATOR . Util\rel_path( $muPath, $loadFile );
+		$ds = $this->getDirectorySeparator();
+		$loadFile = dirname( __DIR__ ) . $ds . 'mu-loader.php';
+		$toLoader = $ds . Util\rel_path( $muPath, $loadFile, $ds );
 
 		// Write the boostrapping PHP file.
 		if ( !file_exists( $muPath ) ) {
@@ -194,4 +195,21 @@ protected function resolveMURelPath( $relpath ) {
 		// Return the abosolute path.
 		return $basepath . $relpath;
 	}
+
+	/**
+	 * Get the directory separator to use for the generatoed loader
+	 *
+	 * This defaults to the DIRECTORY_SEPARATOR constant, but can be overridden in
+	 * the composer.json extra section with "force-unix-separator" set to true.
+	 *
+	 * @return string The directory separator character to use
+	 */
+	protected function getDirectorySeparator() {
+		$separator = DIRECTORY_SEPARATOR;
+		if ( ! empty( $this->extras['force-unix-separator'] ) ) {
+			$separator = '/';
+		}
+
+		return $separator;
+	}
 }

tests/phpunit/list-table_Tests.php

@@ -48,18 +48,19 @@ public function test_list_table() {
 				'lastone/lastone.php'
 			]
 		] );
+		$base = WPMU_PLUGIN_DIR . DIRECTORY_SEPARATOR;
 		WP_Mock::wpFunction( 'get_plugin_data', [
-			'args' => ['/root/random/random.php', false ],
+			'args' => [$base . 'random/random.php', false ],
 			'return' => [
 				'Name' => 'Random MU Plugin'
 			]
 		] );
 		WP_Mock::wpFunction( 'get_plugin_data', [
-			'args' => ['/root/testing/notsame.php', false],
+			'args' => [$base . 'testing/notsame.php', false],
 			'return' => []
 		] );
 		WP_Mock::wpFunction( 'get_plugin_data', [
-			'args' => ['/root/lastone/lastone.php', false],
+			'args' => [$base . 'lastone/lastone.php', false],
 			'return' => [
 				'Name' => 'The Last One',
 				'arbitrary' => [ 1, 2, 3 ],

tests/phpunit/loader_Tests.php

@@ -109,7 +109,7 @@ public function test_get_muplugins_nocache() {
 		// only plugins in directorys should pass: rootplugin.php will go away.
 		// WP will include root plugins in it's normal course.
 		WP_Mock::wpFunction( 'get_plugins', [
-			'args' => [ '/relpath' ],
+			'args' => [ DIRECTORY_SEPARATOR . 'relpath' ],
 			'return' => [
 				'random/plugin1.php' => true,
 				'random/plugin2.php' => true,