<!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>[35148] trunk/tests/phpunit/tests/pluggable.php: Improve [35146] to only skip pluggable function signature tests for `wp-includes/cache.php` when an external object cache is in use.</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/35148">35148</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/35148","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-10-13 20:44:16 +0000 (Tue, 13 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'>Improve <a href="https://core.trac.wordpress.org/changeset/35146">[35146]</a> to only skip pluggable function signature tests for `wp-includes/cache.php` when an external object cache is in use.

See <a href="https://core.trac.wordpress.org/ticket/31491">#31491</a>, <a href="https://core.trac.wordpress.org/ticket/33867">#33867</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestspluggablephp">trunk/tests/phpunit/tests/pluggable.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestspluggablephp"></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/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/pluggable.php   2015-10-13 19:32:27 UTC (rev 35147)
+++ trunk/tests/phpunit/tests/pluggable.php     2015-10-13 20:44:16 UTC (rev 35148)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,11 +15,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function testPluggableFunctionSignaturesMatch( $function ) {
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( wp_using_ext_object_cache() ) {
-                       // #31491
-                       $this->markTestSkipped( 'Pluggable function signatures are not tested when an external object cache is in use.' );
-               }
-
</del><span class="cx" style="display: block; padding: 0 10px">                 $signatures = $this->getPluggableFunctionSignatures();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $this->assertTrue( function_exists( $function ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,8 +86,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span><span class="cx" style="display: block; padding: 0 10px">                $test_files = array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'wp-includes/pluggable.php',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'wp-includes/cache.php',
</del><span class="cx" style="display: block; padding: 0 10px">                 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+               // Pluggable function signatures are not tested when an external object cache is in use. #31491
+               if ( ! wp_using_ext_object_cache() ) {
+                       $test_files[] = 'wp-includes/cache.php';
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 $data = array();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $test_functions as $function ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,7 +122,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function getPluggableFunctionSignatures() {
</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 array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $signatures = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        // wp-includes/pluggable.php:
</span><span class="cx" style="display: block; padding: 0 10px">                        'wp_set_current_user'             => array( 'id', 'name' => '' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,22 +165,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        'get_avatar'                      => array( 'id_or_email', 'size' => 96, 'default' => '', 'alt' => '', 'args' => null ),
</span><span class="cx" style="display: block; padding: 0 10px">                        'wp_text_diff'                    => array( 'left_string', 'right_string', 'args' => null ),
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        // wp-includes/cache.php:
-                       'wp_cache_add'                       => array( 'key', 'data', 'group' => '', 'expire' => 0 ),
-                       'wp_cache_close'                     => array(),
-                       'wp_cache_decr'                      => array( 'key', 'offset' => 1, 'group' => '' ),
-                       'wp_cache_delete'                    => array( 'key', 'group' => '' ),
-                       'wp_cache_flush'                     => array(),
-                       'wp_cache_get'                       => array( 'key', 'group' => '', 'force' => false, 'found' => null ),
-                       'wp_cache_incr'                      => array( 'key', 'offset' => 1, 'group' => '' ),
-                       'wp_cache_init'                      => array(),
-                       'wp_cache_replace'                   => array( 'key', 'data', 'group' => '', 'expire' => 0 ),
-                       'wp_cache_set'                       => array( 'key', 'data', 'group' => '', 'expire' => 0 ),
-                       'wp_cache_switch_to_blog'            => array( 'blog_id' ),
-                       'wp_cache_add_global_groups'         => array( 'groups' ),
-                       'wp_cache_add_non_persistent_groups' => array( 'groups' ),
-                       'wp_cache_reset'                     => array(),
-
</del><span class="cx" style="display: block; padding: 0 10px">                         // wp-admin/includes/schema.php:
</span><span class="cx" style="display: block; padding: 0 10px">                        'install_network'                    => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,9 +174,31 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        'wp_new_blog_notification'           => array( 'blog_title', 'blog_url', 'user_id', 'password' ),
</span><span class="cx" style="display: block; padding: 0 10px">                        'wp_upgrade'                         => array(),
</span><span class="cx" style="display: block; padding: 0 10px">                        'install_global_terms'               => array(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">                 );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                // Pluggable function signatures are not tested when an external object cache is in use. #31491
+               if ( ! wp_using_ext_object_cache() ) {
+                       $signatures = array_merge( $signatures, array(
+
+                               // wp-includes/cache.php:
+                               'wp_cache_add'                       => array( 'key', 'data', 'group' => '', 'expire' => 0 ),
+                               'wp_cache_close'                     => array(),
+                               'wp_cache_decr'                      => array( 'key', 'offset' => 1, 'group' => '' ),
+                               'wp_cache_delete'                    => array( 'key', 'group' => '' ),
+                               'wp_cache_flush'                     => array(),
+                               'wp_cache_get'                       => array( 'key', 'group' => '', 'force' => false, 'found' => null ),
+                               'wp_cache_incr'                      => array( 'key', 'offset' => 1, 'group' => '' ),
+                               'wp_cache_init'                      => array(),
+                               'wp_cache_replace'                   => array( 'key', 'data', 'group' => '', 'expire' => 0 ),
+                               'wp_cache_set'                       => array( 'key', 'data', 'group' => '', 'expire' => 0 ),
+                               'wp_cache_switch_to_blog'            => array( 'blog_id' ),
+                               'wp_cache_add_global_groups'         => array( 'groups' ),
+                               'wp_cache_add_non_persistent_groups' => array( 'groups' ),
+                               'wp_cache_reset'                     => array(),
+                       ) );
+               }
+
+               return $signatures;
</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>