Make sure we use the real default for vendor dir

johnpbloch · johnpbloch · commit e9e767f2d9f9 · 2017-05-31T13:42:33.000-05:00
diff --git a/src/johnpbloch/Composer/WordPressCoreInstaller.php b/src/johnpbloch/Composer/WordPressCoreInstaller.php
@@ -58,9 +58,10 @@ public function getInstallPath( PackageInterface $package ) {
 		if ( ! $installationDir ) {
 			$installationDir = 'wordpress';
 		}
+		$vendorDir = $this->composer->getConfig()->get( 'vendor-dir', Config::RELATIVE_PATHS ) ?: 'vendor';
 		if (
 			in_array( $installationDir, $this->sensitiveDirectories ) ||
-			$installationDir === $this->composer->getConfig()->get( 'vendor-dir', Config::RELATIVE_PATHS )
+			( $installationDir === $vendorDir )
 		) {
 			throw new \InvalidArgumentException( $this->getSensitiveDirectoryMessage( $installationDir, $prettyName ) );
 		}

Original file line number	Diff line number	Diff line change
`@@ -58,9 +58,10 @@ public function getInstallPath( PackageInterface $package ) {`
`58`	`58`	`if ( ! $installationDir ) {`
`59`	`59`	`$installationDir = 'wordpress';`
`60`	`60`	`}`
	`61`	`+ $vendorDir = $this->composer->getConfig()->get( 'vendor-dir', Config::RELATIVE_PATHS ) ?: 'vendor';`
`61`	`62`	`if (`
`62`	`63`	`in_array( $installationDir, $this->sensitiveDirectories ) \|\|`
`63`		`- $installationDir === $this->composer->getConfig()->get( 'vendor-dir', Config::RELATIVE_PATHS )`
	`64`	`+ ( $installationDir === $vendorDir )`
`64`	`65`	`) {`
`65`	`66`	`throw new \InvalidArgumentException( $this->getSensitiveDirectoryMessage( $installationDir, $prettyName ) );`
`66`	`67`	`}`