Changeset 3082

Timestamp:

05/05/2016 07:45:24 AM (9 years ago)

Author:

dd32

Message:

Plugin Directory: Move the SVN authentication handlers into the SVN class.
This also fixes an issue where the commit message was being prefixed with a = due to invalid arguement creation.

See [3026]
See #1570

Location:

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

Files:

• admin/class-status-transitions.php (modified) (1 diff)
• tools/class-svn.php (modified) (6 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/class-status-transitions.php

@@ -96 +96 @@
         rename( $plugin_root, "$dir/trunk" );
 
-        SVN::import( $dir, 'http://plugins.svn.wordpress.org/' . $post->post_name, array(
-            'm'        => sprintf( 'Adding %1$s by %2$s.', $post->post_title, $plugin_author->user_login ),
-            'username' => AUTOMATTIC_SVN_TRACKER__SVN_USER,
-            'password' => AUTOMATTIC_SVN_TRACKER__SVN_PASSWORD,
-        ) );
+        SVN::import( $dir, 'http://plugins.svn.wordpress.org/' . $post->post_name, sprintf( 'Adding %1$s by %2$s.', $post->post_title, $plugin_author->user_login ) );
 
         // Delete zips.

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/tools/class-svn.php

@@ -10 +10 @@
 
     /**
-     * Create an SVN Export of a local directory to a URL.
-     *
-     * Note: An exception will be thrown upon SVN error.
+     * Import a local directory to a SVN path.
      *
      * @param string $path    The local folder to import into SVN.
      * @param string $url     The URL to import to.
-     * @param array  $options A list of options to pass to SVN. Optional.
+     * @param string $message The commit message.
      *
      * @return array {
@@ -23 +21 @@
      * }
      */
-    public static function import( $path, $url, $options = array() ) {
+    public static function import( $path, $url, $message ) {
+        $options = array(
+            'non-interactive',
+            'm' => $message,
+            'user' => PLUGIN_SVN_MANAGEMENT_USER,
+            'pass' => PLUGIN_SVN_MANAGEMENT_PASS,
+        );
         $esc_options = self::parse_esc_parameters( $options );
 
@@ -44 +48 @@
      * Create an SVN Export of a URL to a local directory.
      *
-     * Note: An exception will be thrown upon SVN error.
-     *
      * @param string $url         The URL to export.
      * @param string $destination The local folder to export into.
@@ -56 +58 @@
      */
     public static function export( $url, $destination, $options = array() ) {
+        $options[] = 'non-interactive';
         $esc_options = self::parse_esc_parameters( $options );
 
@@ -82 +85 @@
      */
     public static function ls( $url, $verbose = false ) {
-        $esc_options = '';
+        $options = array(
+            'non-interactive'
+        );
         if ( $verbose ) {
-            $esc_options = '-v';
+            $options[] = 'v';
         }
+        $esc_options = self::parse_esc_parameters( $options );
         $esc_url = escapeshellarg( $url );
 
@@ -133 +139 @@
             }
 
-            $result[] = escapeshellarg( $key ) . ( $no_parameters ? '' : '=' . escapeshellarg( $value ) );
+            $result[] = escapeshellarg( $key ) . ( $no_parameters ? '' : ' ' . escapeshellarg( $value ) );
         }