<!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>[44903] trunk/tests/phpunit/includes/factory: Build/Test Tools: Add missing access modifiers to factory classes in `phpunit/includes/factory`.</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/44903">44903</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/44903","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>2019-03-15 12:15:08 +0000 (Fri, 15 Mar 2019)</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'>Build/Test Tools: Add missing access modifiers to factory classes in `phpunit/includes/factory`.
Props andizer.
Fixes <a href="https://core.trac.wordpress.org/ticket/46504">#46504</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitincludesfactoryclasswpunittestfactorycallbackaftercreatephp">trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-callback-after-create.php</a></li>
<li><a href="#trunktestsphpunitincludesfactoryclasswpunittestfactoryforattachmentphp">trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-attachment.php</a></li>
<li><a href="#trunktestsphpunitincludesfactoryclasswpunittestfactoryforblogphp">trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-blog.php</a></li>
<li><a href="#trunktestsphpunitincludesfactoryclasswpunittestfactoryforcommentphp">trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-comment.php</a></li>
<li><a href="#trunktestsphpunitincludesfactoryclasswpunittestfactoryfornetworkphp">trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-network.php</a></li>
<li><a href="#trunktestsphpunitincludesfactoryclasswpunittestfactoryforpostphp">trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-post.php</a></li>
<li><a href="#trunktestsphpunitincludesfactoryclasswpunittestfactoryfortermphp">trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-term.php</a></li>
<li><a href="#trunktestsphpunitincludesfactoryclasswpunittestfactoryforthingphp">trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-thing.php</a></li>
<li><a href="#trunktestsphpunitincludesfactoryclasswpunittestfactoryforuserphp">trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-user.php</a></li>
<li><a href="#trunktestsphpunitincludesfactoryclasswpunittestfactoryphp">trunk/tests/phpunit/includes/factory/class-wp-unittest-factory.php</a></li>
<li><a href="#trunktestsphpunitincludesfactoryclasswpunittestgeneratorsequencephp">trunk/tests/phpunit/includes/factory/class-wp-unittest-generator-sequence.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitincludesfactoryclasswpunittestfactorycallbackaftercreatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-callback-after-create.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-callback-after-create.php 2019-03-15 12:01:15 UTC (rev 44902)
+++ trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-callback-after-create.php 2019-03-15 12:15:08 UTC (rev 44903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +5,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @var callable
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var $callback;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public $callback;
</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"> * WP_UnitTest_Factory_Callback_After_Create constructor.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param callable $callback A callback 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">- function __construct( $callback ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function __construct( $callback ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->callback = $callback;
</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">@@ -23,7 +23,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed The possibly altered object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function call( $object ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function call( $object ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return call_user_func( $this->callback, $object );
</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="trunktestsphpunitincludesfactoryclasswpunittestfactoryforattachmentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-attachment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-attachment.php 2019-03-15 12:01:15 UTC (rev 44902)
+++ trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-attachment.php 2019-03-15 12:15:08 UTC (rev 44903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,7 +16,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int|WP_Error The attachment ID on success. The value 0 or WP_Error on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function create_object( $args, $legacy_parent = 0, $legacy_args = array() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function create_object( $args, $legacy_parent = 0, $legacy_args = array() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Backward compatibility for legacy argument format.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_string( $args ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $file = $args;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,7 +44,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int|WP_Error The attachment ID on success. The value 0 or WP_Error on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function create_upload_object( $file, $parent = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function create_upload_object( $file, $parent = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $contents = file_get_contents( $file );
</span><span class="cx" style="display: block; padding: 0 10px"> $upload = wp_upload_bits( wp_basename( $file ), null, $contents );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunitincludesfactoryclasswpunittestfactoryforblogphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-blog.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-blog.php 2019-03-15 12:01:15 UTC (rev 44902)
+++ trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-blog.php 2019-03-15 12:15:08 UTC (rev 44903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class WP_UnitTest_Factory_For_Blog extends WP_UnitTest_Factory_For_Thing {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function __construct( $factory = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function __construct( $factory = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $current_site, $base;
</span><span class="cx" style="display: block; padding: 0 10px"> parent::__construct( $factory );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->default_generation_definitions = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +30,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int|WP_Error Returns WP_Error object on failure, the site ID on success.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function create_object( $args ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function create_object( $args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $meta = isset( $args['meta'] ) ? $args['meta'] : array( 'public' => 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = isset( $args['user_id'] ) ? $args['user_id'] : get_current_user_id();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,7 +53,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return void
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function update_object( $blog_id, $fields ) {}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function update_object( $blog_id, $fields ) {}
</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"> * Retrieves a site by given blog id.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return null|WP_Site The site object or null if not found.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function get_object_by_id( $blog_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function get_object_by_id( $blog_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return get_site( $blog_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="trunktestsphpunitincludesfactoryclasswpunittestfactoryforcommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-comment.php 2019-03-15 12:01:15 UTC (rev 44902)
+++ trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-comment.php 2019-03-15 12:15:08 UTC (rev 44903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class WP_UnitTest_Factory_For_Comment extends WP_UnitTest_Factory_For_Thing {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function __construct( $factory = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function __construct( $factory = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::__construct( $factory );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->default_generation_definitions = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_author' => new WP_UnitTest_Generator_Sequence( 'Commenter %s' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +29,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return false|int The comment's ID on success, false on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function create_object( $args ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function create_object( $args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return wp_insert_comment( $this->addslashes_deep( $args ) );
</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">@@ -41,7 +41,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int When updated 1, not update 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">- function update_object( $comment_id, $fields ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function update_object( $comment_id, $fields ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $fields['comment_ID'] = $comment_id;
</span><span class="cx" style="display: block; padding: 0 10px"> return wp_update_comment( $this->addslashes_deep( $fields ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,7 +56,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int[] Array with the comment ids.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function create_post_comments( $post_id, $count = 1, $args = array(), $generation_definitions = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function create_post_comments( $post_id, $count = 1, $args = array(), $generation_definitions = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['comment_post_ID'] = $post_id;
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->create_many( $count, $args, $generation_definitions );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,7 +68,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return null|WP_Comment WP_Comment when found, null when not found.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function get_object_by_id( $comment_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function get_object_by_id( $comment_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return get_comment( $comment_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="trunktestsphpunitincludesfactoryclasswpunittestfactoryfornetworkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-network.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-network.php 2019-03-15 12:01:15 UTC (rev 44902)
+++ trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-network.php 2019-03-15 12:15:08 UTC (rev 44903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class WP_UnitTest_Factory_For_Network extends WP_UnitTest_Factory_For_Thing {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function __construct( $factory = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function __construct( $factory = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::__construct( $factory );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->default_generation_definitions = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'domain' => WP_TESTS_DOMAIN,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,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">- function create_object( $args ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function create_object( $args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . 'wp-admin/includes/upgrade.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $args['user'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,9 +36,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $args['network_id'];
</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">- function update_object( $network_id, $fields ) {}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function update_object( $network_id, $fields ) {}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function get_object_by_id( $network_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function get_object_by_id( $network_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return get_network( $network_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="trunktestsphpunitincludesfactoryclasswpunittestfactoryforpostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-post.php 2019-03-15 12:01:15 UTC (rev 44902)
+++ trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-post.php 2019-03-15 12:15:08 UTC (rev 44903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class WP_UnitTest_Factory_For_Post extends WP_UnitTest_Factory_For_Thing {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function __construct( $factory = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function __construct( $factory = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::__construct( $factory );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->default_generation_definitions = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +30,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int|WP_Error The post ID on success. The value 0 or WP_Error on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function create_object( $args ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function create_object( $args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return wp_insert_post( $args );
</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">@@ -42,7 +42,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int|WP_Error The value 0 or WP_Error on failure. The post ID on success.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function update_object( $post_id, $fields ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function update_object( $post_id, $fields ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $fields['ID'] = $post_id;
</span><span class="cx" style="display: block; padding: 0 10px"> return wp_update_post( $fields );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +54,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return null|WP_Post WP_Post on success or null on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function get_object_by_id( $post_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function get_object_by_id( $post_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return get_post( $post_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="trunktestsphpunitincludesfactoryclasswpunittestfactoryfortermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-term.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-term.php 2019-03-15 12:01:15 UTC (rev 44902)
+++ trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-term.php 2019-03-15 12:15:08 UTC (rev 44903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> private $taxonomy;
</span><span class="cx" style="display: block; padding: 0 10px"> const DEFAULT_TAXONOMY = 'post_tag';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function __construct( $factory = null, $taxonomy = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function __construct( $factory = null, $taxonomy = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::__construct( $factory );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->taxonomy = $taxonomy ? $taxonomy : self::DEFAULT_TAXONOMY;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->default_generation_definitions = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|WP_Error
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function create_object( $args ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function create_object( $args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array_merge( array( 'taxonomy' => $this->taxonomy ), $args );
</span><span class="cx" style="display: block; padding: 0 10px"> $term_id_pair = wp_insert_term( $args['name'], $args['taxonomy'], $args );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $term_id_pair ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +48,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int The term id.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function update_object( $term, $fields ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function update_object( $term, $fields ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $fields = array_merge( array( 'taxonomy' => $this->taxonomy ), $fields );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_object( $term ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = $term->taxonomy;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +71,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|false|WP_Error Array of term taxonomy IDs of affected terms. WP_Error or false on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function add_post_terms( $post_id, $terms, $taxonomy, $append = true ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function add_post_terms( $post_id, $terms, $taxonomy, $append = true ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return wp_set_post_terms( $post_id, $terms, $taxonomy, $append );
</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">@@ -83,7 +83,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return null|WP_Error|WP_Term WP_Term on success. WP_error if taxonomy does not exist. Null for miscellaneous failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function create_and_get( $args = array(), $generation_definitions = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function create_and_get( $args = array(), $generation_definitions = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term_id = $this->create( $args, $generation_definitions );
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = isset( $args['taxonomy'] ) ? $args['taxonomy'] : $this->taxonomy;
</span><span class="cx" style="display: block; padding: 0 10px"> return get_term( $term_id, $taxonomy );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +96,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return null|WP_Error|WP_Term WP_Term on success. WP_error if taxonomy does not exist. Null for miscellaneous failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function get_object_by_id( $term_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function get_object_by_id( $term_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return get_term( $term_id, $this->taxonomy );
</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="trunktestsphpunitincludesfactoryclasswpunittestfactoryforthingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-thing.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-thing.php 2019-03-15 12:01:15 UTC (rev 44902)
+++ trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-thing.php 2019-03-15 12:15:08 UTC (rev 44903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,8 +5,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> abstract class WP_UnitTest_Factory_For_Thing {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var $default_generation_definitions;
- var $factory;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public $default_generation_definitions;
+ public $factory;
</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"> * Creates a new factory, which will create objects of a specific Thing
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,7 +16,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * can be generators -- an object with next() method. There are some default generators: {@link WP_UnitTest_Generator_Sequence},
</span><span class="cx" style="display: block; padding: 0 10px"> * {@link WP_UnitTest_Generator_Locale_Name}, {@link WP_UnitTest_Factory_Callback_After_Create}.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function __construct( $factory, $default_generation_definitions = array() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function __construct( $factory, $default_generation_definitions = array() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->factory = $factory;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->default_generation_definitions = $default_generation_definitions;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed The result. Can be anything.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- abstract function create_object( $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ abstract public function create_object( $args );
</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"> * Updates an existing object.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,7 +38,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed The result. Can be anything.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- abstract function update_object( $object, $fields );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ abstract public function update_object( $object, $fields );
</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"> * Creates an object.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +48,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed The result. Can be anything.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function create( $args = array(), $generation_definitions = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function create( $args = array(), $generation_definitions = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_null( $generation_definitions ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $generation_definitions = $this->default_generation_definitions;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,7 +77,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed The created object. Can be anything.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function create_and_get( $args = array(), $generation_definitions = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function create_and_get( $args = array(), $generation_definitions = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $object_id = $this->create( $args, $generation_definitions );
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->get_object_by_id( $object_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,7 +89,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed The object. Can be anything.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- abstract function get_object_by_id( $object_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ abstract public function get_object_by_id( $object_id );
</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"> * Creates multiple objects.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +100,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return 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">- function create_many( $count, $args = array(), $generation_definitions = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function create_many( $count, $args = array(), $generation_definitions = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $results = array();
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < $count; $i++ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $results[] = $this->create( $args, $generation_definitions );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,7 +118,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|WP_Error Combined array on success. WP_Error when default value is incorrent.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function generate_args( $args = array(), $generation_definitions = null, &$callbacks = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function generate_args( $args = array(), $generation_definitions = null, &$callbacks = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $callbacks = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_null( $generation_definitions ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $generation_definitions = $this->default_generation_definitions;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,7 +155,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array The altered fields.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function apply_callbacks( $callbacks, $created ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function apply_callbacks( $callbacks, $created ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $updated_fields = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $callbacks as $field_name => $generator ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +171,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_UnitTest_Factory_Callback_After_Create
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function callback( $function ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function callback( $function ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_UnitTest_Factory_Callback_After_Create( $function );
</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">@@ -182,7 +182,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|string The value with the possibly applied slashes.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function addslashes_deep( $value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function addslashes_deep( $value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $value ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $value = array_map( array( $this, 'addslashes_deep' ), $value );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_object( $value ) ) {
</span></span></pre></div>
<a id="trunktestsphpunitincludesfactoryclasswpunittestfactoryforuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-user.php 2019-03-15 12:01:15 UTC (rev 44902)
+++ trunk/tests/phpunit/includes/factory/class-wp-unittest-factory-for-user.php 2019-03-15 12:15:08 UTC (rev 44903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class WP_UnitTest_Factory_For_User extends WP_UnitTest_Factory_For_Thing {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function __construct( $factory = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function __construct( $factory = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::__construct( $factory );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->default_generation_definitions = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_login' => new WP_UnitTest_Generator_Sequence( 'User %s' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int|WP_Error
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function create_object( $args ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function create_object( $args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return wp_insert_user( $args );
</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">@@ -40,7 +40,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int|WP_Error User id on success. WP_Error on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function update_object( $user_id, $fields ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function update_object( $user_id, $fields ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $fields['ID'] = $user_id;
</span><span class="cx" style="display: block; padding: 0 10px"> return wp_update_user( $fields );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> * @return WP_User The user.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function get_object_by_id( $user_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function get_object_by_id( $user_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_User( $user_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="trunktestsphpunitincludesfactoryclasswpunittestfactoryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/factory/class-wp-unittest-factory.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/factory/class-wp-unittest-factory.php 2019-03-15 12:01:15 UTC (rev 44902)
+++ trunk/tests/phpunit/includes/factory/class-wp-unittest-factory.php 2019-03-15 12:15:08 UTC (rev 44903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,7 +58,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public $network;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function __construct() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function __construct() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->post = new WP_UnitTest_Factory_For_Post( $this );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->attachment = new WP_UnitTest_Factory_For_Attachment( $this );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->comment = new WP_UnitTest_Factory_For_Comment( $this );
</span></span></pre></div>
<a id="trunktestsphpunitincludesfactoryclasswpunittestgeneratorsequencephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/factory/class-wp-unittest-generator-sequence.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/factory/class-wp-unittest-generator-sequence.php 2019-03-15 12:01:15 UTC (rev 44902)
+++ trunk/tests/phpunit/includes/factory/class-wp-unittest-generator-sequence.php 2019-03-15 12:15:08 UTC (rev 44903)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5,7 +5,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $next;
</span><span class="cx" style="display: block; padding: 0 10px"> public $template_string;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function __construct( $template_string = '%s', $start = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function __construct( $template_string = '%s', $start = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $start ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->next = $start;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->template_string = $template_string;
</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">- function next() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function next() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $generated = sprintf( $this->template_string, $this->next );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->next++;
</span><span class="cx" style="display: block; padding: 0 10px"> return $generated;
</span></span></pre>
</div>
</div>
</body>
</html>