From e15e501d30c2c823910c2bb894f70c4d8fa7430f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Wed, 2 Jun 2021 08:49:48 +0200 Subject: [PATCH] Flatten add_plugins Errors go into a conditional, normal operation does not need indentation. --- installer.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/installer.php b/installer.php index 85e89b6..c6060db 100644 --- a/installer.php +++ b/installer.php @@ -190,19 +190,19 @@ public function cleanup( $args, $assoc_args ) { public function add_plugins( $args, $assoc_args ) { $base_path = isset( $assoc_args['base_path'] ) ? $assoc_args['base_path'] : getcwd(); - if ( isset( $assoc_args['plugin_list'] ) && file_exists( $assoc_args['plugin_list'] ) ) { - $plugins = file_get_contents( $assoc_args['plugin_list'] ); - $plugins = array_filter( explode( PHP_EOL, $plugins ) ); - - foreach ( $plugins as $plugin ) { - $cmd = 'wp --path=%s plugin install %s'; - $cmd = \WP_CLI\Utils\esc_cmd( $cmd, $base_path . '/' . $args[0], $plugin ); - $result = WP_CLI::launch( $cmd, false, true ); - WP_CLI::log( $result ); - - } - } else { + if ( ! isset( $assoc_args['plugin_list'] ) || ! file_exists( $assoc_args['plugin_list'] ) ) { WP_CLI::log( 'Plugin list not found' ); + return; + } + + $plugins = file_get_contents( $assoc_args['plugin_list'] ); + $plugins = array_filter( explode( PHP_EOL, $plugins ) ); + + foreach ( $plugins as $plugin ) { + $cmd = 'wp --path=%s plugin install %s'; + $cmd = \WP_CLI\Utils\esc_cmd( $cmd, $base_path . '/' . $args[0], $plugin ); + $result = WP_CLI::launch( $cmd, false, true ); + WP_CLI::log( $result ); } }