Changeset 11230

Timestamp:

09/14/2021 06:38:51 AM (5 years ago)

Author:

dd32

Message:

Theme Directory: Move exec_with_notify() to a trait for use in other classes too.

See #5899.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory

Files:

• class-wporg-themes-upload.php (modified) (3 diffs)
• lib/class-exec-with-logging.php (added)

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-wporg-themes-upload.php

@@ -1 +1 @@
 <?php
 use WordPressdotorg\Theme_Directory\Lib\GitHub;
+use WordPressdotorg\Theme_Directory\Lib\Exec_With_Logging;
 
 /**
@@ -8 +9 @@
  */
 class WPORG_Themes_Upload {
+    use Exec_With_Logging {
+        Exec_With_Logging::exec as exec_with_notify;
+    }
+
     /**
      * Path to `svn` script.
@@ -1623 +1628 @@
     protected function sort_by_string_length( $a, $b ) {
         return strlen( $b ) - strlen( $a );
-    }
-
-    /**
-     * Execute a shell process, same behaviour as `exec()` but with PHP Warnings/Notices generated on errors.
-     * 
-     * @param string $command    Command to execute. Escape it.
-     * @param array  $output     Array to append program output to. Passed by reference.
-     * @param int    $return_var The commands return value. Passed by reference.
-     * 
-     * @return false|string False on failure, last line of output on success, as per exec().
-     */
-    public function exec_with_notify( $command, &$output = null, &$return_var = null ) {
-        $proc = proc_open(
-            $command,
-            [
-                1 => [ 'pipe', 'w' ], // STDOUT
-                2 => [ 'pipe', 'w' ], // STDERR
-            ],
-            $pipes
-        );
-
-        $stdout = stream_get_contents( $pipes[1] );
-        $stderr = stream_get_contents( $pipes[2] );
-        fclose( $pipes[1] );
-        fclose( $pipes[2] );
-
-        $return_var = proc_close( $proc );
-
-        // Append to $output, as `exec()` does.
-        if ( ! is_array( $output ) ) {
-            $output = [];
-        }
-        if ( $stdout ) {
-            $output = array_merge( $output, explode( "\n", rtrim( $stdout, "\r\n" ) ) );
-        }
-
-        // Redact any passwords that might be in a command and included in logged errors.
-        $command = str_replace( [ THEME_TRACBOT_PASSWORD, THEME_DROPBOX_PASSWORD ], '[redacted]', $command );
-
-        if ( $return_var > 0 ) {
-            trigger_error(
-                "Command failed, `{$command}`\n" .
-                    "```\n" .
-                    "Return Value: {$return_var}\n" .
-                    "STDOUT: {$stdout}\n" .
-                    "STDERR: {$stderr}\n" .
-                    "```",
-                E_USER_WARNING
-            );
-        } elseif ( $stderr ) {
-            trigger_error(
-                "Command produced errors, `{$command}`\n" .
-                    "```\n" .
-                    "Return Value: {$return_var}\n" .
-                    "STDOUT: {$stdout}\n" .
-                    "STDERR: {$stderr}\n" .
-                    "```",
-                E_USER_NOTICE
-            );
-        }
-
-        // Execution failed.
-        if ( $return_var > 0 ) {
-            return false;
-        }
-
-        // Successful, return the last output line.
-        return $stdout ? end( $output ) : '';
     }