Merge pull request #95 from wp-cli/fix/rectify-vendor-folder-discovery

Rectify vendor folder discovery

Author: schlessera

features/bootstrap/FeatureContext.php

@@ -181,14 +181,15 @@ private static function get_vendor_dir() {
 		}
 
 		$paths = [
+			dirname( dirname( __DIR__ ) ) . '/vendor/bin/wp',
 			dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) . '/bin/wp',
 			dirname( dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) ) . '/bin/wp',
-			dirname( dirname( __DIR__ ) ) . '/vendor/bin/wp',
 		];
 
 		foreach ( $paths as $path ) {
 			if ( file_exists( $path ) && is_executable( $path ) ) {
-				$vendor_dir = (string) realpath( dirname( $path ) );
+				$vendor_dir = (string) realpath( dirname( dirname( $path ) ) );
+
 				break;
 			}
 		}
@@ -632,10 +633,10 @@ public function build_phar( $version = 'same' ) {
 
 		// Test running against a package installed as a WP-CLI dependency
 		// WP-CLI bundle installed as a project dependency
-		$make_phar_path = self::get_vendor_dir() . '/../wp-cli/wp-cli-bundle/utils/make-phar.php';
+		$make_phar_path = self::get_vendor_dir() . '/wp-cli/wp-cli-bundle/utils/make-phar.php';
 		if ( ! file_exists( $make_phar_path ) ) {
 			// Running against WP-CLI bundle proper
-			$make_phar_path = self::get_vendor_dir() . '/../../utils/make-phar.php';
+			$make_phar_path = self::get_vendor_dir() . '/../utils/make-phar.php';
 		}
 
 		$this->proc(