allow WP-CLI to be invoked from subdirectories other than the subdir the WP files...

diff --git a/features/config.feature b/features/config.feature
index 86294e9..f3021ec 100644 (file)
--- a/features/config.feature
+++ b/features/config.feature
@@ -54,6 +54,10 @@ Feature: Have a config file
     When I run `wp core is-installed` from 'core/wp-content'
     Then STDOUT should be empty
 
+    When I run `mkdir -p other/subdir`
+    And I run `wp core is-installed` from 'other/subdir'
+    Then STDOUT should be empty
+
   Scenario: WP in a subdirectory (autodetected)
     Given a WP install in 'core'
 
@@ -71,6 +75,10 @@ Feature: Have a config file
     When I run `wp core is-installed`
     Then STDOUT should be empty
 
+    When I run `mkdir -p other/subdir`
+    And I run `wp core is-installed` from 'other/subdir'
+    Then STDOUT should be empty
+
   Scenario: Nested installs
     Given a WP install
     And a WP install in 'subsite'

diff --git a/php/WP_CLI/Runner.php b/php/WP_CLI/Runner.php
index b4823e1..6abb09a 100644 (file)
--- a/php/WP_CLI/Runner.php
+++ b/php/WP_CLI/Runner.php
@@ -119,7 +119,7 @@ class Runner {
                        return dirname( $wp_load_path );
                }
 
-               return self::extract_subdir_path( getcwd() . '/index.php' );
+               return self::extract_subdir_path( Utils\find_file_upward( 'index.php' ) );
        }
 
        private static function set_wp_root( $path ) {