<!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>[48454] trunk: Media: Fix `wp_image_file_matches_image_meta()` to also match when the original image URL is used.</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 { white-space: pre-line; 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="https://core.trac.wordpress.org/changeset/48454">48454</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/48454","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-07-12 21:18:38 +0000 (Sun, 12 Jul 2020)</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'>Media: Fix `wp_image_file_matches_image_meta()` to also match when the original image URL is used.
Also refreshes and fixes some of the unit tests for media, and replaces test-image-large.png with test-image-large.jpg which is larger to allow testing of `original_image` in the image meta.
Fixes <a href="https://core.trac.wordpress.org/ticket/50628">#50628</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
<li><a href="#trunktestsphpunittestsimagefunctionsphp">trunk/tests/phpunit/tests/image/functions.php</a></li>
<li><a href="#trunktestsphpunittestsmediaphp">trunk/tests/phpunit/tests/media.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunitdataimagestestimagelargejpg">trunk/tests/phpunit/data/images/test-image-large.jpg</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunktestsphpunitdataimagestestimagelargepng">trunk/tests/phpunit/data/images/test-image-large.png</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media.php 2020-07-12 19:59:00 UTC (rev 48453)
+++ trunk/src/wp-includes/media.php 2020-07-12 21:18:38 UTC (rev 48454)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1522,7 +1522,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Check if the relative image path from the image meta is at the end of $image_location.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( strrpos( $image_location, $image_meta['file'] ) === strlen( $image_location ) - strlen( $image_meta['file'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $match = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( ! empty( $image_meta['sizes'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Retrieve the uploads sub-directory from the full size image.
</span><span class="cx" style="display: block; padding: 0 10px"> $dirname = _wp_get_attachment_relative_path( $image_meta['file'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1530,14 +1530,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $dirname = trailingslashit( $dirname );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $image_meta['sizes'] as $image_size_data ) {
- $relative_path = $dirname . $image_size_data['file'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $image_meta['original_image'] ) ) {
+ $relative_path = $dirname . $image_meta['original_image'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( strrpos( $image_location, $relative_path ) === strlen( $image_location ) - strlen( $relative_path ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $match = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- break;
</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">+
+ if ( ! $match && ! empty( $image_meta['sizes'] ) ) {
+ foreach ( $image_meta['sizes'] as $image_size_data ) {
+ $relative_path = $dirname . $image_size_data['file'];
+
+ if ( strrpos( $image_location, $relative_path ) === strlen( $image_location ) - strlen( $relative_path ) ) {
+ $match = true;
+ break;
+ }
+ }
+ }
</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></pre></div>
<a id="trunktestsphpunitdataimagestestimagelargejpg"></a>
<div class="binary"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/data/images/test-image-large.jpg</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx" style="display: block; padding: 0 10px">Index: trunk/tests/phpunit/data/images/test-image-large.jpg
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- trunk/tests/phpunit/data/images/test-image-large.jpg 2020-07-12 19:59:00 UTC (rev 48453)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ trunk/tests/phpunit/data/images/test-image-large.jpg 2020-07-12 21:18:38 UTC (rev 48454)
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/tests/phpunit/data/images/test-image-large.jpg
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:mime-type</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+application/octet-stream
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunktestsphpunitdataimagestestimagelargepng"></a>
<div class="binary"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/tests/phpunit/data/images/test-image-large.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunktestsphpunittestsimagefunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/image/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/functions.php 2020-07-12 19:59:00 UTC (rev 48453)
+++ trunk/tests/phpunit/tests/image/functions.php 2020-07-12 21:18:38 UTC (rev 48454)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -345,6 +345,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> false,
</span><span class="cx" style="display: block; padding: 0 10px"> DIR_TESTDATA . '/images/' . __FUNCTION__ . '.jpg'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( is_wp_error( $file ) && $file->get_error_code() === 'invalid_image' ) {
+ $this->markTestSkipped( 'Tests_Image_Functions::test_wp_crop_image_url() cannot access remote image.' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotWPError( $file );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFileExists( $file );
</span><span class="cx" style="display: block; padding: 0 10px"> $image = wp_get_image_editor( $file );
</span></span></pre></div>
<a id="trunktestsphpunittestsmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/media.php 2020-07-12 19:59:00 UTC (rev 48453)
+++ trunk/tests/phpunit/tests/media.php 2020-07-12 21:18:38 UTC (rev 48454)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,12 +7,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Media extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $large_id;
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $_sizes;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected static $large_filename = 'test-image-large.jpg';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public static function wpSetUpBeforeClass( $factory ) {
</span><span class="cx" style="display: block; padding: 0 10px"> self::$_sizes = wp_get_additional_image_sizes();
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['_wp_additional_image_sizes'] = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $filename = DIR_TESTDATA . '/images/test-image-large.png';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $filename = DIR_TESTDATA . '/images/' . self::$large_filename;
</ins><span class="cx" style="display: block; padding: 0 10px"> self::$large_id = $factory->attachment->create_upload_object( $filename );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1332,7 +1333,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_get_attachment_image_defaults() {
</span><span class="cx" style="display: block; padding: 0 10px"> $image = image_downsize( self::$large_id, 'thumbnail' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = sprintf( '<img width="%1$d" height="%2$d" src="%3$s" class="attachment-thumbnail size-thumbnail" alt="" loading="lazy" />', $image[1], $image[2], $image[0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = sprintf(
+ '<img width="%1$d" height="%2$d" src="%3$s" class="attachment-thumbnail size-thumbnail" alt="" loading="lazy" />',
+ $image[1],
+ $image[2],
+ $image[0]
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected, wp_get_attachment_image( self::$large_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1347,7 +1353,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( self::$large_id, '_wp_attachment_image_alt', 'Some very clever alt text', true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $image = image_downsize( self::$large_id, 'thumbnail' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = sprintf( '<img width="%1$d" height="%2$d" src="%3$s" class="attachment-thumbnail size-thumbnail" alt="Some very clever alt text" loading="lazy" />', $image[1], $image[2], $image[0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = sprintf(
+ '<img width="%1$d" height="%2$d" src="%3$s" class="attachment-thumbnail size-thumbnail" alt="Some very clever alt text" loading="lazy" />',
+ $image[1],
+ $image[2],
+ $image[0]
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $expected, wp_get_attachment_image( self::$large_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1479,13 +1490,20 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Add the full size width at the end.
- $expected .= $uploads_dir_url . $image_meta['file'] . ' ' . $image_meta['width'] . 'w';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = trim( $expected, ' ,' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $intermediates as $int ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $image_url = wp_get_attachment_image_url( self::$large_id, $int );
- $size_array = $this->_get_image_size_array_from_meta( $image_meta, $int );
- $expected_srcset = $this->_src_first( $expected, $image_url, $size_array[0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $image_url = wp_get_attachment_image_url( self::$large_id, $int );
+ $size_array = $this->_get_image_size_array_from_meta( $image_meta, $int );
+
+ if ( 'full' === $int ) {
+ // Add the full size image. Expected to be in the srcset when the full size image is used as src.
+ $_expected = $uploads_dir_url . $image_meta['file'] . ' ' . $image_meta['width'] . 'w, ' . $expected;
+ } else {
+ $_expected = $expected;
+ }
+
+ $expected_srcset = $this->_src_first( $_expected, $image_url, $size_array[0] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected_srcset, wp_calculate_image_srcset( $size_array, $image_url, $image_meta ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1500,7 +1518,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'upload_dir', '_upload_dir_no_subdir' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make an image.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $filename = DIR_TESTDATA . '/images/test-image-large.png';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $filename = DIR_TESTDATA . '/images/' . self::$large_filename;
</ins><span class="cx" style="display: block; padding: 0 10px"> $id = self::factory()->attachment->create_upload_object( $filename );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $image_meta = wp_get_attachment_metadata( $id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1524,13 +1542,20 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Add the full size width at the end.
- $expected .= $uploads_dir_url . $image_meta['file'] . ' ' . $image_meta['width'] . 'w';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = trim( $expected, ' ,' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $intermediates as $int ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $size_array = $this->_get_image_size_array_from_meta( $image_meta, $int );
- $image_url = wp_get_attachment_image_url( $id, $int );
- $expected_srcset = $this->_src_first( $expected, $image_url, $size_array[0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $size_array = $this->_get_image_size_array_from_meta( $image_meta, $int );
+ $image_url = wp_get_attachment_image_url( $id, $int );
+
+ if ( 'full' === $int ) {
+ // Add the full size image. Expected to be in the srcset when the full size image is used as src.
+ $_expected = $uploads_dir_url . $image_meta['file'] . ' ' . $image_meta['width'] . 'w, ' . $expected;
+ } else {
+ $_expected = $expected;
+ }
+
+ $expected_srcset = $this->_src_first( $_expected, $image_url, $size_array[0] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected_srcset, wp_calculate_image_srcset( $size_array, $image_url, $image_meta ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1552,16 +1577,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Copy hash generation method used in wp_save_image().
</span><span class="cx" style="display: block; padding: 0 10px"> $hash = 'e' . time() . rand( 100, 999 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $filename_base = wp_basename( $image_meta['file'], '.png' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $filename_base = wp_basename( self::$large_filename, '.jpg' );
+ $filename_hash = "{$filename_base}-{$hash}";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add the hash to the image URL.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $image_url = str_replace( $filename_base, $filename_base . '-' . $hash, $image_url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $image_url = str_replace( $filename_base, $filename_hash, $image_url );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Replace file paths for full and medium sizes with hashed versions.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $image_meta['file'] = str_replace( $filename_base, $filename_base . '-' . $hash, $image_meta['file'] );
- $image_meta['sizes']['medium']['file'] = str_replace( $filename_base, $filename_base . '-' . $hash, $image_meta['sizes']['medium']['file'] );
- $image_meta['sizes']['medium_large']['file'] = str_replace( $filename_base, $filename_base . '-' . $hash, $image_meta['sizes']['medium_large']['file'] );
- $image_meta['sizes']['large']['file'] = str_replace( $filename_base, $filename_base . '-' . $hash, $image_meta['sizes']['large']['file'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $image_meta['sizes']['medium']['file'] = str_replace( $filename_base, $filename_hash, $image_meta['sizes']['medium']['file'] );
+ $image_meta['sizes']['medium_large']['file'] = str_replace( $filename_base, $filename_hash, $image_meta['sizes']['medium_large']['file'] );
+ $image_meta['sizes']['large']['file'] = str_replace( $filename_base, $filename_hash, $image_meta['sizes']['large']['file'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Calculate a srcset array.
</span><span class="cx" style="display: block; padding: 0 10px"> $sizes = explode( ', ', wp_calculate_image_srcset( $size_array, $image_url, $image_meta ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1601,16 +1626,24 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Add the full size width at the end.
- $expected .= $uploads_dir_url . $image_meta['file'] . ' ' . $image_meta['width'] . 'w';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = trim( $expected, ' ,' );
+ $full_size_file = $image_meta['file'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prepend an absolute path to simulate a pre-2.7 upload.
</span><span class="cx" style="display: block; padding: 0 10px"> $image_meta['file'] = 'H:\home\wordpress\trunk/wp-content/uploads/' . $image_meta['file'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $intermediates as $int ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $image_url = wp_get_attachment_image_url( self::$large_id, $int );
- $size_array = $this->_get_image_size_array_from_meta( $image_meta, $int );
- $expected_srcset = $this->_src_first( $expected, $image_url, $size_array[0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $image_url = wp_get_attachment_image_url( self::$large_id, $int );
+ $size_array = $this->_get_image_size_array_from_meta( $image_meta, $int );
+
+ if ( 'full' === $int ) {
+ // Add the full size image. Expected to be in the srcset when the full size image is used as src.
+ $_expected = $uploads_dir_url . $full_size_file . ' ' . $image_meta['width'] . 'w, ' . $expected;
+ } else {
+ $_expected = $expected;
+ }
+
+ $expected_srcset = $this->_src_first( $_expected, $image_url, $size_array[0] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected_srcset, wp_calculate_image_srcset( $size_array, $image_url, $image_meta ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1681,8 +1714,12 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected_srcset = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/2015/12/test-768x1055-218x300.png 218w, http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/2015/12/test-768x1055-600x824.png 600w, http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/2015/12/test-768x1055.png 768w';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $uploads_url = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/2015/12/';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected_srcset = $uploads_url . 'test-768x1055-218x300.png 218w, ' .
+ $uploads_url . 'test-768x1055-600x824.png 600w, ' .
+ $uploads_url . 'test-768x1055.png 768w';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected_srcset, wp_calculate_image_srcset( $size_array, $image_src, $image_meta ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1726,8 +1763,13 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected_srcset = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/2015/12/test.png 2000w, http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/2015/12/test-300x150.png 300w, http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/2015/12/test-768x384.png 768w, http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/2015/12/test-1024x512.png 1024w';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $uploads_url = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/2015/12/';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected_srcset = $uploads_url . 'test.png 2000w, ' .
+ $uploads_url . 'test-300x150.png 300w, ' .
+ $uploads_url . 'test-768x384.png 768w, ' .
+ $uploads_url . 'test-1024x512.png 1024w';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected_srcset, wp_calculate_image_srcset( $size_array, $image_src, $image_meta ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1843,8 +1885,12 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected_srcset = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/2015/12/test%20image-300x150.png 300w, http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/2015/12/test%20image-768x384.png 768w, http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/2015/12/test%20image-1024x512.png 1024w';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $uploads_url = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/2015/12/';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected_srcset = $uploads_url . 'test%20image-300x150.png 300w, ' .
+ $uploads_url . 'test%20image-768x384.png 768w, ' .
+ $uploads_url . 'test%20image-1024x512.png 1024w';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected_srcset, wp_calculate_image_srcset( array( 300, 150 ), $image_src, $image_meta ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1855,7 +1901,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_wp_additional_image_sizes = wp_get_additional_image_sizes();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $image_meta = wp_get_attachment_metadata( self::$large_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $size_array = array( 1600, 1200 ); // Full size.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $size_array = array( $image_meta['width'], $image_meta['height'] ); // Full size.
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $srcset = wp_get_attachment_image_srcset( self::$large_id, $size_array, $image_meta );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2011,9 +2057,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p>Image, HTML 5.0 style. Should have srcset and sizes.</p>
</span><span class="cx" style="display: block; padding: 0 10px"> %7$s';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content_unfiltered = sprintf( $content, $img, $img_no_size_in_class, $img_no_width_height, $img_no_size_id, $img_with_sizes_attr, $img_xhtml, $img_html5 );
- $content_filtered = sprintf( $content, $respimg, $respimg_no_size_in_class, $respimg_no_width_height, $img_no_size_id, $respimg_with_sizes_attr, $respimg_xhtml, $respimg_html5 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content_unfiltered = sprintf(
+ $content,
+ $img,
+ $img_no_size_in_class,
+ $img_no_width_height,
+ $img_no_size_id,
+ $img_with_sizes_attr,
+ $img_xhtml,
+ $img_html5
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content_filtered = sprintf(
+ $content,
+ $respimg,
+ $respimg_no_size_in_class,
+ $respimg_no_width_height,
+ $img_no_size_id,
+ $respimg_with_sizes_attr,
+ $respimg_xhtml,
+ $respimg_html5
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Do not add width, height, and loading.
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_img_tag_add_width_and_height_attr', '__return_false' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_img_tag_add_loading_attr', '__return_false' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2134,10 +2199,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p>Image, protocol-relative. Should have srcset and sizes.</p>
</span><span class="cx" style="display: block; padding: 0 10px"> %3$s';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $unfiltered = sprintf( $content, $img, $img_https, $img_relative );
- $expected = sprintf( $content, $respimg, $respimg_https, $respimg_relative );
- $actual = wp_filter_content_tags( $unfiltered );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $unfiltered = sprintf(
+ $content,
+ $img,
+ $img_https,
+ $img_relative
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = sprintf(
+ $content,
+ $respimg,
+ $respimg_https,
+ $respimg_relative
+ );
+
+ $actual = wp_filter_content_tags( $unfiltered );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2176,9 +2253,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['HTTPS'] = 'on';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = 'https://' . WP_TESTS_DOMAIN . '/wp-content/uploads/test-1024x512.jpg 1024w, https://' . WP_TESTS_DOMAIN . '/wp-content/uploads/test-300x150.jpg 300w, https://' . WP_TESTS_DOMAIN . '/wp-content/uploads/test.jpg 1200w';
- $actual = wp_calculate_image_srcset( $size_array, $image_url, $image_meta );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $uploads_url = 'https://' . WP_TESTS_DOMAIN . '/wp-content/uploads/';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = $uploads_url . 'test-1024x512.jpg 1024w, ' .
+ $uploads_url . 'test-300x150.jpg 300w, ' .
+ $uploads_url . 'test.jpg 1200w';
+
+ $actual = wp_calculate_image_srcset( $size_array, $image_url, $image_meta );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2265,16 +2347,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_all_filters( 'wp_calculate_image_sizes' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $basename = wp_basename( self::$large_filename, '.jpg' );
+ $year_month = gmdate( 'Y/m' );
+ $uploads_url = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . $year_month . '/';
+
+ $expected = '<img width="999" height="999" ' .
+ 'src="' . $uploads_url . 'test-image-testsize-999x999.jpg" ' .
+ 'class="attachment-testsize size-testsize" alt="" loading="lazy" ' .
+ 'srcset="' . $uploads_url . 'test-image-testsize-999x999.jpg 999w, ' . $uploads_url . $basename . '-150x150.jpg 150w" ' .
+ 'sizes="(max-width: 999px) 100vw, 999px" />';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $actual = wp_get_attachment_image( self::$large_id, 'testsize' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $year = gmdate( 'Y' );
- $month = gmdate( 'm' );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = '<img width="999" height="999" src="http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . $year . '/' . $month . '/test-image-testsize-999x999.png"' .
- ' class="attachment-testsize size-testsize" alt="" loading="lazy"' .
- ' srcset="http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . $year . '/' . $month . '/test-image-testsize-999x999.png 999w,' .
- ' http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . $year . '/' . $month . '/test-image-large-150x150.png 150w"' .
- ' sizes="(max-width: 999px) 100vw, 999px" />';
-
</del><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'wp_get_attachment_metadata', array( $this, '_filter_36246' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, $actual );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2282,10 +2366,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function _filter_36246( $data, $attachment_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data['sizes']['testsize'] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'file' => 'test-image-testsize-999x999.png',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'file' => 'test-image-testsize-999x999.jpg',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'width' => 999,
</span><span class="cx" style="display: block; padding: 0 10px"> 'height' => 999,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'mime-type' => 'image/png',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'mime-type' => 'image/jpg',
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> return $data;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2852,6 +2936,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_image_file_matches_image_meta( $image_src, $image_meta ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket 50543
+ */
+ function test_wp_image_file_matches_image_meta_original_image() {
+ $image_meta = wp_get_attachment_metadata( self::$large_id );
+ $image_src = wp_get_original_image_url( self::$large_id );
+
+ $this->assertTrue( wp_image_file_matches_image_meta( $image_src, $image_meta ) );
+ }
</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></pre>
</div>
</div>
</body>
</html>