Changeset 42343 for trunk/src/wp-admin/includes/class-plugin-installer-skin.php

Timestamp:

11/30/2017 11:09:33 PM (9 years ago)

Author:

pento

Message:

Code is Poetry.
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.

File:

• trunk/src/wp-admin/includes/class-plugin-installer-skin.php (modified) (4 diffs)

trunk/src/wp-admin/includes/class-plugin-installer-skin.php

@@ -21 +21 @@
 
         /**
-         *
          * @param array $args
          */
-        public function __construct($args = array()) {
-                $defaults = array( 'type' => 'web', 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => '' );
-                $args = wp_parse_args($args, $defaults);
+        public function __construct( $args = array() ) {
+                $defaults = array(
+                        'type'   => 'web',
+                        'url'    => '',
+                        'plugin' => '',
+                        'nonce'  => '',
+                        'title'  => '',
+                );
+                $args     = wp_parse_args( $args, $defaults );
 
                 $this->type = $args['type'];
-                $this->api = isset($args['api']) ? $args['api'] : array();
+                $this->api  = isset( $args['api'] ) ? $args['api'] : array();
 
-                parent::__construct($args);
+                parent::__construct( $args );
         }
 
@@ -37 +42 @@
          */
         public function before() {
-                if ( !empty($this->api) )
-                        $this->upgrader->strings['process_success'] = sprintf( __('Successfully installed the plugin <strong>%s %s</strong>.'), $this->api->name, $this->api->version);
+                if ( ! empty( $this->api ) ) {
+                        $this->upgrader->strings['process_success'] = sprintf( __( 'Successfully installed the plugin <strong>%1$s %2$s</strong>.' ), $this->api->name, $this->api->version );
+                }
         }
 
@@ -48 +54 @@
                 $install_actions = array();
 
-                $from = isset($_GET['from']) ? wp_unslash( $_GET['from'] ) : 'plugins';
+                $from = isset( $_GET['from'] ) ? wp_unslash( $_GET['from'] ) : 'plugins';
 
                 if ( 'import' == $from ) {
                         $install_actions['activate_plugin'] = '<a class="button button-primary" href="' . wp_nonce_url( 'plugins.php?action=activate&amp;from=import&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Activate Plugin &amp; Run Importer' ) . '</a>';
-                } else if ( 'press-this' == $from ) {
+                } elseif ( 'press-this' == $from ) {
                         $install_actions['activate_plugin'] = '<a class="button button-primary" href="' . wp_nonce_url( 'plugins.php?action=activate&amp;from=press-this&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Activate Plugin &amp; Return to Press This' ) . '</a>';
                 } else {
@@ -73 +79 @@
                 }
 
-                if ( ! $this->result || is_wp_error($this->result) ) {
+                if ( ! $this->result || is_wp_error( $this->result ) ) {
                         unset( $install_actions['activate_plugin'], $install_actions['network_activate'] );
                 } elseif ( ! current_user_can( 'activate_plugin', $plugin_file ) ) {