<!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>[35464] trunk: Responsive images:</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="https://core.trac.wordpress.org/changeset/35464">35464</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/35464","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>2015-10-30 23:26:44 +0000 (Fri, 30 Oct 2015)</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'>Responsive images:
- Merge `wp_image_srcset_attr()` into `wp_calculate_image_srcset()`.
- Remove the `wp_image_srcset` filter.
- Fix the tests for the above changes.
See <a href="https://core.trac.wordpress.org/ticket/34430">#34430</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
<li><a href="#trunktestsphpunittestsmediaphp">trunk/tests/phpunit/tests/media.php</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 2015-10-30 22:05:22 UTC (rev 35463)
+++ trunk/src/wp-includes/media.php 2015-10-30 23:26:44 UTC (rev 35464)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -817,11 +817,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $image_meta ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $size_array = array( absint( $width ), absint( $height ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sources = wp_calculate_image_srcset( $src, $size_array, $image_meta, $attachment_id );
- $sizes = wp_get_attachment_image_sizes( $size_array, $image_meta, $attachment_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $srcset = wp_calculate_image_srcset( $src, $size_array, $image_meta, $attachment_id );
+ $sizes = wp_get_attachment_image_sizes( $size_array, $image_meta, $attachment_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( count( $sources ) > 1 && ( $sizes || ! empty( $attr['sizes'] ) ) ) {
- $attr['srcset'] = wp_image_srcset_attr( $sources, $size_array, $image_meta, $attachment_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $srcset && ( $sizes || ! empty( $attr['sizes'] ) ) ) {
+ $attr['srcset'] = $srcset;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $attr['sizes'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $attr['sizes'] = $sizes;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -943,51 +943,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> absint( $image[2] )
</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">- // Calculate the sources for the 'srcset'.
- $sources = wp_calculate_image_srcset( $image_url, $size_array, $image_meta, $attachment_id );
-
- // Only return a 'srcset' value if there is more than one source.
- if ( count( $sources ) < 2 ) {
- return false;
- }
-
- return wp_image_srcset_attr( $sources, $size_array, $image_meta, $attachment_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return wp_calculate_image_srcset( $image_url, $size_array, $image_meta, $attachment_id );
</ins><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">-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * A helper function to concatenate and filter the 'srcset' attribute value.
- *
- * @since 4.4.0
- *
- * @param array $sources The array containing image sizes data as returned by 'wp_calculate_image_srcset()'.
- * @param array $size_array Array of width and height values in pixels (in that order).
- * @param array $image_meta The image meta data as returned by 'wp_get_attachment_metadata()'.
- * @param int $attachment_id The image attachment ID to pass to the filter.
- * @return string The 'srcset' attribute value.
- */
-function wp_image_srcset_attr( $sources, $size_array, $image_meta, $attachment_id ) {
- $srcset = '';
-
- foreach ( $sources as $source ) {
- $srcset .= $source['url'] . ' ' . $source['value'] . $source['descriptor'] . ', ';
- }
-
- /**
- * Filter the output of 'wp_image_srcset_attr()'.
- *
- * @since 4.4.0
- *
- * @param string $srcset A source set formatted for a 'srcset' attribute.
- * @param int $attachment_id Image attachment ID.
- * @param array|string $size Image size. Image size name, or an array of width and height
- * values in pixels (in that order).
- * @param array $image_meta The image meta data as returned by 'wp_get_attachment_metadata()'.
- */
- return apply_filters( 'wp_image_srcset', rtrim( $srcset, ', ' ), $attachment_id, $size_array, $image_meta );
-}
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * A helper function to calculate the image sources to include in a 'srcset' attribute.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -996,17 +955,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $size_array Array of width and height values in pixels (in that order).
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $image_meta The image meta data as returned by 'wp_get_attachment_metadata()'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $attachment_id Optional. The image attachment ID to pass to the filter.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return array|bool $sources {
- * Array image candidate values containing a URL, descriptor type, and
- * descriptor value. False if none exist.
- *
- * @type array $values {
- * @type string $url An image URL.
- * @type string $descriptor A width or density descriptor used in a 'srcset'.
- * @type int $value The descriptor value representing a width or
- * or pixel density.
- * }
- * }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string|bool The 'srcset' attribute value. False on error or when only one source exists.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_calculate_image_srcset( $image_name, $size_array, $image_meta, $attachment_id = 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $image_meta['sizes'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1102,14 +1051,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $sources An array of image URLs and widths.
- * @param int $attachment_id Image attachment ID.
- * @param array|string $size Image size. Image size name, or an array of width and height
- * values in pixels (in that order).
- * @param array $image_meta The image meta data as returned by 'wp_get_attachment_metadata()'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $sources An array of image URLs and widths.
+ * @param int $attachment_id Image attachment ID.
+ * @param array $size_array Array of width and height values in pixels (in that order).
+ * @param array $image_meta The image meta data as returned by 'wp_get_attachment_metadata()'.
</ins><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">- return apply_filters( 'wp_calculate_image_srcset', array_values( $sources ), $attachment_id, $size_array, $image_meta );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sources = apply_filters( 'wp_calculate_image_srcset', $sources, $attachment_id, $size_array, $image_meta );
+
+ // Only return a 'srcset' value if there is more than one source.
+ if ( count( $sources ) < 2 ) {
+ return false;
+ }
+
+ $srcset = '';
+
+ foreach ( $sources as $source ) {
+ $srcset .= $source['url'] . ' ' . $source['value'] . $source['descriptor'] . ', ';
+ }
+
+ return rtrim( $srcset, ', ' );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1276,12 +1237,9 @@
</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"> $size_array = array( $width, $height );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sources = wp_calculate_image_srcset( $src, $size_array, $image_meta, $attachment_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $srcset = wp_calculate_image_srcset( $src, $size_array, $image_meta, $attachment_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $srcset = $sizes = '';
- // Only calculate 'srcset' and 'sizes' values if there is more than one source.
- if ( count( $sources ) > 1 ) {
- $srcset = wp_image_srcset_attr( $sources, $size_array, $image_meta, $attachment_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $srcset ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $sizes = wp_get_attachment_image_sizes( $size_array, $image_meta, $attachment_id );
</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="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 2015-10-30 22:05:22 UTC (rev 35463)
+++ trunk/tests/phpunit/tests/media.php 2015-10-30 23:26:44 UTC (rev 35464)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -739,24 +739,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_calculate_image_srcset() {
</span><span class="cx" style="display: block; padding: 0 10px"> $year_month = date('Y/m');
</span><span class="cx" style="display: block; padding: 0 10px"> $image_meta = wp_get_attachment_metadata( self::$large_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $uploads_dir_url = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = array(
- array(
- 'url' => 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . $year_month . '/' . $image_meta['sizes']['medium']['file'],
- 'descriptor' => 'w',
- 'value' => $image_meta['sizes']['medium']['width'],
- ),
- array(
- 'url' => 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . $year_month . '/' . $image_meta['sizes']['large']['file'],
- 'descriptor' => 'w',
- 'value' => $image_meta['sizes']['large']['width'],
- ),
- array(
- 'url' => 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . $image_meta['file'],
- 'descriptor' => 'w',
- 'value' => $image_meta['width'],
- ),
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = $uploads_dir_url . $year_month . '/' . $image_meta['sizes']['medium']['file'] . ' ' . $image_meta['sizes']['medium']['width'] . 'w, ' .
+ $uploads_dir_url . $year_month . '/' . $image_meta['sizes']['large']['file'] . ' ' . $image_meta['sizes']['large']['width'] . 'w, ' .
+ $uploads_dir_url . $image_meta['file'] . ' ' . $image_meta['width'] . 'w';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set up test cases for all expected size names and a random one.
</span><span class="cx" style="display: block; padding: 0 10px"> $sizes = array( 'medium', 'large', 'full', 'yoav' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -783,24 +770,11 @@
</span><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $uploads_dir_url = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = array(
- array(
- 'url' => 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . $image_meta['sizes']['medium']['file'],
- 'descriptor' => 'w',
- 'value' => $image_meta['sizes']['medium']['width'],
- ),
- array(
- 'url' => 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . $image_meta['sizes']['large']['file'],
- 'descriptor' => 'w',
- 'value' => $image_meta['sizes']['large']['width'],
- ),
- array(
- 'url' => 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . $image_meta['file'],
- 'descriptor' => 'w',
- 'value' => $image_meta['width'],
- ),
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = $uploads_dir_url . $image_meta['sizes']['medium']['file'] . ' ' . $image_meta['sizes']['medium']['width'] . 'w, ' .
+ $uploads_dir_url . $image_meta['sizes']['large']['file'] . ' ' . $image_meta['sizes']['large']['width'] . 'w, ' .
+ $uploads_dir_url . $image_meta['file'] . ' ' . $image_meta['width'] . 'w';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set up test cases for all expected size names and a random one.
</span><span class="cx" style="display: block; padding: 0 10px"> $sizes = array( 'medium', 'large', 'full', 'yoav' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -835,11 +809,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $image_meta['sizes']['large']['file'] = str_replace( $filename_base, $filename_base . '-' . $hash, $image_meta['sizes']['large']['file'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Calculate a srcset array.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sizes = wp_calculate_image_srcset( $image_url, $size_array, $image_meta );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sizes = explode( ', ', wp_calculate_image_srcset( $image_url, $size_array, $image_meta ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Test to confirm all sources in the array include the same edit hash.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $sizes as $size ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( false !== strpos( $size['url'], $hash ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( false !== strpos( $size, $hash ) );
</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>