keep 'not found' message in Fetcher child classes

otherwise, might get a mismatch between the class and the message

diff --git a/php/WP_CLI/Fetcher.php b/php/WP_CLI/Fetcher.php
index bf24465..0ef9f92 100644 (file)
--- a/php/WP_CLI/Fetcher.php
+++ b/php/WP_CLI/Fetcher.php
@@ -4,14 +4,10 @@ namespace WP_CLI;
 
 abstract class Fetcher {
 
-       protected $msg;
-
        /**
         * @param string $msg The message to display when an item is not found
         */
-       function __construct( $msg ) {
-               $this->msg = $msg;
-       }
+       protected $msg;
 
        /**
         * @param string $arg The raw CLI argument

diff --git a/php/WP_CLI/FetcherComment.php b/php/WP_CLI/FetcherComment.php
index 806ece1..167b043 100644 (file)
--- a/php/WP_CLI/FetcherComment.php
+++ b/php/WP_CLI/FetcherComment.php
@@ -4,6 +4,8 @@ namespace WP_CLI;
 
 class FetcherComment extends Fetcher {
 
+       protected $msg = "Comment with ID %s does not exist.";
+
        public function get( $arg ) {
                $comment_id = (int) $arg;
                $comment = get_comment( $comment_id );

diff --git a/php/WP_CLI/FetcherPlugin.php b/php/WP_CLI/FetcherPlugin.php
index 3c8893a..bd68712 100644 (file)
--- a/php/WP_CLI/FetcherPlugin.php
+++ b/php/WP_CLI/FetcherPlugin.php
@@ -4,6 +4,8 @@ namespace WP_CLI;
 
 class FetcherPlugin extends Fetcher {
 
+       protected $msg = "The '%s' plugin could not be found.";
+
        public function get( $name ) {
                $plugins = get_plugins( '/' . $name );
 

diff --git a/php/WP_CLI/FetcherTheme.php b/php/WP_CLI/FetcherTheme.php
index 0327763..5066983 100644 (file)
--- a/php/WP_CLI/FetcherTheme.php
+++ b/php/WP_CLI/FetcherTheme.php
@@ -4,6 +4,8 @@ namespace WP_CLI;
 
 class FetcherTheme extends Fetcher {
 
+       protected $msg = "The '%s' theme could not be found.";
+
        public function get( $name ) {
                $theme = wp_get_theme( $name );
 

diff --git a/php/WP_CLI/FetcherUser.php b/php/WP_CLI/FetcherUser.php
index aea6ffb..e1111e0 100644 (file)
--- a/php/WP_CLI/FetcherUser.php
+++ b/php/WP_CLI/FetcherUser.php
@@ -4,6 +4,8 @@ namespace WP_CLI;
 
 class FetcherUser extends Fetcher {
 
+       protected $msg = "Invalid user ID or login: '%s'";
+
        public function get( $id_or_login ) {
                if ( is_numeric( $id_or_login ) )
                        $user = get_user_by( 'id', $id_or_login );

diff --git a/php/commands/comment.php b/php/commands/comment.php
index cb7c4f0..aa73d16 100644 (file)
--- a/php/commands/comment.php
+++ b/php/commands/comment.php
@@ -19,7 +19,7 @@ class Comment_Command extends \WP_CLI\CommandWithDBObject {
        );
 
        public function __construct() {
-               $this->fetcher = new \WP_CLI\FetcherComment( "Comment with ID %s does not exist." );
+               $this->fetcher = new \WP_CLI\FetcherComment;
        }
 
        /**

diff --git a/php/commands/plugin.php b/php/commands/plugin.php
index ab0bd6b..ff90c5c 100644 (file)
--- a/php/commands/plugin.php
+++ b/php/commands/plugin.php
@@ -24,7 +24,7 @@ class Plugin_Command extends \WP_CLI\CommandWithUpgrade {
 
                parent::__construct();
 
-               $this->fetcher = new \WP_CLI\FetcherPlugin( "The '%s' plugin could not be found." );
+               $this->fetcher = new \WP_CLI\FetcherPlugin;
        }
 
        protected function get_upgrader_class( $force ) {

diff --git a/php/commands/theme.php b/php/commands/theme.php
index 8a8d6dd..d543778 100644 (file)
--- a/php/commands/theme.php
+++ b/php/commands/theme.php
@@ -21,7 +21,7 @@ class Theme_Command extends \WP_CLI\CommandWithUpgrade {
        function __construct() {
                parent::__construct();
 
-               $this->fetcher = new \WP_CLI\FetcherTheme( "The '%s' theme could not be found." );
+               $this->fetcher = new \WP_CLI\FetcherTheme;
        }
 
        protected function get_upgrader_class( $force ) {

diff --git a/php/commands/user.php b/php/commands/user.php
index df0c65e..cf18fcb 100644 (file)
--- a/php/commands/user.php
+++ b/php/commands/user.php
@@ -18,7 +18,7 @@ class User_Command extends \WP_CLI\CommandWithDBObject {
        );
 
        public function __construct() {
-               $this->fetcher = new \WP_CLI\FetcherUser( "Invalid user ID or login: '%s'" );
+               $this->fetcher = new \WP_CLI\FetcherUser;
        }
 
        /**