<!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>[25380] trunk/tests/phpunit: * Avoid notice by making `WP_Image_Editor_Mock::test()` compatible with `WP_Image_Editor::test()`.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25380">25380</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2013-09-12 04:40:13 +0000 (Thu, 12 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>* Avoid notice by making `WP_Image_Editor_Mock::test()` compatible with `WP_Image_Editor::test()`.
* Suppress deprecated function notice for `wp_load_image()`.
* Add assertion for `wp_get_image_editor()`.
See <a href="http://core.trac.wordpress.org/ticket/25282">#25282</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitincludesmockimageeditorphp">trunk/tests/phpunit/includes/mock-image-editor.php</a></li>
<li><a href="#trunktestsphpunittestsimagefunctionsphp">trunk/tests/phpunit/tests/image/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitincludesmockimageeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/includes/mock-image-editor.php (25379 => 25380)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/includes/mock-image-editor.php 2013-09-12 04:28:34 UTC (rev 25379)
+++ trunk/tests/phpunit/includes/mock-image-editor.php 2013-09-12 04:40:13 UTC (rev 25380)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> public function load() {
</span><span class="cx"> return self::$load_return;
</span><span class="cx"> }
</span><del>- public static function test() {
</del><ins>+ public static function test( $args = array() ) {
</ins><span class="cx"> return self::$test_return;
</span><span class="cx"> }
</span><span class="cx"> public static function supports_mime_type( $mime_type ) {
</span></span></pre></div>
<a id="trunktestsphpunittestsimagefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/image/functions.php (25379 => 25380)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/image/functions.php 2013-09-12 04:28:34 UTC (rev 25379)
+++ trunk/tests/phpunit/tests/image/functions.php 2013-09-12 04:40:13 UTC (rev 25380)
</span><span class="lines">@@ -9,14 +9,32 @@
</span><span class="cx"> /**
</span><span class="cx"> * Setup test fixture
</span><span class="cx"> */
</span><del>- public function setup() {
</del><ins>+ public function setUp() {
+ parent::setUp();
+
</ins><span class="cx"> require_once( ABSPATH . WPINC . '/class-wp-image-editor.php' );
</span><span class="cx"> require_once( ABSPATH . WPINC . '/class-wp-image-editor-gd.php' );
</span><span class="cx"> require_once( ABSPATH . WPINC . '/class-wp-image-editor-imagick.php' );
</span><span class="cx">
</span><span class="cx"> include_once( DIR_TESTDATA . '/../includes/mock-image-editor.php' );
</span><ins>+ add_action( 'deprecated_function_run', array( $this, 'deprecated_function_run' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ function tearDown() {
+ parent::tearDown();
+ remove_action( 'deprecated_function_run', array( $this, 'deprecated_function_run' ) );
+ }
+
+ function deprecated_function_run( $function ) {
+ if ( in_array( $function, array( 'wp_load_image' ) ) )
+ add_filter( 'deprecated_function_trigger_error', array( $this, 'deprecated_function_trigger_error' ) );
+ }
+
+ function deprecated_function_trigger_error() {
+ remove_filter( 'deprecated_function_trigger_error', array( $this, 'deprecated_function_trigger_error' ) );
+ return false;
+ }
+
</ins><span class="cx"> /**
</span><span class="cx"> * Get the MIME type of a file
</span><span class="cx"> * @param string $filename
</span><span class="lines">@@ -236,9 +254,12 @@
</span><span class="cx"> public function test_load_directory() {
</span><span class="cx">
</span><span class="cx"> // First, test with deprecated wp_load_image function
</span><del>- $editor = wp_load_image( DIR_TESTDATA );
- $this->assertNotInternalType( 'resource', $editor );
</del><ins>+ $editor1 = wp_load_image( DIR_TESTDATA );
+ $this->assertNotInternalType( 'resource', $editor1 );
</ins><span class="cx">
</span><ins>+ $editor2 = wp_get_image_editor( DIR_TESTDATA );
+ $this->assertNotInternalType( 'resource', $editor2 );
+
</ins><span class="cx"> // Then, test with editors.
</span><span class="cx"> $classes = array('WP_Image_Editor_GD', 'WP_Image_Editor_Imagick');
</span><span class="cx"> foreach ( $classes as $class ) {
</span></span></pre>
</div>
</div>
</body>
</html>