<!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>[54401] trunk/tests/phpunit/tests/image: Tests: Bring some consistency to `WP_Image_Editor_GD` and `WP_Image_Editor_Imagick` tests.</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/54401">54401</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/54401","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-10-07 00:40:07 +0000 (Fri, 07 Oct 2022)</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'>Tests: Bring some consistency to `WP_Image_Editor_GD` and `WP_Image_Editor_Imagick` tests.
Includes:
* Adjusting test method descriptions and comments per the documentation standards.
* Creating image editor class instances directly, instead of calling `wp_get_image_editor()`.
* Cleaning up temporary files before performing assertions, where possible.
* Using more consistent variable names for image editor class instances.
* Reordering some test methods.
Follow-up to [1182/tests], [1188/tests], <a href="https://core.trac.wordpress.org/changeset/27794">[27794]</a>, <a href="https://core.trac.wordpress.org/changeset/30549">[30549]</a>, <a href="https://core.trac.wordpress.org/changeset/30990">[30990]</a>, <a href="https://core.trac.wordpress.org/changeset/31040">[31040]</a>, <a href="https://core.trac.wordpress.org/changeset/39580">[39580]</a>, <a href="https://core.trac.wordpress.org/changeset/40123">[40123]</a>, <a href="https://core.trac.wordpress.org/changeset/49230">[49230]</a>, <a href="https://core.trac.wordpress.org/changeset/49488">[49488]</a>, <a href="https://core.trac.wordpress.org/changeset/49542">[49542]</a>, <a href="https://core.trac.wordpress.org/changeset/49751">[49751]</a>.
See <a href="https://core.trac.wordpress.org/ticket/55652">#55652</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsimageeditorGdphp">trunk/tests/phpunit/tests/image/editorGd.php</a></li>
<li><a href="#trunktestsphpunittestsimageeditorImagickphp">trunk/tests/phpunit/tests/image/editorImagick.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsimageeditorGdphp"></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/editorGd.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/editorGd.php 2022-10-06 18:55:05 UTC (rev 54400)
+++ trunk/tests/phpunit/tests/image/editorGd.php 2022-10-07 00:40:07 UTC (rev 54401)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +52,7 @@
</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">- * Test resizing an image, not using crop
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests resizing an image, not using crop.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,7 +74,7 @@
</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">- * Test multi_resize with single image resize and no crop
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests multi_resize() with single image resize and no crop.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,7 +116,7 @@
</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">- * Ensure multi_resize doesn't create an image when
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests that multi_resize() does not create an image when
</ins><span class="cx" style="display: block; padding: 0 10px"> * both height and weight are missing, null, or 0.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26823
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,7 +185,7 @@
</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">- * Test multi_resize with multiple sizes
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests multi_resize() with multiple sizes.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26823
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function imagejpeg
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -198,7 +198,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sizes_array = 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">- /**
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
</ins><span class="cx" style="display: block; padding: 0 10px"> * #0 - 10x10 resize, no cropping.
</span><span class="cx" style="display: block; padding: 0 10px"> * By aspect, should be 10x6 output.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -208,7 +208,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'crop' => false,
</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">- /**
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
</ins><span class="cx" style="display: block; padding: 0 10px"> * #1 - 75x50 resize, with cropping.
</span><span class="cx" style="display: block; padding: 0 10px"> * Output dimensions should be 75x50
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -218,7 +218,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'crop' => true,
</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">- /**
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
</ins><span class="cx" style="display: block; padding: 0 10px"> * #2 - 20 pixel max height, no cropping.
</span><span class="cx" style="display: block; padding: 0 10px"> * By aspect, should be 30x20 output.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,7 +228,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'crop' => false,
</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">- /**
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
</ins><span class="cx" style="display: block; padding: 0 10px"> * #3 - 45 pixel max height, with cropping.
</span><span class="cx" style="display: block; padding: 0 10px"> * By aspect, should be 45x400 output.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -238,7 +238,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'crop' => true,
</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">- /**
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
</ins><span class="cx" style="display: block; padding: 0 10px"> * #4 - 50 pixel max width, no cropping.
</span><span class="cx" style="display: block; padding: 0 10px"> * By aspect, should be 50x33 output.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -246,7 +246,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => 50,
</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">- /**
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
</ins><span class="cx" style="display: block; padding: 0 10px"> * #5 - 55 pixel max width, no cropping, null height
</span><span class="cx" style="display: block; padding: 0 10px"> * By aspect, should be 55x36 output.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,7 +255,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'height' => null,
</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">- /**
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
</ins><span class="cx" style="display: block; padding: 0 10px"> * #6 - 55 pixel max height, no cropping, no width specified.
</span><span class="cx" style="display: block; padding: 0 10px"> * By aspect, should be 82x55 output.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,7 +263,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'height' => 55,
</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">- /**
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
</ins><span class="cx" style="display: block; padding: 0 10px"> * #7 - 60 pixel max height, no cropping, null width.
</span><span class="cx" style="display: block; padding: 0 10px"> * By aspect, should be 90x60 output.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,7 +272,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'height' => 60,
</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">- /**
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
</ins><span class="cx" style="display: block; padding: 0 10px"> * #8 - 70 pixel max height, no cropping, negative width.
</span><span class="cx" style="display: block; padding: 0 10px"> * By aspect, should be 105x70 output.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -281,7 +281,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'height' => 70,
</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">- /**
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
</ins><span class="cx" style="display: block; padding: 0 10px"> * #9 - 200 pixel max width, no cropping, negative height.
</span><span class="cx" style="display: block; padding: 0 10px"> * By aspect, should be 200x133 output.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -402,7 +402,7 @@
</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">- * Test resizing an image with cropping
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests resizing an image with cropping.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_resize_and_crop() {
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/waffles.jpg';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -422,7 +422,7 @@
</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">- * Test cropping an image.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests cropping an image.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 51937
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -479,7 +479,7 @@
</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">- * Test should return WP_Error when dimensions are not integer or are <= 0.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests that crop() returns WP_Error when dimensions are not integer or are <= 0.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 51937
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -545,7 +545,7 @@
</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">- * Test rotating an image 180 deg
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests rotating an image 180 deg.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_rotate() {
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/gradient-square.jpg';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -564,7 +564,7 @@
</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">- * Test flipping an image
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests flipping an image.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_flip() {
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/gradient-square.jpg';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -583,11 +583,11 @@
</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">- * Test the image created with WP_Image_Editor_GD preserves alpha when resizing
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests that an image created with WP_Image_Editor_GD preserves alpha with no resizing.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23039
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_image_preserves_alpha_on_resize() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_image_preserves_alpha() {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! ( imagetypes() & IMG_PNG ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->fail( 'This test requires PHP to be compiled with PNG support.' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -594,15 +594,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/transparent.png';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $editor = wp_get_image_editor( $file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $gd_image_editor = new WP_Image_Editor_GD( $file );
+ $gd_image_editor->load();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotWPError( $editor );
-
- $editor->load();
- $editor->resize( 5, 5 );
</del><span class="cx" style="display: block; padding: 0 10px"> $save_to_file = tempnam( get_temp_dir(), '' ) . '.png';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $editor->save( $save_to_file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $gd_image_editor->save( $save_to_file );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertImageAlphaAtPointGD( $save_to_file, array( 0, 0 ), 127 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -610,11 +607,11 @@
</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">- * Test the image created with WP_Image_Editor_GD preserves alpha with no resizing etc
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests that an image created with WP_Image_Editor_GD preserves alpha when resizing.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 23039
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_image_preserves_alpha() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_image_preserves_alpha_on_resize() {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! ( imagetypes() & IMG_PNG ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->fail( 'This test requires PHP to be compiled with PNG support.' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -621,15 +618,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/transparent.png';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $editor = wp_get_image_editor( $file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $gd_image_editor = new WP_Image_Editor_GD( $file );
+ $gd_image_editor->load();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertNotWPError( $editor );
-
- $editor->load();
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $gd_image_editor->resize( 5, 5 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $save_to_file = tempnam( get_temp_dir(), '' ) . '.png';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $editor->save( $save_to_file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $gd_image_editor->save( $save_to_file );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertImageAlphaAtPointGD( $save_to_file, array( 0, 0 ), 127 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -650,27 +645,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $rgb = imagecolorat( $image, 0, 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> $expected = imagecolorsforindex( $image, $rgb );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $editor = new WP_Image_Editor_GD( $file );
- $editor->load();
- $editor->rotate( 180 );
- $save_to_file = tempnam( get_temp_dir(), '' ) . '.png';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $gd_image_editor = new WP_Image_Editor_GD( $file );
+ $gd_image_editor->load();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $editor->save( $save_to_file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $gd_image_editor->rotate( 180 );
+ $save_to_file = tempnam( get_temp_dir(), '' ) . '.png';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertImageAlphaAtPointGD( $save_to_file, array( 0, 0 ), $expected['alpha'] );
- unlink( $save_to_file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $gd_image_editor->save( $save_to_file );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertImageAlphaAtPointGD( $save_to_file, array( 0, 0 ), $expected['alpha'] );
+
+ unlink( $save_to_file );
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Test WP_Image_Editor_GD handles extension-less images
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests that WP_Image_Editor_GD handles extensionless images.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 39195
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_image_non_existent_extension() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $image_editor = new WP_Image_Editor_GD( DIR_TESTDATA . '/images/test-image-no-extension' );
- $result = $image_editor->load();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $gd_image_editor = new WP_Image_Editor_GD( DIR_TESTDATA . '/images/test-image-no-extension' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $loaded = $gd_image_editor->load();
+
+ $this->assertTrue( $loaded );
</ins><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="trunktestsphpunittestsimageeditorImagickphp"></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/editorImagick.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/editorImagick.php 2022-10-06 18:55:05 UTC (rev 54400)
+++ trunk/tests/phpunit/tests/image/editorImagick.php 2022-10-07 00:40:07 UTC (rev 54401)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,7 +35,7 @@
</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">- * Check support for ImageMagick compatible mime types.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests support for ImageMagick compatible mime types.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_supports_mime_type() {
</span><span class="cx" style="display: block; padding: 0 10px"> $imagick_image_editor = new WP_Image_Editor_Imagick( null );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,7 +46,7 @@
</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">- * Test resizing an image, not using crop
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests resizing an image, not using crop.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_resize() {
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/waffles.jpg';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,7 +66,7 @@
</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">- * Test multi_resize with single image resize and no crop
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests multi_resize() with single image resize and no crop.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_single_multi_resize() {
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/waffles.jpg';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,7 +106,7 @@
</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">- * Ensure multi_resize doesn't create an image when
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests that multi_resize() does not create an image when
</ins><span class="cx" style="display: block; padding: 0 10px"> * both height and weight are missing, null, or 0.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26823
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,7 +175,7 @@
</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">- * Test multi_resize with multiple sizes
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests multi_resize() with multiple sizes.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 26823
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,7 +187,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sizes_array = 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">- /**
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
</ins><span class="cx" style="display: block; padding: 0 10px"> * #0 - 10x10 resize, no cropping.
</span><span class="cx" style="display: block; padding: 0 10px"> * By aspect, should be 10x6 output.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,7 +197,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'crop' => false,
</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">- /**
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
</ins><span class="cx" style="display: block; padding: 0 10px"> * #1 - 75x50 resize, with cropping.
</span><span class="cx" style="display: block; padding: 0 10px"> * Output dimensions should be 75x50
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,7 +207,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'crop' => true,
</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">- /**
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
</ins><span class="cx" style="display: block; padding: 0 10px"> * #2 - 20 pixel max height, no cropping.
</span><span class="cx" style="display: block; padding: 0 10px"> * By aspect, should be 30x20 output.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,7 +217,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'crop' => false,
</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">- /**
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
</ins><span class="cx" style="display: block; padding: 0 10px"> * #3 - 45 pixel max height, with cropping.
</span><span class="cx" style="display: block; padding: 0 10px"> * By aspect, should be 45x400 output.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -227,7 +227,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'crop' => true,
</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">- /**
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
</ins><span class="cx" style="display: block; padding: 0 10px"> * #4 - 50 pixel max width, no cropping.
</span><span class="cx" style="display: block; padding: 0 10px"> * By aspect, should be 50x33 output.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -235,7 +235,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => 50,
</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">- /**
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
</ins><span class="cx" style="display: block; padding: 0 10px"> * #5 - 55 pixel max width, no cropping, null height
</span><span class="cx" style="display: block; padding: 0 10px"> * By aspect, should be 55x36 output.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,7 +244,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'height' => null,
</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">- /**
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
</ins><span class="cx" style="display: block; padding: 0 10px"> * #6 - 55 pixel max height, no cropping, no width specified.
</span><span class="cx" style="display: block; padding: 0 10px"> * By aspect, should be 82x55 output.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -252,7 +252,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'height' => 55,
</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">- /**
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
</ins><span class="cx" style="display: block; padding: 0 10px"> * #7 - 60 pixel max height, no cropping, null width.
</span><span class="cx" style="display: block; padding: 0 10px"> * By aspect, should be 90x60 output.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -261,7 +261,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'height' => 60,
</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">- /**
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
</ins><span class="cx" style="display: block; padding: 0 10px"> * #8 - 70 pixel max height, no cropping, negative width.
</span><span class="cx" style="display: block; padding: 0 10px"> * By aspect, should be 105x70 output.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -270,7 +270,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'height' => 70,
</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">- /**
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
</ins><span class="cx" style="display: block; padding: 0 10px"> * #9 - 200 pixel max width, no cropping, negative height.
</span><span class="cx" style="display: block; padding: 0 10px"> * By aspect, should be 200x133 output.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -391,7 +391,7 @@
</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">- * Test resizing an image with cropping
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests resizing an image with cropping.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_resize_and_crop() {
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/waffles.jpg';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -411,7 +411,7 @@
</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">- * Test cropping an image
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests cropping an image.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_crop() {
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/gradient-square.jpg';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -431,7 +431,7 @@
</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">- * Test rotating an image 180 deg
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests rotating an image 180 deg.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_rotate() {
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/one-blue-pixel-100x100.png';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -450,7 +450,7 @@
</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">- * Test flipping an image
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests flipping an image.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_flip() {
</span><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/one-blue-pixel-100x100.png';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -469,19 +469,19 @@
</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">- * Test the image created with WP_Image_Editor_Imagick preserves alpha when resizing
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests that an image created with WP_Image_Editor_Imagick preserves alpha with no resizing.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24871
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_image_preserves_alpha_on_resize() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_image_preserves_alpha() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/transparent.png';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $editor = new WP_Image_Editor_Imagick( $file );
- $editor->load();
- $editor->resize( 5, 5 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $imagick_image_editor = new WP_Image_Editor_Imagick( $file );
+ $imagick_image_editor->load();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $save_to_file = tempnam( get_temp_dir(), '' ) . '.png';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $editor->save( $save_to_file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $imagick_image_editor->save( $save_to_file );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $im = new Imagick( $save_to_file );
</span><span class="cx" style="display: block; padding: 0 10px"> $pixel = $im->getImagePixelColor( 0, 0 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -493,19 +493,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">- * Test the image created with WP_Image_Editor_Imagick preserves alpha with no resizing etc
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests that an image created with WP_Image_Editor_Imagick preserves alpha when resizing.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 24871
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_image_preserves_alpha() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_image_preserves_alpha_on_resize() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $file = DIR_TESTDATA . '/images/transparent.png';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $editor = new WP_Image_Editor_Imagick( $file );
- $editor->load();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $imagick_image_editor = new WP_Image_Editor_Imagick( $file );
+ $imagick_image_editor->load();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $imagick_image_editor->resize( 5, 5 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $save_to_file = tempnam( get_temp_dir(), '' ) . '.png';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $editor->save( $save_to_file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $imagick_image_editor->save( $save_to_file );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $im = new Imagick( $save_to_file );
</span><span class="cx" style="display: block; padding: 0 10px"> $pixel = $im->getImagePixelColor( 0, 0 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -525,33 +526,37 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $pre_rotate_editor = new Imagick( $file );
</span><span class="cx" style="display: block; padding: 0 10px"> $pre_rotate_pixel = $pre_rotate_editor->getImagePixelColor( 0, 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> $pre_rotate_alpha = $pre_rotate_pixel->getColorValue( imagick::COLOR_ALPHA );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $save_to_file = tempnam( get_temp_dir(), '' ) . '.png';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $save_to_file = tempnam( get_temp_dir(), '' ) . '.png';
</ins><span class="cx" style="display: block; padding: 0 10px"> $pre_rotate_editor->writeImage( $save_to_file );
</span><span class="cx" style="display: block; padding: 0 10px"> $pre_rotate_editor->destroy();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $image_editor = new WP_Image_Editor_Imagick( $save_to_file );
- $image_editor->load();
- $image_editor->rotate( 180 );
- $image_editor->save( $save_to_file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $imagick_image_editor = new WP_Image_Editor_Imagick( $save_to_file );
+ $imagick_image_editor->load();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $imagick_image_editor->rotate( 180 );
+ $imagick_image_editor->save( $save_to_file );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertImageAlphaAtPointImagick( $save_to_file, array( 0, 0 ), $pre_rotate_alpha );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> unlink( $save_to_file );
</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">- * Test WP_Image_Editor_Imagick handles extension-less images
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests that WP_Image_Editor_Imagick handles extensionless images.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 39195
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_image_non_existent_extension() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $image_editor = new WP_Image_Editor_Imagick( DIR_TESTDATA . '/images/test-image-no-extension' );
- $result = $image_editor->load();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $imagick_image_editor = new WP_Image_Editor_Imagick( DIR_TESTDATA . '/images/test-image-no-extension' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( $result );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $loaded = $imagick_image_editor->load();
+
+ $this->assertTrue( $loaded );
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Test resetting Exif orientation data on rotate
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests resetting Exif orientation data on rotate.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37140
</span><span class="cx" style="display: block; padding: 0 10px"> * @requires function exif_read_data
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -564,24 +569,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 3, (int) $data['orientation'], 'Orientation value read from does not match image file Exif data: ' . $file );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $temp_file = wp_tempnam( $file );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $image = wp_get_image_editor( $file );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $imagick_image_editor = new WP_Image_Editor_Imagick( $file );
+ $imagick_image_editor->load();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Test a value that would not lead back to 1, as WP is resetting the value to 1 manually.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $image->rotate( 90 );
- $ret = $image->save( $temp_file, 'image/jpeg' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $imagick_image_editor->rotate( 90 );
+ $saved = $imagick_image_editor->save( $temp_file, 'image/jpeg' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data = wp_read_image_metadata( $ret['path'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data = wp_read_image_metadata( $saved['path'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove both the generated file ending in .tmp and tmp.jpg due to wp_tempnam().
+ unlink( $temp_file );
+ unlink( $saved['path'] );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Make sure the image is no longer in The Upside Down Exif orientation.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, (int) $data['orientation'], 'Orientation Exif data was not updated after rotating image: ' . $file );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- // Remove both the generated file ending in .tmp and tmp.jpg due to wp_tempnam().
- unlink( $temp_file );
- unlink( $ret['path'] );
</del><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">- * Test that images can be loaded and written over streams
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tests that images can be loaded and written over streams.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_streams() {
</span><span class="cx" style="display: block; padding: 0 10px"> stream_wrapper_register( 'wptest', 'WP_Test_Stream' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -594,20 +601,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $file = 'wptest://Tests_Image_Editor_Imagick/read.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> $imagick_image_editor = new WP_Image_Editor_Imagick( $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">- $ret = $imagick_image_editor->load();
- $this->assertNotWPError( $ret );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $loaded = $imagick_image_editor->load();
+ $this->assertNotWPError( $loaded );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $temp_file = 'wptest://Tests_Image_Editor_Imagick/write.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">- $ret = $imagick_image_editor->save( $temp_file );
- $this->assertNotWPError( $ret );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $saved = $imagick_image_editor->save( $temp_file );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $temp_file, $ret['path'] );
-
- if ( $temp_file !== $ret['path'] ) {
- unlink( $ret['path'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $temp_file !== $saved['path'] ) {
+ unlink( $saved['path'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( $temp_file );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $this->assertNotWPError( $saved );
+ $this->assertSame( $temp_file, $saved['path'] );
</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">@@ -616,20 +623,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_directory_creation() {
</span><span class="cx" style="display: block; padding: 0 10px"> $file = realpath( DIR_TESTDATA ) . '/images/a2-small.jpg';
</span><span class="cx" style="display: block; padding: 0 10px"> $directory = realpath( DIR_TESTDATA ) . '/images/nonexistent-directory';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $editor = new WP_Image_Editor_Imagick( $file );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $imagick_image_editor = new WP_Image_Editor_Imagick( $file );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertFileDoesNotExist( $directory );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $loaded = $editor->load();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $loaded = $imagick_image_editor->load();
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotWPError( $loaded );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $resized = $editor->resize( 100, 100, true );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $resized = $imagick_image_editor->resize( 100, 100, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotWPError( $resized );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $saved = $editor->save( $directory . '/a2-small-cropped.jpg' );
- $this->assertNotWPError( $saved );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $saved = $imagick_image_editor->save( $directory . '/a2-small-cropped.jpg' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( $directory . '/a2-small-cropped.jpg' );
</span><span class="cx" style="display: block; padding: 0 10px"> rmdir( $directory );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $this->assertNotWPError( $saved );
</ins><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>