<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[6114] sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/zip/class-builder.php: Plugin Directory: Checksums: Combine the `md5` and `sha256` fields back into the `files` property.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/6114">6114</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/6114","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-11-10 05:23:33 +0000 (Fri, 10 Nov 2017)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Plugin Directory: Checksums: Combine the `md5` and `sha256` fields back into the `files` property.
See <a href="http://meta.trac.wordpress.org/ticket/3192">#3192</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryzipclassbuilderphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/zip/class-builder.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryzipclassbuilderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/zip/class-builder.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/zip/class-builder.php 2017-11-10 02:45:53 UTC (rev 6113)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/zip/class-builder.php 2017-11-10 05:23:33 UTC (rev 6114)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -206,10 +206,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Existing checksums?
</span><span class="cx" style="display: block; padding: 0 10px"> $existing_json_checksum_file = file_exists( $this->checksum_file );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $checksums = array(
- 'md5' => array(),
- 'sha256' => array()
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $checksums = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'md5' => 'md5sum', 'sha256' => 'sha256sum' ) as $checksum_type => $checksum_bin ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->exec( sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> 'cd %s && find . -type f -print0 | sort -z | xargs -0 ' . $checksum_bin . ' 2>&1',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,17 +223,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> list( $checksum, $filename ) = preg_split( '!\s+!', $line );
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = trim( preg_replace( '!^./!', '', $filename ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $checksum = trim( $checksum );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $checksums[ $checksum_type][ $filename ] = $checksum;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( ! isset( $checksums[ $filename ] ) ) {
+ $checksums[ $filename ] = array( 'md5' => array(), 'sha256' => array() );
+ }
+
+ $checksums[ $filename ][ $checksum_type ] = $checksum;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $json_checksum_file = (object) array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'plugin' => $this->slug,
- 'version' => $plugin_version,
- 'source' => $this->plugin_version_svn_url,
- 'zip' => 'https://downloads.wordpress.org/plugins/' . basename( $this->zip_file ),
- 'md5' => $checksums['md5'],
- 'sha256' => $checksums['sha256'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'plugin' => $this->slug,
+ 'version' => $plugin_version,
+ 'source' => $this->plugin_version_svn_url,
+ 'zip' => 'https://downloads.wordpress.org/plugins/' . basename( $this->zip_file ),
+ 'files' => $checksums,
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If the checksum file exists already, merge it into this one.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -261,31 +262,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Combine Checksums from existing files and the new files
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( array( 'md5', 'sha256' ) as $checksum_type ) {
- if ( ! $existing_json_checksum_file || empty( $existing_json_checksum_file->{$checksum_type} ) ) {
- continue;
- }
- $existing_checksums = (array) $existing_json_checksum_file->{$checksum_type}; // Assoc array => Object in JSON
- $new_checksums = &$json_checksum_file->{$checksum_type}; // byref to update new array
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $existing_json_checksum_file->files as $file => $checksums ) {
+ if ( ! isset( $json_checksum_file->files[ $file ] ) ) {
+ // Deleted file, use existing checksums.
+ $json_checksum_file->files[ $file ] = $checksums;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $existing_checksums as $file => $checksums ) {
- if ( ! isset( $new_checksums[ $file ] ) ) {
- // Deleted file, include it in checksums.
- $new_checksums[ $file ] = $existing_checksums[ $file ];
-
- } elseif ( $new_checksums[ $file ] != $existing_checksums[ $file ] ) {
- // Checksum has changed, include both in the resulting json file.
-
- $new_checksums[ $file ] = array_unique( array_merge(
- (array) $existing_checksums[ $file ], // May already be an array
- (array) $new_checksums[ $file ]
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } 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 ]
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 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 ] );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ksort( $json_checksum_file->files );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> file_put_contents( $this->checksum_file, wp_json_encode( $json_checksum_file ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>