Ticket #6275: 6275.diff

plugin-directory/zip/class-builder.php

@@ -196 +196 @@
                         return;
                 }
 
                 $plugin_version = $plugin_data['Version'];
                 // Catch malformed version strings.
                 if ( basename( $plugin_version ) != $plugin_version ) {
                         return;
                 }
 
                 $this->checksum_file = "{$this->tmp_dir}/{$this->slug}/{$this->slug}.{$plugin_version}.checksums.json";
 
                 // Checkout the Checksum file for this plugin version
                 SVN::up( $this->checksum_file );
 
                 // Existing checksums?
-                $existing_json_checksum_file = file_exists( $this->checksum_file );
+                $existing_json_checksum_file = file_exists( $this->checksum_file ) ? json_decode( file_get_contents( $this->checksum_file ) ) : false;
 
                 $skip_bad_files = array();
                 $checksums      = array();
                 foreach ( array(
                         'md5'    => 'md5sum',
                         'sha256' => 'sha256sum',
                 ) as $checksum_type => $checksum_bin ) {
                         $checksum_output = array();
                         $this->exec( sprintf(
                                 'cd %s && find . -type f -print0 | sort -z | xargs -0 ' . $checksum_bin . ' 2>&1',
                                 escapeshellarg( $this->tmp_build_dir . '/' . $this->slug )
                         ), $checksum_output, $return_value );
 
                         if ( $return_value ) {
                                 // throw new Exception( __METHOD__ . ': Checksum generation failed, return code: ' . $return_value, 503 );
@@ -235 +235 @@
                                 $checksum = trim( $checksum );
 
                                 // See https://meta.trac.wordpress.org/ticket/3335 - Filenames like 'Testing Test' truncated to 'Testing'
                                 if ( preg_match( '!^(\S+)\s+\S!', $filename, $m ) ) {
                                         $skip_bad_files[ $m[1] ] = true;
                                 }
 
                                 if ( ! isset( $checksums[ $filename ] ) ) {
                                         $checksums[ $filename ] = array(
                                                 'md5'    => array(),
                                                 'sha256' => array(),
                                         );
                                 }
 
                                 $checksums[ $filename ][ $checksum_type ] = $checksum;
+
+                                // If the checksums have already been generated, and this file did not previously exist, it's just been added and therefor is optional.
+                                if ( ! empty( $existing_json_checksum_file->files ) && ! isset( $existing_json_checksum_file->files[ $filename ] ) ) {
+                                        $checksums[ $filename ]['optional'] = true;
+                                }
                         }
                 }
 
                 $json_checksum_file = (object) array(
+                        'format'  => 2,
                         'plugin'  => $this->slug,
                         'version' => $plugin_version,
                         'source'  => $this->plugin_version_svn_url,
                         'zip'     => 'https://downloads.wordpress.org/plugins/' . basename( $this->zip_file ),
                         'files'   => $checksums,
                 );
 
                 // If the checksum file exists already, merge it into this one.
                 if ( $existing_json_checksum_file ) {
-                        $existing_json_checksum_file = json_decode( file_get_contents( $this->checksum_file ) );
-
                         // Sometimes plugin versions exist in multiple tags/zips, include all the SVN urls & ZIP urls
                         foreach ( array( 'source', 'zip' ) as $maybe_different ) {
                                 if ( ! empty( $existing_json_checksum_file->{$maybe_different} ) &&
                                         $existing_json_checksum_file->{$maybe_different} != $json_checksum_file->{$maybe_different}
                                 ) {
                                         $json_checksum_file->{$maybe_different} = array_unique( array_merge(
                                                 (array) $existing_json_checksum_file->{$maybe_different},
                                                 (array) $json_checksum_file->{$maybe_different}
                                         ) );
 
                                         // Reduce single arrays back to a string when possible.
                                         if ( 1 == count( $json_checksum_file->{$maybe_different} ) ) {
                                                 $json_checksum_file->{$maybe_different} = array_shift( $json_checksum_file->{$maybe_different} );
                                         }
                                 }
                         }
 
                         // Combine Checksums from existing files and the new files
                         foreach ( $existing_json_checksum_file->files as $file => $checksums ) {
 
                                 if ( ! isset( $json_checksum_file->files[ $file ] ) ) {
                                         if ( isset( $skip_bad_files[ $file ] ) ) {
                                                 // See https://meta.trac.wordpress.org/ticket/3335
                                                 // This is a partial filename, which shouldn't have been in the checksums.
                                                 continue;
                                         }
 
                                         // Deleted file, use existing checksums.
                                         $json_checksum_file->files[ $file ] = $checksums;
 
+                                        // Flag the file as optional, it was present, but now it's gone.
+                                        $json_checksum_file->files[ $file ]['optional'] = true;
+
                                 } elseif ( $checksums !== $json_checksum_file->files[ $file ] ) {
                                         // Checksum has changed, include both in the resulting json file.
                                         foreach ( array( 'md5', 'sha256' ) as $checksum_type ) {
                                                 $json_checksum_file->files[ $file ][ $checksum_type ] = array_unique( array_merge(
                                                         (array) $checksums->{$checksum_type}, // May already be an array
                                                         (array) $json_checksum_file->files[ $file ][ $checksum_type ]
                                                 ) );
 
                                                 // Reduce single arrays back to a string when possible.
                                                 if ( 1 == count( $json_checksum_file->files[ $file ][ $checksum_type ] ) ) {
                                                         $json_checksum_file->files[ $file ][ $checksum_type ] = array_shift( $json_checksum_file->files[ $file ][ $checksum_type ] );
                                                 }
                                         }
                                 }
                         }