don't pick up php files inside plugin subdirs

diff --git a/features/plugin.feature b/features/plugin.feature
index 93c693a..be9c51c 100644 (file)
--- a/features/plugin.feature
+++ b/features/plugin.feature
@@ -17,7 +17,9 @@ Feature: Manage WordPress plugins
     And the {PLUGIN_DIR}/zombieland/zombieland.php file should exist
     And the {PLUGIN_DIR}/zombieland/phpunit.xml file should exist
 
-    When I run `wp plugin status zombieland`
+    # Check that the inner-plugin is not picked up
+    When I run `mv {PLUGIN_DIR}/plugin1 {PLUGIN_DIR}/zombieland/`
+    And I run `wp plugin status zombieland`
     Then STDOUT should contain:
       """
       Plugin zombieland details:

diff --git a/php/WP_CLI/Fetchers/Plugin.php b/php/WP_CLI/Fetchers/Plugin.php
index 247192b..f596725 100644 (file)
--- a/php/WP_CLI/Fetchers/Plugin.php
+++ b/php/WP_CLI/Fetchers/Plugin.php
@@ -9,22 +9,30 @@ class Plugin extends Base {
        public function get( $name ) {
                $plugins = get_plugins( '/' . $name );
 
-               if ( !empty( $plugins ) ) {
-                       $file = $name . '/' . key( $plugins );
-               } else {
-                       $file = $name . '.php';
+               // some-plugin/the-plugin.php
+               while ( !empty( $plugins ) ) {
+                       $file = key( $plugins );
+                       array_shift( $plugins );
+
+                       // ignore files inside a plugin's subdirectory (like WP does)
+                       if ( dirname( $file ) == '.' ) {
+                               return (object) array(
+                                       'name' => $name,
+                                       'file' => $name . '/' . $file
+                               );
+                       }
+               }
 
-                       $plugins = get_plugins();
+               // some-plugin.php
+               $file = $name . '.php';
 
-                       if ( !isset( $plugins[$file] ) ) {
-                               return false;
-                       }
+               $plugins = get_plugins();
+
+               if ( isset( $plugins[ $file ] ) ) {
+                       return (object) compact( 'name', 'file' );
                }
 
-               return (object) array(
-                       'name' => $name,
-                       'file' => $file
-               );
+               return false;
        }
 }