From ca7e87d56a4ed8c5d00fdacd6be43823d9185aa8 Mon Sep 17 00:00:00 2001
From: scribu <mail@scribu.net>
Date: Tue, 12 Feb 2013 04:27:01 +0200
Subject: [PATCH] show validation warnings only when generating man pages. see
 #298

---
 php/WP_CLI/Dispatcher/CompositeCommand.php |  2 +-
 php/WP_CLI/Dispatcher/Subcommand.php       | 20 +++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/php/WP_CLI/Dispatcher/CompositeCommand.php b/php/WP_CLI/Dispatcher/CompositeCommand.php
index e0ff1f67..897992bb 100644
--- a/php/WP_CLI/Dispatcher/CompositeCommand.php
+++ b/php/WP_CLI/Dispatcher/CompositeCommand.php
@@ -78,7 +78,7 @@ class CompositeCommand extends AbstractCommandContainer implements Documentable
 		$str = array();
 
 		foreach ( $this->subcommands as $subcommand ) {
-			$str[] = $subcommand->get_full_synopsis();
+			$str[] = $subcommand->get_full_synopsis( true );
 		}
 
 		return implode( "\n\n", $str );
diff --git a/php/WP_CLI/Dispatcher/Subcommand.php b/php/WP_CLI/Dispatcher/Subcommand.php
index db17c4df..80d43f62 100644
--- a/php/WP_CLI/Dispatcher/Subcommand.php
+++ b/php/WP_CLI/Dispatcher/Subcommand.php
@@ -14,25 +14,27 @@ class Subcommand implements Command, AtomicCommand, Documentable {
 	}
 
 	function show_usage( $prefix = 'usage: ' ) {
-		\WP_CLI::line( $prefix . $this->get_full_synopsis( false ) );
+		\WP_CLI::line( $prefix . $this->get_full_synopsis() );
 	}
 
 	function get_shortdesc() {
 		return $this->docparser->get_shortdesc();
 	}
 
-	function get_full_synopsis( $validate = true ) {
+	function get_full_synopsis( $validate = false ) {
 		$full_name = implode( ' ', get_path( $this ) );
 		$synopsis = $this->get_synopsis();
 
-		$tokens = \WP_CLI\SynopsisParser::parse( $synopsis );
+		if ( $validate ) {
+			$tokens = \WP_CLI\SynopsisParser::parse( $synopsis );
 
-		foreach ( $tokens as $token ) {
-			if ( 'unknown' == $token['type'] ) {
-				\WP_CLI::warning( sprintf(
-					"Invalid token '%s' in synopsis for '%s'",
-					$token['token'], $full_name
-				) );
+			foreach ( $tokens as $token ) {
+				if ( 'unknown' == $token['type'] ) {
+					\WP_CLI::warning( sprintf(
+						"Invalid token '%s' in synopsis for '%s'",
+						$token['token'], $full_name
+					) );
+				}
 			}
 		}
 
-- 
2.11.0