Skip to content

Commit

Permalink
Fix WP CLI undefined index and tidy code
Browse files Browse the repository at this point in the history
  • Loading branch information
Scott Parry committed Apr 27, 2018
1 parent 9b57dbe commit d958e5a
Show file tree
Hide file tree
Showing 2 changed files with 178 additions and 120 deletions.
4 changes: 2 additions & 2 deletions checks/textdomain.php
View file
Expand Up @@ -133,8 +133,8 @@ function check( $php_files, $css_files, $other_files ) {
'<br>'. __( '(If this is a child theme, you can ignore this error.)' , 'theme-check' );
} elseif ( ! in_array( $correct_domain, $domains ) ) {
$this->error[] = '<span class="tc-lead tc-required">' . __( 'REQUIRED', 'theme-check' ) . '</span>: '
. sprintf ( __( "This theme text domain does not match the theme's slug. The text domain used: %s", 'theme-check' ), '<strong>' . $domainlist . '</strong>' )
. sprintf ( __( "This theme's correct slug and text-domain is %s.", 'theme-check' ), '<strong>' . $correct_domain . '</strong>' );
. sprintf ( __( "This theme text domain does not match the theme's slug. The text domain used: %s ", 'theme-check' ), '<strong>' . $domainlist . '</strong>' )
. sprintf ( __( "This theme's correct slug and text-domain is %s ", 'theme-check' ), '<strong>' . $correct_domain . '</strong>' );
$ret = false;
}
}
Expand Down
294 changes: 176 additions & 118 deletions theme-check-cli.php
View file
@@ -1,195 +1,253 @@
<?php
// Run Envato Theme Check from the command line

/**
* Run Envato Theme Check from the command line
*/
include 'checkbase.php';
include 'main.php';
class ThemeCheckCLI extends WP_CLI_Command {

function __construct() {
class ThemeCheckCLI extends WP_CLI_Command {
function __construct()
{
parent::__construct();
$this->fetcher = new \WP_CLI\Fetchers\Theme;
}
/**
* Show a list of the current themes
*
* ## OPTIONS
*
* [--errors=<errors>]
* : set true to return only themes with errors, false for only without errors. Default: false
*
* [--allowed=<allowed>]
* : (Multisite) set true to return only themes allowed on this site, false for only those not allowed,
* 'site' for only site-allowed, 'network' for only network-allowed.
*
* [--blog_id=<id>]
* : (Multisite) Blog ID, if different than current
*
* @subcommand list
*/
public function list_themes( $args = array(), $assoc_args = array() ) {
$defaults = array( 'errors' => false, 'allowed' => null, 'blog_id' => 0 );
$args = wp_parse_args( $assoc_args, $defaults );
* Show a list of the current themes
*
* ## OPTIONS
*
* [--errors=<errors>]
* : set true to return only themes with errors, false for only without errors. Default: false
*
* [--allowed=<allowed>]
* : (Multisite) set true to return only themes allowed on this site, false for only those not allowed,
* 'site' for only site-allowed, 'network' for only network-allowed.
*
* [--blog_id=<id>]
* : (Multisite) Blog ID, if different than current
*
* @subcommand list
*/
public function list_themes( $args = array(), $assoc_args = array() )
{
$defaults = array( 'errors' => false, 'allowed' => null, 'blog_id' => 0 );
$args = wp_parse_args( $assoc_args, $defaults );
$args['errors'] = 'true' === $args['errors'];

if ( ( 'true' == $args['allowed'] ) || ( 'false' == $args['allowed'] ) )
$args['allowed'] = 'true' === $args['allowed'];

$themes = wp_get_themes( $args );
foreach ( $themes as $slug => $theme ) {

foreach ( $themes as $slug => $theme )
{
WP_CLI::line( $slug . ': ' . $theme->get('Name') );
}
}

/**
* Check a theme
*
* <theme>
* : The theme slug to check
*
* [--format=<format>]
* : set to true to format as json. Default: false
*
*/
public function check( $args = array(), $assoc_args = array() ) {

global $checkcount, $themechecks;
* Check a theme
*
* <theme>
* : The theme slug to check
*
* [--format=<format>]
* : set to true to format as json. Default: false
*
*/
public function check( $args = array(), $assoc_args = array() )
{
global $themechecks;

checkcount();

// prevent undefined index errors
$assoc_args['format'] = '';

// empty array for the json format
$required_json = array();
$warnings_json = array();
$required_json = array();
$warnings_json = array();
$recommended_json = array();
$errors_json = array();
$result_json = array();
$errors_json = array();
$result_json = array();

$theme = $this->fetcher->get_check( $args[0] );
$files = $theme->get_files( null, -1 );
$css = $php = $other = array();
foreach( $files as $key => $filename ) {
if ( substr( $filename, -4 ) == '.php' ) {
$css = $php = $other = array();

foreach( $files as $key => $filename )
{
if ( substr( $filename, -4 ) == '.php' )
{
$php[ $filename ] = php_strip_whitespace( $filename );
} else if ( substr( $filename, -4 ) == '.css' ) {
}
else if ( substr( $filename, -4 ) == '.css' )
{
$css[ $filename ] = file_get_contents( $filename );
} else {
}
else
{
$other[ $filename ] = ( ! is_dir( $filename ) ) ? file_get_contents( $filename ) : '';
}
}

$success = run_themechecks($php, $css, $other);
$errors = array();
foreach ( $themechecks as $check ) {
if ( $check instanceof themecheck ) {
$errors = array();

foreach ( $themechecks as $check )
{
if ( $check instanceof themecheck )
{
$error = $check->getError();
if ( ! empty( $error ) ) {

if ( ! empty( $error ) )
{
$errors = array_merge( $error, $errors );
}
}
}

$errors = array_unique( $errors );
$errors = array_map( 'strip_tags', $errors );
rsort( $errors );
// We assume to pass unless we see a required or warning message.

// assume to pass unless we see a required or warning message.
$pass = true;
foreach ( $errors as $error ) {

foreach ( $errors as $error )
{
list( $type, $message ) = explode( ':', $error, 2 );
if ( 'REQUIRED' == trim( $type ) ) {

if( 'true' == $assoc_args['format'] ) {
array_push($required_json, "Required: ".trim( $message ));
} else {
WP_CLI::warning( '%rRequired:%n '.trim( $message ) );
if ( 'REQUIRED' == trim( $type ) )
{
if ( 'true' == $assoc_args['format'] )
{
array_push( $required_json, "REQUIRED: " . trim( $message ) );
}
else
{
WP_CLI::warning( '%rREQUIRED:%n ' . trim( $message ) );
}
$pass = false;

} elseif ( 'WARNING' == trim( $type ) ) {

if( 'true' == $assoc_args['format'] ) {
array_push($warnings_json, "Warning: ".trim( $message ));
} else {
WP_CLI::warning( '%yWarning:%n '.trim( $message ) );
}
elseif ( 'WARNING' == trim( $type ) )
{
if ( 'true' == $assoc_args['format'] )
{
array_push( $warnings_json, "WARNING: " . trim( $message ) );
}
else
{
WP_CLI::warning( '%yWARNING:%n ' . trim( $message ) );
}
$pass = false;

} elseif ( 'RECOMMENDED' == trim( $type ) ) {
if( 'true' == $assoc_args['format'] ) {
array_push($recommended_json, "Recommended: ".trim( $message ));
} else {
WP_CLI::warning( '%cRecommended:%n '.trim( $message ) );
}
elseif ( 'RECOMMENDED' == trim( $type ) )
{
if ( 'true' == $assoc_args['format'] )
{
array_push( $recommended_json, "RECOMMENDED: " . trim( $message ) );
}
} else {
if( 'true' == $assoc_args['format'] ) {
array_push($errors_json, "Error: ".trim( $error ));
} else {
else
{
WP_CLI::warning( '%cRECOMMENDED:%n ' . trim( $message ) );
}
}
else
{
if ( 'true' == $assoc_args['format'] )
{
array_push( $errors_json, "ERROR: " . trim( $error ) );
}
else
{
WP_CLI::warning( $error );
}
}
}


WP_CLI::line();
if ( empty( $errors ) ){
if( 'true' == $assoc_args['format'] ) {
array_push($result_json, "Success");
array_push($result_json, "Theme passed review.");
} else {
WP_CLI::success( "Theme passed review." );

if ( empty( $errors ) )
{
if ( 'true' == $assoc_args['format'] )
{
array_push( $result_json, "SUCCESS" );
array_push( $result_json, "THEME PASSED REVIEW" );
}
} elseif ( true === $pass ){
if( 'true' == $assoc_args['format'] ) {
array_push($result_json, "Success");
array_push($result_json, "Theme passed review with some recommended changes.");
} else {
WP_CLI::success( "Theme passed review with some recommended changes." );
else
{
WP_CLI::success( "THEME PASSED REVIEW" );
}
} else {
if( 'true' == $assoc_args['format'] ) {
array_push($result_json, "Fail");
array_push($result_json, "Theme did not pass review.");
} else {
WP_CLI::line( WP_CLI::colorize( "%RFail:%n Theme did not pass review." ) );
}
elseif ( true === $pass )
{
if ( 'true' == $assoc_args['format'] )
{
array_push( $result_json, "SUCCESS" );
array_push( $result_json, "THEME PASSED REVIEW WITH RECOMMENDED CHANGES" );
}
else
{
WP_CLI::success( "THEME PASSED REVIEW WITH RECOMMENDED CHANGES" );
}
}
else
{
if ( 'true' == $assoc_args['format'] )
{
array_push( $result_json, "FAIL" );
array_push( $result_json, "THEME DID NOT PASS REVIEW" );
}
else
{
WP_CLI::line( WP_CLI::colorize( "%RFAIL:%n THEME DID NOT PASS REVIEW" ) );
}
}

if( 'true' == $assoc_args['format'] ) {

if ( 'true' == $assoc_args['format'] )
{
$output = array (
'result' => $result_json,
'required' => $required_json,
'result' => $result_json,
'required' => $required_json,
'recommended' => $recommended_json,
'warnings' => $warnings_json,
'errors' => $errors_json
'warnings' => $warnings_json,
'errors' => $errors_json
);

echo htmlspecialchars_decode( json_encode($output, JSON_UNESCAPED_SLASHES ));
echo htmlspecialchars_decode( json_encode( $output, JSON_UNESCAPED_SLASHES ) );
}



}

/**
* Check for the active theme
*
* [--format=<format>]
* : set to true to format as json. Default: false
*
*/
public function active( $args = array(), $assoc_args = array() ) {
$active_theme = wp_get_theme();
* Check for the active theme
*
* [--format=<format>]
* : set to true to format as json. Default: false
*
*/
public function active( $args = array(), $assoc_args = array() )
{
$active_theme = wp_get_theme();
$theme_folder_name = $active_theme->template;

$this->check( array($theme_folder_name), $assoc_args);
}

}

class ThemeCheckCLILogger extends WP_CLI\Loggers\Regular {
public function _line( $message, $label, $color, $handle = STDOUT ) {
if ( ! empty( $label ) ) {
public function _line( $message, $label, $color, $handle = STDOUT )
{
if ( ! empty( $label ) )
{
$label = \cli\Colors::colorize( "$color$label:%n ", $this->in_color );
}
$this->write( $handle, "{$label}{$message}\n" );
}
function warning( $message ) {

function warning( $message )
{
$this->_line( WP_CLI::colorize( $message ), '', '', STDERR );
}
}

WP_CLI::set_logger( new ThemeCheckCLILogger( true ) );
// Here we define the command name we want to use.

WP_CLI::add_command( 'theme review', 'ThemeCheckCLI' );

0 comments on commit d958e5a

Please sign in to comment.