Ticket #33968: awesome-2.diff

.gitignore

@@ -4 +4 @@
 wp-config.php
 wp-tests-config.php
 .htaccess
-
+.idea
 # Files and folders related to build/test tools
 /phpunit.xml
 /tests/phpunit/data/plugins/wordpress-importer

tests/phpunit/includes/testcase-ajax.php

@@ -75 +75 @@
                 error_reporting( $this->_error_level & ~E_WARNING );
 
                 // Make some posts
-                self::$factory->post->create_many( 5 );
+                self::factory()->post->create_many( 5 );
         }
 
         /**
@@ -148 +148 @@
          */
         protected function _setRole( $role ) {
                 $post = $_POST;
-                $user_id = self::$factory->user->create( array( 'role' => $role ) );
+                $user_id = self::factory()->user->create( array( 'role' => $role ) );
                 wp_set_current_user( $user_id );
                 $_POST = array_merge($_POST, $post);
         }

tests/phpunit/includes/testcase-canonical.php

@@ -49 +49 @@
                 wp_set_current_user( self::$author_id );
 
                 // Already created by install defaults:
-                // self::$factory->term->create( array( 'taxonomy' => 'category', 'name' => 'uncategorized' ) );
+                // self::factory()->term->create( array( 'taxonomy' => 'category', 'name' => 'uncategorized' ) );
 
                 self::$post_ids[] = $factory->post->create( array( 'import_id' => 587, 'post_title' => 'post-format-test-audio', 'post_date' => '2008-06-02 00:00:00' ) );
                 self::$post_ids[] = $post_id = $factory->post->create( array( 'post_title' => 'post-format-test-gallery', 'post_date' => '2008-06-10 00:00:00' ) );

tests/phpunit/includes/testcase-xmlrpc.php

@@ -22 +22 @@
         }
 
         protected function make_user_by_role( $role ) {
-                return self::$factory->user->create( array(
+                return self::factory()->user->create( array(
                         'user_login' => $role,
                         'user_pass'  => $role,
                         'role'       => $role

tests/phpunit/includes/testcase.php

@@ -14 +14 @@
         protected static $hooks_saved = array();
         protected static $ignore_files;
 
-        /**
-         * @var WP_UnitTest_Factory
-         */
-        protected static $factory;
+
+        function __isset( $name ) {
+                return 'factory' === $name;
+        }
+
+
+        function __get( $name ) {
+                if ( 'factory' === $name ) {
+                        return self::factory();
+            }
+        }
+
+
+
+        protected static function factory() {
+                static $factory = null;
+                if ( ! $factory ) {
+                        $factory = new WP_UnitTest_Factory();
+                }
+                return $factory;
+        }
 
         public static function get_called_class() {
                 if ( function_exists( 'get_called_class' ) ) {
@@ -37 +54 @@
         public static function setUpBeforeClass() {
                 parent::setUpBeforeClass();
 
-                if ( ! self::$factory ) {
-                        self::$factory = new WP_UnitTest_Factory();
-                }
-
                 $c = self::get_called_class();
                 if ( ! method_exists( $c, 'wpSetUpBeforeClass' ) ) {
                         return;
                 }
 
-                call_user_func( array( $c, 'wpSetUpBeforeClass' ), self::$factory );
+                call_user_func( array( $c, 'wpSetUpBeforeClass' ), self::factory() );
 
                 self::commit_transaction();
         }

tests/phpunit/tests/admin/includesComment.php

@@ -6 +6 @@
  */
 class Tests_Admin_IncludesComment extends WP_UnitTestCase {
         public function test_must_match_date_and_author() {
-                $p1 = self::$factory->post->create();
-                $c1 = self::$factory->comment->create( array(
+                $p1 = self::factory()->post->create();
+                $c1 = self::factory()->comment->create( array(
                         'comment_author' => 1,
                         'comment_date' => '2014-05-06 12:00:00',
                         'comment_post_ID' => $p1,
                 ) );
 
-                $p2 = self::$factory->post->create();
-                $c2 = self::$factory->comment->create( array(
+                $p2 = self::factory()->post->create();
+                $c2 = self::factory()->comment->create( array(
                         'comment_author' => 2,
                         'comment_date' => '2004-01-02 12:00:00',
                         'comment_post_ID' => $p2,
@@ -28 +28 @@
          * @ticket 33871
          */
         public function test_default_value_of_timezone_should_be_blog() {
-                $p = self::$factory->post->create();
-                $c = self::$factory->comment->create( array(
+                $p = self::factory()->post->create();
+                $c = self::factory()->comment->create( array(
                         'comment_author' => 1,
                         'comment_post_ID' => $p,
                         'comment_date' => '2014-05-06 12:00:00',
@@ -43 +43 @@
          * @ticket 33871
          */
         public function test_should_respect_timezone_blog() {
-                $p = self::$factory->post->create();
-                $c = self::$factory->comment->create( array(
+                $p = self::factory()->post->create();
+                $c = self::factory()->comment->create( array(
                         'comment_author' => 1,
                         'comment_post_ID' => $p,
                         'comment_date' => '2014-05-06 12:00:00',
@@ -58 +58 @@
          * @ticket 33871
          */
         public function test_should_respect_timezone_gmt() {
-                $p = self::$factory->post->create();
-                $c = self::$factory->comment->create( array(
+                $p = self::factory()->post->create();
+                $c = self::factory()->comment->create( array(
                         'comment_author' => 1,
                         'comment_post_ID' => $p,
                         'comment_date' => '2014-05-06 12:00:00',
@@ -73 +73 @@
          * @ticket 33871
          */
         public function test_invalid_timezone_should_fall_back_on_blog() {
-                $p = self::$factory->post->create();
-                $c = self::$factory->comment->create( array(
+                $p = self::factory()->post->create();
+                $c = self::factory()->comment->create( array(
                         'comment_author' => 1,
                         'comment_post_ID' => $p,
                         'comment_date' => '2014-05-06 12:00:00',

tests/phpunit/tests/admin/includesPlugin.php

@@ -29 +29 @@
 
         function test_menu_page_url() {
                 $current_user = get_current_user_id();
-                wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
+                wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
                 update_option( 'siteurl', 'http://example.com' );
 
                 // add some pages

tests/phpunit/tests/admin/includesPost.php

@@ -11 +11 @@
         }
 
         function test__wp_translate_postdata_cap_checks_contributor() {
-                $contributor_id = self::$factory->user->create( array( 'role' => 'contributor' ) );
-                $editor_id = self::$factory->user->create( array( 'role' => 'editor' ) );
+                $contributor_id = self::factory()->user->create( array( 'role' => 'contributor' ) );
+                $editor_id = self::factory()->user->create( array( 'role' => 'editor' ) );
 
                 wp_set_current_user( $contributor_id );
 
@@ -51 +51 @@
 
                 // Edit Draft Post for another user
                 $_post_data = array();
-                $_post_data['post_ID'] = self::$factory->post->create( array( 'post_author' => $editor_id ) );
+                $_post_data['post_ID'] = self::factory()->post->create( array( 'post_author' => $editor_id ) );
                 $_post_data['post_author'] = $editor_id;
                 $_post_data['post_type'] = 'post';
                 $_post_data['post_status'] = 'draft';
@@ -64 +64 @@
         }
 
         function test__wp_translate_postdata_cap_checks_editor() {
-                $contributor_id = self::$factory->user->create( array( 'role' => 'contributor' ) );
-                $editor_id = self::$factory->user->create( array( 'role' => 'editor' ) );
+                $contributor_id = self::factory()->user->create( array( 'role' => 'contributor' ) );
+                $editor_id = self::factory()->user->create( array( 'role' => 'editor' ) );
 
                 wp_set_current_user( $editor_id );
 
@@ -104 +104 @@
 
                 // Edit Draft Post for another user
                 $_post_data = array();
-                $_post_data['post_ID'] = self::$factory->post->create( array( 'post_author' => $contributor_id ) );
+                $_post_data['post_ID'] = self::factory()->post->create( array( 'post_author' => $contributor_id ) );
                 $_post_data['post_author'] = $contributor_id;
                 $_post_data['post_type'] = 'post';
                 $_post_data['post_status'] = 'draft';
@@ -122 +122 @@
          * @ticket 25272
          */
         function test_edit_post_auto_draft() {
-                $user_id = self::$factory->user->create( array( 'role' => 'editor' ) );
+                $user_id = self::factory()->user->create( array( 'role' => 'editor' ) );
                 wp_set_current_user( $user_id );
-                $post = self::$factory->post->create_and_get( array( 'post_status' => 'auto-draft' ) );
+                $post = self::factory()->post->create_and_get( array( 'post_status' => 'auto-draft' ) );
                 $this->assertEquals( 'auto-draft', $post->post_status );
                 $post_data = array(
                         'post_title' => 'Post title',
@@ -140 +140 @@
          * @ticket 30615
          */
         public function test_edit_post_should_parse_tax_input_by_name_rather_than_slug_for_nonhierarchical_taxonomies() {
-                $u = self::$factory->user->create( array( 'role' => 'editor' ) );
+                $u = self::factory()->user->create( array( 'role' => 'editor' ) );
                 wp_set_current_user( $u );
 
                 register_taxonomy( 'wptests_tax', array( 'post' ) );
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'name' => 'foo',
                         'slug' => 'bar',
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'name' => 'bar',
                         'slug' => 'foo',
                 ) );
 
-                $p = self::$factory->post->create();
+                $p = self::factory()->post->create();
 
                 $post_data = array(
                         'post_ID' => $p,
@@ -179 +179 @@
          * @ticket 30615
          */
         public function test_edit_post_should_not_create_terms_for_an_empty_tag_input_field() {
-                $u = self::$factory->user->create( array( 'role' => 'editor' ) );
+                $u = self::factory()->user->create( array( 'role' => 'editor' ) );
                 wp_set_current_user( $u );
 
                 register_taxonomy( 'wptests_tax', array( 'post' ) );
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'name' => 'foo',
                         'slug' => 'bar',
                 ) );
 
-                $p = self::$factory->post->create();
+                $p = self::factory()->post->create();
 
                 $post_data = array(
                         'post_ID' => $p,
@@ -209 +209 @@
          * @ticket 27792
          */
         function test_bulk_edit_posts_stomping() {
-                $admin = self::$factory->user->create( array( 'role' => 'administrator' ) );
-                $users = self::$factory->user->create_many( 2, array( 'role' => 'author' ) );
+                $admin = self::factory()->user->create( array( 'role' => 'administrator' ) );
+                $users = self::factory()->user->create_many( 2, array( 'role' => 'author' ) );
                 wp_set_current_user( $admin );
 
-                $post1 = self::$factory->post->create( array(
+                $post1 = self::factory()->post->create( array(
                         'post_author'    => $users[0],
                         'comment_status' => 'open',
                         'ping_status'    => 'open',
                         'post_status'    => 'publish',
                 ) );
 
-                $post2 = self::$factory->post->create( array(
+                $post2 = self::factory()->post->create( array(
                         'post_author'    => $users[1],
                         'comment_status' => 'closed',
                         'ping_status'    => 'closed',
@@ -255 +255 @@
                 $this->set_permalink_structure( "/$permalink_structure/" );
 
                 $future_date = date( 'Y-m-d H:i:s', time() + 100 );
-                $p = self::$factory->post->create( array( 'post_status' => 'future', 'post_name' => 'foo', 'post_date' => $future_date ) );
+                $p = self::factory()->post->create( array( 'post_status' => 'future', 'post_name' => 'foo', 'post_date' => $future_date ) );
 
                 $found = get_sample_permalink( $p );
                 $expected = trailingslashit( home_url( $permalink_structure ) );
@@ -268 +268 @@
          * @ticket 18306
          */
         public function test_get_sample_permalink_html_should_use_default_permalink_for_view_post_link_when_pretty_permalinks_are_disabled() {
-                wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
+                wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
 
                 $future_date = date( 'Y-m-d H:i:s', time() + 100 );
-                $p = self::$factory->post->create( array( 'post_status' => 'future', 'post_name' => 'foo', 'post_date' => $future_date ) );
+                $p = self::factory()->post->create( array( 'post_status' => 'future', 'post_name' => 'foo', 'post_date' => $future_date ) );
 
                 $found = get_sample_permalink_html( $p );
                 $this->assertContains( 'href="' . get_option( 'home' ) . '/?p=' . $p . '"', $found );
@@ -284 +284 @@
         public function test_get_sample_permalink_html_should_use_pretty_permalink_for_view_post_link_when_pretty_permalinks_are_enabled() {
                 $this->set_permalink_structure( '/%postname%/' );
 
-                wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
+                wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
 
                 $future_date = date( 'Y-m-d H:i:s', time() + 100 );
-                $p = self::$factory->post->create( array( 'post_status' => 'future', 'post_name' => 'foo', 'post_date' => $future_date ) );
+                $p = self::factory()->post->create( array( 'post_status' => 'future', 'post_name' => 'foo', 'post_date' => $future_date ) );
 
                 $found = get_sample_permalink_html( $p );
                 $post = get_post( $p );
@@ -301 +301 @@
         public function test_get_sample_permalink_html_should_use_correct_permalink_for_view_post_link_when_changing_slug() {
                 $this->set_permalink_structure( '/%postname%/' );
 
-                wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
+                wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
 
                 // Published posts should use published permalink
-                $p = self::$factory->post->create( array( 'post_status' => 'publish', 'post_name' => 'foo' ) );
+                $p = self::factory()->post->create( array( 'post_status' => 'publish', 'post_name' => 'foo' ) );
 
                 $found = get_sample_permalink_html( $p, null, 'new_slug' );
                 $post = get_post( $p );
@@ -313 +313 @@
 
                 // Scheduled posts should use published permalink
                 $future_date = date( 'Y-m-d H:i:s', time() + 100 );
-                $p = self::$factory->post->create( array( 'post_status' => 'future', 'post_name' => 'bar', 'post_date' => $future_date ) );
+                $p = self::factory()->post->create( array( 'post_status' => 'future', 'post_name' => 'bar', 'post_date' => $future_date ) );
 
                 $found = get_sample_permalink_html( $p, null, 'new_slug' );
                 $post = get_post( $p );
@@ -321 +321 @@
                 $this->assertContains( 'href="' . get_option( 'home' ) . "/" . $post->post_name . '/"', $found, $message );
 
                 // Draft posts should use preview link
-                $p = self::$factory->post->create( array( 'post_status' => 'draft', 'post_name' => 'baz' ) );
+                $p = self::factory()->post->create( array( 'post_status' => 'draft', 'post_name' => 'baz' ) );
 
                 $found = get_sample_permalink_html( $p, null, 'new_slug' );
                 $post = get_post( $p );
@@ -339 +339 @@
         public function test_get_sample_permalink_should_avoid_slugs_that_would_create_clashes_with_year_archives() {
                 $this->set_permalink_structure( '/%postname%/' );
 
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_name' => '2015',
                 ) );
 
@@ -353 +353 @@
         public function test_get_sample_permalink_should_allow_yearlike_slugs_if_permastruct_does_not_cause_an_archive_conflict() {
                 $this->set_permalink_structure( '/%year%/%postname%/' );
 
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_name' => '2015',
                 ) );
 
@@ -367 +367 @@
         public function test_get_sample_permalink_should_avoid_slugs_that_would_create_clashes_with_month_archives() {
                 $this->set_permalink_structure( '/%year%/%postname%/' );
 
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_name' => '11',
                 ) );
 
@@ -381 +381 @@
         public function test_get_sample_permalink_should_ignore_potential_month_conflicts_for_invalid_monthnum() {
                 $this->set_permalink_structure( '/%year%/%postname%/' );
 
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_name' => '13',
                 ) );
 
@@ -395 +395 @@
         public function test_get_sample_permalink_should_avoid_slugs_that_would_create_clashes_with_day_archives() {
                 $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
 
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_name' => '30',
                 ) );
 
@@ -409 +409 @@
         public function test_get_sample_permalink_should_iterate_slug_suffix_when_a_date_conflict_is_found() {
                 $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
 
-                self::$factory->post->create( array(
+                self::factory()->post->create( array(
                         'post_name' => '30-2',
                 ) );
 
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_name' => '30',
                 ) );
 
@@ -427 +427 @@
         public function test_get_sample_permalink_should_ignore_potential_day_conflicts_for_invalid_day() {
                 $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
 
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_name' => '32',
                 ) );
 
@@ -441 +441 @@
         public function test_get_sample_permalink_should_allow_daylike_slugs_if_permastruct_does_not_cause_an_archive_conflict() {
                 $this->set_permalink_structure( '/%year%/%month%/%day%/%postname%/' );
 
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_name' => '30',
                 ) );
 
@@ -450 +450 @@
         }
 
         public function test_post_exists_should_match_title() {
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_title' => 'Foo Bar',
                 ) );
 
@@ -458 +458 @@
         }
 
         public function test_post_exists_should_not_match_nonexistent_title() {
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_title' => 'Foo Bar',
                 ) );
 
@@ -468 +468 @@
         public function test_post_exists_should_match_nonempty_content() {
                 $title = 'Foo Bar';
                 $content = 'Foo Bar Baz';
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_title' => $title,
                         'post_content' => $content,
                 ) );
@@ -479 +479 @@
         public function test_post_exists_should_not_match_when_nonempty_content_doesnt_match() {
                 $title = 'Foo Bar';
                 $content = 'Foo Bar Baz';
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_title' => $title,
                         'post_content' => $content . ' Quz',
                 ) );
@@ -490 +490 @@
         public function test_post_exists_should_match_nonempty_date() {
                 $title = 'Foo Bar';
                 $date = '2014-05-08 12:00:00';
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_title' => $title,
                         'post_date' => $date,
                 ) );
@@ -501 +501 @@
         public function test_post_exists_should_not_match_when_nonempty_date_doesnt_match() {
                 $title = 'Foo Bar';
                 $date = '2014-05-08 12:00:00';
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_title' => $title,
                         'post_date' => '2015-10-10 00:00:00',
                 ) );
@@ -513 +513 @@
                 $title = 'Foo Bar';
                 $content = 'Foo Bar Baz';
                 $date = '2014-05-08 12:00:00';
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_title' => $title,
                         'post_content' => $content,
                         'post_date' => $date,

tests/phpunit/tests/adminbar.php

@@ -15 +15 @@
          * @ticket 21117
          */
         function test_content_post_type() {
-                wp_set_current_user( self::$factory->user->create( array( 'role' => 'editor' ) ) );
+                wp_set_current_user( self::factory()->user->create( array( 'role' => 'editor' ) ) );
 
                 register_post_type( 'content', array( 'show_in_admin_bar' => true ) );
 
@@ -34 +34 @@
          * @ticket 21117
          */
         function test_merging_existing_meta_values() {
-                wp_set_current_user( self::$factory->user->create( array( 'role' => 'editor' ) ) );
+                wp_set_current_user( self::factory()->user->create( array( 'role' => 'editor' ) ) );
 
                 $admin_bar = new WP_Admin_Bar;
 
@@ -62 +62 @@
                         $this->markTestSkipped( 'Test does not run in multisite' );
                 }
 
-                $nobody = self::$factory->user->create( array( 'role' => '' ) );
+                $nobody = self::factory()->user->create( array( 'role' => '' ) );
                 $this->assertFalse( user_can( $nobody, 'read' ) );
 
                 wp_set_current_user( $nobody );
@@ -92 +92 @@
                         $this->markTestSkipped( 'Test does not run in multisite' );
                 }
 
-                $editor = self::$factory->user->create( array( 'role' => 'editor' ) );
+                $editor = self::factory()->user->create( array( 'role' => 'editor' ) );
                 $this->assertTrue( user_can( $editor, 'read' ) );
 
                 wp_set_current_user( $editor );
@@ -125 +125 @@
                         $this->markTestSkipped( 'Test only runs in multisite' );
                 }
 
-                $admin  = self::$factory->user->create( array( 'role' => 'administrator' ) );
-                $editor = self::$factory->user->create( array( 'role' => 'editor' ) );
+                $admin  = self::factory()->user->create( array( 'role' => 'administrator' ) );
+                $editor = self::factory()->user->create( array( 'role' => 'editor' ) );
 
                 $this->assertTrue( user_can( $admin, 'read' ) );
                 $this->assertTrue( user_can( $editor, 'read' ) );
 
-                $new_blog_id = self::$factory->blog->create( array(
+                $new_blog_id = self::factory()->blog->create( array(
                         'user_id' => $admin,
                 ) );
 
@@ -179 +179 @@
                         $this->markTestSkipped( 'Test only runs in multisite' );
                 }
 
-                $admin  = self::$factory->user->create( array( 'role' => 'administrator' ) );
-                $nobody = self::$factory->user->create( array( 'role' => '' ) );
+                $admin  = self::factory()->user->create( array( 'role' => 'administrator' ) );
+                $nobody = self::factory()->user->create( array( 'role' => '' ) );
 
                 $this->assertTrue( user_can( $admin, 'read' ) );
                 $this->assertFalse( user_can( $nobody, 'read' ) );
 
-                $new_blog_id = self::$factory->blog->create( array(
+                $new_blog_id = self::factory()->blog->create( array(
                         'user_id' => $admin,
                 ) );
 

tests/phpunit/tests/ajax/Autosave.php

@@ -33 +33 @@
         public function setUp() {
                 parent::setUp();
                 // Set a user so the $post has 'post_author'
-                $this->user_id = self::$factory->user->create( array( 'role' => 'administrator' ) );
+                $this->user_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
                 wp_set_current_user( $this->user_id );
 
-                $post_id = self::$factory->post->create( array( 'post_status' => 'draft' ) );
+                $post_id = self::factory()->post->create( array( 'post_status' => 'draft' ) );
                 $this->_post = get_post( $post_id );
         }
 
@@ -97 +97 @@
          */
         public function test_autosave_locked_post() {
                 // Lock the post to another user
-                $another_user_id = self::$factory->user->create( array( 'role' => 'editor' ) );
+                $another_user_id = self::factory()->user->create( array( 'role' => 'editor' ) );
                 wp_set_current_user( $another_user_id );
                 wp_set_post_lock( $this->_post->ID );
 

tests/phpunit/tests/ajax/CustomizeMenus.php

@@ -22 +22 @@
         public function setUp() {
                 parent::setUp();
                 require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
-                wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
+                wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
                 global $wp_customize;
                 $this->wp_customize = new WP_Customize_Manager();
                 $wp_customize = $this->wp_customize;
@@ -65 +65 @@
                         $this->setExpectedException( 'WPAjaxDieStopException' );
                 }
 
-                wp_set_current_user( self::$factory->user->create( array( 'role' => $role ) ) );
+                wp_set_current_user( self::factory()->user->create( array( 'role' => $role ) ) );
 
                 $_POST = array(
                         'action'                => 'load-available-menu-items-customizer',
@@ -307 +307 @@
                 );
 
                 // Create some terms and pages.
-                self::$factory->term->create_many( 5 );
-                self::$factory->post->create_many( 5, array( 'post_type' => 'page' ) );
+                self::factory()->term->create_many( 5 );
+                self::factory()->post->create_many( 5, array( 'post_type' => 'page' ) );
 
                 $_POST = array_merge( array(
                         'action'                => 'load-available-menu-items-customizer',
@@ -396 +396 @@
                         $this->setExpectedException( 'WPAjaxDieStopException' );
                 }
 
-                wp_set_current_user( self::$factory->user->create( array( 'role' => $role ) ) );
+                wp_set_current_user( self::factory()->user->create( array( 'role' => $role ) ) );
 
                 $_POST = array(
                         'action'                => 'search-available-menu-items-customizer',
@@ -469 +469 @@
          */
         function test_ajax_search_available_items_results( $post_args, $expected_results ) {
 
-                self::$factory->post->create_many( 5, array( 'post_title' => 'Test Post' ) );
+                self::factory()->post->create_many( 5, array( 'post_title' => 'Test Post' ) );
 
                 $_POST = array_merge( array(
                         'action'                => 'search-available-menu-items-customizer',

tests/phpunit/tests/ajax/DeleteComment.php

@@ -26 +26 @@
          */
         public function setUp() {
                 parent::setUp();
-                $post_id = self::$factory->post->create();
-                $this->_comments = self::$factory->comment->create_post_comments( $post_id, 15 );
+                $post_id = self::factory()->post->create();
+                $this->_comments = self::factory()->comment->create_post_comments( $post_id, 15 );
                 $this->_comments = array_map( 'get_comment', $this->_comments );
         }
 

tests/phpunit/tests/ajax/DimComment.php

@@ -26 +26 @@
          */
         public function setUp() {
                 parent::setUp();
-                $post_id = self::$factory->post->create();
-                $this->_comments = self::$factory->comment->create_post_comments( $post_id, 15 );
+                $post_id = self::factory()->post->create();
+                $this->_comments = self::factory()->comment->create_post_comments( $post_id, 15 );
                 $this->_comments = array_map( 'get_comment', $this->_comments );
         }
 

tests/phpunit/tests/ajax/EditComment.php

@@ -26 +26 @@
          */
         public function setUp() {
                 parent::setUp();
-                $post_id = self::$factory->post->create();
-                self::$factory->comment->create_post_comments( $post_id, 5 );
+                $post_id = self::factory()->post->create();
+                self::factory()->comment->create_post_comments( $post_id, 5 );
                 $this->_comment_post = get_post( $post_id );
         }
 

tests/phpunit/tests/ajax/GetComments.php

@@ -32 +32 @@
          */
         public function setUp() {
                 parent::setUp();
-                $post_id = self::$factory->post->create();
-                self::$factory->comment->create_post_comments( $post_id, 5 );
+                $post_id = self::factory()->post->create();
+                self::factory()->comment->create_post_comments( $post_id, 5 );
                 $this->_comment_post = get_post( $post_id );
 
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
                 $this->_no_comment_post = get_post( $post_id );
 
                 unset( $GLOBALS['post_id'] );

tests/phpunit/tests/ajax/QuickEdit.php

@@ -25 +25 @@
                         'hierarchical' => true,
                 ) );
 
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax_1',
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax_2',
                 ) );
 
                 // Become an administrator.
                 $this->_setRole( 'administrator' );
 
-                $post = self::$factory->post->create_and_get( array(
+                $post = self::factory()->post->create_and_get( array(
                         'post_author' => get_current_user_id(),
                 ) );
 

tests/phpunit/tests/ajax/ReplytoComment.php

@@ -32 +32 @@
          */
         public function setUp() {
                 parent::setUp();
-                $post_id = self::$factory->post->create();
-                self::$factory->comment->create_post_comments( $post_id, 5 );
+                $post_id = self::factory()->post->create();
+                self::factory()->comment->create_post_comments( $post_id, 5 );
                 $this->_comment_post = get_post( $post_id );
 
-                $post_id = self::$factory->post->create( array( 'post_status' => 'draft' ) );
+                $post_id = self::factory()->post->create( array( 'post_status' => 'draft' ) );
                 $this->_draft_post = get_post( $post_id );
         }
 

tests/phpunit/tests/attachment/slashes.php

@@ -8 +8 @@
 class Tests_Attachment_Slashes extends WP_UnitTestCase {
         function setUp() {
                 parent::setUp();
-                $this->author_id = self::$factory->user->create( array( 'role' => 'editor' ) );
+                $this->author_id = self::factory()->user->create( array( 'role' => 'editor' ) );
                 $this->old_current_user = get_current_user_id();
                 wp_set_current_user( $this->author_id );
 

tests/phpunit/tests/avatar.php

@@ -87 +87 @@
                 $url2 = get_avatar_url( $user );
                 $this->assertEquals( $url, $url2 );
 
-                $post_id = self::$factory->post->create( array( 'post_author' => 1 ) );
+                $post_id = self::factory()->post->create( array( 'post_author' => 1 ) );
                 $post = get_post( $post_id );
                 $url2 = get_avatar_url( $post );
                 $this->assertEquals( $url, $url2 );
 
-                $comment_id = self::$factory->comment->create( array( 'comment_post_ID' => $post_id, 'user_id' => 1 ) );
+                $comment_id = self::factory()->comment->create( array( 'comment_post_ID' => $post_id, 'user_id' => 1 ) );
                 $comment = get_comment( $comment_id );
                 $url2 = get_avatar_url( $comment );
                 $this->assertEquals( $url, $url2 );
@@ -138 +138 @@
         public function test_get_avatar_comment_types_filter() {
                 $url = get_avatar_url( 1 );
 
-                $post_id = self::$factory->post->create( array( 'post_author' => 1 ) );
-                $comment_id = self::$factory->comment->create( array( 'comment_post_ID' => $post_id, 'user_id' => 1, 'comment_type' => 'pingback' ) );
+                $post_id = self::factory()->post->create( array( 'post_author' => 1 ) );
+                $comment_id = self::factory()->comment->create( array( 'comment_post_ID' => $post_id, 'user_id' => 1, 'comment_type' => 'pingback' ) );
                 $comment = get_comment( $comment_id );
 
                 $url2 = get_avatar_url( $comment );

tests/phpunit/tests/canonical/pageOnFront.php

@@ -18 +18 @@
                 parent::setUp();
 
                 update_option( 'show_on_front', 'page' );
-                update_option( 'page_for_posts', self::$factory->post->create( array( 'post_title' => 'blog-page', 'post_type' => 'page' ) ) );
-                update_option( 'page_on_front', self::$factory->post->create( array( 'post_title' => 'front-page', 'post_type' => 'page' ) ) );
+                update_option( 'page_for_posts', self::factory()->post->create( array( 'post_title' => 'blog-page', 'post_type' => 'page' ) ) );
+                update_option( 'page_on_front', self::factory()->post->create( array( 'post_title' => 'front-page', 'post_type' => 'page' ) ) );
         }
 
         /**

tests/phpunit/tests/canonical/paged.php

@@ -12 +12 @@
                         This is a paragraph.';
                 $next = '<!--nextpage-->';
 
-                $post_id = self::$factory->post->create( array(
+                $post_id = self::factory()->post->create( array(
                         'post_status' => 'publish',
                         'post_content' => "{$para}{$next}{$para}{$next}{$para}"
                 ) );

tests/phpunit/tests/category.php

@@ -21 +21 @@
          */
         function test_get_all_category_ids() {
                 // create categories
-                self::$factory->category->create_many( 2 );
+                self::factory()->category->create_many( 2 );
 
                 // create new taxonomy to ensure not included
                 register_taxonomy( 'test_tax_cat', 'post' );
@@ -38 +38 @@
         function test_get_category_by_slug() {
 
                 // create Test Categories
-                $testcat = self::$factory->category->create_and_get(
+                $testcat = self::factory()->category->create_and_get(
                         array(
                                 'slug' => 'testcat',
                                 'name' => 'Test Category 1'
                         )
                 );
-                $testcat2 = self::$factory->category->create_and_get(
+                $testcat2 = self::factory()->category->create_and_get(
                         array(
                                 'slug' => 'testcat2',
                                 'name' => 'Test Category 2'
@@ -73 +73 @@
                         'name' => 'Test MCC',
                         'description' => 'Category Test'
                 );
-                $testcat = self::$factory->category->create_and_get( $testcat_array );
+                $testcat = self::factory()->category->create_and_get( $testcat_array );
                 $testcat_array['term_id'] = $testcat->term_id;
 
                 $testcat2_array = array(
@@ -82 +82 @@
                         'description' => 'Category Test',
                         'parent' => $testcat->term_id
                 );
-                $testcat2 = self::$factory->category->create_and_get( $testcat2_array );
+                $testcat2 = self::factory()->category->create_and_get( $testcat2_array );
                 $testcat2_array['term_id'] = $testcat2->term_id;
 
                 // unset properties to enable validation of object
@@ -145 +145 @@
         function test_get_cat_name() {
 
                 // create Test Category
-                $testcat = self::$factory->category->create_and_get(
+                $testcat = self::factory()->category->create_and_get(
                         array(
                                 'slug' => 'testcat',
                                 'name' => 'Test Category 1'
@@ -165 +165 @@
         function test_get_cat_ID() {
 
                 // create Test Category
-                $testcat = self::$factory->category->create_and_get(
+                $testcat = self::factory()->category->create_and_get(
                         array(
                                 'slug' => 'testcat',
                                 'name' => 'Test Category 1'
@@ -185 +185 @@
         function test_get_category_by_path() {
 
                 // create Test Categories
-                $root_id = self::$factory->category->create(
+                $root_id = self::factory()->category->create(
                         array(
                                 'slug' => 'root',
                         )
                 );
-                $root_cat_id = self::$factory->category->create(
+                $root_cat_id = self::factory()->category->create(
                         array(
                                 'slug' => 'cat',
                                 'parent' => $root_id
                         )
                 );
-                $root_cat_cat_id = self::$factory->category->create(
+                $root_cat_cat_id = self::factory()->category->create(
                         array(
                                 'slug' => 'cat', //note this is modified on create
                                 'parent' => $root_cat_id
                         )
                 );
-                $root_path_id = self::$factory->category->create(
+                $root_path_id = self::factory()->category->create(
                         array(
                                 'slug' => 'path',
                                 'parent' => $root_id
                         )
                 );
-                $root_path_cat_id = self::$factory->category->create(
+                $root_path_cat_id = self::factory()->category->create(
                         array(
                                 'slug' => 'cat', //note this is modified on create
                                 'parent' => $root_path_id
                         )
                 );
-                $root_level_id = self::$factory->category->create(
+                $root_level_id = self::factory()->category->create(
                         array(
                                 'slug' => 'level-1',
                                 'parent' => $root_id
                         )
                 );
-                $root_level_cat_id = self::$factory->category->create(
+                $root_level_cat_id = self::factory()->category->create(
                         array(
                                 'slug' => 'cat', //note this is modified on create
                                 'parent' => $root_level_id
@@ -248 +248 @@
          */
         public function test_wp_dropdown_categories_value_field_should_default_to_term_id() {
                 // Create a test category.
-                $cat_id = self::$factory->category->create( array(
+                $cat_id = self::factory()->category->create( array(
                         'name' => 'Test Category',
                         'slug' => 'test_category',
                 ) );
@@ -268 +268 @@
          */
         public function test_wp_dropdown_categories_value_field_term_id() {
                 // Create a test category.
-                $cat_id = self::$factory->category->create( array(
+                $cat_id = self::factory()->category->create( array(
                         'name' => 'Test Category',
                         'slug' => 'test_category',
                 ) );
@@ -289 +289 @@
          */
         public function test_wp_dropdown_categories_value_field_slug() {
                 // Create a test category.
-                $cat_id = self::$factory->category->create( array(
+                $cat_id = self::factory()->category->create( array(
                         'name' => 'Test Category',
                         'slug' => 'test_category',
                 ) );
@@ -310 +310 @@
          */
         public function test_wp_dropdown_categories_value_field_should_fall_back_on_term_id_when_an_invalid_value_is_provided() {
                 // Create a test category.
-                $cat_id = self::$factory->category->create( array(
+                $cat_id = self::factory()->category->create( array(
                         'name' => 'Test Category',
                         'slug' => 'test_category',
                 ) );
@@ -330 +330 @@
          * @ticket 32330
          */
         public function test_wp_dropdown_categories_selected_should_respect_custom_value_field() {
-                $c1 = self::$factory->category->create( array(
+                $c1 = self::factory()->category->create( array(
                         'name' => 'Test Category 1',
                         'slug' => 'test_category_1',
                 ) );
 
-                $c2 = self::$factory->category->create( array(
+                $c2 = self::factory()->category->create( array(
                         'name' => 'Test Category 2',
                         'slug' => 'test_category_2',
                 ) );
@@ -354 +354 @@
          * @ticket 33452
          */
         public function test_wp_dropdown_categories_show_option_all_should_be_selected_if_no_selected_value_is_explicitly_passed_and_value_field_does_not_have_string_values() {
-                $cats = self::$factory->category->create_many( 3 );
+                $cats = self::factory()->category->create_many( 3 );
 
                 $found = wp_dropdown_categories( array(
                         'echo' => 0,
@@ -375 +375 @@
          * @ticket 33452
          */
         public function test_wp_dropdown_categories_show_option_all_should_be_selected_if_selected_value_of_0_string_is_explicitly_passed_and_value_field_does_not_have_string_values() {
-                $cats = self::$factory->category->create_many( 3 );
+                $cats = self::factory()->category->create_many( 3 );
 
                 $found = wp_dropdown_categories( array(
                         'echo' => 0,

tests/phpunit/tests/category/getCategoryParents.php

@@ -10 +10 @@
         public function setUp() {
                 parent::setUp();
 
-                $this->c1 = self::$factory->category->create_and_get();
-                $this->c2 = self::$factory->category->create_and_get( array(
+                $this->c1 = self::factory()->category->create_and_get();
+                $this->c2 = self::factory()->category->create_and_get( array(
                         'parent' => $this->c1->term_id,
                 ) );
         }
@@ -51 +51 @@
         }
 
         public function test_visited() {
-                $c3 = self::$factory->category->create_and_get( array(
+                $c3 = self::factory()->category->create_and_get( array(
                         'parent' => $this->c2->term_id,
                 ) );
-                $c4 = self::$factory->category->create_and_get( array(
+                $c4 = self::factory()->category->create_and_get( array(
                         'parent' => $c3->term_id,
                 ) );
 

tests/phpunit/tests/category/wpListCategories.php

@@ -5 +5 @@
  */
 class Tests_Category_WpListCategories extends WP_UnitTestCase {
         public function test_class() {
-                $c = self::$factory->category->create();
+                $c = self::factory()->category->create();
 
                 $found = wp_list_categories( array(
                         'hide_empty' => false,
@@ -16 +16 @@
         }
 
         public function test_class_containing_current_cat() {
-                $c1 = self::$factory->category->create();
-                $c2 = self::$factory->category->create();
+                $c1 = self::factory()->category->create();
+                $c2 = self::factory()->category->create();
 
                 $found = wp_list_categories( array(
                         'hide_empty' => false,
@@ -30 +30 @@
         }
 
         public function test_class_containing_current_cat_parent() {
-                $c1 = self::$factory->category->create();
-                $c2 = self::$factory->category->create( array(
+                $c1 = self::factory()->category->create();
+                $c2 = self::factory()->category->create( array(
                         'parent' => $c1,
                 ) );
 
@@ -49 +49 @@
          * @ticket 33565
          */
         public function test_current_category_should_accept_an_array_of_ids() {
-                $cats = self::$factory->category->create_many( 3 );
+                $cats = self::factory()->category->create_many( 3 );
 
                 $found = wp_list_categories( array(
                         'echo' => false,
@@ -66 +66 @@
          * @ticket 16792
          */
         public function test_should_not_create_element_when_cat_name_is_filtered_to_empty_string() {
-                $c1 = self::$factory->category->create( array(
+                $c1 = self::factory()->category->create( array(
                         'name' => 'Test Cat 1',
                 ) );
-                $c2 = self::$factory->category->create( array(
+                $c2 = self::factory()->category->create( array(
                         'name' => 'Test Cat 2',
                 ) );
 
@@ -88 +88 @@
         }
 
         public function test_show_option_all_link_should_go_to_home_page_when_show_on_front_is_false() {
-                $cats = self::$factory->category->create_many( 2 );
+                $cats = self::factory()->category->create_many( 2 );
 
                 $found = wp_list_categories( array(
                         'echo' => false,
@@ -101 +101 @@
         }
 
         public function test_show_option_all_link_should_respect_page_for_posts() {
-                $cats = self::$factory->category->create_many( 2 );
-                $p = self::$factory->post->create( array( 'post_type' => 'page' ) );
+                $cats = self::factory()->category->create_many( 2 );
+                $p = self::factory()->post->create( array( 'post_type' => 'page' ) );
 
                 update_option( 'show_on_front', 'page' );
                 update_option( 'page_for_posts', $p );
@@ -125 +125 @@
                 register_post_type( 'wptests_pt2', array( 'has_archive' => true ) );
                 register_taxonomy( 'wptests_tax', array( 'foo', 'wptests_pt', 'wptests_pt2' ) );
 
-                $terms = self::$factory->term->create_many( 2, array(
+                $terms = self::factory()->term->create_many( 2, array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 
@@ -149 +149 @@
                 register_post_type( 'wptests_pt2', array( 'has_archive' => true ) );
                 register_taxonomy( 'wptests_tax', array( 'foo', 'wptests_pt', 'wptests_pt2' ) );
 
-                $terms = self::$factory->term->create_many( 2, array(
+                $terms = self::factory()->term->create_many( 2, array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 
@@ -170 +170 @@
                 register_post_type( 'wptests_pt2', array( 'has_archive' => true ) );
                 register_taxonomy( 'wptests_tax', array( 'foo', 'wptests_pt', 'post', 'wptests_pt2' ) );
 
-                $terms = self::$factory->term->create_many( 2, array(
+                $terms = self::factory()->term->create_many( 2, array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 
@@ -191 +191 @@
                 register_post_type( 'wptests_pt2', array( 'has_archive' => false ) );
                 register_taxonomy( 'wptests_tax', array( 'foo', 'wptests_pt', 'wptests_pt2' ) );
 
-                $terms = self::$factory->term->create_many( 2, array(
+                $terms = self::factory()->term->create_many( 2, array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 
@@ -254 +254 @@
          * @ticket 33460
          */
         public function test_hide_title_if_empty_should_be_ignored_when_category_list_is_not_empty() {
-                $cat = self::$factory->category->create();
+                $cat = self::factory()->category->create();
 
                 $found = wp_list_categories( array(
                         'echo' => false,
@@ -269 +269 @@
          * @ticket 12981
          */
         public function test_exclude_tree_should_be_respected() {
-                $c = self::$factory->category->create();
-                $parent = self::$factory->category->create( array( 'name' => 'Parent', 'slug' => 'parent' ) );
-                $child = self::$factory->category->create( array( 'name' => 'Child', 'slug' => 'child', 'parent' => $parent ) );
+                $c = self::factory()->category->create();
+                $parent = self::factory()->category->create( array( 'name' => 'Parent', 'slug' => 'parent' ) );
+                $child = self::factory()->category->create( array( 'name' => 'Child', 'slug' => 'child', 'parent' => $parent ) );
 
                 $args = array( 'echo' => 0, 'hide_empty' => 0, 'exclude_tree' => $parent );
 
@@ -286 +286 @@
          * @ticket 12981
          */
         public function test_exclude_tree_should_be_merged_with_exclude() {
-                $c = self::$factory->category->create();
-                $parent = self::$factory->category->create( array( 'name' => 'Parent', 'slug' => 'parent' ) );
-                $child = self::$factory->category->create( array( 'name' => 'Child', 'slug' => 'child', 'parent' => $parent ) );
-                $parent2 = self::$factory->category->create( array( 'name' => 'Parent', 'slug' => 'parent2' ) );
-                $child2 = self::$factory->category->create( array( 'name' => 'Child', 'slug' => 'child2', 'parent' => $parent2 ) );
+                $c = self::factory()->category->create();
+                $parent = self::factory()->category->create( array( 'name' => 'Parent', 'slug' => 'parent' ) );
+                $child = self::factory()->category->create( array( 'name' => 'Child', 'slug' => 'child', 'parent' => $parent ) );
+                $parent2 = self::factory()->category->create( array( 'name' => 'Parent', 'slug' => 'parent2' ) );
+                $child2 = self::factory()->category->create( array( 'name' => 'Child', 'slug' => 'child2', 'parent' => $parent2 ) );
 
                 $args = array( 'echo' => 0, 'hide_empty' => 0, 'exclude_tree' => $parent );
 

tests/phpunit/tests/comment-submission.php

@@ -38 +38 @@
 
                 $this->assertSame( 0, did_action( $error ) );
 
-                $post = self::$factory->post->create_and_get( array(
+                $post = self::factory()->post->create_and_get( array(
                         'comment_status' => 'closed',
                 ) );
                 $data = array(
@@ -58 +58 @@
 
                 $this->assertSame( 0, did_action( $error ) );
 
-                $post = self::$factory->post->create_and_get();
+                $post = self::factory()->post->create_and_get();
                 wp_trash_post( $post );
                 $data = array(
                         'comment_post_ID' => $post->ID,
@@ -77 +77 @@
 
                 $this->assertSame( 0, did_action( $error ) );
 
-                $post = self::$factory->post->create_and_get( array(
+                $post = self::factory()->post->create_and_get( array(
                         'post_status' => 'draft',
                 ) );
                 $data = array(
@@ -98 +98 @@
 
                 $this->assertSame( 0, did_action( $error ) );
 
-                $post = self::$factory->post->create_and_get( array(
+                $post = self::factory()->post->create_and_get( array(
                         'post_date' => date( 'Y-m-d H:i:s', strtotime( '+1 day' ) ),
                 ) );
 
@@ -121 +121 @@
 
                 $this->assertSame( 0, did_action( $error ) );
 
-                $post = self::$factory->post->create_and_get( array(
+                $post = self::factory()->post->create_and_get( array(
                         'post_password' => 'password',
                 ) );
                 $data = array(
@@ -142 +142 @@
 
                 $_COOKIE['wp-postpass_' . COOKIEHASH] = $hasher->HashPassword( $password );
 
-                $post = self::$factory->post->create_and_get( array(
+                $post = self::factory()->post->create_and_get( array(
                         'post_password' => $password,
                 ) );
                 $data = array(
@@ -162 +162 @@
 
         public function test_submitting_valid_comment_as_logged_in_user_succeeds() {
 
-                $user = self::$factory->user->create_and_get( array(
+                $user = self::factory()->user->create_and_get( array(
                         'user_url' => 'http://user.example.org'
                 ) );
 
                 wp_set_current_user( $user->ID );
 
-                $post = self::$factory->post->create_and_get();
+                $post = self::factory()->post->create_and_get();
                 $data = array(
                         'comment_post_ID' => $post->ID,
                         'comment'         => 'Comment',
@@ -187 +187 @@
 
         public function test_submitting_valid_comment_anonymously_succeeds() {
 
-                $post = self::$factory->post->create_and_get();
+                $post = self::factory()->post->create_and_get();
                 $data = array(
                         'comment_post_ID' => $post->ID,
                         'comment'         => 'Comment',
@@ -214 +214 @@
          */
         public function test_submitting_comment_handles_slashes_correctly_handles_slashes() {
 
-                $post = self::$factory->post->create_and_get();
+                $post = self::factory()->post->create_and_get();
                 $data = array(
                         'comment_post_ID' => $post->ID,
                         'comment'         => 'Comment with 1 slash: \\',
@@ -236 +236 @@
 
                 $error = 'not_logged_in';
 
-                $post = self::$factory->post->create_and_get( array(
+                $post = self::factory()->post->create_and_get( array(
                         'post_status' => 'private',
                 ) );
                 $data = array(
@@ -252 +252 @@
 
         public function test_submitting_comment_to_own_private_post_succeeds() {
 
-                $user = self::$factory->user->create_and_get();
+                $user = self::factory()->user->create_and_get();
 
                 wp_set_current_user( $user->ID );
 
-                $post = self::$factory->post->create_and_get( array(
+                $post = self::factory()->post->create_and_get( array(
                         'post_status' => 'private',
                         'post_author' => $user->ID,
                 ) );
@@ -274 +274 @@
 
         public function test_submitting_comment_to_accessible_private_post_succeeds() {
 
-                $author = self::$factory->user->create_and_get( array(
+                $author = self::factory()->user->create_and_get( array(
                         'role' => 'author',
                 ) );
-                $user = self::$factory->user->create_and_get( array(
+                $user = self::factory()->user->create_and_get( array(
                         'role' => 'editor',
                 ) );
 
                 wp_set_current_user( $user->ID );
 
-                $post = self::$factory->post->create_and_get( array(
+                $post = self::factory()->post->create_and_get( array(
                         'post_status' => 'private',
                         'post_author' => $author->ID,
                 ) );
@@ -301 +301 @@
 
         public function test_anonymous_user_cannot_comment_unfiltered_html() {
 
-                $post = self::$factory->post->create_and_get();
+                $post = self::factory()->post->create_and_get();
                 $data = array(
                         'comment_post_ID' => $post->ID,
                         'comment'         => 'Comment <script>alert(document.cookie);</script>',
@@ -318 +318 @@
 
         public function test_unprivileged_user_cannot_comment_unfiltered_html() {
 
-                $user = self::$factory->user->create_and_get( array(
+                $user = self::factory()->user->create_and_get( array(
                         'role' => 'author',
                 ) );
                 wp_set_current_user( $user->ID );
 
                 $this->assertFalse( current_user_can( 'unfiltered_html' ) );
 
-                $post = self::$factory->post->create_and_get();
+                $post = self::factory()->post->create_and_get();
                 $data = array(
                         'comment_post_ID' => $post->ID,
                         'comment'         => 'Comment <script>alert(document.cookie);</script>',
@@ -340 +340 @@
 
         public function test_unprivileged_user_cannot_comment_unfiltered_html_even_with_valid_nonce() {
 
-                $user = self::$factory->user->create_and_get( array(
+                $user = self::factory()->user->create_and_get( array(
                         'role' => 'author',
                 ) );
                 wp_set_current_user( $user->ID );
 
                 $this->assertFalse( current_user_can( 'unfiltered_html' ) );
 
-                $post   = self::$factory->post->create_and_get();
+                $post   = self::factory()->post->create_and_get();
                 $action = 'unfiltered-html-comment_' . $post->ID;
                 $nonce  = wp_create_nonce( $action );
 
@@ -370 +370 @@
 
                 $this->assertFalse( defined( 'DISALLOW_UNFILTERED_HTML' ) );
 
-                $user = self::$factory->user->create_and_get( array(
+                $user = self::factory()->user->create_and_get( array(
                         'role' => 'editor',
                 ) );
 
@@ -384 +384 @@
 
                 $this->assertTrue( current_user_can( 'unfiltered_html' ) );
 
-                $post   = self::$factory->post->create_and_get();
+                $post   = self::factory()->post->create_and_get();
                 $action = 'unfiltered-html-comment_' . $post->ID;
                 $nonce  = wp_create_nonce( $action );
 
@@ -405 +405 @@
 
         public function test_privileged_user_cannot_comment_unfiltered_html_without_valid_nonce() {
 
-                $user = self::$factory->user->create_and_get( array(
+                $user = self::factory()->user->create_and_get( array(
                         'role' => 'editor',
                 ) );
 
@@ -419 +419 @@
 
                 $this->assertTrue( current_user_can( 'unfiltered_html' ) );
 
-                $post   = self::$factory->post->create_and_get();
+                $post   = self::factory()->post->create_and_get();
                 $data = array(
                         'comment_post_ID' => $post->ID,
                         'comment'         => 'Comment <script>alert(document.cookie);</script>',
@@ -439 +439 @@
                 $_comment_registration = get_option( 'comment_registration' );
                 update_option( 'comment_registration', '1' );
 
-                $post = self::$factory->post->create_and_get();
+                $post = self::factory()->post->create_and_get();
                 $data = array(
                         'comment_post_ID' => $post->ID,
                 );
@@ -459 +459 @@
                 $_require_name_email = get_option( 'require_name_email' );
                 update_option( 'require_name_email', '1' );
 
-                $post = self::$factory->post->create_and_get();
+                $post = self::factory()->post->create_and_get();
                 $data = array(
                         'comment_post_ID' => $post->ID,
                         'comment'         => 'Comment',
@@ -481 +481 @@
                 $_require_name_email = get_option( 'require_name_email' );
                 update_option( 'require_name_email', '1' );
 
-                $post = self::$factory->post->create_and_get();
+                $post = self::factory()->post->create_and_get();
                 $data = array(
                         'comment_post_ID' => $post->ID,
                         'comment'         => 'Comment',
@@ -503 +503 @@
                 $_require_name_email = get_option( 'require_name_email' );
                 update_option( 'require_name_email', '1' );
 
-                $post = self::$factory->post->create_and_get();
+                $post = self::factory()->post->create_and_get();
                 $data = array(
                         'comment_post_ID' => $post->ID,
                         'comment'         => 'Comment',
@@ -523 +523 @@
 
                 $error = 'require_valid_comment';
 
-                $post = self::$factory->post->create_and_get();
+                $post = self::factory()->post->create_and_get();
                 $data = array(
                         'comment_post_ID' => $post->ID,
                         'comment'         => '',

tests/phpunit/tests/comment.php

@@ -21 +21 @@
         }
 
         function test_wp_update_comment() {
-                $post = self::$factory->post->create_and_get( array( 'post_title' => 'some-post', 'post_type' => 'post' ) );
-                $post2 = self::$factory->post->create_and_get( array( 'post_title' => 'some-post-2', 'post_type' => 'post' ) );
-                $comments = self::$factory->comment->create_post_comments( $post->ID, 5 );
+                $post = self::factory()->post->create_and_get( array( 'post_title' => 'some-post', 'post_type' => 'post' ) );
+                $post2 = self::factory()->post->create_and_get( array( 'post_title' => 'some-post-2', 'post_type' => 'post' ) );
+                $comments = self::factory()->comment->create_post_comments( $post->ID, 5 );
                 $result = wp_update_comment( array( 'comment_ID' => $comments[0], 'comment_parent' => $comments[1] ) );
                 $this->assertEquals( 1, $result );
                 $comment = get_comment( $comments[0] );
@@ -39 +39 @@
          * @ticket 30627
          */
         function test_wp_update_comment_updates_comment_type() {
-                $comment_id = self::$factory->comment->create( array( 'comment_post_ID' => self::$post_id ) );
+                $comment_id = self::factory()->comment->create( array( 'comment_post_ID' => self::$post_id ) );
 
                 wp_update_comment( array( 'comment_ID' => $comment_id, 'comment_type' => 'pingback' ) );
 
@@ -51 +51 @@
          * @ticket 30307
          */
         function test_wp_update_comment_updates_user_id() {
-                $comment_id = self::$factory->comment->create( array( 'comment_post_ID' => self::$post_id ) );
+                $comment_id = self::factory()->comment->create( array( 'comment_post_ID' => self::$post_id ) );
 
                 wp_update_comment( array( 'comment_ID' => $comment_id, 'user_id' => 1 ) );
 
@@ -60 +60 @@
         }
 
         public function test_get_approved_comments() {
-                $ca1 = self::$factory->comment->create( array(
+                $ca1 = self::factory()->comment->create( array(
                         'comment_post_ID' => self::$post_id, 'comment_approved' => '1'
                 ) );
-                $ca2 = self::$factory->comment->create( array(
+                $ca2 = self::factory()->comment->create( array(
                         'comment_post_ID' => self::$post_id, 'comment_approved' => '1'
                 ) );
-                $ca3 = self::$factory->comment->create( array(
+                $ca3 = self::factory()->comment->create( array(
                         'comment_post_ID' => self::$post_id, 'comment_approved' => '0'
                 ) );
-                $c2 = self::$factory->comment->create( array(
+                $c2 = self::factory()->comment->create( array(
                         'comment_post_ID' => self::$post_id, 'comment_approved' => '1', 'comment_type' => 'pingback'
                 ) );
-                $c3 = self::$factory->comment->create( array(
+                $c3 = self::factory()->comment->create( array(
                         'comment_post_ID' => self::$post_id, 'comment_approved' => '1', 'comment_type' => 'trackback'
                 ) );
-                $c4 = self::$factory->comment->create( array(
+                $c4 = self::factory()->comment->create( array(
                         'comment_post_ID' => self::$post_id, 'comment_approved' => '1', 'comment_type' => 'mario'
                 ) );
-                $c5 = self::$factory->comment->create( array(
+                $c5 = self::factory()->comment->create( array(
                         'comment_post_ID' => self::$post_id, 'comment_approved' => '1', 'comment_type' => 'luigi'
                 ) );
 
@@ -92 +92 @@
          * @ticket 30412
          */
         public function test_get_approved_comments_with_post_id_0_should_return_empty_array() {
-                $ca1 = self::$factory->comment->create( array(
+                $ca1 = self::factory()->comment->create( array(
                         'comment_post_ID' => self::$post_id, 'comment_approved' => '1'
                 ) );
 
@@ -256 +256 @@
          * @ticket 32566
          */
         public function test_wp_notify_moderator_should_not_throw_notice_when_post_author_is_0() {
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_author' => 0,
                 ) );
 
-                $c = self::$factory->comment->create( array(
+                $c = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                 ) );
 
@@ -271 +271 @@
          * @ticket 33587
          */
         public function test_wp_new_comment_notify_postauthor_should_not_send_email_when_comment_has_been_marked_as_spam() {
-                $c = self::$factory->comment->create( array(
+                $c = self::factory()->comment->create( array(
                         'comment_post_ID' => self::$post_id,
                         'comment_approved' => 'spam',
                 ) );
@@ -284 +284 @@
          * @ticket 12431
          */
         public function test_wp_new_comment_with_meta() {
-                $c = self::$factory->comment->create( array(
+                $c = self::factory()->comment->create( array(
                         'comment_approved' => '1',
                         'comment_meta' => array(
                                 'food' => 'taco',
@@ -299 +299 @@
          * @ticket 8071
          */
         public function test_wp_comment_get_children_should_fill_children() {
-                $c1 = self::$factory->comment->create( array(
+                $c1 = self::factory()->comment->create( array(
                         'comment_post_ID' => self::$post_id,
                         'comment_approved' => '1',
                 ) );
 
-                $c2 = self::$factory->comment->create( array(
+                $c2 = self::factory()->comment->create( array(
                         'comment_post_ID' => self::$post_id,
                         'comment_approved' => '1',
                         'comment_parent' => $c1,
                 ) );
 
-                $c3 = self::$factory->comment->create( array(
+                $c3 = self::factory()->comment->create( array(
                         'comment_post_ID' => self::$post_id,
                         'comment_approved' => '1',
                         'comment_parent' => $c2,
                 ) );
 
-                $c4 = self::$factory->comment->create( array(
+                $c4 = self::factory()->comment->create( array(
                         'comment_post_ID' => self::$post_id,
                         'comment_approved' => '1',
                         'comment_parent' => $c1,
                 ) );
 
-                $c5 = self::$factory->comment->create( array(
+                $c5 = self::factory()->comment->create( array(
                         'comment_post_ID' => self::$post_id,
                         'comment_approved' => '1',
                 ) );
 
-                $c6 = self::$factory->comment->create( array(
+                $c6 = self::factory()->comment->create( array(
                         'comment_post_ID' => self::$post_id,
                         'comment_approved' => '1',
                         'comment_parent' => $c5,
@@ -347 +347 @@
          * @group 27571
          */
         public function test_post_properties_should_be_lazyloaded() {
-                $c = self::$factory->comment->create( array( 'comment_post_ID' => self::$post_id ) );
+                $c = self::factory()->comment->create( array( 'comment_post_ID' => self::$post_id ) );
 
                 $post = get_post( self::$post_id );
                 $comment = get_comment( $c );

tests/phpunit/tests/comment/checkComment.php

@@ -31 +31 @@
         }
 
         public function test_should_return_true_when_comment_whitelist_is_enabled_and_author_has_approved_comment() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
                 $prev_args = array(
                         'comment_post_ID'      => $post_id,
                         'comment_content'      => 'Can we build it?',
@@ -39 +39 @@
                         'comment_author_email' => 'bob@example.com',
                         'comment_author'       => 'BobtheBuilder',
                 );
-                $prev_comment_id = self::$factory->comment->create( $prev_args );
+                $prev_comment_id = self::factory()->comment->create( $prev_args );
 
                 update_option( 'comment_whitelist', 1 );
 

tests/phpunit/tests/comment/commentForm.php

@@ -5 +5 @@
  */
 class Tests_Comment_CommentForm extends WP_UnitTestCase {
         public function test_default_markup_for_submit_button_and_wrapper() {
-                $p = self::$factory->post->create();
+                $p = self::factory()->post->create();
 
                 $args = array(
                         'name_submit' => 'foo-name',
@@ -21 +21 @@
         }
 
         public function test_custom_submit_button() {
-                $p = self::$factory->post->create();
+                $p = self::factory()->post->create();
 
                 $args = array(
                         'name_submit' => 'foo-name',
@@ -37 +37 @@
         }
 
         public function test_custom_submit_field() {
-                $p = self::$factory->post->create();
+                $p = self::factory()->post->create();
 
                 $args = array(
                         'name_submit' => 'foo-name',
@@ -57 +57 @@
          * @ticket 32312
          */
         public function test_submit_button_and_submit_field_should_fall_back_on_defaults_when_filtered_defaults_do_not_contain_the_keys() {
-                $p = self::$factory->post->create();
+                $p = self::factory()->post->create();
 
                 $args = array(
                         'name_submit' => 'foo-name',

tests/phpunit/tests/comment/commentsTemplate.php

@@ -12 +12 @@
          */
         public function test_should_respect_comment_order_asc_when_default_comments_page_is_newest() {
                 $now = time();
-                $p = self::$factory->post->create();
-                $comment_1 = self::$factory->comment->create( array(
+                $p = self::factory()->post->create();
+                $comment_1 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '1',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
                 ) );
-                $comment_2 = self::$factory->comment->create( array(
+                $comment_2 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '2',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
@@ -42 +42 @@
          */
         public function test_should_respect_comment_order_desc_when_default_comments_page_is_newest() {
                 $now = time();
-                $p = self::$factory->post->create();
-                $comment_1 = self::$factory->comment->create( array(
+                $p = self::factory()->post->create();
+                $comment_1 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '1',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
                 ) );
-                $comment_2 = self::$factory->comment->create( array(
+                $comment_2 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '2',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
@@ -72 +72 @@
          */
         public function test_should_respect_comment_order_asc_when_default_comments_page_is_oldest() {
                 $now = time();
-                $p = self::$factory->post->create();
-                $comment_1 = self::$factory->comment->create( array(
+                $p = self::factory()->post->create();
+                $comment_1 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '1',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
                 ) );
-                $comment_2 = self::$factory->comment->create( array(
+                $comment_2 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '2',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
@@ -102 +102 @@
          */
         public function test_should_respect_comment_order_desc_when_default_comments_page_is_oldest() {
                 $now = time();
-                $p = self::$factory->post->create();
-                $comment_1 = self::$factory->comment->create( array(
+                $p = self::factory()->post->create();
+                $comment_1 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '1',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
                 ) );
-                $comment_2 = self::$factory->comment->create( array(
+                $comment_2 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '2',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
@@ -132 +132 @@
          */
         public function test_should_respect_comment_order_asc_when_default_comments_page_is_newest_on_subsequent_pages() {
                 $now = time();
-                $p = self::$factory->post->create();
-                $comment_1 = self::$factory->comment->create( array(
+                $p = self::factory()->post->create();
+                $comment_1 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '1',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
                 ) );
-                $comment_2 = self::$factory->comment->create( array(
+                $comment_2 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '2',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
                 ) );
-                $comment_3 = self::$factory->comment->create( array(
+                $comment_3 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '3',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 300 ),
                 ) );
-                $comment_4 = self::$factory->comment->create( array(
+                $comment_4 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '4',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 400 ),
                 ) );
-                $comment_5 = self::$factory->comment->create( array(
+                $comment_5 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '3',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 500 ),
                 ) );
-                $comment_6 = self::$factory->comment->create( array(
+                $comment_6 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '4',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 600 ),
@@ -187 +187 @@
          */
         public function test_should_respect_comment_order_desc_when_default_comments_page_is_newest_on_subsequent_pages() {
                 $now = time();
-                $p = self::$factory->post->create();
-                $comment_1 = self::$factory->comment->create( array(
+                $p = self::factory()->post->create();
+                $comment_1 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '1',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
                 ) );
-                $comment_2 = self::$factory->comment->create( array(
+                $comment_2 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '2',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
                 ) );
-                $comment_3 = self::$factory->comment->create( array(
+                $comment_3 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '3',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 300 ),
                 ) );
-                $comment_4 = self::$factory->comment->create( array(
+                $comment_4 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '4',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 400 ),
                 ) );
-                $comment_5 = self::$factory->comment->create( array(
+                $comment_5 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '3',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 500 ),
                 ) );
-                $comment_6 = self::$factory->comment->create( array(
+                $comment_6 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '4',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 600 ),
@@ -242 +242 @@
          */
         public function test_should_respect_comment_order_asc_when_default_comments_page_is_oldest_on_subsequent_pages() {
                 $now = time();
-                $p = self::$factory->post->create();
-                $comment_1 = self::$factory->comment->create( array(
+                $p = self::factory()->post->create();
+                $comment_1 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '1',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
                 ) );
-                $comment_2 = self::$factory->comment->create( array(
+                $comment_2 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '2',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
                 ) );
-                $comment_3 = self::$factory->comment->create( array(
+                $comment_3 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '3',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 300 ),
                 ) );
-                $comment_4 = self::$factory->comment->create( array(
+                $comment_4 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '4',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 400 ),
@@ -287 +287 @@
          */
         public function test_should_respect_comment_order_desc_when_default_comments_page_is_oldest_on_subsequent_pages() {
                 $now = time();
-                $p = self::$factory->post->create();
-                $comment_1 = self::$factory->comment->create( array(
+                $p = self::factory()->post->create();
+                $comment_1 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '1',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
                 ) );
-                $comment_2 = self::$factory->comment->create( array(
+                $comment_2 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '2',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
                 ) );
-                $comment_3 = self::$factory->comment->create( array(
+                $comment_3 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '3',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 300 ),
                 ) );
-                $comment_4 = self::$factory->comment->create( array(
+                $comment_4 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '4',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 400 ),
@@ -334 +334 @@
          */
         public function test_last_page_of_comments_should_be_full_when_default_comment_page_is_newest() {
                 $now = time();
-                $p = self::$factory->post->create();
-                $comment_1 = self::$factory->comment->create( array(
+                $p = self::factory()->post->create();
+                $comment_1 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '1',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
                 ) );
-                $comment_2 = self::$factory->comment->create( array(
+                $comment_2 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '2',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
                 ) );
-                $comment_3 = self::$factory->comment->create( array(
+                $comment_3 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '3',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 300 ),
@@ -376 +376 @@
          */
         public function test_first_page_of_comments_should_have_remainder_when_default_comments_page_is_newest() {
                 $now = time();
-                $p = self::$factory->post->create();
-                $comment_1 = self::$factory->comment->create( array(
+                $p = self::factory()->post->create();
+                $comment_1 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '1',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
                 ) );
-                $comment_2 = self::$factory->comment->create( array(
+                $comment_2 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '2',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
                 ) );
-                $comment_3 = self::$factory->comment->create( array(
+                $comment_3 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '3',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 300 ),
@@ -416 +416 @@
          */
         public function test_comment_permalinks_should_be_correct_when_using_default_display_callback_with_default_comment_page_oldest() {
                 $now = time();
-                $p = self::$factory->post->create();
-                $comment_1 = self::$factory->comment->create( array(
+                $p = self::factory()->post->create();
+                $comment_1 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '1',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
                 ) );
-                $comment_2 = self::$factory->comment->create( array(
+                $comment_2 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '2',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
                 ) );
-                $comment_3 = self::$factory->comment->create( array(
+                $comment_3 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '3',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 300 ),
                 ) );
-                $comment_4 = self::$factory->comment->create( array(
+                $comment_4 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '4',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 400 ),
@@ -480 +480 @@
          */
         public function test_comment_permalinks_should_be_correct_when_using_default_display_callback_with_default_comment_page_newest() {
                 $now = time();
-                $p = self::$factory->post->create();
-                $comment_1 = self::$factory->comment->create( array(
+                $p = self::factory()->post->create();
+                $comment_1 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '1',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
                 ) );
-                $comment_2 = self::$factory->comment->create( array(
+                $comment_2 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '2',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
                 ) );
-                $comment_3 = self::$factory->comment->create( array(
+                $comment_3 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '3',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 300 ),
                 ) );
-                $comment_4 = self::$factory->comment->create( array(
+                $comment_4 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '4',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 400 ),
                 ) );
-                $comment_5 = self::$factory->comment->create( array(
+                $comment_5 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '4',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 500 ),
                 ) );
-                $comment_6 = self::$factory->comment->create( array(
+                $comment_6 = self::factory()->comment->create( array(
                         'comment_post_ID' => $p,
                         'comment_content' => '4',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 600 ),

tests/phpunit/tests/comment/dateQuery.php

@@ -22 +22 @@
 
                 // Just some dummy posts to use as parents for comments
                 for ( $i = 1; $i <= 2; $i++ ) {
-                        $this->posts[$i] = self::$factory->post->create();
+                        $this->posts[$i] = self::factory()->post->create();
                 }
 
                 // Be careful modifying this. Tests are coded to expect this exact sample data.
@@ -39 +39 @@
                 );
 
                 foreach ( $comment_dates as $comment_date => $comment_parent ) {
-                        $result = self::$factory->comment->create( array(
+                        $result = self::factory()->comment->create( array(
                                 'comment_date'    => $comment_date,
                                 'comment_post_ID' => $this->posts[ $comment_parent ],
                         ) );

tests/phpunit/tests/comment/getCommentClass.php

@@ -5 +5 @@
  */
 class Tests_Comment_GetCommentClass extends WP_UnitTestCase {
         public function test_should_accept_comment_id() {
-                $post_id    = self::$factory->post->create();
-                $comment_id = self::$factory->comment->create( array( 'comment_post_ID' => $post_id ) );
+                $post_id    = self::factory()->post->create();
+                $comment_id = self::factory()->comment->create( array( 'comment_post_ID' => $post_id ) );
 
                 $classes = get_comment_class( '', $comment_id );
                 $this->assertContains( 'comment', $classes );
         }
 
         public function test_should_accept_comment_object() {
-                $post_id = self::$factory->post->create();
-                $comment = self::$factory->comment->create_and_get( array( 'comment_post_ID' => $post_id ) );
+                $post_id = self::factory()->post->create();
+                $comment = self::factory()->comment->create_and_get( array( 'comment_post_ID' => $post_id ) );
 
                 $classes = get_comment_class( '', $comment );
                 $this->assertContains( 'comment', $classes );
         }
 
         public function test_should_append_single_class() {
-                $post_id    = self::$factory->post->create();
-                $comment_id = self::$factory->comment->create( array( 'comment_post_ID' => $post_id ) );
+                $post_id    = self::factory()->post->create();
+                $comment_id = self::factory()->comment->create( array( 'comment_post_ID' => $post_id ) );
 
                 $classes = get_comment_class( 'foo', $comment_id );
                 $this->assertContains( 'foo', $classes );
         }
 
         public function test_should_append_array_of_classes() {
-                $post_id    = self::$factory->post->create();
-                $comment_id = self::$factory->comment->create( array( 'comment_post_ID' => $post_id ) );
+                $post_id    = self::factory()->post->create();
+                $comment_id = self::factory()->comment->create( array( 'comment_post_ID' => $post_id ) );
 
                 $classes = get_comment_class( array( 'foo', 'bar' ), $comment_id );
                 $this->assertContains( 'foo', $classes );

tests/phpunit/tests/comment/getCommentCount.php

@@ -14 +14 @@
         }
 
         public function test_get_comment_count_approved() {
-                self::$factory->comment->create( array(
+                self::factory()->comment->create( array(
                         'comment_approved' => 1
                 ) );
 
@@ -29 +29 @@
         }
 
         public function test_get_comment_count_awaiting() {
-                self::$factory->comment->create( array(
+                self::factory()->comment->create( array(
                         'comment_approved' => 0
                 ) );
 
@@ -44 +44 @@
         }
 
         public function test_get_comment_count_spam() {
-                self::$factory->comment->create( array(
+                self::factory()->comment->create( array(
                         'comment_approved' => 'spam'
                 ) );
 
@@ -59 +59 @@
         }
 
         public function test_get_comment_count_trash() {
-                self::$factory->comment->create( array(
+                self::factory()->comment->create( array(
                         'comment_approved' => 'trash'
                 ) );
 
@@ -74 +74 @@
         }
 
         public function test_get_comment_count_post_trashed() {
-                self::$factory->comment->create( array(
+                self::factory()->comment->create( array(
                         'comment_approved' => 'post-trashed'
                 ) );
 

tests/phpunit/tests/comment/getCommentExcerpt.php

@@ -14 +14 @@
         }
 
         public function test_get_comment_excerpt() {
-                $comment_id = self::$factory->comment->create( array(
+                $comment_id = self::factory()->comment->create( array(
                         'comment_content' => self::$bacon_comment
                 ) );
 
@@ -24 +24 @@
         }
 
         public function test_get_comment_excerpt_filtered() {
-                $comment_id = self::$factory->comment->create( array(
+                $comment_id = self::factory()->comment->create( array(
                         'comment_content' => self::$bacon_comment
                 ) );
 

tests/phpunit/tests/comment/getCommentLink.php

@@ -11 +11 @@
                 parent::setUp();
 
                 $now = time();
-                $this->p = self::$factory->post->create();
-                $this->comments[] = self::$factory->comment->create( array(
+                $this->p = self::factory()->post->create();
+                $this->comments[] = self::factory()->comment->create( array(
                         'comment_post_ID' => $this->p,
                         'comment_content' => '1',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 100 ),
                 ) );
-                $this->comments[] = self::$factory->comment->create( array(
+                $this->comments[] = self::factory()->comment->create( array(
                         'comment_post_ID' => $this->p,
                         'comment_content' => '2',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 200 ),
                 ) );
-                $this->comments[] = self::$factory->comment->create( array(
+                $this->comments[] = self::factory()->comment->create( array(
                         'comment_post_ID' => $this->p,
                         'comment_content' => '3',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 300 ),
                 ) );
-                $this->comments[] = self::$factory->comment->create( array(
+                $this->comments[] = self::factory()->comment->create( array(
                         'comment_post_ID' => $this->p,
                         'comment_content' => '4',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 400 ),
                 ) );
-                $this->comments[] = self::$factory->comment->create( array(
+                $this->comments[] = self::factory()->comment->create( array(
                         'comment_post_ID' => $this->p,
                         'comment_content' => '4',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 500 ),
                 ) );
-                $this->comments[] = self::$factory->comment->create( array(
+                $this->comments[] = self::factory()->comment->create( array(
                         'comment_post_ID' => $this->p,
                         'comment_content' => '4',
                         'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 600 ),

tests/phpunit/tests/comment/getCommentsPagesCount.php

@@ -38 +38 @@
          */
         function test_empty() {
                 //setup post and comments
-                $post_id = self::$factory->post->create( array( 'post_title' => 'comment--post', 'post_type' => 'post' ) );
+                $post_id = self::factory()->post->create( array( 'post_title' => 'comment--post', 'post_type' => 'post' ) );
                 $this->go_to( '/?p=' . $post_id );
 
                 global $wp_query;
@@ -60 +60 @@
          */
         function test_threaded_comments( ) {
                 //setup post and comments
-                $post = self::$factory->post->create_and_get( array( 'post_title' => 'comment--post', 'post_type' => 'post' ) );
-                $comments = self::$factory->comment->create_post_comments( $post->ID, 15 );
-                self::$factory->comment->create_post_comments( $post->ID, 6, array( 'comment_parent' => $comments[0] ) );
+                $post = self::factory()->post->create_and_get( array( 'post_title' => 'comment--post', 'post_type' => 'post' ) );
+                $comments = self::factory()->comment->create_post_comments( $post->ID, 15 );
+                self::factory()->comment->create_post_comments( $post->ID, 6, array( 'comment_parent' => $comments[0] ) );
                 $comments = get_comments( array( 'post_id' => $post->ID ) );
 
                 $this->assertEquals( 3, get_comment_pages_count( $comments, 10, false ) );
@@ -76 +76 @@
         function test_option_thread_comments() {
 
                 //setup post and comments
-                $post = self::$factory->post->create_and_get( array( 'post_title' => 'comment--post', 'post_type' => 'post' ) );
-                $comments = self::$factory->comment->create_post_comments( $post->ID, 15 );
-                self::$factory->comment->create_post_comments( $post->ID, 6, array('comment_parent' => $comments[0] ) );
+                $post = self::factory()->post->create_and_get( array( 'post_title' => 'comment--post', 'post_type' => 'post' ) );
+                $comments = self::factory()->comment->create_post_comments( $post->ID, 15 );
+                self::factory()->comment->create_post_comments( $post->ID, 6, array('comment_parent' => $comments[0] ) );
                 $comments = get_comments( array( 'post_id' => $post->ID ) );
 
                 update_option( 'thread_comments', false );
@@ -104 +104 @@
 
                 update_option( 'posts_per_rss', 100 );
 
-                $post = self::$factory->post->create_and_get( array( 'post_title' => 'comment-post', 'post_type' => 'post' ) );
-                $comments = self::$factory->comment->create_post_comments( $post->ID, 25 );
+                $post = self::factory()->post->create_and_get( array( 'post_title' => 'comment-post', 'post_type' => 'post' ) );
+                $comments = self::factory()->comment->create_post_comments( $post->ID, 25 );
 
                 $wp_query = new WP_Query( array( 'p' => $post->ID, 'comments_per_page' => 10, 'feed' =>'comments-' ) );
 

tests/phpunit/tests/comment/getPageOfComment.php

@@ -7 +7 @@
 class Tests_Comment_GetPageOfComment extends WP_UnitTestCase {
 
         public function test_last_comment() {
-                $p = self::$factory->post->create();
+                $p = self::factory()->post->create();
 
                 // page 4
-                $comment_last = self::$factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-24 00:00:00' ) );
-                self::$factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-23 00:00:00' ) );
+                $comment_last = self::factory()->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-24 00:00:00' ) );
+                self::factory()->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-23 00:00:00' ) );
 
                 // page 3
-                self::$factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-22 00:00:00' ) );
-                self::$factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-21 00:00:00' ) );
-                self::$factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-20 00:00:00' ) );
+                self::factory()->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-22 00:00:00' ) );
+                self::factory()->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-21 00:00:00' ) );
+                self::factory()->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-20 00:00:00' ) );
 
                 // page 2
-                self::$factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-19 00:00:00' ) );
-                self::$factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-18 00:00:00' ) );
-                self::$factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-17 00:00:00' ) );
+                self::factory()->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-19 00:00:00' ) );
+                self::factory()->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-18 00:00:00' ) );
+                self::factory()->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-17 00:00:00' ) );
 
                 // page 1
-                self::$factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-16 00:00:00' ) );
-                self::$factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-15 00:00:00' ) );
-                $comment_first = self::$factory->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-14 00:00:00' ) );
+                self::factory()->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-16 00:00:00' ) );
+                self::factory()->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-15 00:00:00' ) );
+                $comment_first = self::factory()->comment->create_post_comments( $p, 1, array( 'comment_date' => '2013-09-14 00:00:00' ) );
 
                 $this->assertEquals( 4, get_page_of_comment( $comment_last[0],  array( 'per_page' =>  3 ) ) );
                 $this->assertEquals( 2, get_page_of_comment( $comment_last[0],  array( 'per_page' => 10 ) ) );
@@ -36 +36 @@
         }
 
         public function test_type_pings() {
-                $p = self::$factory->post->create();
+                $p = self::factory()->post->create();
                 $now = time();
 
                 $trackbacks = array();
                 for ( $i = 0; $i <= 3; $i++ ) {
-                        $trackbacks[ $i ] = self::$factory->comment->create( array( 'comment_post_ID' => $p, 'comment_type' => 'trackback', 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now ) ) );
+                        $trackbacks[ $i ] = self::factory()->comment->create( array( 'comment_post_ID' => $p, 'comment_type' => 'trackback', 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now ) ) );
                         $now -= 10 * $i;
                 }
 
                 $pingbacks = array();
                 for ( $i = 0; $i <= 6; $i++ ) {
-                        $pingbacks[ $i ] = self::$factory->comment->create( array( 'comment_post_ID' => $p, 'comment_type' => 'pingback', 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now ) ) );
+                        $pingbacks[ $i ] = self::factory()->comment->create( array( 'comment_post_ID' => $p, 'comment_type' => 'pingback', 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now ) ) );
                         $now -= 10 * $i;
                 }
 
@@ -62 +62 @@
         public function test_subsequent_calls_should_hit_cache() {
                 global $wpdb;
 
-                $p = self::$factory->post->create();
-                $c = self::$factory->comment->create( array( 'comment_post_ID' => $p ) );
+                $p = self::factory()->post->create();
+                $c = self::factory()->comment->create( array( 'comment_post_ID' => $p ) );
 
                 // Prime cache.
                 $page_1 = get_page_of_comment( $c, array( 'per_page' => 3 ) );
@@ -81 +81 @@
         public function test_cache_hits_should_be_sensitive_to_comment_type() {
                 global $wpdb;
 
-                $p = self::$factory->post->create();
-                $comment = self::$factory->comment->create( array( 'comment_post_ID' => $p, 'comment_type' => 'comment' ) );
+                $p = self::factory()->post->create();
+                $comment = self::factory()->comment->create( array( 'comment_post_ID' => $p, 'comment_type' => 'comment' ) );
 
                 $now = time();
                 $trackbacks = array();
                 for ( $i = 0; $i <= 5; $i++ ) {
-                        $trackbacks[ $i ] = self::$factory->comment->create( array( 'comment_post_ID' => $p, 'comment_type' => 'trackback', 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - ( 10 * $i ) ) ) );
+                        $trackbacks[ $i ] = self::factory()->comment->create( array( 'comment_post_ID' => $p, 'comment_type' => 'trackback', 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - ( 10 * $i ) ) ) );
                 }
 
                 // Prime cache for trackbacks.
@@ -105 +105 @@
          * @ticket 11334
          */
         public function test_cache_should_be_invalidated_when_comment_is_approved() {
-                $p = self::$factory->post->create();
-                $c = self::$factory->comment->create( array( 'comment_post_ID' => $p, 'comment_approved' => 0 ) );
+                $p = self::factory()->post->create();
+                $c = self::factory()->comment->create( array( 'comment_post_ID' => $p, 'comment_approved' => 0 ) );
 
                 // Prime cache.
                 $page_1 = get_page_of_comment( $c, array( 'per_page' => 3 ) );
@@ -121 +121 @@
          * @ticket 11334
          */
         public function test_cache_should_be_invalidated_when_comment_is_deleted() {
-                $p = self::$factory->post->create();
-                $c = self::$factory->comment->create( array( 'comment_post_ID' => $p ) );
+                $p = self::factory()->post->create();
+                $c = self::factory()->comment->create( array( 'comment_post_ID' => $p ) );
 
                 // Prime cache.
                 $page_1 = get_page_of_comment( $c, array( 'per_page' => 3 ) );
@@ -137 +137 @@
          * @ticket 11334
          */
         public function test_cache_should_be_invalidated_when_comment_is_spammed() {
-                $p = self::$factory->post->create();
-                $c = self::$factory->comment->create( array( 'comment_post_ID' => $p ) );
+                $p = self::factory()->post->create();
+                $c = self::factory()->comment->create( array( 'comment_post_ID' => $p ) );
 
                 // Prime cache.
                 $page_1 = get_page_of_comment( $c, array( 'per_page' => 3 ) );
@@ -155 +155 @@
         public function test_cache_should_be_invalidated_when_older_comment_is_published() {
                 $now = time();
 
-                $p = self::$factory->post->create();
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now ) ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 20 ) ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $p, 'comment_approved' => 0, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 30 ) ) );
+                $p = self::factory()->post->create();
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now ) ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 20 ) ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $p, 'comment_approved' => 0, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 30 ) ) );
 
                 $this->assertEquals( 1, get_page_of_comment( $c1, array( 'per_page' => 2 ) ) );
 
@@ -171 +171 @@
          * @ticket 34057
          */
         public function test_query_should_be_limited_to_comments_on_the_proper_post() {
-                $posts = self::$factory->post->create_many( 2 );
+                $posts = self::factory()->post->create_many( 2 );
 
                 $now = time();
                 $comments_0 = $comments_1 = array();
                 for ( $i = 0; $i < 5; $i++ ) {
-                        $comments_0[] = self::$factory->comment->create( array( 'comment_post_ID' => $posts[0], 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - ( $i * 60 ) ) ) );
-                        $comments_1[] = self::$factory->comment->create( array( 'comment_post_ID' => $posts[1], 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - ( $i * 60 ) ) ) );
+                        $comments_0[] = self::factory()->comment->create( array( 'comment_post_ID' => $posts[0], 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - ( $i * 60 ) ) ) );
+                        $comments_1[] = self::factory()->comment->create( array( 'comment_post_ID' => $posts[1], 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - ( $i * 60 ) ) ) );
                 }
 
                 $found_0 = get_page_of_comment( $comments_0[0], array( 'per_page' => 2 ) );
@@ -191 +191 @@
          * @ticket 13939
          */
         public function test_only_top_level_comments_should_be_included_in_older_count() {
-                $post = self::$factory->post->create();
+                $post = self::factory()->post->create();
 
                 $now = time();
                 $comment_parents = $comment_children = array();
                 for ( $i = 0; $i < 5; $i++ ) {
-                        $parent = self::$factory->comment->create( array( 'comment_post_ID' => $post, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - ( $i * 60 ) ) ) );
+                        $parent = self::factory()->comment->create( array( 'comment_post_ID' => $post, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - ( $i * 60 ) ) ) );
                         $comment_parents[ $i ] = $parent;
 
-                        $child = self::$factory->comment->create( array( 'comment_post_ID' => $post, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - ( $i * 59 ) ), 'comment_parent' => $parent ) );
+                        $child = self::factory()->comment->create( array( 'comment_post_ID' => $post, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - ( $i * 59 ) ), 'comment_parent' => $parent ) );
                         $comment_children[ $i ] = $child;
                 }
 
@@ -228 +228 @@
         public function test_comments_per_page_option_should_be_fallback_when_query_var_is_not_available() {
                 $now = time();
 
-                $p = self::$factory->post->create();
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now ) ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 20 ) ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 30 ) ) );
+                $p = self::factory()->post->create();
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now ) ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 20 ) ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $p, 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - 30 ) ) );
 
                 update_option( 'comments_per_page', 2 );
 

tests/phpunit/tests/comment/metaCache.php

@@ -10 +10 @@
         public function test_update_comment_meta_cache_should_default_to_true() {
                 global $wpdb;
 
-                $p = self::$factory->post->create( array( 'post_status' => 'publish' ) );
-                $comment_ids = self::$factory->comment->create_post_comments( $p, 3 );
+                $p = self::factory()->post->create( array( 'post_status' => 'publish' ) );
+                $comment_ids = self::factory()->comment->create_post_comments( $p, 3 );
 
                 foreach ( $comment_ids as $cid ) {
                         update_comment_meta( $cid, 'foo', 'bar' );
@@ -38 +38 @@
         public function test_update_comment_meta_cache_true() {
                 global $wpdb;
 
-                $p = self::$factory->post->create( array( 'post_status' => 'publish' ) );
-                $comment_ids = self::$factory->comment->create_post_comments( $p, 3 );
+                $p = self::factory()->post->create( array( 'post_status' => 'publish' ) );
+                $comment_ids = self::factory()->comment->create_post_comments( $p, 3 );
 
                 foreach ( $comment_ids as $cid ) {
                         update_comment_meta( $cid, 'foo', 'bar' );
@@ -67 +67 @@
         public function test_update_comment_meta_cache_false() {
                 global $wpdb;
 
-                $p = self::$factory->post->create( array( 'post_status' => 'publish' ) );
-                $comment_ids = self::$factory->comment->create_post_comments( $p, 3 );
+                $p = self::factory()->post->create( array( 'post_status' => 'publish' ) );
+                $comment_ids = self::factory()->comment->create_post_comments( $p, 3 );
 
                 foreach ( $comment_ids as $cid ) {
                         update_comment_meta( $cid, 'foo', 'bar' );
@@ -93 +93 @@
         public function test_comment_meta_should_be_lazy_loaded_for_all_comments_in_comments_template() {
                 global $wpdb;
 
-                $p = self::$factory->post->create( array( 'post_status' => 'publish' ) );
-                $comment_ids = self::$factory->comment->create_post_comments( $p, 3 );
+                $p = self::factory()->post->create( array( 'post_status' => 'publish' ) );
+                $comment_ids = self::factory()->comment->create_post_comments( $p, 3 );
 
                 foreach ( $comment_ids as $cid ) {
                         update_comment_meta( $cid, 'sauce', 'fire' );
@@ -128 +128 @@
         public function test_comment_meta_should_be_lazy_loaded_in_comment_feed_queries() {
                 global $wpdb;
 
-                $posts = self::$factory->post->create_many( 2, array( 'post_status' => 'publish' ) );
+                $posts = self::factory()->post->create_many( 2, array( 'post_status' => 'publish' ) );
 
                 $now = time();
                 $comments = array();
                 for ( $i = 0; $i < 5; $i++ ) {
-                        $comments[] = self::$factory->comment->create( array(
+                        $comments[] = self::factory()->comment->create( array(
                                 'comment_post_ID' => $posts[0],
                                 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - ( 60 * $i ) ),
                         ) );
@@ -172 +172 @@
         public function test_comment_meta_should_be_lazy_loaded_in_single_post_comment_feed_queries() {
                 global $wpdb;
 
-                $posts = self::$factory->post->create_many( 2, array( 'post_status' => 'publish' ) );
+                $posts = self::factory()->post->create_many( 2, array( 'post_status' => 'publish' ) );
 
                 $now = time();
                 $comments = array();
                 for ( $i = 0; $i < 5; $i++ ) {
-                        $comments[] = self::$factory->comment->create( array(
+                        $comments[] = self::factory()->comment->create( array(
                                 'comment_post_ID' => $posts[0],
                                 'comment_date_gmt' => date( 'Y-m-d H:i:s', $now - ( 60 * $i ) ),
                         ) );

tests/phpunit/tests/comment/query.php

@@ -12 +12 @@
         function setUp() {
                 parent::setUp();
 
-                $this->post_id = self::$factory->post->create();
+                $this->post_id = self::factory()->post->create();
         }
 
         public function test_query() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
-                $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
-                $c5 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+                $c4 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
+                $c5 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -31 +31 @@
         }
 
         public function test_query_post_id_0() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -46 +46 @@
          * @ticket 12668
          */
         public function test_query_type_empty_string() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
-                $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
-                $c5 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+                $c4 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
+                $c5 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -65 +65 @@
          * @ticket 12668
          */
         public function test_query_type_comment() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
-                $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
-                $c5 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+                $c4 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
+                $c5 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -81 +81 @@
         }
 
         public function test_query_type_pingback() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
-                $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+                $c4 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -97 +97 @@
         }
 
         public function test_query_type_trackback() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
-                $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+                $c4 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -116 +116 @@
          * 'pings' is an alias for 'trackback' + 'pingback'.
          */
         public function test_query_type_pings() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
-                $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
-                $c5 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+                $c4 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
+                $c5 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -136 +136 @@
          * @ticket 12668
          */
         public function test_type_array_comments_and_custom() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
-                $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
-                $c5 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
-                $c6 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+                $c4 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
+                $c5 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
+                $c6 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -156 +156 @@
          * @ticket 12668
          */
         public function test_type_not__in_array_custom() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
-                $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
-                $c5 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
-                $c6 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+                $c4 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
+                $c5 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
+                $c6 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -176 +176 @@
          * @ticket 12668
          */
         public function test_type__in_array_and_not_type_array_custom() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
-                $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
-                $c5 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
-                $c6 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+                $c4 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
+                $c5 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
+                $c6 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -197 +197 @@
          * @ticket 12668
          */
         public function test_type_array_and_type__not_in_array_custom() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
-                $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
-                $c5 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
-                $c6 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+                $c4 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
+                $c5 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
+                $c6 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -218 +218 @@
          * @ticket 12668
          */
         public function test_type__not_in_custom() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
-                $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
-                $c5 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
-                $c6 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+                $c4 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
+                $c5 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
+                $c6 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -238 +238 @@
          * @ticket 12668
          */
         public function test_type_array_comments_and_pings() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
-                $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
-                $c5 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+                $c4 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'mario' ) );
+                $c5 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'luigi' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -257 +257 @@
          * @ticket 12668
          */
         public function test_type_array_comment_pings() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -274 +274 @@
          * @ticket 12668
          */
         public function test_type_array_pingback() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -291 +291 @@
          * @ticket 12668
          */
         public function test_type_array_custom_pingpack() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -308 +308 @@
          * @ticket 12668
          */
         public function test_type_array_pings() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -325 +325 @@
          * @ticket 12668
          */
         public function test_type_status_approved_array_comment_pings() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
-                $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0', 'comment_type' => 'pingback' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+                $c4 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0', 'comment_type' => 'pingback' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -344 +344 @@
          * @ticket 12668
          */
         public function test_type_array_trackback() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -361 +361 @@
          * @ticket 12668
          */
         public function test_type_array_custom_trackback() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'pingback' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -378 +378 @@
          * @ticket 12668
          */
         public function test_type_array_pings_approved() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
-                $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0', 'comment_type' => 'trackback' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1', 'comment_type' => 'trackback' ) );
+                $c4 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0', 'comment_type' => 'trackback' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -397 +397 @@
          * @ticket 29612
          */
         public function test_status_empty_string() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'spam' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'spam' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -414 +414 @@
          * @ticket 21101
          */
         public function test_status_hold() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -430 +430 @@
          * @ticket 21101
          */
         public function test_status_approve() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -443 +443 @@
         }
 
         public function test_status_custom() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'foo' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'foo1' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'foo' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'foo1' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -457 +457 @@
         }
 
         public function test_status_all() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'foo' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'foo' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -471 +471 @@
         }
 
         public function test_status_default_to_all() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'foo' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'foo' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -487 +487 @@
          * @ticket 29612
          */
         public function test_status_comma_any() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'foo' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'foo' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -504 +504 @@
          * @ticket 29612
          */
         public function test_status_comma_separated() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'foo' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'foo' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -521 +521 @@
          * @ticket 29612
          */
         public function test_status_array() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'foo' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => 'foo' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '0' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -537 +537 @@
         function test_get_comments_for_post() {
                 $limit = 5;
 
-                $post_id = self::$factory->post->create();
-                self::$factory->comment->create_post_comments( $post_id, $limit );
+                $post_id = self::factory()->post->create();
+                self::factory()->comment->create_post_comments( $post_id, $limit );
                 $comments = get_comments( array( 'post_id' => $post_id ) );
                 $this->assertEquals( $limit, count( $comments ) );
                 foreach ( $comments as $comment ) {
                         $this->assertEquals( $post_id, $comment->comment_post_ID );
                 }
 
-                $post_id2 = self::$factory->post->create();
-                self::$factory->comment->create_post_comments( $post_id2, $limit );
+                $post_id2 = self::factory()->post->create();
+                self::factory()->comment->create_post_comments( $post_id2, $limit );
                 $comments = get_comments( array( 'post_id' => $post_id2 ) );
                 $this->assertEquals( $limit, count( $comments ) );
                 foreach ( $comments as $comment ) {
                         $this->assertEquals( $post_id2, $comment->comment_post_ID );
                 }
 
-                $post_id3 = self::$factory->post->create();
-                self::$factory->comment->create_post_comments( $post_id3, $limit, array( 'comment_approved' => '0' ) );
+                $post_id3 = self::factory()->post->create();
+                self::factory()->comment->create_post_comments( $post_id3, $limit, array( 'comment_approved' => '0' ) );
                 $comments = get_comments( array( 'post_id' => $post_id3 ) );
                 $this->assertEquals( $limit, count( $comments ) );
                 foreach ( $comments as $comment ) {
@@ -570 +570 @@
                 $comments = get_comments( array( 'post_id' => $post_id3, 'status' => 'approve' ) );
                 $this->assertEquals( 0, count( $comments ) );
 
-                self::$factory->comment->create_post_comments( $post_id3, $limit, array( 'comment_approved' => '1' ) );
+                self::factory()->comment->create_post_comments( $post_id3, $limit, array( 'comment_approved' => '1' ) );
                 $comments = get_comments( array( 'post_id' => $post_id3 ) );
                 $this->assertEquals( $limit * 2, count( $comments ) );
                 foreach ( $comments as $comment ) {
@@ -582 +582 @@
          * @ticket 21003
          */
         function test_orderby_meta() {
-                $comment_id = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id ) );
-                $comment_id2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id ) );
-                $comment_id3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id ) );
+                $comment_id = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id ) );
+                $comment_id2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id ) );
+                $comment_id3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id ) );
 
                 add_comment_meta( $comment_id, 'key', 'value1', true );
                 add_comment_meta( $comment_id, 'key1', 'value1', true );
@@ -632 +632 @@
          * @ticket 30478
          */
         public function test_orderby_clause_key() {
-                $comments = self::$factory->comment->create_many( 3 );
+                $comments = self::factory()->comment->create_many( 3 );
                 add_comment_meta( $comments[0], 'foo', 'aaa' );
                 add_comment_meta( $comments[1], 'foo', 'zzz' );
                 add_comment_meta( $comments[2], 'foo', 'jjj' );
@@ -657 +657 @@
          * @ticket 30478
          */
         public function test_orderby_clause_key_as_secondary_sort() {
-                $c1 = self::$factory->comment->create( array(
+                $c1 = self::factory()->comment->create( array(
                         'comment_date' => '2015-01-28 03:00:00',
                 ) );
-                $c2 = self::$factory->comment->create( array(
+                $c2 = self::factory()->comment->create( array(
                         'comment_date' => '2015-01-28 05:00:00',
                 ) );
-                $c3 = self::$factory->comment->create( array(
+                $c3 = self::factory()->comment->create( array(
                         'comment_date' => '2015-01-28 03:00:00',
                 ) );
 
@@ -693 +693 @@
          * @ticket 30478
          */
         public function test_orderby_more_than_one_clause_key() {
-                $comments = self::$factory->comment->create_many( 3 );
+                $comments = self::factory()->comment->create_many( 3 );
 
                 add_comment_meta( $comments[0], 'foo', 'jjj' );
                 add_comment_meta( $comments[1], 'foo', 'zzz' );
@@ -728 +728 @@
          * @group 32081
          */
         public function test_meta_query_should_work_with_comment__in() {
-                $comments = self::$factory->comment->create_many( 3 );
+                $comments = self::factory()->comment->create_many( 3 );
 
                 add_comment_meta( $comments[0], 'foo', 'jjj' );
                 add_comment_meta( $comments[1], 'foo', 'zzz' );
@@ -752 +752 @@
          * @group 32081
          */
         public function test_meta_query_should_work_with_comment__not_in() {
-                $comments = self::$factory->comment->create_many( 3 );
+                $comments = self::factory()->comment->create_many( 3 );
 
                 add_comment_meta( $comments[0], 'foo', 'jjj' );
                 add_comment_meta( $comments[1], 'foo', 'zzz' );
@@ -776 +776 @@
          * @ticket 27064
          */
         function test_get_comments_by_user() {
-                $users = self::$factory->user->create_many( 2 );
-                self::$factory->comment->create( array( 'user_id' => $users[0], 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                self::$factory->comment->create( array( 'user_id' => $users[0], 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                self::$factory->comment->create( array( 'user_id' => $users[1], 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $users = self::factory()->user->create_many( 2 );
+                self::factory()->comment->create( array( 'user_id' => $users[0], 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                self::factory()->comment->create( array( 'user_id' => $users[0], 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                self::factory()->comment->create( array( 'user_id' => $users[1], 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
 
                 $comments = get_comments( array(
                         'user_id' => $users[0],
@@ -808 +808 @@
          * @ticket 28434
          */
         function test_fields_ids_query() {
-                $comment_1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
-                $comment_2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
-                $comment_3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
+                $comment_1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
+                $comment_2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
+                $comment_3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
 
                 // Ensure we are dealing with integers, and not objects.
                 $this->assertInternalType( 'integer', $comment_1 );
@@ -826 +826 @@
          * @ticket 29189
          */
         function test_fields_comment__in() {
-                $comment_1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
-                $comment_2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
-                $comment_3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
+                $comment_1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
+                $comment_2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
+                $comment_3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
 
                 $comment_ids = get_comments( array(
                         'fields' => 'ids',
@@ -842 +842 @@
          * @ticket 29189
          */
         function test_fields_comment__not_in() {
-                $comment_1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
-                $comment_2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
-                $comment_3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
+                $comment_1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
+                $comment_2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
+                $comment_3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
 
                 $comment_ids = get_comments( array(
                         'fields' => 'ids',
@@ -858 +858 @@
          * @ticket 29189
          */
         function test_fields_post__in() {
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
 
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 7, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $p2, 'user_id' => 1, 'comment_approved' => '1' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $p3, 'user_id' => 1, 'comment_approved' => '1' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 7, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $p2, 'user_id' => 1, 'comment_approved' => '1' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $p3, 'user_id' => 1, 'comment_approved' => '1' ) );
 
                 $comment_ids = get_comments( array(
                         'fields' => 'ids',
@@ -878 +878 @@
          * @ticket 29189
          */
         function test_fields_post__not_in() {
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
 
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 7, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $p2, 'user_id' => 1, 'comment_approved' => '1' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $p3, 'user_id' => 1, 'comment_approved' => '1' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 7, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $p2, 'user_id' => 1, 'comment_approved' => '1' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $p3, 'user_id' => 1, 'comment_approved' => '1' ) );
 
                 $comment_ids = get_comments( array(
                         'fields' => 'ids',
@@ -901 +901 @@
                 $author_id1 = 105;
                 $author_id2 = 106;
 
-                $p1 = self::$factory->post->create( array( 'post_author' => $author_id1 ) );
-                $p2 = self::$factory->post->create( array( 'post_author' => $author_id1 ) );
-                $p3 = self::$factory->post->create( array( 'post_author' => $author_id2 ) );
+                $p1 = self::factory()->post->create( array( 'post_author' => $author_id1        ) );
+                $p2 = self::factory()->post->create( array( 'post_author' => $author_id1        ) );
+                $p3 = self::factory()->post->create( array( 'post_author' => $author_id2        ) );
 
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 1, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $p2, 'user_id' => 1, 'comment_approved' => '1' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $p3, 'user_id' => 1, 'comment_approved' => '1' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 1, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $p2, 'user_id' => 1, 'comment_approved' => '1' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $p3, 'user_id' => 1, 'comment_approved' => '1' ) );
 
                 $comment_ids = get_comments( array(
                         'fields' => 'ids',
@@ -924 +924 @@
                 $author_id1 = 111;
                 $author_id2 = 112;
 
-                $p1 = self::$factory->post->create( array( 'post_author' => $author_id1 ) );
-                $p2 = self::$factory->post->create( array( 'post_author' => $author_id1 ) );
-                $p3 = self::$factory->post->create( array( 'post_author' => $author_id2 ) );
+                $p1 = self::factory()->post->create( array( 'post_author' => $author_id1        ) );
+                $p2 = self::factory()->post->create( array( 'post_author' => $author_id1        ) );
+                $p3 = self::factory()->post->create( array( 'post_author' => $author_id2        ) );
 
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 1, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $p2, 'user_id' => 1, 'comment_approved' => '1' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $p3, 'user_id' => 1, 'comment_approved' => '1' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 1, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $p2, 'user_id' => 1, 'comment_approved' => '1' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $p3, 'user_id' => 1, 'comment_approved' => '1' ) );
 
                 $comment_ids = get_comments( array(
                         'fields' => 'ids',
@@ -944 +944 @@
          * @ticket 29885
          */
         function test_fields_author__in() {
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
-                $p4 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
+                $p4 = self::factory()->post->create();
 
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 1, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 2, 'comment_approved' => '1' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $p2, 'user_id' => 3, 'comment_approved' => '1' ) );
-                $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $p4, 'user_id' => 4, 'comment_approved' => '1' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 1, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 2, 'comment_approved' => '1' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $p2, 'user_id' => 3, 'comment_approved' => '1' ) );
+                $c4 = self::factory()->comment->create( array( 'comment_post_ID' => $p4, 'user_id' => 4, 'comment_approved' => '1' ) );
 
                 $comment_ids = get_comments( array(
                         'fields' => 'ids',
@@ -966 +966 @@
          * @ticket 29885
          */
         function test_fields_author__not_in() {
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
-                $p4 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
+                $p4 = self::factory()->post->create();
 
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 1, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 2, 'comment_approved' => '1' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $p2, 'user_id' => 3, 'comment_approved' => '1' ) );
-                $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $p4, 'user_id' => 4, 'comment_approved' => '1' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 1, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $p1, 'user_id' => 2, 'comment_approved' => '1' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $p2, 'user_id' => 3, 'comment_approved' => '1' ) );
+                $c4 = self::factory()->comment->create( array( 'comment_post_ID' => $p4, 'user_id' => 4, 'comment_approved' => '1' ) );
 
                 $comment_ids = get_comments( array(
                         'fields' => 'ids',
@@ -988 +988 @@
          * @ticket 19623
          */
         public function test_get_comments_with_status_all() {
-                $comment_1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
-                $comment_2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
-                $comment_3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '0' ) );
+                $comment_1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
+                $comment_2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
+                $comment_3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '0' ) );
                 $comments_approved_1 = get_comments( array( 'status' => 'all' ) );
 
                 $comment_ids = get_comments( array( 'fields' => 'ids' ) );
@@ -1001 +1001 @@
          * @ticket 19623
          */
         public function test_get_comments_with_include_unapproved_user_id() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '0' ) );
-                $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 6, 'comment_approved' => '0' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '0' ) );
+                $c4 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 6, 'comment_approved' => '0' ) );
 
                 $found = get_comments( array(
                         'fields' => 'ids',
@@ -1019 +1019 @@
          * @ticket 19623
          */
         public function test_get_comments_with_include_unapproved_user_id_array() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '0' ) );
-                $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 6, 'comment_approved' => '0' ) );
-                $c5 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 8, 'comment_approved' => '0' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '0' ) );
+                $c4 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 6, 'comment_approved' => '0' ) );
+                $c5 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 8, 'comment_approved' => '0' ) );
 
                 $found = get_comments( array(
                         'fields' => 'ids',
@@ -1038 +1038 @@
          * @ticket 19623
          */
         public function test_get_comments_with_include_unapproved_user_id_comma_separated() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '0' ) );
-                $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 6, 'comment_approved' => '0' ) );
-                $c5 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 8, 'comment_approved' => '0' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '1' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 1, 'comment_approved' => '0' ) );
+                $c4 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 6, 'comment_approved' => '0' ) );
+                $c5 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 8, 'comment_approved' => '0' ) );
 
                 $found = get_comments( array(
                         'fields' => 'ids',
@@ -1057 +1057 @@
          * @ticket 19623
          */
         public function test_get_comments_with_include_unapproved_author_email() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '1', 'comment_author' => 'foo', 'comment_author_email' => 'foo@example.com' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'foo@example.com' ) );
-                $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'bar@example.com' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '1', 'comment_author' => 'foo', 'comment_author_email' => 'foo@example.com' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'foo@example.com' ) );
+                $c4 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'bar@example.com' ) );
 
                 $found = get_comments( array(
                         'fields' => 'ids',
@@ -1075 +1075 @@
          * @ticket 19623
          */
         public function test_get_comments_with_include_unapproved_mixed_array() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '1', 'comment_author' => 'foo', 'comment_author_email' => 'foo@example.com' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'foo@example.com' ) );
-                $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'bar@example.com' ) );
-                $c5 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'bar@example.com' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '1', 'comment_author' => 'foo', 'comment_author_email' => 'foo@example.com' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'foo@example.com' ) );
+                $c4 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'bar@example.com' ) );
+                $c5 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'bar@example.com' ) );
 
                 $found = get_comments( array(
                         'fields' => 'ids',
@@ -1094 +1094 @@
          * @ticket 19623
          */
         public function test_get_comments_with_include_unapproved_mixed_comma_separated() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '1', 'comment_author' => 'foo', 'comment_author_email' => 'foo@example.com' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'foo@example.com' ) );
-                $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'bar@example.com' ) );
-                $c5 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'bar@example.com' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '1', 'comment_author' => 'foo', 'comment_author_email' => 'foo@example.com' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'foo@example.com' ) );
+                $c4 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 0, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'bar@example.com' ) );
+                $c5 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'bar@example.com' ) );
 
                 $found = get_comments( array(
                         'fields' => 'ids',
@@ -1110 +1110 @@
         }
 
         public function test_search() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'bar@example.com' ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'bar', 'comment_author_email' => 'foo@example.com' ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'bar', 'comment_author_email' => 'bar@example.com', 'comment_author_url' => 'http://foo.bar' ) );
-                $c4 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'bar', 'comment_author_email' => 'bar@example.com', 'comment_author_url' => 'http://example.com', 'comment_author_IP' => 'foo.bar' ) );
-                $c5 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'bar', 'comment_author_email' => 'bar@example.com', 'comment_author_url' => 'http://example.com', 'comment_content' => 'Nice foo comment' ) );
-                $c6 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'bar', 'comment_author_email' => 'bar@example.com', 'comment_author_url' => 'http://example.com' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'foo', 'comment_author_email' => 'bar@example.com' ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'bar', 'comment_author_email' => 'foo@example.com' ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'bar', 'comment_author_email' => 'bar@example.com', 'comment_author_url' => 'http://foo.bar' ) );
+                $c4 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'bar', 'comment_author_email' => 'bar@example.com', 'comment_author_url' => 'http://example.com', 'comment_author_IP' => 'foo.bar' ) );
+                $c5 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'bar', 'comment_author_email' => 'bar@example.com', 'comment_author_url' => 'http://example.com', 'comment_content' => 'Nice foo comment' ) );
+                $c6 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 4, 'comment_approved' => '0', 'comment_author' => 'bar', 'comment_author_email' => 'bar@example.com', 'comment_author_url' => 'http://example.com' ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -1363 +1363 @@
          */
         public function test_orderby_date_modified_gmt_should_order_by_comment_ID_in_case_of_tie_ASC() {
                 $now = current_time( 'mysql', 1 );
-                $comments = self::$factory->comment->create_many( 5, array(
+                $comments = self::factory()->comment->create_many( 5, array(
                         'comment_post_ID' => $this->post_id,
                         'comment_date_gmt' => $now,
                 ) );
@@ -1383 +1383 @@
          */
         public function test_orderby_date_modified_gmt_should_order_by_comment_ID_in_case_of_tie_DESC() {
                 $now = current_time( 'mysql', 1 );
-                $comments = self::$factory->comment->create_many( 5, array(
+                $comments = self::factory()->comment->create_many( 5, array(
                         'comment_post_ID' => $this->post_id,
                         'comment_date_gmt' => $now,
                 ) );
@@ -1416 +1416 @@
         }
 
         public function test_count() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7 ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7 ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7 ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7 ) );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -1431 +1431 @@
          * @ticket 23369
          */
         public function test_count_with_meta_query() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7 ) );
-                $c2 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7 ) );
-                $c3 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7 ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7 ) );
+                $c2 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7 ) );
+                $c3 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'user_id' => 7 ) );
                 add_comment_meta( $c1, 'foo', 'bar' );
                 add_comment_meta( $c3, 'foo', 'bar' );
 
@@ -1455 +1455 @@
                 register_post_type( 'post-type-1' );
                 register_post_type( 'post-type-2' );
 
-                $p1 = self::$factory->post->create( array( 'post_type' => 'post-type-1' ) );
-                $p2 = self::$factory->post->create( array( 'post_type' => 'post-type-2' ) );
+                $p1 = self::factory()->post->create( array( 'post_type' => 'post-type-1' ) );
+                $p2 = self::factory()->post->create( array( 'post_type' => 'post-type-2' ) );
 
-                $c1 = self::$factory->comment->create_post_comments( $p1, 1 );
-                $c2 = self::$factory->comment->create_post_comments( $p2, 1 );
+                $c1 = self::factory()->comment->create_post_comments( $p1, 1 );
+                $c2 = self::factory()->comment->create_post_comments( $p2, 1 );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -1480 +1480 @@
                 register_post_type( 'post-type-1' );
                 register_post_type( 'post-type-2' );
 
-                $p1 = self::$factory->post->create( array( 'post_type' => 'post-type-1' ) );
-                $p2 = self::$factory->post->create( array( 'post_type' => 'post-type-2' ) );
+                $p1 = self::factory()->post->create( array( 'post_type' => 'post-type-1' ) );
+                $p2 = self::factory()->post->create( array( 'post_type' => 'post-type-2' ) );
 
-                $c1 = self::$factory->comment->create_post_comments( $p1, 1 );
-                $c2 = self::$factory->comment->create_post_comments( $p2, 1 );
+                $c1 = self::factory()->comment->create_post_comments( $p1, 1 );
+                $c2 = self::factory()->comment->create_post_comments( $p2, 1 );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -1505 +1505 @@
                 register_post_type( 'post-type-1' );
                 register_post_type( 'post-type-2' );
 
-                $p1 = self::$factory->post->create( array( 'post_type' => 'post-type-1' ) );
-                $p2 = self::$factory->post->create( array( 'post_type' => 'post-type-2' ) );
-                $p3 = self::$factory->post->create( array( 'post_type' => 'post-type-3' ) );
+                $p1 = self::factory()->post->create( array( 'post_type' => 'post-type-1' ) );
+                $p2 = self::factory()->post->create( array( 'post_type' => 'post-type-2' ) );
+                $p3 = self::factory()->post->create( array( 'post_type' => 'post-type-3' ) );
 
-                $c1 = self::$factory->comment->create_post_comments( $p1, 1 );
-                $c2 = self::$factory->comment->create_post_comments( $p2, 1 );
-                $c3 = self::$factory->comment->create_post_comments( $p3, 1 );
+                $c1 = self::factory()->comment->create_post_comments( $p1, 1 );
+                $c2 = self::factory()->comment->create_post_comments( $p2, 1 );
+                $c3 = self::factory()->comment->create_post_comments( $p3, 1 );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -1526 +1526 @@
         }
 
         public function test_post_name_single_value() {
-                $p1 = self::$factory->post->create( array( 'post_name' => 'foo' ) );
-                $p2 = self::$factory->post->create( array( 'post_name' => 'bar' ) );
+                $p1 = self::factory()->post->create( array( 'post_name' => 'foo' ) );
+                $p2 = self::factory()->post->create( array( 'post_name' => 'bar' ) );
 
-                $c1 = self::$factory->comment->create_post_comments( $p1, 1 );
-                $c2 = self::$factory->comment->create_post_comments( $p2, 1 );
+                $c1 = self::factory()->comment->create_post_comments( $p1, 1 );
+                $c2 = self::factory()->comment->create_post_comments( $p2, 1 );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -1545 +1545 @@
          * @ticket 20006
          */
         public function test_post_name_singleton_array() {
-                $p1 = self::$factory->post->create( array( 'post_name' => 'foo' ) );
-                $p2 = self::$factory->post->create( array( 'post_name' => 'bar' ) );
+                $p1 = self::factory()->post->create( array( 'post_name' => 'foo' ) );
+                $p2 = self::factory()->post->create( array( 'post_name' => 'bar' ) );
 
-                $c1 = self::$factory->comment->create_post_comments( $p1, 1 );
-                $c2 = self::$factory->comment->create_post_comments( $p2, 1 );
+                $c1 = self::factory()->comment->create_post_comments( $p1, 1 );
+                $c2 = self::factory()->comment->create_post_comments( $p2, 1 );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -1564 +1564 @@
          * @ticket 20006
          */
         public function test_post_name_array() {
-                $p1 = self::$factory->post->create( array( 'post_name' => 'foo' ) );
-                $p2 = self::$factory->post->create( array( 'post_name' => 'bar' ) );
-                $p3 = self::$factory->post->create( array( 'post_name' => 'baz' ) );
+                $p1 = self::factory()->post->create( array( 'post_name' => 'foo' ) );
+                $p2 = self::factory()->post->create( array( 'post_name' => 'bar' ) );
+                $p3 = self::factory()->post->create( array( 'post_name' => 'baz' ) );
 
-                $c1 = self::$factory->comment->create_post_comments( $p1, 1 );
-                $c2 = self::$factory->comment->create_post_comments( $p2, 1 );
-                $c3 = self::$factory->comment->create_post_comments( $p3, 1 );
+                $c1 = self::factory()->comment->create_post_comments( $p1, 1 );
+                $c2 = self::factory()->comment->create_post_comments( $p2, 1 );
+                $c3 = self::factory()->comment->create_post_comments( $p3, 1 );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -1582 +1582 @@
         }
 
         public function test_post_status_single_value() {
-                $p1 = self::$factory->post->create( array( 'post_status' => 'publish' ) );
-                $p2 = self::$factory->post->create( array( 'post_status' => 'draft' ) );
+                $p1 = self::factory()->post->create( array( 'post_status' => 'publish' ) );
+                $p2 = self::factory()->post->create( array( 'post_status' => 'draft' ) );
 
-                $c1 = self::$factory->comment->create_post_comments( $p1, 1 );
-                $c2 = self::$factory->comment->create_post_comments( $p2, 1 );
+                $c1 = self::factory()->comment->create_post_comments( $p1, 1 );
+                $c2 = self::factory()->comment->create_post_comments( $p2, 1 );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -1601 +1601 @@
          * @ticket 20006
          */
         public function test_post_status_singleton_array() {
-                $p1 = self::$factory->post->create( array( 'post_status' => 'publish' ) );
-                $p2 = self::$factory->post->create( array( 'post_status' => 'draft' ) );
+                $p1 = self::factory()->post->create( array( 'post_status' => 'publish' ) );
+                $p2 = self::factory()->post->create( array( 'post_status' => 'draft' ) );
 
-                $c1 = self::$factory->comment->create_post_comments( $p1, 1 );
-                $c2 = self::$factory->comment->create_post_comments( $p2, 1 );
+                $c1 = self::factory()->comment->create_post_comments( $p1, 1 );
+                $c2 = self::factory()->comment->create_post_comments( $p2, 1 );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -1620 +1620 @@
          * @ticket 20006
          */
         public function test_post_status_array() {
-                $p1 = self::$factory->post->create( array( 'post_status' => 'publish' ) );
-                $p2 = self::$factory->post->create( array( 'post_status' => 'draft' ) );
-                $p3 = self::$factory->post->create( array( 'post_status' => 'future' ) );
+                $p1 = self::factory()->post->create( array( 'post_status' => 'publish' ) );
+                $p2 = self::factory()->post->create( array( 'post_status' => 'draft' ) );
+                $p3 = self::factory()->post->create( array( 'post_status' => 'future' ) );
 
-                $c1 = self::$factory->comment->create_post_comments( $p1, 1 );
-                $c2 = self::$factory->comment->create_post_comments( $p2, 1 );
-                $c3 = self::$factory->comment->create_post_comments( $p3, 1 );
+                $c1 = self::factory()->comment->create_post_comments( $p1, 1 );
+                $c2 = self::factory()->comment->create_post_comments( $p2, 1 );
+                $c3 = self::factory()->comment->create_post_comments( $p3, 1 );
 
                 $q = new WP_Comment_Query();
                 $found = $q->query( array(
@@ -1641 +1641 @@
          * @ticket 24826
          */
         public function test_comment_query_object() {
-                $comment_id = self::$factory->comment->create();
+                $comment_id = self::factory()->comment->create();
 
                 $query1 = new WP_Comment_Query();
                 $this->assertNull( $query1->query_vars );
@@ -1663 +1663 @@
         public function test_comment_cache_key_should_ignore_custom_params() {
                 global $wpdb;
 
-                $p = self::$factory->post->create();
-                $c = self::$factory->comment->create( array( 'comment_post_ID' => $p ) );
+                $p = self::factory()->post->create();
+                $c = self::factory()->comment->create( array( 'comment_post_ID' => $p ) );
 
                 $q1 = new WP_Comment_Query();
                 $q1->query( array(
@@ -1688 +1688 @@
          * @ticket 32762
          */
         public function test_it_should_be_possible_to_modify_meta_query_using_pre_get_comments_action() {
-                $comments = self::$factory->comment->create_many( 2, array(
+                $comments = self::factory()->comment->create_many( 2, array(
                         'comment_post_ID' => $this->post_id,
                 ) );
 
@@ -1719 +1719 @@
          * @ticket 32762
          */
         public function test_it_should_be_possible_to_modify_meta_params_using_pre_get_comments_action() {
-                $comments = self::$factory->comment->create_many( 2, array(
+                $comments = self::factory()->comment->create_many( 2, array(
                         'comment_post_ID' => $this->post_id,
                 ) );
 
@@ -1746 +1746 @@
          * @ticket 33882
          */
         public function test_parent__in() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array(
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array(
                         'comment_post_ID' => $this->post_id,
                         'comment_approved' => '1',
                         'comment_parent' => $c1,
@@ -1766 +1766 @@
          * @ticket 33882
          */
         public function test_parent__in_commas() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array(
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array(
                         'comment_post_ID' => $this->post_id,
                         'comment_approved' => '1'
                 ) );
-                $c3 = self::$factory->comment->create( array(
+                $c3 = self::factory()->comment->create( array(
                         'comment_post_ID' => $this->post_id,
                         'comment_approved' => '1',
                         'comment_parent' => $c1,
                 ) );
-                $c4 = self::$factory->comment->create( array(
+                $c4 = self::factory()->comment->create( array(
                         'comment_post_ID' => $this->post_id,
                         'comment_approved' => '1',
                         'comment_parent' => $c2,
@@ -1795 +1795 @@
          * @ticket 33882
          */
         public function test_parent__not_in() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
 
-                self::$factory->comment->create( array(
+                self::factory()->comment->create( array(
                         'comment_post_ID' => $this->post_id,
                         'comment_approved' => '1',
                         'comment_parent' => $c1,
@@ -1816 +1816 @@
          * @ticket 33882
          */
         public function test_parent__not_in_commas() {
-                $c1 = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
-                $c2 = self::$factory->comment->create( array(
+                $c1 = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_approved' => '1' ) );
+                $c2 = self::factory()->comment->create( array(
                         'comment_post_ID' => $this->post_id,
                         'comment_approved' => '1'
                 ) );
 
-                self::$factory->comment->create( array(
+                self::factory()->comment->create( array(
                         'comment_post_ID' => $this->post_id,
                         'comment_approved' => '1',
                         'comment_parent' => $c1,
                 ) );
-                self::$factory->comment->create( array(
+                self::factory()->comment->create( array(
                         'comment_post_ID' => $this->post_id,
                         'comment_approved' => '1',
                         'comment_parent' => $c2,
@@ -1846 +1846 @@
          * @ticket 33883
          */
         public function test_orderby_comment__in() {
-                self::$factory->comment->create( array(
+                self::factory()->comment->create( array(
                         'comment_post_ID' => $this->post_id,
                         'comment_approved' => '1'
                 ) );
 
-                $c2 = self::$factory->comment->create( array(
+                $c2 = self::factory()->comment->create( array(
                         'comment_post_ID' => $this->post_id,
                         'comment_approved' => '1'
                 ) );
-                $c3 = self::$factory->comment->create( array(
+                $c3 = self::factory()->comment->create( array(
                         'comment_post_ID' => $this->post_id,
                         'comment_approved' => '1'
                 ) );
 
-                self::$factory->comment->create( array(
+                self::factory()->comment->create( array(
                         'comment_post_ID' => $this->post_id,
                         'comment_approved' => '1'
                 ) );
@@ -1880 +1880 @@
          * @ticket 8071
          */
         public function test_no_found_rows_should_default_to_true() {
-                $comments = self::$factory->comment->create_many( 3, array( 'comment_post_ID' => $this->post_id ) );
+                $comments = self::factory()->comment->create_many( 3, array( 'comment_post_ID' => $this->post_id ) );
 
                 $q = new WP_Comment_Query( array(
                         'post_id' => $this->post_id,
@@ -1895 +1895 @@
          * @ticket 8071
          */
         public function test_should_respect_no_found_rows_true() {
-                $comments = self::$factory->comment->create_many( 3, array( 'comment_post_ID' => $this->post_id ) );
+                $comments = self::factory()->comment->create_many( 3, array( 'comment_post_ID' => $this->post_id ) );
 
                 $q = new WP_Comment_Query( array(
                         'post_id' => $this->post_id,
@@ -1911 +1911 @@
          * @ticket 8071
          */
         public function test_should_respect_no_found_rows_false() {
-                $comments = self::$factory->comment->create_many( 3, array( 'comment_post_ID' => $this->post_id ) );
+                $comments = self::factory()->comment->create_many( 3, array( 'comment_post_ID' => $this->post_id ) );
 
                 $q = new WP_Comment_Query( array(
                         'post_id' => $this->post_id,
@@ -1927 +1927 @@
          * @ticket 8071
          */
         public function test_hierarchical_should_skip_child_comments_in_offset() {
-                $top_level_0 = self::$factory->comment->create( array(
+                $top_level_0 = self::factory()->comment->create( array(
                         'comment_post_ID' => $this->post_id,
                         'comment_approved' => '1',
                 ) );
 
-                $child_of_0 = self::$factory->comment->create( array(
+                $child_of_0 = self::factory()->comment->create( array(
                         'comment_post_ID' => $this->post_id,
                         'comment_approved' => '1',
                         'comment_parent' => $top_level_0,
                 ) );
 
-                $top_level_comments = self::$factory->comment->create_many( 3, array(
+                $top_level_comments = self::factory()->comment->create_many( 3, array(
                         'comment_post_ID' => $this->post_id,
                         'comment_approved' => '1',
                 ) );
@@ -1960 +1960 @@
          * @ticket 8071
          */
         public function test_hierarchical_should_not_include_child_comments_in_number() {
-                $top_level_0 = self::$factory->comment->create( array(
+                $top_level_0 = self::factory()->comment->create( array(
                         'comment_post_ID' => $this->post_id,
                         'comment_approved' => '1',
                 ) );
 
-                $child_of_0 = self::$factory->comment->create( array(
+                $child_of_0 = self::factory()->comment->create( array(
                         'comment_post_ID' => $this->post_id,
                         'comment_approved' => '1',
                         'comment_parent' => $top_level_0,
                 ) );
 
-                $top_level_comments = self::$factory->comment->create_many( 3, array(
+                $top_level_comments = self::factory()->comment->create_many( 3, array(
                         'comment_post_ID' => $this->post_id,
                         'comment_approved' => '1',
                 ) );
@@ -1991 +1991 @@
          * @ticket 8071
          */
         public function test_hierarchical_threaded() {
-                $c1 = self::$factory->comment->create( array(
+                $c1 = self::factory()->comment->create( array(
                         'comment_post_ID' => $this->post_id,
                         'comment_approved' => '1',
                 ) );
 
-                $c2 = self::$factory->comment->create( array(
+                $c2 = self::factory()->comment->create( array(
                         'comment_post_ID' => $this->post_id,
                         'comment_approved' => '1',
                         'comment_parent' => $c1,
                 ) );
 
-                $c3 = self::$factory->comment->create( array(
+                $c3 = self::factory()->comment->create( array(
                         'comment_post_ID' => $this->post_id,
                         'comment_approved' => '1',
                         'comment_parent' => $c2,
                 ) );
 
-                $c4 = self::$factory->comment->create( array(
+                $c4 = self::factory()->comment->create( array(
                         'comment_post_ID' => $this->post_id,
                         'comment_approved' => '1',
                         'comment_parent' => $c1,
                 ) );
 
-                $c5 = self::$factory->comment->create( array(
+                $c5 = self::factory()->comment->create( array(
                         'comment_post_ID' => $this->post_id,
                         'comment_approved' => '1',
                 ) );
 
-                $c6 = self::$factory->comment->create( array(
+                $c6 = self::factory()->comment->create( array(
                         'comment_post_ID' => $this->post_id,
                         'comment_approved' => '1',
                         'comment_parent' => $c5,
@@ -2054 +2054 @@
          * @ticket 8071
          */
         public function test_hierarchical_threaded_approved() {
-                $c1 = self::$factory->comment->create( array(
+                $c1 = self::factory()->comment->create( array(
                         'comment_post_ID' => $this->post_id,
                         'comment_approved' => '1',
                 ) );
 
-                $c2 = self::$factory->comment->create( array(
+                $c2 = self::factory()->comment->create( array(
                         'comment_post_ID' => $this->post_id,
                         'comment_approved' => '1',
                         'comment_parent' => $c1,
                 ) );
 
-                $c3 = self::$factory->comment->create( array(
+                $c3 = self::factory()->comment->create( array(
                         'comment_post_ID' => $this->post_id,
                         'comment_approved' => '0',
                         'comment_parent' => $c2,
                 ) );
 
-                $c4 = self::$factory->comment->create( array(
+                $c4 = self::factory()->comment->create( array(
                         'comment_post_ID' => $this->post_id,
                         'comment_approved' => '1',
                         'comment_parent' => $c1,
                 ) );
 
-                $c5 = self::$factory->comment->create( array(
+                $c5 = self::factory()->comment->create( array(
                         'comment_post_ID' => $this->post_id,
                         'comment_approved' => '1',
                 ) );
 
-                self::$factory->comment->create( array(
+                self::factory()->comment->create( array(
                         'comment_post_ID' => $this->post_id,
                         'comment_approved' => '1',
                         'comment_parent' => $c5,
@@ -2117 +2117 @@
         public function test_update_comment_post_cache_should_be_disabled_by_default() {
                 global $wpdb;
 
-                $p = self::$factory->post->create();
-                $c = self::$factory->comment->create( array( 'comment_post_ID' => $p ) );
+                $p = self::factory()->post->create();
+                $c = self::factory()->comment->create( array( 'comment_post_ID' => $p ) );
 
                 $q = new WP_Comment_Query( array(
                         'post_ID' => $p,
@@ -2135 +2135 @@
         public function test_should_respect_update_comment_post_cache_true() {
                 global $wpdb;
 
-                $p = self::$factory->post->create();
-                $c = self::$factory->comment->create( array( 'comment_post_ID' => $p ) );
+                $p = self::factory()->post->create();
+                $c = self::factory()->comment->create( array( 'comment_post_ID' => $p ) );
 
                 $q = new WP_Comment_Query( array(
                         'post_ID' => $p,

tests/phpunit/tests/comment/slashes.php

@@ -9 +9 @@
         function setUp() {
                 parent::setUp();
                 // we need an admin user to bypass comment flood protection
-                $this->author_id = self::$factory->user->create( array( 'role' => 'administrator' ) );
+                $this->author_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
                 $this->old_current_user = get_current_user_id();
                 wp_set_current_user( $this->author_id );
 
@@ -34 +34 @@
          *
          */
         function test_wp_new_comment() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
 
                 // not testing comment_author_email or comment_author_url
                 // as slashes are not permitted in that data
@@ -74 +74 @@
          *
          */
         function test_edit_comment() {
-                $post_id = self::$factory->post->create();
-                $comment_id = self::$factory->comment->create(array(
+                $post_id = self::factory()->post->create();
+                $comment_id = self::factory()->comment->create(array(
                         'comment_post_ID' => $post_id
                 ));
 
@@ -117 +117 @@
          *
          */
         function test_wp_insert_comment() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
 
                 $comment_id = wp_insert_comment(array(
                         'comment_post_ID' => $post_id,
@@ -145 +145 @@
          *
          */
         function test_wp_update_comment() {
-                $post_id = self::$factory->post->create();
-                $comment_id = self::$factory->comment->create(array(
+                $post_id = self::factory()->post->create();
+                $comment_id = self::factory()->comment->create(array(
                         'comment_post_ID' => $post_id
                 ));
 

tests/phpunit/tests/comment/template.php

@@ -5 +5 @@
 class Tests_Comment_Template extends WP_UnitTestCase {
 
         function test_get_comments_number() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
 
                 $this->assertEquals( 0, get_comments_number( 0 ) );
                 $this->assertEquals( 0, get_comments_number( $post_id ) );
                 $this->assertEquals( 0, get_comments_number( get_post( $post_id ) ) );
 
-                self::$factory->comment->create_post_comments( $post_id, 12 );
+                self::factory()->comment->create_post_comments( $post_id, 12 );
 
                 $this->assertEquals( 12, get_comments_number( $post_id ) );
                 $this->assertEquals( 12, get_comments_number( get_post( $post_id ) ) );
         }
 
         function test_get_comments_number_without_arg() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
                 $permalink = get_permalink( $post_id );
                 $this->go_to( $permalink );
 
                 $this->assertEquals( 0, get_comments_number() );
 
-                self::$factory->comment->create_post_comments( $post_id, 12 );
+                self::factory()->comment->create_post_comments( $post_id, 12 );
                 $this->go_to( $permalink );
 
                 $this->assertEquals( 12, get_comments_number() );

tests/phpunit/tests/comment/walker.php

@@ -8 +8 @@
         function setUp() {
                 parent::setUp();
 
-                $this->post_id = self::$factory->post->create();
+                $this->post_id = self::factory()->post->create();
         }
 
         /**
          * @ticket 14041
          */
         function test_has_children() {
-                $comment_parent = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id ) );
-                $comment_child  = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_parent' => $comment_parent ) );
+                $comment_parent = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id ) );
+                $comment_child  = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id, 'comment_parent' => $comment_parent ) );
                 $comment_parent = get_comment( $comment_parent );
                 $comment_child  = get_comment( $comment_child  );
 

tests/phpunit/tests/comment/wpCountComments.php

@@ -15 +15 @@
         }
 
         public function test_wp_count_comments_approved() {
-                self::$factory->comment->create( array(
+                self::factory()->comment->create( array(
                         'comment_approved' => 1
                 ) );
 
@@ -31 +31 @@
         }
 
         public function test_wp_count_comments_awaiting() {
-                self::$factory->comment->create( array(
+                self::factory()->comment->create( array(
                         'comment_approved' => 0
                 ) );
 
@@ -47 +47 @@
         }
 
         public function test_wp_count_comments_spam() {
-                self::$factory->comment->create( array(
+                self::factory()->comment->create( array(
                         'comment_approved' => 'spam'
                 ) );
 
@@ -63 +63 @@
         }
 
         public function test_wp_count_comments_trash() {
-                self::$factory->comment->create( array(
+                self::factory()->comment->create( array(
                         'comment_approved' => 'trash'
                 ) );
 
@@ -79 +79 @@
         }
 
         public function test_wp_count_comments_post_trashed() {
-                self::$factory->comment->create( array(
+                self::factory()->comment->create( array(
                         'comment_approved' => 'post-trashed'
                 ) );
 
@@ -95 +95 @@
         }
 
         public function test_wp_count_comments_cache() {
-                $post_id = self::$factory->post->create( array(
+                $post_id = self::factory()->post->create( array(
                         'post_status' => 'publish'
                 ) );
-                $comment_id = self::$factory->comment->create( array(
+                $comment_id = self::factory()->comment->create( array(
                         'comment_approved' => '1',
                         'comment_post_ID' => $post_id
                 ) );

tests/phpunit/tests/customize/manager.php

@@ -251 +251 @@
          * @see WP_Customize_Manager::set_return_url()
          */
         function test_return_url() {
-                wp_set_current_user( self::$factory->user->create( array( 'role' => 'author' ) ) );
+                wp_set_current_user( self::factory()->user->create( array( 'role' => 'author' ) ) );
                 $this->assertEquals( get_admin_url(), $this->manager->get_return_url() );
 
-                wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
+                wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
                 $this->assertTrue( current_user_can( 'edit_theme_options' ) );
                 $this->assertEquals( admin_url( 'themes.php' ), $this->manager->get_return_url() );
 
@@ -301 +301 @@
          * @see WP_Customize_Manager::customize_pane_settings()
          */
         function test_customize_pane_settings() {
-                wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
+                wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
                 $this->manager->register_controls();
                 $this->manager->prepare_controls();
                 $autofocus = array( 'control' => 'blogname' );

tests/phpunit/tests/customize/nav-menu-item-setting.php

@@ -21 +21 @@
         function setUp() {
                 parent::setUp();
                 require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
-                wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
+                wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
 
                 global $wp_customize;
                 $this->wp_customize = new WP_Customize_Manager();
@@ -149 +149 @@
         function test_value_type_post_type() {
                 do_action( 'customize_register', $this->wp_customize );
 
-                $post_id = self::$factory->post->create( array( 'post_title' => 'Hello World' ) );
+                $post_id = self::factory()->post->create( array( 'post_title' => 'Hello World' ) );
 
                 $menu_id = wp_create_nav_menu( 'Menu' );
                 $item_title = 'Greetings';
@@ -192 +192 @@
         function test_value_type_taxonomy() {
                 do_action( 'customize_register', $this->wp_customize );
 
-                $tax_id = self::$factory->category->create( array( 'name' => 'Salutations' ) );
+                $tax_id = self::factory()->category->create( array( 'name' => 'Salutations' ) );
 
                 $menu_id = wp_create_nav_menu( 'Menu' );
                 $item_title = 'Greetings';
@@ -270 +270 @@
                 $value = $menu->value();
                 $this->assertEquals( $post_value, $value );
 
-                $post_id = self::$factory->post->create( array( 'post_title' => 'Hello World' ) );
+                $post_id = self::factory()->post->create( array( 'post_title' => 'Hello World' ) );
                 $item_id = wp_update_nav_menu_item( $menu_id, 0, array(
                         'menu-item-type' => 'post_type',
                         'menu-item-object' => 'post',
@@ -296 +296 @@
         function test_preview_updated() {
                 do_action( 'customize_register', $this->wp_customize );
 
-                $first_post_id = self::$factory->post->create( array( 'post_title' => 'Hello World' ) );
-                $second_post_id = self::$factory->post->create( array( 'post_title' => 'Hola Muno' ) );
+                $first_post_id = self::factory()->post->create( array( 'post_title' => 'Hello World' ) );
+                $second_post_id = self::factory()->post->create( array( 'post_title' => 'Hola Muno' ) );
 
                 $primary_menu_id = wp_create_nav_menu( 'Primary' );
                 $secondary_menu_id = wp_create_nav_menu( 'Secondary' );
@@ -348 +348 @@
                 do_action( 'customize_register', $this->wp_customize );
 
                 $menu_id = wp_create_nav_menu( 'Primary' );
-                $post_id = self::$factory->post->create( array( 'post_title' => 'Hello World' ) );
+                $post_id = self::factory()->post->create( array( 'post_title' => 'Hello World' ) );
                 $item_ids = array();
                 for ( $i = 0; $i < 5; $i += 1 ) {
                         $item_id = wp_update_nav_menu_item( $menu_id, 0, array(
@@ -403 +403 @@
                 do_action( 'customize_register', $this->wp_customize );
 
                 $menu_id = wp_create_nav_menu( 'Primary' );
-                $post_id = self::$factory->post->create( array( 'post_title' => 'Hello World' ) );
+                $post_id = self::factory()->post->create( array( 'post_title' => 'Hello World' ) );
                 $item_ids = array();
                 for ( $i = 0; $i < 5; $i += 1 ) {
                         $item_id = wp_update_nav_menu_item( $menu_id, 0, array(
@@ -488 +488 @@
         function test_save_updated() {
                 do_action( 'customize_register', $this->wp_customize );
 
-                $first_post_id = self::$factory->post->create( array( 'post_title' => 'Hello World' ) );
-                $second_post_id = self::$factory->post->create( array( 'post_title' => 'Hola Muno' ) );
+                $first_post_id = self::factory()->post->create( array( 'post_title' => 'Hello World' ) );
+                $second_post_id = self::factory()->post->create( array( 'post_title' => 'Hola Muno' ) );
 
                 $primary_menu_id = wp_create_nav_menu( 'Primary' );
                 $secondary_menu_id = wp_create_nav_menu( 'Secondary' );
@@ -554 +554 @@
                 do_action( 'customize_register', $this->wp_customize );
 
                 $menu_id = wp_create_nav_menu( 'Primary' );
-                $post_id = self::$factory->post->create( array( 'post_title' => 'Hello World' ) );
+                $post_id = self::factory()->post->create( array( 'post_title' => 'Hello World' ) );
                 $item_ids = array();
                 for ( $i = 0; $i < 5; $i += 1 ) {
                         $item_id = wp_update_nav_menu_item( $menu_id, 0, array(
@@ -623 +623 @@
                 do_action( 'customize_register', $this->wp_customize );
 
                 $menu_id = wp_create_nav_menu( 'Primary' );
-                $post_id = self::$factory->post->create( array( 'post_title' => 'Hello World' ) );
+                $post_id = self::factory()->post->create( array( 'post_title' => 'Hello World' ) );
                 $item_ids = array();
                 for ( $i = 0; $i < 5; $i += 1 ) {
                         $item_id = wp_update_nav_menu_item( $menu_id, 0, array(

tests/phpunit/tests/customize/nav-menu-setting.php

@@ -22 +22 @@
         function setUp() {
                 parent::setUp();
                 require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
-                wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
+                wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
 
                 global $wp_customize;
                 $this->wp_customize = new WP_Customize_Manager();

tests/phpunit/tests/customize/nav-menus.php

@@ -22 +22 @@
         function setUp() {
                 parent::setUp();
                 require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
-                wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
+                wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
                 global $wp_customize;
                 $this->wp_customize = new WP_Customize_Manager();
                 $wp_customize = $this->wp_customize;
@@ -124 +124 @@
                 );
 
                 // Create pages.
-                self::$factory->post->create_many( 12, array( 'post_type' => 'page' ) );
+                self::factory()->post->create_many( 12, array( 'post_type' => 'page' ) );
 
                 // Home is included in menu items when page is zero.
                 $items = $menus->load_available_items_query( 'post_type', 'page', 0 );
@@ -145 +145 @@
                 $menus = new WP_Customize_Nav_Menus( $this->wp_customize );
 
                 // Create page.
-                $post_id = self::$factory->post->create( array( 'post_title' => 'Post Title' ) );
+                $post_id = self::factory()->post->create( array( 'post_title' => 'Post Title' ) );
 
                 // Create pages.
-                self::$factory->post->create_many( 10 );
+                self::factory()->post->create_many( 10 );
 
                 // Expected menu item array.
                 $expected = array(
@@ -175 +175 @@
                 $menus = new WP_Customize_Nav_Menus( $this->wp_customize );
 
                 // Create page.
-                $page_id = self::$factory->post->create( array( 'post_title' => 'Page Title', 'post_type' => 'page' ) );
+                $page_id = self::factory()->post->create( array( 'post_title' => 'Page Title', 'post_type' => 'page' ) );
 
                 // Expected menu item array.
                 $expected = array(
@@ -201 +201 @@
                 $menus = new WP_Customize_Nav_Menus( $this->wp_customize );
 
                 // Create post.
-                $post_id = self::$factory->post->create( array( 'post_title' => 'Post Title' ) );
+                $post_id = self::factory()->post->create( array( 'post_title' => 'Post Title' ) );
 
                 // Expected menu item array.
                 $expected = array(
@@ -227 +227 @@
                 $menus = new WP_Customize_Nav_Menus( $this->wp_customize );
 
                 // Create term.
-                $term_id = self::$factory->category->create( array( 'name' => 'Term Title' ) );
+                $term_id = self::factory()->category->create( array( 'name' => 'Term Title' ) );
 
                 // Expected menu item array.
                 $expected = array(
@@ -279 +279 @@
 
                 // Create posts
                 $post_ids = array();
-                $post_ids[] = self::$factory->post->create( array( 'post_title' => 'Search & Test' ) );
-                $post_ids[] = self::$factory->post->create( array( 'post_title' => 'Some Other Title' ) );
+                $post_ids[] = self::factory()->post->create( array( 'post_title' => 'Search & Test' ) );
+                $post_ids[] = self::factory()->post->create( array( 'post_title' => 'Some Other Title' ) );
 
                 // Create terms
                 $term_ids = array();
-                $term_ids[] = self::$factory->category->create( array( 'name' => 'Dogs Are Cool' ) );
-                $term_ids[] = self::$factory->category->create( array( 'name' => 'Cats Drool' ) );
+                $term_ids[] = self::factory()->category->create( array( 'name' => 'Dogs Are Cool' ) );
+                $term_ids[] = self::factory()->category->create( array( 'name' => 'Cats Drool' ) );
 
                 // Test empty results
                 $expected = array();
@@ -386 +386 @@
         function test_customize_register() {
                 do_action( 'customize_register', $this->wp_customize );
                 $menu_id = wp_create_nav_menu( 'Primary' );
-                $post_id = self::$factory->post->create( array( 'post_title' => 'Hello World' ) );
+                $post_id = self::factory()->post->create( array( 'post_title' => 'Hello World' ) );
                 $item_id = wp_update_nav_menu_item( $menu_id, 0, array(
                         'menu-item-type'      => 'post_type',
                         'menu-item-object'    => 'post',

tests/phpunit/tests/customize/panel.php

@@ -128 +128 @@
          * @see WP_Customize_Panel::check_capabilities()
          */
         function test_check_capabilities() {
-                $user_id = self::$factory->user->create( array( 'role' => 'administrator' ) );
+                $user_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
                 wp_set_current_user( $user_id );
 
                 $panel = new WP_Customize_Panel( $this->manager, 'foo' );
@@ -154 +154 @@
          * @see WP_Customize_Panel::maybe_render()
          */
         function test_maybe_render() {
-                wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
+                wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
                 $panel = new WP_Customize_Panel( $this->manager, 'bar' );
                 $customize_render_panel_count = did_action( 'customize_render_panel' );
                 add_action( 'customize_render_panel', array( $this, 'action_customize_render_panel_test' ) );
@@ -179 +179 @@
          * @see WP_Customize_Panel::print_template()
          */
         function test_print_templates_standard() {
-                wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
+                wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
 
                 $panel = new WP_Customize_Panel( $this->manager, 'baz' );
                 ob_start();
@@ -197 +197 @@
          * @see WP_Customize_Panel::print_template()
          */
         function test_print_templates_custom() {
-                wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
+                wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
 
                 $panel = new Custom_Panel_Test( $this->manager, 'baz' );
                 ob_start();

tests/phpunit/tests/customize/section.php

@@ -135 +135 @@
          * @see WP_Customize_Section::check_capabilities()
          */
         function test_check_capabilities() {
-                $user_id = self::$factory->user->create( array( 'role' => 'administrator' ) );
+                $user_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
                 wp_set_current_user( $user_id );
 
                 $section = new WP_Customize_Section( $this->manager, 'foo' );
@@ -161 +161 @@
          * @see WP_Customize_Section::maybe_render()
          */
         function test_maybe_render() {
-                wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
+                wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
                 $section = new WP_Customize_Section( $this->manager, 'bar' );
                 $customize_render_section_count = did_action( 'customize_render_section' );
                 add_action( 'customize_render_section', array( $this, 'action_customize_render_section_test' ) );
@@ -186 +186 @@
          * @see WP_Customize_Section::print_template()
          */
         function test_print_templates_standard() {
-                wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
+                wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
 
                 $section = new WP_Customize_Section( $this->manager, 'baz' );
                 ob_start();
@@ -201 +201 @@
          * @see WP_Customize_Section::print_template()
          */
         function test_print_templates_custom() {
-                wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
+                wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
 
                 $section = new Custom_Section_Test( $this->manager, 'baz' );
                 ob_start();

tests/phpunit/tests/customize/setting.php

@@ -394 +394 @@
                 $this->assertTrue( 0 === did_action( 'customize_save_foo' ) );
 
                 // Satisfy all requirements for save to happen.
-                wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
+                wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
                 $this->assertTrue( false !== $setting->save() );
                 $this->assertTrue( 1 === did_action( 'customize_update_custom' ) );
                 $this->assertTrue( 1 === did_action( 'customize_save_foo' ) );
@@ -465 +465 @@
                 $setting->preview();
                 $this->assertTrue( $setting->is_current_blog_previewed() );
 
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
                 switch_to_blog( $blog_id );
                 $this->assertFalse( $setting->is_current_blog_previewed() );
                 $this->assertNotEquals( $post_value, $setting->value() );

tests/phpunit/tests/customize/widgets.php

@@ -38 +38 @@
 
                 remove_action( 'after_setup_theme', 'twentyfifteen_setup' ); // @todo We should not be including a theme anyway
 
-                $user_id = self::$factory->user->create( array( 'role' => 'administrator' ) );
+                $user_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
                 wp_set_current_user( $user_id );
 
                 $this->backup_registered_sidebars = $GLOBALS['wp_registered_sidebars'];

tests/phpunit/tests/date/query.php

@@ -975 +975 @@
          * @ticket 31001
          */
         public function test_validate_date_values_should_process_array_value_for_year() {
-                $p1 = self::$factory->post->create( array( 'post_date' => '2015-01-12 00:00:00' ) );
-                $p2 = self::$factory->post->create( array( 'post_date' => '2013-01-12 00:00:00' ) );
+                $p1 = self::factory()->post->create( array( 'post_date' => '2015-01-12 00:00:00' ) );
+                $p2 = self::factory()->post->create( array( 'post_date' => '2013-01-12 00:00:00' ) );
 
                 $q = new WP_Query( array(
                         'date_query' => array(
@@ -995 +995 @@
          * @ticket 31001
          */
         public function test_validate_date_values_should_process_array_value_for_day() {
-                $p1 = self::$factory->post->create( array( 'post_date' => '2015-01-12 00:00:00' ) );
-                $p2 = self::$factory->post->create( array( 'post_date' => '2015-01-10 00:00:00' ) );
+                $p1 = self::factory()->post->create( array( 'post_date' => '2015-01-12 00:00:00' ) );
+                $p2 = self::factory()->post->create( array( 'post_date' => '2015-01-10 00:00:00' ) );
 
                 $q = new WP_Query( array(
                         'date_query' => array(
@@ -1016 +1016 @@
          * @expectedIncorrectUsage WP_Date_Query
          */
         public function test_validate_date_values_should_process_array_value_for_day_when_values_are_invalid() {
-                $p1 = self::$factory->post->create( array( 'post_date' => '2015-01-12 00:00:00' ) );
-                $p2 = self::$factory->post->create( array( 'post_date' => '2015-01-10 00:00:00' ) );
+                $p1 = self::factory()->post->create( array( 'post_date' => '2015-01-12 00:00:00' ) );
+                $p2 = self::factory()->post->create( array( 'post_date' => '2015-01-10 00:00:00' ) );
 
                 $q = new WP_Query( array(
                         'date_query' => array(

tests/phpunit/tests/db.php

@@ -509 +509 @@
                         $this->markTestSkipped( 'procedure could not be created (missing privileges?)' );
                 }
 
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
 
                 $this->assertNotEmpty( $wpdb->get_results( 'CALL `test_mysqli_flush_sync_procedure`' ) );
                 $this->assertNotEmpty( $wpdb->get_results( "SELECT ID FROM `{$wpdb->posts}` LIMIT 1" ) );

tests/phpunit/tests/formatting/SanitizePost.php

@@ -9 +9 @@
          * @ticket 22324
          */
         function test_int_fields() {
-                $post = self::$factory->post->create_and_get();
+                $post = self::factory()->post->create_and_get();
                 $int_fields = array(
                         'ID'            => 'integer',
                         'post_parent'   => 'integer',

tests/phpunit/tests/formatting/WpTrimExcerpt.php

@@ -9 +9 @@
          * @ticket 25349
          */
         public function test_secondary_loop_respect_more() {
-                $post1 = self::$factory->post->create( array(
+                $post1 = self::factory()->post->create( array(
                         'post_content' => 'Post 1 Page 1<!--more-->Post 1 Page 2',
                 ) );
-                $post2 = self::$factory->post->create( array(
+                $post2 = self::factory()->post->create( array(
                         'post_content' => 'Post 2 Page 1<!--more-->Post 2 Page 2',
                 ) );
 
@@ -34 +34 @@
          * @ticket 25349
          */
         public function test_secondary_loop_respect_nextpage() {
-                $post1 = self::$factory->post->create( array(
+                $post1 = self::factory()->post->create( array(
                         'post_content' => 'Post 1 Page 1<!--nextpage-->Post 1 Page 2',
                 ) );
-                $post2 = self::$factory->post->create( array(
+                $post2 = self::factory()->post->create( array(
                         'post_content' => 'Post 2 Page 1<!--nextpage-->Post 2 Page 2',
                 ) );
 

tests/phpunit/tests/functions.php

@@ -689 +689 @@
                 $actual = ob_get_clean();
                 $this->assertEquals( '', $actual );
 
-                $GLOBALS['post']        = self::$factory->post->create_and_get( array(
+                $GLOBALS['post']        = self::factory()->post->create_and_get( array(
                         'post_date' => '2015-09-16 08:00:00'
                 ) );
 

tests/phpunit/tests/functions/getArchives.php

@@ -87 +87 @@
         }
 
         function test_wp_get_archives_order() {
-                self::$factory->post->create( array( 'post_type' => 'post', 'post_author' => '1', 'post_date' => '2012-10-23 19:34:42' ) );
+                self::factory()->post->create( array( 'post_type' => 'post', 'post_author' => '1', 'post_date' => '2012-10-23 19:34:42' ) );
 
                 $date_full = date( 'F Y' );
                 $oct_url = get_month_link( 2012, 10 );
@@ -110 +110 @@
         function test_wp_get_archives_post_type() {
                 register_post_type( 'taco', array( 'public' => true ) );
 
-                self::$factory->post->create( array(
+                self::factory()->post->create( array(
                         'post_type' => 'taco',
                         'post_author' => '1',
                         'post_date' => '2014-10-23 19:34:42'

tests/phpunit/tests/general/archives.php

@@ -16 +16 @@
         function test_get_archives_cache() {
                 global $wpdb;
 
-                self::$factory->post->create_many( 3, array( 'post_type' => 'post' ) );
+                self::factory()->post->create_many( 3, array( 'post_type' => 'post' ) );
                 wp_cache_delete( 'last_changed', 'posts' );
                 $this->assertFalse( wp_cache_get( 'last_changed', 'posts' ) );
 

tests/phpunit/tests/includes/factory.php

@@ -34 +34 @@
          */
         public function test_term_factory_create_and_get_should_return_term_object() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $term = self::$factory->term->create_and_get( array( 'taxonomy' => 'wptests_tax' ) );
+                $term = self::factory()->term->create_and_get( array( 'taxonomy' => 'wptests_tax' ) );
                 $this->assertInternalType( 'object', $term );
                 $this->assertNotEmpty( $term->term_id );
         }

tests/phpunit/tests/link.php

@@ -33 +33 @@
         }
 
         function test_wp_get_shortlink() {
-                $post_id = self::$factory->post->create();
-                $post_id2 = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
+                $post_id2 = self::factory()->post->create();
 
                 // Basic case
                 $this->assertEquals( get_permalink( $post_id ), wp_get_shortlink( $post_id, 'post' ) );
@@ -77 +77 @@
         }
 
         function test_wp_get_shortlink_with_page() {
-                $post_id = self::$factory->post->create( array( 'post_type' => 'page' ) );
+                $post_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
 
                 // Basic case
                 // Don't test against get_permalink() since it uses ?page_id= for pages.
@@ -92 +92 @@
          * @ticket 26871
          */
         function test_wp_get_shortlink_with_home_page() {
-                $post_id = self::$factory->post->create( array( 'post_type' => 'page' ) );
+                $post_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
                 update_option( 'show_on_front', 'page' );
                 update_option( 'page_on_front', $post_id );
 
@@ -108 +108 @@
          */
         function test_get_adjacent_post() {
                 // Need some sample posts to test adjacency
-                $post_one = self::$factory->post->create_and_get( array(
+                $post_one = self::factory()->post->create_and_get( array(
                         'post_title' => 'First',
                         'post_date' => '2012-01-01 12:00:00'
                 ) );
 
-                $post_two = self::$factory->post->create_and_get( array(
+                $post_two = self::factory()->post->create_and_get( array(
                         'post_title' => 'Second',
                         'post_date' => '2012-02-01 12:00:00'
                 ) );
 
-                $post_three = self::$factory->post->create_and_get( array(
+                $post_three = self::factory()->post->create_and_get( array(
                         'post_title' => 'Third',
                         'post_date' => '2012-03-01 12:00:00'
                 ) );
 
-                $post_four = self::$factory->post->create_and_get( array(
+                $post_four = self::factory()->post->create_and_get( array(
                         'post_title' => 'Fourth',
                         'post_date' => '2012-04-01 12:00:00'
                 ) );
@@ -183 +183 @@
                 global $wpdb;
                 $wpdb->insert( $wpdb->term_taxonomy, array( 'taxonomy' => 'foo', 'term_id' => 12345, 'description' => '' ) );
 
-                $include = self::$factory->term->create( array(
+                $include = self::factory()->term->create( array(
                         'taxonomy' => 'category',
                         'name' => 'Include',
                 ) );
-                $exclude = self::$factory->category->create();
+                $exclude = self::factory()->category->create();
 
-                $one = self::$factory->post->create_and_get( array(
+                $one = self::factory()->post->create_and_get( array(
                         'post_date' => '2012-01-01 12:00:00',
                         'post_category' => array( $include, $exclude ),
                 ) );
 
-                $two = self::$factory->post->create_and_get( array(
+                $two = self::factory()->post->create_and_get( array(
                         'post_date' => '2012-01-02 12:00:00',
                         'post_category' => array(),
                 ) );
 
-                $three = self::$factory->post->create_and_get( array(
+                $three = self::factory()->post->create_and_get( array(
                         'post_date' => '2012-01-03 12:00:00',
                         'post_category' => array( $include, $exclude ),
                 ) );
 
-                $four = self::$factory->post->create_and_get( array(
+                $four = self::factory()->post->create_and_get( array(
                         'post_date' => '2012-01-04 12:00:00',
                         'post_category' => array( $include ),
                 ) );
 
-                $five = self::$factory->post->create_and_get( array(
+                $five = self::factory()->post->create_and_get( array(
                         'post_date' => '2012-01-05 12:00:00',
                         'post_category' => array( $include, $exclude ),
                 ) );
@@ -249 +249 @@
         public function test_get_adjacent_post_excluded_terms() {
                 register_taxonomy( 'wptests_tax', 'post' );
 
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 
-                $p1 = self::$factory->post->create( array( 'post_date' => '2015-08-27 12:00:00' ) );
-                $p2 = self::$factory->post->create( array( 'post_date' => '2015-08-26 12:00:00' ) );
-                $p3 = self::$factory->post->create( array( 'post_date' => '2015-08-25 12:00:00' ) );
+                $p1 = self::factory()->post->create( array( 'post_date' => '2015-08-27 12:00:00' ) );
+                $p2 = self::factory()->post->create( array( 'post_date' => '2015-08-26 12:00:00' ) );
+                $p3 = self::factory()->post->create( array( 'post_date' => '2015-08-25 12:00:00' ) );
 
                 wp_set_post_terms( $p2, array( $t ), 'wptests_tax' );
 
@@ -281 +281 @@
         public function test_get_adjacent_post_excluded_terms_should_not_require_posts_to_have_terms_in_any_taxonomy() {
                 register_taxonomy( 'wptests_tax', 'post' );
 
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 
-                $p1 = self::$factory->post->create( array( 'post_date' => '2015-08-27 12:00:00' ) );
-                $p2 = self::$factory->post->create( array( 'post_date' => '2015-08-26 12:00:00' ) );
-                $p3 = self::$factory->post->create( array( 'post_date' => '2015-08-25 12:00:00' ) );
+                $p1 = self::factory()->post->create( array( 'post_date' => '2015-08-27 12:00:00' ) );
+                $p2 = self::factory()->post->create( array( 'post_date' => '2015-08-26 12:00:00' ) );
+                $p3 = self::factory()->post->create( array( 'post_date' => '2015-08-25 12:00:00' ) );
 
                 wp_set_post_terms( $p2, array( $t ), 'wptests_tax' );
 
@@ -348 +348 @@
 
                 flush_rewrite_rules();
 
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_status' => 'publish',
                         'post_date'   => strftime( '%Y-%m-%d %H:%M:%S', strtotime( '+1 day' ) )
                 ) );
@@ -368 +368 @@
 
                 flush_rewrite_rules();
 
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_status' => 'future',
                         'post_type'   => 'wptests_pt',
                         'post_date'   => strftime( '%Y-%m-%d %H:%M:%S', strtotime( '+1 day' ) )
@@ -388 +388 @@
         public function test_unattached_attachment_has_a_pretty_permalink() {
                 $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
 
-                $attachment_id = self::$factory->attachment->create_object( 'image.jpg', 0, array(
+                $attachment_id = self::factory()->attachment->create_object( 'image.jpg', 0, array(
                         'post_mime_type' => 'image/jpeg',
                         'post_type' => 'attachment',
                         'post_title' => 'An Attachment!',
@@ -412 +412 @@
 
                 flush_rewrite_rules();
 
-                $post_id = self::$factory->post->create( array( 'post_type' => 'not_a_post_type' ) );
+                $post_id = self::factory()->post->create( array( 'post_type' => 'not_a_post_type' ) );
 
-                $attachment_id = self::$factory->attachment->create_object( 'image.jpg', $post_id, array(
+                $attachment_id = self::factory()->attachment->create_object( 'image.jpg', $post_id, array(
                         'post_mime_type' => 'image/jpeg',
                         'post_type' => 'attachment',
                         'post_title' => 'An Attachment!',

tests/phpunit/tests/link/getAdjacentPostLink.php

@@ -10 +10 @@
 
         public function setUp(){
                 parent::setUp();
-                $this->cat_id = self::$factory->category->create( array( 'name' => 'other' ) );
+                $this->cat_id = self::factory()->category->create( array( 'name' => 'other' ) );
                 $this->post_ids = array();
-                $this->post_ids[] = self::$factory->post->create( array( 'post_type' => 'post', 'post_date' => '2014-10-26 05:32:29', 'category_id' => 1 ) );
-                $this->post_ids[] = self::$factory->post->create( array( 'post_type' => 'post', 'post_date' => '2014-10-26 04:32:29', 'category_id' => $this->cat_id ) );
-                $this->post_ids[] = self::$factory->post->create( array( 'post_type' => 'post', 'post_date' => '2014-10-26 03:32:29', 'category_id' => 1 ) );
-                $this->post_ids[] = self::$factory->post->create( array( 'post_type' => 'post', 'post_date' => '2014-10-26 02:32:29', 'category_id' => $this->cat_id ) );
-                $this->post_ids[] = self::$factory->post->create( array( 'post_type' => 'post', 'post_date' => '2014-10-26 01:32:29', 'category_id' => 1 ) );
+                $this->post_ids[] = self::factory()->post->create( array( 'post_type' => 'post', 'post_date' => '2014-10-26 05:32:29', 'category_id' => 1 ) );
+                $this->post_ids[] = self::factory()->post->create( array( 'post_type' => 'post', 'post_date' => '2014-10-26 04:32:29', 'category_id' => $this->cat_id ) );
+                $this->post_ids[] = self::factory()->post->create( array( 'post_type' => 'post', 'post_date' => '2014-10-26 03:32:29', 'category_id' => 1 ) );
+                $this->post_ids[] = self::factory()->post->create( array( 'post_type' => 'post', 'post_date' => '2014-10-26 02:32:29', 'category_id' => $this->cat_id ) );
+                $this->post_ids[] = self::factory()->post->create( array( 'post_type' => 'post', 'post_date' => '2014-10-26 01:32:29', 'category_id' => 1 ) );
 
                 //set current post (has 2 on each end)
                 global $GLOBALS;

tests/phpunit/tests/link/getNextCommentsLink.php

@@ -8 +8 @@
 class Tests_Link_GetNextCommentsLink extends WP_UnitTestCase {
 
         public function test_page_should_respect_value_of_cpage_query_var() {
-                $p = self::$factory->post->create();
+                $p = self::factory()->post->create();
                 $this->go_to( get_permalink( $p ) );
 
                 $cpage = get_query_var( 'cpage' );
@@ -25 +25 @@
          * @ticket 20319
          */
         public function test_page_should_default_to_1_when_no_cpage_query_var_is_found() {
-                $p = self::$factory->post->create();
+                $p = self::factory()->post->create();
                 $this->go_to( get_permalink( $p ) );
 
                 $cpage = get_query_var( 'cpage' );

tests/phpunit/tests/link/getPostCommentsFeedLink.php

@@ -5 +5 @@
 class Tests_Link_GetPostCommentsFeedLink extends WP_UnitTestCase {
 
         public function test_post_link() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
 
                 $link = get_post_comments_feed_link( $post_id );
                 $expected = add_query_arg( array(
@@ -19 +19 @@
         public function test_post_pretty_link() {
                 $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
 
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
 
                 $link = get_post_comments_feed_link( $post_id );
                 $expected = get_permalink( $post_id ) . 'feed/';
@@ -28 +28 @@
         }
 
         public function test_attachment_link() {
-                $post_id = self::$factory->post->create();
-                $attachment_id = self::$factory->attachment->create_object( 'image.jpg', $post_id, array(
+                $post_id = self::factory()->post->create();
+                $attachment_id = self::factory()->attachment->create_object( 'image.jpg', $post_id, array(
                         'post_mime_type' => 'image/jpeg',
                         'post_type' => 'attachment'
                 ) );
@@ -46 +46 @@
         public function test_attachment_pretty_link() {
                 $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
 
-                $post_id = self::$factory->post->create( array(
+                $post_id = self::factory()->post->create( array(
                         'post_status' => 'publish'
                 ) );
-                $attachment_id = self::$factory->attachment->create_object( 'image.jpg', $post_id, array(
+                $attachment_id = self::factory()->attachment->create_object( 'image.jpg', $post_id, array(
                         'post_mime_type' => 'image/jpeg',
                         'post_type' => 'attachment',
                         'post_title' => 'Burrito'
@@ -66 +66 @@
         public function test_attachment_no_name_pretty_link() {
                 $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
 
-                $post_id = self::$factory->post->create();
-                $attachment_id = self::$factory->attachment->create_object( 'image.jpg', $post_id, array(
+                $post_id = self::factory()->post->create();
+                $attachment_id = self::factory()->attachment->create_object( 'image.jpg', $post_id, array(
                         'post_mime_type' => 'image/jpeg',
                         'post_type' => 'attachment'
                 ) );
@@ -79 +79 @@
         }
 
         public function test_unattached_link() {
-                $attachment_id = self::$factory->attachment->create_object( 'image.jpg', 0, array(
+                $attachment_id = self::factory()->attachment->create_object( 'image.jpg', 0, array(
                         'post_mime_type' => 'image/jpeg',
                         'post_type' => 'attachment'
                 ) );
@@ -96 +96 @@
         public function test_unattached_pretty_link() {
                 $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
 
-                $attachment_id = self::$factory->attachment->create_object( 'image.jpg', 0, array(
+                $attachment_id = self::factory()->attachment->create_object( 'image.jpg', 0, array(
                         'post_mime_type' => 'image/jpeg',
                         'post_type' => 'attachment'
                 ) );

tests/phpunit/tests/link/getPreviousCommentsLink.php

@@ -8 +8 @@
 class Tests_Link_GetPreviousCommentsLink extends WP_UnitTestCase {
 
         public function test_page_should_respect_value_of_cpage_query_var() {
-                $p = self::$factory->post->create();
+                $p = self::factory()->post->create();
                 $this->go_to( get_permalink( $p ) );
 
                 $cpage = get_query_var( 'cpage' );
@@ -22 +22 @@
         }
 
         public function test_page_should_default_to_1_when_no_cpage_query_var_is_found() {
-                $p = self::$factory->post->create();
+                $p = self::factory()->post->create();
                 $this->go_to( get_permalink( $p ) );
 
                 $cpage = get_query_var( 'cpage' );

tests/phpunit/tests/media.php

@@ -236 +236 @@
          * @ticket 22960
          */
         function test_get_attached_images() {
-                $post_id = self::$factory->post->create();
-                $attachment_id = self::$factory->attachment->create_object( $this->img_name, $post_id, array(
+                $post_id = self::factory()->post->create();
+                $attachment_id = self::factory()->attachment->create_object( $this->img_name, $post_id, array(
                         'post_mime_type' => 'image/jpeg',
                         'post_type' => 'attachment'
                 ) );
@@ -253 +253 @@
                 $ids1 = array();
                 $ids1_srcs = array();
                 foreach ( range( 1, 3 ) as $i ) {
-                        $attachment_id = self::$factory->attachment->create_object( "image$i.jpg", 0, array(
+                        $attachment_id = self::factory()->attachment->create_object( "image$i.jpg", 0, array(
                                 'post_mime_type' => 'image/jpeg',
                                 'post_type' => 'attachment'
                         ) );
@@ -266 +266 @@
                 $ids2 = array();
                 $ids2_srcs = array();
                 foreach ( range( 4, 6 ) as $i ) {
-                        $attachment_id = self::$factory->attachment->create_object( "image$i.jpg", 0, array(
+                        $attachment_id = self::factory()->attachment->create_object( "image$i.jpg", 0, array(
                                 'post_mime_type' => 'image/jpeg',
                                 'post_type' => 'attachment'
                         ) );
@@ -284 +284 @@
 
 [gallery ids="$ids2_joined"]
 BLOB;
-                $post_id = self::$factory->post->create( array( 'post_content' => $blob ) );
+                $post_id = self::factory()->post->create( array( 'post_content' => $blob ) );
                 $srcs = get_post_galleries_images( $post_id );
                 $this->assertEquals( $srcs, array( $ids1_srcs, $ids2_srcs ) );
         }
@@ -296 +296 @@
                 $ids1 = array();
                 $ids1_srcs = array();
                 foreach ( range( 1, 3 ) as $i ) {
-                        $attachment_id = self::$factory->attachment->create_object( "image$i.jpg", 0, array(
+                        $attachment_id = self::factory()->attachment->create_object( "image$i.jpg", 0, array(
                                 'post_mime_type' => 'image/jpeg',
                                 'post_type' => 'attachment'
                         ) );
@@ -309 +309 @@
                 $ids2 = array();
                 $ids2_srcs = array();
                 foreach ( range( 4, 6 ) as $i ) {
-                        $attachment_id = self::$factory->attachment->create_object( "image$i.jpg", 0, array(
+                        $attachment_id = self::factory()->attachment->create_object( "image$i.jpg", 0, array(
                                 'post_mime_type' => 'image/jpeg',
                                 'post_type' => 'attachment'
                         ) );
@@ -327 +327 @@
 
 [gallery ids="$ids2_joined"]
 BLOB;
-                $post_id = self::$factory->post->create( array( 'post_content' => $blob ) );
+                $post_id = self::factory()->post->create( array( 'post_content' => $blob ) );
                 $srcs = get_post_gallery_images( $post_id );
                 $this->assertEquals( $srcs, $ids1_srcs );
         }
@@ -505 +505 @@
          */
         function test_attachment_url_to_postid() {
                 $image_path = '2014/11/' . $this->img_name;
-                $attachment_id = self::$factory->attachment->create_object( $image_path, 0, array(
+                $attachment_id = self::factory()->attachment->create_object( $image_path, 0, array(
                         'post_mime_type' => 'image/jpeg',
                         'post_type'      => 'attachment',
                 ) );
@@ -516 +516 @@
 
         function test_attachment_url_to_postid_schemes() {
                 $image_path = '2014/11/' . $this->img_name;
-                $attachment_id = self::$factory->attachment->create_object( $image_path, 0, array(
+                $attachment_id = self::factory()->attachment->create_object( $image_path, 0, array(
                         'post_mime_type' => 'image/jpeg',
                         'post_type'      => 'attachment',
                 ) );
@@ -530 +530 @@
 
         function test_attachment_url_to_postid_filtered() {
                 $image_path = '2014/11/' . $this->img_name;
-                $attachment_id = self::$factory->attachment->create_object( $image_path, 0, array(
+                $attachment_id = self::factory()->attachment->create_object( $image_path, 0, array(
                         'post_mime_type' => 'image/jpeg',
                         'post_type'      => 'attachment',
                 ) );
@@ -704 +704 @@
         function test_wp_get_attachment_image_url() {
                 $this->assertFalse( wp_get_attachment_image_url( 0 ) );
 
-                $post_id = self::$factory->post->create();
-                $attachment_id = self::$factory->attachment->create_object( $this->img_name, $post_id, array(
+                $post_id = self::factory()->post->create();
+                $attachment_id = self::factory()->attachment->create_object( $this->img_name, $post_id, array(
                         'post_mime_type' => 'image/jpeg',
                         'post_type' => 'attachment',
                 ) );
@@ -760 +760 @@
 
                 // Make an image.
                 $filename = DIR_TESTDATA . '/images/test-image-large.png';
-                $id = self::$factory->attachment->create_upload_object( $filename );
+                $id = self::factory()->attachment->create_upload_object( $filename );
 
                 $image = wp_get_attachment_metadata( $id );
 

tests/phpunit/tests/meta.php

@@ -8 +8 @@
 
         function setUp() {
                 parent::setUp();
-                $this->author = new WP_User( self::$factory->user->create( array( 'role' => 'author' ) ) );
+                $this->author = new WP_User( self::factory()->user->create( array( 'role' => 'author' ) ) );
                 $this->meta_id = add_metadata( 'user', $this->author->ID, 'meta_key', 'meta_value' );
                 $this->delete_meta_id = add_metadata( 'user', $this->author->ID, 'delete_meta_key', 'delete_meta_value' );
         }
@@ -194 +194 @@
          * @ticket 16814
          */
         function test_meta_type_cast() {
-                $post_id1 = self::$factory->post->create();
+                $post_id1 = self::factory()->post->create();
                 add_post_meta( $post_id1, 'num_as_longtext', 123 );
                 add_post_meta( $post_id1, 'num_as_longtext_desc', 10 );
-                $post_id2 = self::$factory->post->create();
+                $post_id2 = self::factory()->post->create();
                 add_post_meta( $post_id2, 'num_as_longtext', 99 );
                 add_post_meta( $post_id2, 'num_as_longtext_desc', 100 );
 
@@ -258 +258 @@
         }
 
         function test_meta_cache_order_asc() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
                 $colors = array( 'red', 'blue', 'yellow', 'green' );
                 foreach ( $colors as $color )
                         add_post_meta( $post_id, 'color', $color );

tests/phpunit/tests/meta/slashes.php

@@ -8 +8 @@
 class Tests_Meta_Slashes extends WP_UnitTestCase {
         function setUp() {
                 parent::setUp();
-                $this->author_id = self::$factory->user->create( array( 'role' => 'editor' ) );
-                $this->post_id = self::$factory->post->create();
+                $this->author_id = self::factory()->user->create( array( 'role' => 'editor' ) );
+                $this->post_id = self::factory()->post->create();
                 $this->old_current_user = get_current_user_id();
                 wp_set_current_user( $this->author_id );
 
@@ -32 +32 @@
          *
          */
         function test_edit_post() {
-                $id = self::$factory->post->create();
+                $id = self::factory()->post->create();
                 if ( function_exists( 'wp_add_post_meta' ) ) {
                         $meta_1 = wp_add_post_meta( $id, 'slash_test_1', 'foo' );
                         $meta_2 = wp_add_post_meta( $id, 'slash_test_2', 'foo' );
@@ -108 +108 @@
          *
          */
         function test_add_post_meta() {
-                $id = self::$factory->post->create();
+                $id = self::factory()->post->create();
                 add_post_meta( $id, 'slash_test_1', addslashes( $this->slash_1 ) );
                 add_post_meta( $id, 'slash_test_2', addslashes( $this->slash_3 ) );
                 add_post_meta( $id, 'slash_test_3', addslashes( $this->slash_4 ) );
@@ -123 +123 @@
          *
          */
         function test_update_post_meta() {
-                $id = self::$factory->post->create();
+                $id = self::factory()->post->create();
                 update_post_meta( $id, 'slash_test_1', addslashes( $this->slash_1 ) );
                 update_post_meta( $id, 'slash_test_2', addslashes( $this->slash_3 ) );
                 update_post_meta( $id, 'slash_test_3', addslashes( $this->slash_4 ) );
@@ -141 +141 @@
                 if ( !function_exists( 'wp_add_post_meta' ) ) {
                         return;
                 }
-                $id = self::$factory->post->create();
+                $id = self::factory()->post->create();
                 wp_add_post_meta( $id, 'slash_test_1', $this->slash_1 );
                 wp_add_post_meta( $id, 'slash_test_2', $this->slash_3 );
                 wp_add_post_meta( $id, 'slash_test_3', $this->slash_4 );
@@ -159 +159 @@
                 if ( !function_exists( 'wp_update_post_meta' ) ) {
                         return;
                 }
-                $id = self::$factory->post->create();
+                $id = self::factory()->post->create();
                 wp_update_post_meta( $id, 'slash_test_1', $this->slash_1 );
                 wp_update_post_meta( $id, 'slash_test_2', $this->slash_3 );
                 wp_update_post_meta( $id, 'slash_test_3', $this->slash_4 );
@@ -174 +174 @@
          *
          */
         function test_add_comment_meta() {
-                $id = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id ) );
+                $id = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id ) );
 
                 add_comment_meta( $id, 'slash_test_1', $this->slash_1 );
                 add_comment_meta( $id, 'slash_test_2', $this->slash_3 );
@@ -198 +198 @@
          *
          */
         function test_update_comment_meta() {
-                $id = self::$factory->comment->create( array( 'comment_post_ID' => $this->post_id ) );
+                $id = self::factory()->comment->create( array( 'comment_post_ID' => $this->post_id ) );
 
                 add_comment_meta( $id, 'slash_test_1', 'foo' );
                 add_comment_meta( $id, 'slash_test_2', 'foo' );
@@ -226 +226 @@
          *
          */
         function test_add_user_meta() {
-                $id = self::$factory->user->create();
+                $id = self::factory()->user->create();
 
                 add_user_meta( $id, 'slash_test_1', $this->slash_1 );
                 add_user_meta( $id, 'slash_test_2', $this->slash_3 );
@@ -250 +250 @@
          *
          */
         function test_update_user_meta() {
-                $id = self::$factory->user->create();
+                $id = self::factory()->user->create();
 
                 add_user_meta( $id, 'slash_test_1', 'foo' );
                 add_user_meta( $id, 'slash_test_2', 'foo' );

tests/phpunit/tests/multisite/bootstrap.php

@@ -40 +40 @@
                 );
 
                 foreach ( $ids as &$id ) {
-                        $id = self::$factory->network->create( $id );
+                        $id = self::factory()->network->create( $id );
                 }
                 unset( $id );
 
@@ -88 +88 @@
                 );
 
                 foreach ( $ids as &$id ) {
-                        $id = self::$factory->blog->create( $id );
+                        $id = self::factory()->blog->create( $id );
                 }
                 unset( $id );
 
@@ -169 +169 @@
                 );
 
                 foreach ( $network_ids as &$id ) {
-                        $id = self::$factory->network->create( $id );
+                        $id = self::factory()->network->create( $id );
                 }
                 unset( $id );
 
@@ -182 +182 @@
                 );
 
                 foreach ( $ids as &$id ) {
-                        $id = self::$factory->blog->create( $id );
+                        $id = self::factory()->blog->create( $id );
                 }
                 unset( $id );
 

tests/phpunit/tests/multisite/getSpaceUsed.php

@@ -22 +22 @@
         }
 
         function test_get_space_used_switched_site() {
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
                 switch_to_blog( $blog_id );
 
                 // Our comparison of space relies on an initial value of 0. If a previous test has failed or if the
@@ -30 +30 @@
                 // will be polluted. We create sites until an empty one is available.
                 while ( 0 != get_space_used() ) {
                         restore_current_blog();
-                        $blog_id = self::$factory->blog->create();
+                        $blog_id = self::factory()->blog->create();
                         switch_to_blog( $blog_id );
                 }
 
@@ -58 +58 @@
         function test_get_space_used_main_site() {
                 $space_used = get_space_used();
 
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
                 switch_to_blog( $blog_id );
 
                 // We don't rely on an initial value of 0 for space used, but should have a clean space available
@@ -66 +66 @@
                 // existing content directories in src.
                 while ( 0 != get_space_used() ) {
                         restore_current_blog();
-                        $blog_id = self::$factory->blog->create();
+                        $blog_id = self::factory()->blog->create();
                         switch_to_blog( $blog_id );
                 }
 

tests/phpunit/tests/multisite/ms-files-rewriting.php

@@ -37 +37 @@
 
                 $site = get_current_site();
 
-                $user_id = self::$factory->user->create( array( 'role' => 'administrator' ) );
-                $blog_id2 = self::$factory->blog->create( array( 'user_id' => $user_id ) );
+                $user_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
+                $blog_id2 = self::factory()->blog->create( array( 'user_id' => $user_id ) );
                 $info = wp_upload_dir();
                 $this->assertEquals( 'http://' . $site->domain . '/wp-content/uploads/' . gmstrftime('%Y/%m'), $info['url'] );
                 $this->assertEquals( ABSPATH . 'wp-content/uploads/' . gmstrftime('%Y/%m'), $info['path'] );
@@ -67 +67 @@
                 // Upload a file to the main site on the network.
                 $file1 = wp_upload_bits( $filename, null, $contents );
 
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
 
                 switch_to_blog( $blog_id );
                 $file2 = wp_upload_bits( $filename, null, $contents );

tests/phpunit/tests/multisite/network.php

@@ -37 +37 @@
          * as the main network ID.
          */
         function test_get_main_network_id_two_networks() {
-                self::$factory->network->create();
+                self::factory()->network->create();
 
                 $this->assertEquals( 1, get_main_network_id() );
         }
@@ -49 +49 @@
         function test_get_main_network_id_after_network_switch() {
                 global $current_site;
 
-                $id = self::$factory->network->create();
+                $id = self::factory()->network->create();
 
                 $current_site->id = (int) $id;
 
@@ -65 +65 @@
          */
         function test_get_main_network_id_after_network_delete() {
                 global $wpdb, $current_site;
-                $id = self::$factory->network->create();
+                $id = self::factory()->network->create();
 
                 $current_site->id = (int) $id;
                 $wpdb->query( "UPDATE {$wpdb->site} SET id=100 WHERE id=1" );
@@ -90 +90 @@
                 $site_count_start = get_blog_count();
                 // false for large networks by default
                 add_filter( 'enable_live_network_counts', '__return_false' );
-                self::$factory->blog->create_many( 4 );
+                self::factory()->blog->create_many( 4 );
 
                 // count only updated when cron runs, so unchanged
                 $this->assertEquals( $site_count_start, (int) get_blog_count() );
 
                 add_filter( 'enable_live_network_counts', '__return_true' );
-                $site_ids = self::$factory->blog->create_many( 4 );
+                $site_ids = self::factory()->blog->create_many( 4 );
 
                 $this->assertEquals( $site_count_start + 9, (int) get_blog_count() );
 
@@ -211 +211 @@
 
                 // Only false for large networks as of 3.7
                 add_filter( 'enable_live_network_counts', '__return_false' );
-                self::$factory->user->create( array( 'role' => 'administrator' ) );
+                self::factory()->user->create( array( 'role' => 'administrator' ) );
 
                 $count = get_user_count(); // No change, cache not refreshed
                 $this->assertEquals( $start_count, $count );
@@ -240 +240 @@
                 $dashboard_blog = get_dashboard_blog();
                 $this->assertEquals( 1, $dashboard_blog->blog_id );
 
-                $user_id = self::$factory->user->create( array( 'role' => 'administrator' ) );
-                $blog_id = self::$factory->blog->create( array( 'user_id' => $user_id ) );
+                $user_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
+                $blog_id = self::factory()->blog->create( array( 'user_id' => $user_id ) );
                 $this->assertInternalType( 'int', $blog_id );
 
                 // set the dashboard blog to another one

tests/phpunit/tests/multisite/site.php

@@ -34 +34 @@
                 wp_cache_set( 'switch-test', $current_blog_id, 'switch-test' );
                 $this->assertEquals( $current_blog_id, wp_cache_get( 'switch-test', 'switch-test' ) );
 
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
 
                 $cap_key = wp_get_current_user()->cap_key;
                 switch_to_blog( $blog_id );
@@ -74 +74 @@
         function test_created_site_details() {
                 global $wpdb;
 
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
 
                 $this->assertInternalType( 'int', $blog_id );
                 $prefix = $wpdb->get_blog_prefix( $blog_id );
@@ -130 +130 @@
          * When a site is flagged as 'deleted', its data should be cleared from cache.
          */
         function test_data_in_cache_after_wpmu_delete_blog_drop_false() {
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
 
                 $details = get_blog_details( $blog_id, false );
                 $key = md5( $details->domain . $details->path );
@@ -151 +151 @@
         function test_data_in_tables_after_wpmu_delete_blog_drop_false() {
                 global $wpdb;
 
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
 
                 // Delete the site without forcing a table drop.
                 wpmu_delete_blog( $blog_id, false );
@@ -169 +169 @@
          * When a site is fully deleted, its data should be cleared from cache.
          */
         function test_data_in_cache_after_wpmu_delete_blog_drop_true() {
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
 
                 $details = get_blog_details( $blog_id, false );
                 $key = md5( $details->domain . $details->path );
@@ -190 +190 @@
         function test_data_in_tables_after_wpmu_delete_blog_drop_true() {
                 global $wpdb;
 
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
 
                 // Delete the site and force a table drop.
                 wpmu_delete_blog( $blog_id, true );
@@ -247 +247 @@
          * The site count of a network should change when a site is flagged as 'deleted'.
          */
         function test_network_count_after_wpmu_delete_blog_drop_false() {
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
 
                 // Delete the site without forcing a table drop.
                 wpmu_delete_blog( $blog_id, false );
@@ -261 +261 @@
          * The site count of a network should change when a site is fully deleted.
          */
         function test_blog_count_after_wpmu_delete_blog_drop_true() {
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
 
                 // Delete the site and force a table drop.
                 wpmu_delete_blog( $blog_id, true );
@@ -283 +283 @@
                 // Upload a file to the main site on the network.
                 $file1 = wp_upload_bits( $filename, null, $contents );
 
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
 
                 switch_to_blog( $blog_id );
                 $file2 = wp_upload_bits( $filename, null, $contents );
@@ -329 +329 @@
          */
         function test_get_blog_details_when_site_does_not_exist() {
                 // Create an unused site so that we can then assume an invalid site ID.
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
                 $blog_id++;
 
                 // Prime the cache for an invalid site.
@@ -339 +339 @@
                 $this->assertEquals( -1, wp_cache_get( $blog_id, 'blog-details' ) );
 
                 // Create a site in the invalid site's place.
-                self::$factory->blog->create();
+                self::factory()->blog->create();
 
                 // When a new site is created, its cache is cleared through refresh_blog_details.
                 $this->assertFalse( wp_cache_get( $blog_id, 'blog-details' )  );
@@ -370 +370 @@
                 global $test_action_counter;
                 $test_action_counter = 0;
 
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
                 update_blog_details( $blog_id, array( 'spam' => 1 ) );
 
                 add_action( 'make_ham_blog', array( $this, '_action_counter_cb' ), 10 );
@@ -394 +394 @@
                 global $test_action_counter;
                 $test_action_counter = 0;
 
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
 
                 add_action( 'make_spam_blog', array( $this, '_action_counter_cb' ), 10 );
                 update_blog_status( $blog_id, 'spam', 1 );
@@ -417 +417 @@
                 global $test_action_counter;
                 $test_action_counter = 0;
 
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
 
                 add_action( 'archive_blog', array( $this, '_action_counter_cb' ), 10 );
                 update_blog_status( $blog_id, 'archived', 1 );
@@ -440 +440 @@
                 global $test_action_counter;
                 $test_action_counter = 0;
 
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
                 update_blog_details( $blog_id, array( 'archived' => 1 ) );
 
                 add_action( 'unarchive_blog', array( $this, '_action_counter_cb' ), 10 );
@@ -463 +463 @@
                 global $test_action_counter;
                 $test_action_counter = 0;
 
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
 
                 add_action( 'make_delete_blog', array( $this, '_action_counter_cb' ), 10 );
                 update_blog_status( $blog_id, 'deleted', 1 );
@@ -486 +486 @@
                 global $test_action_counter;
                 $test_action_counter = 0;
 
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
                 update_blog_details( $blog_id, array( 'deleted' => 1 ) );
 
                 add_action( 'make_undelete_blog', array( $this, '_action_counter_cb' ), 10 );
@@ -510 +510 @@
                 global $test_action_counter;
                 $test_action_counter = 0;
 
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
 
                 add_action( 'mature_blog', array( $this, '_action_counter_cb' ), 10 );
                 update_blog_status( $blog_id, 'mature', 1 );
@@ -533 +533 @@
                 global $test_action_counter;
                 $test_action_counter = 0;
 
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
                 update_blog_details( $blog_id, array( 'mature' => 1 ) );
 
                 add_action( 'unmature_blog', array( $this, '_action_counter_cb' ), 10 );
@@ -557 +557 @@
                 global $test_action_counter;
                 $test_action_counter = 0;
 
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
 
                 add_action( 'update_blog_public', array( $this, '_action_counter_cb' ), 10 );
                 update_blog_status( $blog_id, 'public', 0 );
@@ -583 +583 @@
          * @ticket 14511
          */
         function test_wp_get_sites_with_default_arguments() {
-                self::$factory->blog->create( array( 'site_id' => 2 ) );
+                self::factory()->blog->create( array( 'site_id' => 2 ) );
 
                 $this->assertCount( 1, wp_get_sites() );
         }
@@ -599 +599 @@
          * A network ID of null should query for all public sites on all networks.
          */
         function test_wp_get_sites_with_network_id_null() {
-                self::$factory->blog->create( array( 'site_id' => 2 ) );
+                self::factory()->blog->create( array( 'site_id' => 2 ) );
 
                 $this->assertCount( 2, wp_get_sites( array( 'network_id' => null ) ) );
         }
@@ -608 +608 @@
          * Expect only sites on the specified network ID to be returned.
          */
         function test_wp_get_sites_with_specific_network_id() {
-                self::$factory->blog->create( array( 'site_id' => 2 ) );
+                self::factory()->blog->create( array( 'site_id' => 2 ) );
 
                 $this->assertCount( 1, wp_get_sites( array( 'network_id' => 2 ) ) );
         }
@@ -617 +617 @@
          * Expect sites from both networks if both network IDs are specified.
          */
         function test_wp_get_sites_with_multiple_network_ids() {
-                self::$factory->blog->create( array( 'site_id' => 2 ) );
+                self::factory()->blog->create( array( 'site_id' => 2 ) );
 
                 $this->assertCount( 2, wp_get_sites( array( 'network_id' => array( 1, 2 ) ) ) );
         }
@@ -626 +626 @@
          * Queries for public or non public sites should work across all networks if network ID is null.
          */
         function test_wp_get_sites_with_public_meta_on_all_networks() {
-                self::$factory->blog->create( array( 'site_id' => 2, 'meta' => array( 'public' => 0 ) ) );
+                self::factory()->blog->create( array( 'site_id' => 2, 'meta' => array( 'public' => 0 ) ) );
 
                 $this->assertCount( 1, wp_get_sites( array( 'public' => 1, 'network_id' => null ) ) );
                 $this->assertcount( 1, wp_get_sites( array( 'public' => 0, 'network_id' => null ) ) );
@@ -636 +636 @@
          * If a network ID is specified, queries for public sites should be restricted to that network.
          */
         function test_wp_get_sites_with_public_meta_restrict_to_one_network() {
-                self::$factory->blog->create( array( 'site_id' => 1, 'meta' => array( 'public' => 0 ) ) );
+                self::factory()->blog->create( array( 'site_id' => 1, 'meta' => array( 'public' => 0 ) ) );
 
                 $this->assertCount( 1, wp_get_sites( array( 'public' => 1, 'network_id' => 1 ) ) );
                 $this->assertCount( 0, wp_get_sites( array( 'public' => 1, 'network_id' => 2 ) ) );
@@ -647 +647 @@
          */
         function test_wp_get_sites_limit_offset() {
                 // Create 2 more sites (in addition to the default one)
-                self::$factory->blog->create_many( 2 );
+                self::factory()->blog->create_many( 2 );
 
                 // Expect first 2 sites when using limit
                 $this->assertCount( 2, wp_get_sites( array( 'limit' => 2 ) ) );
@@ -670 +670 @@
          * @ticket 27952
          */
         function test_posts_count() {
-                self::$factory->post->create();
-                $post2 = self::$factory->post->create();
+                self::factory()->post->create();
+                $post2 = self::factory()->post->create();
                 $this->assertEquals( 2, get_blog_details()->post_count );
 
                 wp_delete_post( $post2 );
@@ -701 +701 @@
                 );
 
                 foreach ( $network_ids as &$id ) {
-                        $id = self::$factory->network->create( $id );
+                        $id = self::factory()->network->create( $id );
                 }
                 unset( $id );
 
@@ -714 +714 @@
                 );
 
                 foreach ( $ids as &$id ) {
-                        $id = self::$factory->blog->create( $id );
+                        $id = self::factory()->blog->create( $id );
                 }
                 unset( $id );
 
@@ -772 +772 @@
          * the blog ID is requested through get_blog_id_from_url().
          */
         function test_get_blog_id_from_url() {
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
                 $details = get_blog_details( $blog_id, false );
                 $key = md5( $details->domain . $details->path );
 
@@ -785 +785 @@
          * Test the case insensitivity of the site lookup.
          */
         function test_get_blog_id_from_url_is_case_insensitive() {
-                $blog_id = self::$factory->blog->create( array( 'domain' => 'example.com', 'path' => '/xyz' ) );
+                $blog_id = self::factory()->blog->create( array( 'domain' => 'example.com', 'path' => '/xyz' ) );
                 $details = get_blog_details( $blog_id, false );
 
                 $this->assertEquals( $blog_id, get_blog_id_from_url( strtoupper( $details->domain ), strtoupper( $details->path ) ) );
@@ -795 +795 @@
          * Test the first and cached responses for a site that does not exist.
          */
         function test_get_blog_id_from_url_that_does_not_exist() {
-                $blog_id = self::$factory->blog->create( array( 'path' => '/xyz' ) );
+                $blog_id = self::factory()->blog->create( array( 'path' => '/xyz' ) );
                 $details = get_blog_details( $blog_id, false );
 
                 $this->assertEquals( 0, get_blog_id_from_url( $details->domain, 'foo' ) );
@@ -807 +807 @@
          * behavior would be expected if passing `false` explicitly to `wpmu_delete_blog()`.
          */
         function test_get_blog_id_from_url_with_deleted_flag() {
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
                 $details = get_blog_details( $blog_id, false );
                 $key = md5( $details->domain . $details->path );
                 wpmu_delete_blog( $blog_id );
@@ -821 +821 @@
          * -1 after an attempt at `get_blog_id_from_url()` is made.
          */
         function test_get_blog_id_from_url_after_dropped() {
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
                 $details = get_blog_details( $blog_id, false );
                 $key = md5( $details->domain . $details->path );
                 wpmu_delete_blog( $blog_id, true );
@@ -850 +850 @@
          * Test with a site ID other than the main site to ensure a false response.
          */
         function test_is_main_site_is_false_with_other_blog_id() {
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
 
                 $this->assertFalse( is_main_site( $blog_id ) );
         }
@@ -859 +859 @@
          * Test with no passed ID after switching to another site ID.
          */
         function test_is_main_site_is_false_after_switch_to_blog() {
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
                 switch_to_blog( $blog_id );
 
                 $this->assertFalse( is_main_site() );
@@ -878 +878 @@
                 $this->assertEquals( gmstrftime('/%Y/%m'), $info['subdir'] );
                 $this->assertEquals( '', $info['error'] );
 
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
 
                 switch_to_blog( $blog_id );
                 $info = wp_upload_dir();
@@ -900 +900 @@
          * another site on the network.
          */
         function test_get_blog_post_from_another_site_on_network() {
-                $blog_id = self::$factory->blog->create();
-                $post_id = self::$factory->post->create(); // Create a post on the primary site, ID 1.
+                $blog_id = self::factory()->blog->create();
+                $post_id = self::factory()->post->create(); // Create a post on the primary site, ID 1.
                 $post = get_post( $post_id );
                 switch_to_blog( $blog_id );
 
@@ -915 +915 @@
          * If get_blog_post() is used on the same site, it should still work.
          */
         function test_get_blog_post_from_same_site() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
 
                 $this->assertEquals( get_blog_post( 1, $post_id ), get_post( $post_id ) );
         }

tests/phpunit/tests/multisite/updateBlogDetails.php

@@ -25 +25 @@
         }
 
         function test_update_blog_details() {
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
 
                 $result = update_blog_details( $blog_id, array( 'domain' => 'example.com', 'path' => 'my_path/' ) );
 
@@ -53 +53 @@
                 global $test_action_counter;
                 $test_action_counter = 0;
 
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
 
                 // Set an initial value of '1' for the flag when '0' is the flag value being tested.
                 if ( '0' === $flag_value ) {

tests/phpunit/tests/multisite/wpmuValidateUserSignup.php

@@ -63 +63 @@
         }
 
         public function test_should_fail_for_existing_user_name() {
-                $u = self::$factory->user->create( array( 'user_login' => 'foo123' ) );
+                $u = self::factory()->user->create( array( 'user_login' => 'foo123' ) );
                 $v = wpmu_validate_user_signup( 'foo123', 'foo@example.com' );
                 $this->assertContains( 'user_name', $v['errors']->get_error_codes() );
         }
 
         public function test_should_fail_for_existing_user_email() {
-                $u = self::$factory->user->create( array( 'user_email' => 'foo@example.com' ) );
+                $u = self::factory()->user->create( array( 'user_email' => 'foo@example.com' ) );
                 $v = wpmu_validate_user_signup( 'foo123', 'foo@example.com' );
                 $this->assertContains( 'user_email', $v['errors']->get_error_codes() );
         }

tests/phpunit/tests/oembed/controller.php

@@ -17 +17 @@
         }
 
         function test_request_json() {
-                $user = self::$factory->user->create_and_get( array(
+                $user = self::factory()->user->create_and_get( array(
                         'display_name' => 'John Doe',
                 ) );
-                $post = self::$factory->post->create_and_get( array(
+                $post = self::factory()->post->create_and_get( array(
                         'post_author' => $user->ID,
                         'post_title'  => 'Hello World',
                 ) );
@@ -60 +60 @@
         }
 
         function test_request_jsonp() {
-                $user = self::$factory->user->create_and_get( array(
+                $user = self::factory()->user->create_and_get( array(
                         'display_name' => 'John Doe',
                 ) );
-                $post = self::$factory->post->create_and_get( array(
+                $post = self::factory()->post->create_and_get( array(
                         'post_author' => $user->ID,
                         'post_title'  => 'Hello World',
                 ) );
@@ -83 +83 @@
         }
 
         function test_request_jsonp_invalid_callback() {
-                $user = self::$factory->user->create_and_get( array(
+                $user = self::factory()->user->create_and_get( array(
                         'display_name' => 'John Doe',
                 ) );
-                $post = self::$factory->post->create_and_get( array(
+                $post = self::factory()->post->create_and_get( array(
                         'post_author' => $user->ID,
                         'post_title'  => 'Hello World',
                 ) );
@@ -118 +118 @@
         }
 
         function test_request_xml() {
-                $user = self::$factory->user->create_and_get( array(
+                $user = self::factory()->user->create_and_get( array(
                         'display_name' => 'John Doe',
                 ) );
-                $post = self::$factory->post->create_and_get( array(
+                $post = self::factory()->post->create_and_get( array(
                         'post_author' => $user->ID,
                         'post_title'  => 'Hello World',
                 ) );
@@ -177 +177 @@
                         $this->markTestSkipped( __METHOD__ . ' is a multisite-only test.' );
                 }
 
-                $child = self::$factory->blog->create();
+                $child = self::factory()->blog->create();
 
                 switch_to_blog( $child );
 
-                $post = self::$factory->post->create_and_get( array(
+                $post = self::factory()->post->create_and_get( array(
                         'post_title' => 'Hello Child Blog',
                 ) );
 
@@ -207 +207 @@
                 $this->assertEquals( home_url() . '/?oembed=true', get_oembed_endpoint_url( '', 'json' ) );
                 $this->assertEquals( home_url() . '/?oembed=true', get_oembed_endpoint_url( '', 'xml' ) );
 
-                $post_id     = self::$factory->post->create();
+                $post_id     = self::factory()->post->create();
                 $url         = get_permalink( $post_id );
                 $url_encoded = urlencode( $url );
 

tests/phpunit/tests/oembed/discovery.php

@@ -12 +12 @@
         }
 
         function test_add_oembed_discovery_links_to_post() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
                 $this->go_to( get_permalink( $post_id ) );
 
                 $this->assertQueryTrue( 'is_single', 'is_singular' );
@@ -28 +28 @@
         }
 
         function test_add_oembed_discovery_links_to_page() {
-                $post_id = self::$factory->post->create( array(
+                $post_id = self::factory()->post->create( array(
                         'post_type' => 'page'
                 ));
                 $this->go_to( get_permalink( $post_id ) );
@@ -46 +46 @@
         }
 
         function test_add_oembed_discovery_links_to_attachment() {
-                $post_id       = self::$factory->post->create();
+                $post_id       = self::factory()->post->create();
                 $file          = DIR_TESTDATA . '/images/canola.jpg';
-                $attachment_id = self::$factory->attachment->create_object( $file, $post_id, array(
+                $attachment_id = self::factory()->attachment->create_object( $file, $post_id, array(
                         'post_mime_type' => 'image/jpeg',
                 ) );
 

tests/phpunit/tests/oembed/getResponseData.php

@@ -9 +9 @@
         }
 
         function test_get_oembed_response_data() {
-                $post = self::$factory->post->create_and_get( array(
+                $post = self::factory()->post->create_and_get( array(
                         'post_title' => 'Some Post',
                 ) );
 
@@ -33 +33 @@
          * Test get_oembed_response_data with an author.
          */
         function test_get_oembed_response_data_author() {
-                $user_id = self::$factory->user->create( array(
+                $user_id = self::factory()->user->create( array(
                         'display_name' => 'John Doe',
                 ) );
 
-                $post = self::$factory->post->create_and_get( array(
+                $post = self::factory()->post->create_and_get( array(
                         'post_title'  => 'Some Post',
                         'post_author' => $user_id,
                 ) );
@@ -61 +61 @@
         function test_get_oembed_response_link() {
                 remove_filter( 'oembed_response_data', 'get_oembed_response_data_rich' );
 
-                $post = self::$factory->post->create_and_get( array(
+                $post = self::factory()->post->create_and_get( array(
                         'post_title' => 'Some Post',
                 ) );
 
@@ -81 +81 @@
         }
 
         function test_get_oembed_response_data_with_draft_post() {
-                $post = self::$factory->post->create_and_get( array(
+                $post = self::factory()->post->create_and_get( array(
                         'post_status' => 'draft',
                 ) );
 
@@ -89 +89 @@
         }
 
         function test_get_oembed_response_data_with_scheduled_post() {
-                $post = self::$factory->post->create_and_get( array(
+                $post = self::factory()->post->create_and_get( array(
                         'post_status' => 'future',
                         'post_date'   => strftime( '%Y-%m-%d %H:%M:%S', strtotime( '+1 day' ) ),
                 ) );
@@ -98 +98 @@
         }
 
         function test_get_oembed_response_data_with_private_post() {
-                $post = self::$factory->post->create_and_get( array(
+                $post = self::factory()->post->create_and_get( array(
                         'post_status' => 'private',
                 ) );
 
@@ -106 +106 @@
         }
 
         function test_get_oembed_response_data_maxwidth_too_high() {
-                $post = self::$factory->post->create_and_get();
+                $post = self::factory()->post->create_and_get();
 
                 $data = get_oembed_response_data( $post, 1000 );
 
@@ -115 +115 @@
         }
 
         function test_get_oembed_response_data_maxwidth_too_low() {
-                $post = self::$factory->post->create_and_get();
+                $post = self::factory()->post->create_and_get();
 
                 $data = get_oembed_response_data( $post, 100 );
 
@@ -124 +124 @@
         }
 
         function test_get_oembed_response_data_maxwidth_invalid() {
-                $post = self::$factory->post->create_and_get();
+                $post = self::factory()->post->create_and_get();
 
                 $data = get_oembed_response_data( $post, '400;" DROP TABLES' );
 
@@ -138 +138 @@
         }
 
         function test_get_oembed_response_data_with_thumbnail() {
-                $post          = self::$factory->post->create_and_get();
+                $post          = self::factory()->post->create_and_get();
                 $file          = DIR_TESTDATA . '/images/canola.jpg';
-                $attachment_id = self::$factory->attachment->create_object( $file, $post->ID, array(
+                $attachment_id = self::factory()->attachment->create_object( $file, $post->ID, array(
                         'post_mime_type' => 'image/jpeg',
                 ) );
                 set_post_thumbnail( $post, $attachment_id );
@@ -154 +154 @@
         }
 
         function test_get_oembed_response_data_for_attachment() {
-                $parent = self::$factory->post->create();
+                $parent = self::factory()->post->create();
                 $file   = DIR_TESTDATA . '/images/canola.jpg';
-                $post   = self::$factory->attachment->create_object( $file, $parent, array(
+                $post   = self::factory()->attachment->create_object( $file, $parent, array(
                         'post_mime_type' => 'image/jpeg',
                 ) );
 

tests/phpunit/tests/oembed/headers.php

@@ -12 +12 @@
                         $this->markTestSkipped( 'xdebug is required for this test' );
                 }
 
-                $post = self::$factory->post->create_and_get( array(
+                $post = self::factory()->post->create_and_get( array(
                         'post_title'  => 'Hello World',
                 ) );
 
@@ -46 +46 @@
                         $this->markTestSkipped( 'xdebug is required for this test' );
                 }
 
-                $post = self::$factory->post->create_and_get( array(
+                $post = self::factory()->post->create_and_get( array(
                         'post_title'  => 'Hello World',
                 ) );
 

tests/phpunit/tests/oembed/postEmbedUrl.php

@@ -12 +12 @@
         function test_get_post_embed_url_with_pretty_permalinks() {
                 update_option( 'permalink_structure', '/%postname%' );
 
-                $post_id   = self::$factory->post->create();
+                $post_id   = self::factory()->post->create();
                 $permalink = get_permalink( $post_id );
                 $embed_url = get_post_embed_url( $post_id );
 
@@ -22 +22 @@
         }
 
         function test_get_post_embed_url_with_ugly_permalinks() {
-                $post_id   = self::$factory->post->create();
+                $post_id   = self::factory()->post->create();
                 $permalink = get_permalink( $post_id );
                 $embed_url = get_post_embed_url( $post_id );
 

tests/phpunit/tests/oembed/template.php

@@ -5 +5 @@
  */
 class Tests_Embed_Template extends WP_UnitTestCase {
         function test_oembed_output_post() {
-                $user = self::$factory->user->create_and_get( array(
+                $user = self::factory()->user->create_and_get( array(
                         'display_name' => 'John Doe',
                 ) );
 
-                $post_id = self::$factory->post->create( array(
+                $post_id = self::factory()->post->create( array(
                         'post_author'  => $user->ID,
                         'post_title'   => 'Hello World',
                         'post_content' => 'Foo Bar',
@@ -30 +30 @@
         }
 
         function test_oembed_output_post_with_thumbnail() {
-                $post_id       = self::$factory->post->create( array(
+                $post_id       = self::factory()->post->create( array(
                         'post_title'   => 'Hello World',
                         'post_content' => 'Foo Bar',
                         'post_excerpt' => 'Bar Baz',
                 ) );
                 $file          = DIR_TESTDATA . '/images/canola.jpg';
-                $attachment_id = self::$factory->attachment->create_object( $file, $post_id, array(
+                $attachment_id = self::factory()->attachment->create_object( $file, $post_id, array(
                         'post_mime_type' => 'image/jpeg',
                 ) );
                 set_post_thumbnail( $post_id, $attachment_id );
@@ -72 +72 @@
         }
 
         function test_oembed_output_attachment() {
-                $post          = self::$factory->post->create_and_get();
+                $post          = self::factory()->post->create_and_get();
                 $file          = DIR_TESTDATA . '/images/canola.jpg';
-                $attachment_id = self::$factory->attachment->create_object( $file, $post->ID, array(
+                $attachment_id = self::factory()->attachment->create_object( $file, $post->ID, array(
                         'post_mime_type' => 'image/jpeg',
                         'post_title'     => 'Hello World',
                         'post_content'   => 'Foo Bar',
@@ -97 +97 @@
         }
 
         function test_oembed_output_draft_post() {
-                $post_id = self::$factory->post->create( array(
+                $post_id = self::factory()->post->create( array(
                         'post_title'   => 'Hello World',
                         'post_content' => 'Foo Bar',
                         'post_excerpt' => 'Bar Baz',
@@ -118 +118 @@
         }
 
         function test_oembed_output_scheduled_post() {
-                $post_id = self::$factory->post->create( array(
+                $post_id = self::factory()->post->create( array(
                         'post_title'   => 'Hello World',
                         'post_content' => 'Foo Bar',
                         'post_excerpt' => 'Bar Baz',
@@ -140 +140 @@
         }
 
         function test_oembed_output_private_post() {
-                $post_id = self::$factory->post->create( array(
+                $post_id = self::factory()->post->create( array(
                         'post_title'   => 'Hello World',
                         'post_content' => 'Foo Bar',
                         'post_excerpt' => 'Bar Baz',
@@ -161 +161 @@
         }
 
         function test_oembed_output_private_post_with_permissions() {
-                $user_id = self::$factory->user->create( array( 'role' => 'editor' ) );
+                $user_id = self::factory()->user->create( array( 'role' => 'editor' ) );
                 wp_set_current_user( $user_id );
 
-                $post_id = self::$factory->post->create( array(
+                $post_id = self::factory()->post->create( array(
                         'post_title'   => 'Hello World',
                         'post_content' => 'Foo Bar',
                         'post_excerpt' => 'Bar Baz',
@@ -193 +193 @@
         }
 
         function test_wp_embed_excerpt_more() {
-                $post_id = self::$factory->post->create( array(
+                $post_id = self::factory()->post->create( array(
                         'post_content' => 'Foo Bar',
                 ) );
 
@@ -214 +214 @@
         function test_is_embed_post() {
                 $this->assertFalse( is_embed() );
 
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
                 $this->go_to( get_post_embed_url( $post_id ) );
                 $this->assertTrue( is_embed() );
         }
 
         function test_is_embed_attachment() {
-                $post_id       = self::$factory->post->create();
+                $post_id       = self::factory()->post->create();
                 $file          = DIR_TESTDATA . '/images/canola.jpg';
-                $attachment_id = self::$factory->attachment->create_object( $file, $post_id, array(
+                $attachment_id = self::factory()->attachment->create_object( $file, $post_id, array(
                         'post_mime_type' => 'image/jpeg',
                 ) );
                 $this->go_to( get_post_embed_url( $attachment_id ) );
@@ -240 +240 @@
         }
 
         function test_get_post_embed_html() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
 
                 $expected = '<iframe sandbox="allow-scripts" security="restricted" src="' . esc_url( get_post_embed_url( $post_id ) ) . '" width="200" height="200" title="Embedded WordPress Post" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" class="wp-embedded-content"></iframe>';
 

tests/phpunit/tests/option/multisite.php

@@ -98 +98 @@
         }
 
         function test_with_another_site() {
-                $user_id = self::$factory->user->create();
+                $user_id = self::factory()->user->create();
                 $this->assertInternalType( 'integer', $user_id );
 
-                $blog_id = self::$factory->blog->create( array(
+                $blog_id = self::factory()->blog->create( array(
                         'user_id' => $user_id,
                         'meta'    => array(
                                 'public' => 1,

tests/phpunit/tests/option/networkOption.php

@@ -11 +11 @@
  */
 class Tests_Option_NetworkOption extends WP_UnitTestCase {
         function test_add_network_option_not_available_on_other_network() {
-                $id = self::$factory->network->create();
+                $id = self::factory()->network->create();
                 $option = rand_str();
                 $value = rand_str();
 
@@ -20 +20 @@
         }
 
         function test_add_network_option_available_on_same_network() {
-                $id = self::$factory->network->create();
+                $id = self::factory()->network->create();
                 $option = rand_str();
                 $value = rand_str();
 
@@ -29 +29 @@
         }
 
         function test_delete_network_option_on_only_one_network() {
-                $id = self::$factory->network->create();
+                $id = self::factory()->network->create();
                 $option = rand_str();
                 $value = rand_str();
 

tests/phpunit/tests/option/userSettings.php

@@ -5 +5 @@
         function setUp() {
                 parent::setUp();
 
-                $this->user_id = self::$factory->user->create( array(
+                $this->user_id = self::factory()->user->create( array(
                         'role' => 'administrator'
                 ) );
 

tests/phpunit/tests/post.php

@@ -545 +545 @@
         function test_get_page_by_path_priority() {
                 global $wpdb;
 
-                $attachment = self::$factory->post->create_and_get( array( 'post_title' => 'some-page', 'post_type' => 'attachment' ) );
-                $page       = self::$factory->post->create_and_get( array( 'post_title' => 'some-page', 'post_type' => 'page' ) );
-                $other_att  = self::$factory->post->create_and_get( array( 'post_title' => 'some-other-page', 'post_type' => 'attachment' ) );
+                $attachment = self::factory()->post->create_and_get( array( 'post_title' => 'some-page', 'post_type' => 'attachment' ) );
+                $page       = self::factory()->post->create_and_get( array( 'post_title' => 'some-page', 'post_type' => 'page' ) );
+                $other_att  = self::factory()->post->create_and_get( array( 'post_title' => 'some-other-page', 'post_type' => 'attachment' ) );
 
                 $wpdb->update( $wpdb->posts, array( 'post_name' => 'some-page' ), array( 'ID' => $page->ID ) );
                 clean_post_cache( $page->ID );
@@ -565 +565 @@
         }
 
         function test_wp_publish_post() {
-                $draft_id = self::$factory->post->create( array( 'post_status' => 'draft' ) );
+                $draft_id = self::factory()->post->create( array( 'post_status' => 'draft' ) );
 
                 $post = get_post( $draft_id );
                 $this->assertEquals( 'draft', $post->post_status );
@@ -581 +581 @@
          */
         function test_wp_insert_post_and_wp_publish_post_with_future_date() {
                 $future_date = gmdate( 'Y-m-d H:i:s', time() + 10000000 );
-                $post_id = self::$factory->post->create( array(
+                $post_id = self::factory()->post->create( array(
                         'post_status' => 'publish',
                         'post_date' => $future_date,
                 ) );
@@ -641 +641 @@
          * @ticket 22883
          */
         function test_get_page_uri_with_stdclass_post_object() {
-                $post_id    = self::$factory->post->create( array( 'post_name' => 'get-page-uri-post-name' ) );
+                $post_id    = self::factory()->post->create( array( 'post_name' => 'get-page-uri-post-name' ) );
 
                 // Mimick an old stdClass post object, missing the ancestors field.
                 $post_array = (object) get_post( $post_id, ARRAY_A );
@@ -664 +664 @@
          * @ticket 15963
          */
         function test_get_post_uri_check_orphan() {
-                $parent_id = self::$factory->post->create( array( 'post_name' => 'parent' ) );
-                $child_id = self::$factory->post->create( array( 'post_name' => 'child', 'post_parent' => $parent_id ) );
+                $parent_id = self::factory()->post->create( array( 'post_name' => 'parent' ) );
+                $child_id = self::factory()->post->create( array( 'post_name' => 'child', 'post_parent' => $parent_id ) );
 
                 // check the parent for good measure
                 $this->assertEquals( 'parent', get_page_uri( $parent_id ) );
@@ -683 +683 @@
          */
         function test_get_post_ancestors_within_loop() {
                 global $post;
-                $parent_id = self::$factory->post->create();
-                $post = self::$factory->post->create_and_get( array( 'post_parent' => $parent_id ) );
+                $parent_id = self::factory()->post->create();
+                $post = self::factory()->post->create_and_get( array( 'post_parent' => $parent_id ) );
                 $this->assertEquals( array( $parent_id ), get_post_ancestors( 0 ) );
         }
 
@@ -692 +692 @@
          * @ticket 23474
          */
         function test_update_invalid_post_id() {
-                $post_id = self::$factory->post->create( array( 'post_name' => 'get-page-uri-post-name' ) );
+                $post_id = self::factory()->post->create( array( 'post_name' => 'get-page-uri-post-name' ) );
                 $post = get_post( $post_id, ARRAY_A );
 
                 $post['ID'] = 123456789;
@@ -707 +707 @@
 
         function test_parse_post_content_single_page() {
                 global $multipage, $pages, $numpages;
-                $post_id = self::$factory->post->create( array( 'post_content' => 'Page 0' ) );
+                $post_id = self::factory()->post->create( array( 'post_content' => 'Page 0' ) );
                 $post = get_post( $post_id );
                 setup_postdata( $post );
                 $this->assertEquals( 0, $multipage );
@@ -718 +718 @@
 
         function test_parse_post_content_multi_page() {
                 global $multipage, $pages, $numpages;
-                $post_id = self::$factory->post->create( array( 'post_content' => 'Page 0<!--nextpage-->Page 1<!--nextpage-->Page 2<!--nextpage-->Page 3' ) );
+                $post_id = self::factory()->post->create( array( 'post_content' => 'Page 0<!--nextpage-->Page 1<!--nextpage-->Page 2<!--nextpage-->Page 3' ) );
                 $post = get_post( $post_id );
                 setup_postdata( $post );
                 $this->assertEquals( 1, $multipage );
@@ -729 +729 @@
 
         function test_parse_post_content_remaining_single_page() {
                 global $multipage, $pages, $numpages;
-                $post_id = self::$factory->post->create( array( 'post_content' => 'Page 0' ) );
+                $post_id = self::factory()->post->create( array( 'post_content' => 'Page 0' ) );
                 $post = get_post( $post_id );
                 setup_postdata( $post );
                 $this->assertEquals( 0, $multipage );
@@ -740 +740 @@
 
         function test_parse_post_content_remaining_multi_page() {
                 global $multipage, $pages, $numpages;
-                $post_id = self::$factory->post->create( array( 'post_content' => 'Page 0<!--nextpage-->Page 1<!--nextpage-->Page 2<!--nextpage-->Page 3' ) );
+                $post_id = self::factory()->post->create( array( 'post_content' => 'Page 0<!--nextpage-->Page 1<!--nextpage-->Page 2<!--nextpage-->Page 3' ) );
                 $post = get_post( $post_id );
                 setup_postdata( $post );
                 $this->assertEquals( 1, $multipage );
@@ -754 +754 @@
          */
         function test_parse_post_content_starting_with_nextpage() {
                 global $multipage, $pages, $numpages;
-                $post_id = self::$factory->post->create( array( 'post_content' => '<!--nextpage-->Page 0<!--nextpage-->Page 1<!--nextpage-->Page 2<!--nextpage-->Page 3' ) );
+                $post_id = self::factory()->post->create( array( 'post_content' => '<!--nextpage-->Page 0<!--nextpage-->Page 1<!--nextpage-->Page 2<!--nextpage-->Page 3' ) );
                 $post = get_post( $post_id );
                 setup_postdata( $post );
                 $this->assertEquals( 1, $multipage );
@@ -768 +768 @@
          */
         function test_parse_post_content_starting_with_nextpage_multi() {
                 global $multipage, $pages, $numpages;
-                $post_id = self::$factory->post->create( array( 'post_content' => '<!--nextpage-->Page 0' ) );
+                $post_id = self::factory()->post->create( array( 'post_content' => '<!--nextpage-->Page 0' ) );
                 $post = get_post( $post_id );
                 setup_postdata( $post );
                 $this->assertEquals( 0, $multipage );
@@ -809 +809 @@
         function test_wp_count_posts() {
                 $post_type = rand_str(20);
                 register_post_type( $post_type );
-                self::$factory->post->create( array(
+                self::factory()->post->create( array(
                         'post_type' => $post_type,
                         'post_author' => self::$editor_id
                 ) );
@@ -822 +822 @@
         function test_wp_count_posts_filtered() {
                 $post_type = rand_str(20);
                 register_post_type( $post_type );
-                self::$factory->post->create_many( 3, array(
+                self::factory()->post->create_many( 3, array(
                         'post_type' => $post_type,
                         'post_author' => self::$editor_id
                 ) );
@@ -842 +842 @@
         }
 
         function test_wp_count_posts_insert_invalidation() {
-                $post_ids = self::$factory->post->create_many( 3 );
+                $post_ids = self::factory()->post->create_many( 3 );
                 $initial_counts = wp_count_posts();
 
                 $key = array_rand( $post_ids );
@@ -860 +860 @@
         }
 
         function test_wp_count_posts_trash_invalidation() {
-                $post_ids = self::$factory->post->create_many( 3 );
+                $post_ids = self::factory()->post->create_many( 3 );
                 $initial_counts = wp_count_posts();
 
                 $key = array_rand( $post_ids );
@@ -881 +881 @@
          * @ticket 13771
          */
         function test_get_the_date_with_id_returns_correct_time() {
-                $post_id = self::$factory->post->create( array( 'post_date' => '2014-03-01 16:35:00' ) );
+                $post_id = self::factory()->post->create( array( 'post_date' => '2014-03-01 16:35:00' ) );
                 $this->assertEquals( 'March 1, 2014', get_the_date( 'F j, Y', $post_id ) );
         }
 
@@ -899 +899 @@
          * @ticket 28310
          */
         function test_get_the_time_with_id_returns_correct_time() {
-                $post_id = self::$factory->post->create( array( 'post_date' => '2014-03-01 16:35:00' ) );
+                $post_id = self::factory()->post->create( array( 'post_date' => '2014-03-01 16:35:00' ) );
                 $this->assertEquals( '16:35:00', get_the_time( 'H:i:s', $post_id ) );
         }
 
@@ -917 +917 @@
          * @ticket 28310
          */
         function test_get_post_time_with_id_returns_correct_time() {
-                $post_id = self::$factory->post->create( array( 'post_date' => '2014-03-01 16:35:00' ) );
+                $post_id = self::factory()->post->create( array( 'post_date' => '2014-03-01 16:35:00' ) );
                 $this->assertEquals( '16:35:00', get_post_time( 'H:i:s', false, $post_id ) );
         }
 
@@ -935 +935 @@
          * @ticket 28310
          */
         function test_get_post_modified_time_with_id_returns_correct_time() {
-                $post_id = self::$factory->post->create( array( 'post_date' => '2014-03-01 16:35:00' ) );
+                $post_id = self::factory()->post->create( array( 'post_date' => '2014-03-01 16:35:00' ) );
                 $this->assertEquals( '16:35:00', get_post_modified_time( 'H:i:s', false, $post_id ) );
         }
 
@@ -973 +973 @@
                 register_post_type( $post_type, array( 'taxonomies' => array( 'post_tag', $tax ) ) );
                 register_taxonomy( $tax, $post_type );
 
-                $post = self::$factory->post->create( array( 'post_type' => $post_type ) );
+                $post = self::factory()->post->create( array( 'post_type' => $post_type ) );
                 wp_set_object_terms( $post, rand_str(), $tax );
 
                 $wp_tag_cloud = wp_tag_cloud( array(
@@ -1015 +1015 @@
 
                 require_once( ABSPATH . '/wp-admin/includes/post.php' );
 
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
 
                 $data = array(
                         'post_ID'      => $post_id,
@@ -1043 +1043 @@
          * @ticket 31168
          */
         function test_wp_insert_post_default_comment_ping_status_open() {
-                $post_id = self::$factory->post->create( array(
+                $post_id = self::factory()->post->create( array(
                         'post_author' => self::$editor_id,
                         'post_status' => 'public',
                         'post_content' => rand_str(),
@@ -1059 +1059 @@
          * @ticket 31168
          */
         function test_wp_insert_post_page_default_comment_ping_status_closed() {
-                $post_id = self::$factory->post->create( array(
+                $post_id = self::factory()->post->create( array(
                         'post_author' => self::$editor_id,
                         'post_status' => 'public',
                         'post_content' => rand_str(),
@@ -1078 +1078 @@
         function test_wp_insert_post_cpt_default_comment_ping_status_open() {
                 $post_type = rand_str(20);
                 register_post_type( $post_type, array( 'supports' => array( 'comments', 'trackbacks' ) ) );
-                $post_id = self::$factory->post->create( array(
+                $post_id = self::factory()->post->create( array(
                         'post_author' => self::$editor_id,
                         'post_status' => 'public',
                         'post_content' => rand_str(),
@@ -1098 +1098 @@
         function test_wp_insert_post_cpt_default_comment_ping_status_closed() {
                 $post_type = rand_str(20);
                 register_post_type( $post_type );
-                $post_id = self::$factory->post->create( array(
+                $post_id = self::factory()->post->create( array(
                         'post_author' => self::$editor_id,
                         'post_status' => 'public',
                         'post_content' => rand_str(),
@@ -1127 +1127 @@
                 $this->assertTrue( current_user_can( 'edit_published_posts' ) );
 
                 // Create a sticky post.
-                $post = self::$factory->post->create_and_get( array(
+                $post = self::factory()->post->create_and_get( array(
                         'post_title'   => 'Will be changed',
                         'post_content' => 'Will be changed',
                 ) );
@@ -1156 +1156 @@
          */
         function test_user_without_publish_cannot_affect_sticky_with_edit_post() {
                 // Create a sticky post.
-                $post = self::$factory->post->create_and_get( array(
+                $post = self::factory()->post->create_and_get( array(
                         'post_title'   => 'Will be changed',
                         'post_content' => 'Will be changed',
                 ) );
@@ -1191 +1191 @@
          * @ticket 32585
          */
         public function test_wp_insert_post_author_zero() {
-                $post_id = self::$factory->post->create( array( 'post_author' => 0 ) );
+                $post_id = self::factory()->post->create( array( 'post_author' => 0 ) );
 
                 $this->assertEquals( 0, get_post( $post_id )->post_author );
         }
@@ -1200 +1200 @@
          * @ticket 32585
          */
         public function test_wp_insert_post_author_null() {
-                $post_id = self::$factory->post->create( array( 'post_author' => null ) );
+                $post_id = self::factory()->post->create( array( 'post_author' => null ) );
 
                 $this->assertEquals( self::$editor_id, get_post( $post_id )->post_author );
         }

tests/phpunit/tests/post/filtering.php

@@ -31 +31 @@
 no such tag
 EOF;
 
-                $id = self::$factory->post->create( array( 'post_content' => $content ) );
+                $id = self::factory()->post->create( array( 'post_content' => $content ) );
                 $post = get_post($id);
 
                 $this->assertEquals( $expected, $post->post_content );
@@ -48 +48 @@
 <i>italics</i>
 EOF;
 
-                $id = self::$factory->post->create( array( 'post_content' => $content ) );
+                $id = self::factory()->post->create( array( 'post_content' => $content ) );
                 $post = get_post($id);
 
                 $this->assertEquals( $expected, $post->post_content );
@@ -65 +65 @@
 <img src='foo' width='500' />
 EOF;
 
-                $id = self::$factory->post->create( array( 'post_content' => $content ) );
+                $id = self::factory()->post->create( array( 'post_content' => $content ) );
                 $post = get_post($id);
 
                 $this->assertEquals( $expected, $post->post_content );
@@ -84 +84 @@
 <img src='foo' width='500' height='300' />
 EOF;
 
-                $id = self::$factory->post->create( array( 'post_content' => $content ) );
+                $id = self::factory()->post->create( array( 'post_content' => $content ) );
                 $post = get_post($id);
 
                 $this->assertEquals( $expected, $post->post_content );
@@ -104 +104 @@
 breaks the graf</p>
 EOF;
 
-                $id = self::$factory->post->create( array( 'post_content' => $content ) );
+                $id = self::factory()->post->create( array( 'post_content' => $content ) );
                 $post = get_post($id);
 
                 $this->assertEquals( $content, $post->post_content );

tests/phpunit/tests/post/formats.php

@@ -9 +9 @@
         }
 
         function test_set_get_post_format_for_post() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
 
                 $format = get_post_format( $post_id );
                 $this->assertFalse( $format );
@@ -37 +37 @@
          * @ticket 22473
          */
         function test_set_get_post_format_for_page() {
-                $post_id = self::$factory->post->create( array( 'post_type' => 'page' ) );
+                $post_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
 
                 $format = get_post_format( $post_id );
                 $this->assertFalse( $format );
@@ -69 +69 @@
         }
 
         function test_has_format() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
 
                 $this->assertFalse( has_post_format( 'standard', $post_id ) );
                 $this->assertFalse( has_post_format( '', $post_id ) );
@@ -111 +111 @@
 
 $commentary
 DATA;
-                $link_post_id = self::$factory->post->create( array( 'post_content' => $link ) );
+                $link_post_id = self::factory()->post->create( array( 'post_content' => $link ) );
                 $content_link = get_url_in_content( get_post_field( 'post_content', $link_post_id ) );
                 $this->assertEquals( false, $content_link );
 
-                $link_with_post_id = self::$factory->post->create( array( 'post_content' => $link_with_commentary ) );
+                $link_with_post_id = self::factory()->post->create( array( 'post_content' => $link_with_commentary ) );
                 $content_link = get_url_in_content( get_post_field( 'post_content', $link_with_post_id ) );
                 $this->assertEquals( false, $content_link );
 
@@ -125 +125 @@
                 $content_link = get_url_in_content( get_post_field( 'post_content', $link_with_post_id ) );
                 $this->assertEquals( false, $content_link );
 
-                $empty_post_id = self::$factory->post->create( array( 'post_content' => '' ) );
+                $empty_post_id = self::factory()->post->create( array( 'post_content' => '' ) );
                 $content_link = get_url_in_content( get_post_field( 'post_content', $empty_post_id ) );
                 $this->assertEquals( false, $content_link );
 
-                $comm_post_id = self::$factory->post->create( array( 'post_content' => $commentary ) );
+                $comm_post_id = self::factory()->post->create( array( 'post_content' => $commentary ) );
                 $content_link = get_url_in_content( get_post_field( 'post_content', $comm_post_id ) );
                 $this->assertEquals( false, $content_link );
 
                 // Now with an href
-                $href_post_id = self::$factory->post->create( array( 'post_content' => $href ) );
+                $href_post_id = self::factory()->post->create( array( 'post_content' => $href ) );
                 $content_link = get_url_in_content( get_post_field( 'post_content', $href_post_id ) );
                 $this->assertEquals( $link, $content_link );
 
-                $href_with_post_id = self::$factory->post->create( array( 'post_content' => $href_with_commentary ) );
+                $href_with_post_id = self::factory()->post->create( array( 'post_content' => $href_with_commentary ) );
                 $content_link = get_url_in_content( get_post_field( 'post_content', $href_with_post_id ) );
                 $this->assertEquals( $link, $content_link );
 
@@ -148 +148 @@
                 $content_link = get_url_in_content( get_post_field( 'post_content', $href_with_post_id ) );
                 $this->assertEquals( $link, $content_link );
 
-                $empty_post_id = self::$factory->post->create( array( 'post_content' => '' ) );
+                $empty_post_id = self::factory()->post->create( array( 'post_content' => '' ) );
                 $content_link = get_url_in_content( get_post_field( 'post_content', $empty_post_id ) );
                 $this->assertEquals( false, $content_link );
 
-                $comm_post_id = self::$factory->post->create( array( 'post_content' => $commentary ) );
+                $comm_post_id = self::factory()->post->create( array( 'post_content' => $commentary ) );
                 $content_link = get_url_in_content( get_post_field( 'post_content', $comm_post_id ) );
                 $this->assertEquals( false, $content_link );
         }

tests/phpunit/tests/post/getBodyClass.php

@@ -9 +9 @@
 
         public function setUp() {
                 parent::setUp();
-                $this->post_id = self::$factory->post->create();
+                $this->post_id = self::factory()->post->create();
         }
 
         /**
          * @ticket 30883
          */
         public function test_with_utf8_category_slugs() {
-                $cat_id1 = self::$factory->category->create( array( 'name' => 'Первая рубрика' ) );
-                $cat_id2 = self::$factory->category->create( array( 'name' => 'Вторая рубрика' ) );
-                $cat_id3 = self::$factory->category->create( array( 'name' => '25кадр' ) );
+                $cat_id1 = self::factory()->category->create( array( 'name' => 'Первая рубрика' ) );
+                $cat_id2 = self::factory()->category->create( array( 'name' => 'Вторая рубрика' ) );
+                $cat_id3 = self::factory()->category->create( array( 'name' => '25кадр' ) );
                 wp_set_post_terms( $this->post_id, array( $cat_id1, $cat_id2, $cat_id3 ), 'category' );
 
                 $this->go_to( home_url( "?cat=$cat_id1" ) );
@@ -35 +35 @@
          * @ticket 30883
          */
         public function test_with_utf8_tag_slugs() {
-                $tag_id1 = self::$factory->tag->create( array( 'name' => 'Первая метка' ) );
-                $tag_id2 = self::$factory->tag->create( array( 'name' => 'Вторая метка' ) );
-                $tag_id3 = self::$factory->tag->create( array( 'name' => '25кадр' ) );
+                $tag_id1 = self::factory()->tag->create( array( 'name' => 'Первая метка' ) );
+                $tag_id2 = self::factory()->tag->create( array( 'name' => 'Вторая метка' ) );
+                $tag_id3 = self::factory()->tag->create( array( 'name' => '25кадр' ) );
                 wp_set_post_terms( $this->post_id, array( $tag_id1, $tag_id2, $tag_id3 ), 'post_tag' );
 
                 $tag1 = get_term( $tag_id1, 'post_tag' );
@@ -59 +59 @@
          */
         public function test_with_utf8_term_slugs() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $term_id1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => 'Первая метка' ) );
-                $term_id2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => 'Вторая метка' ) );
-                $term_id3 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => '25кадр' ) );
+                $term_id1 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => 'Первая метка' ) );
+                $term_id2 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => 'Вторая метка' ) );
+                $term_id3 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => '25кадр' ) );
                 wp_set_post_terms( $this->post_id, array( $term_id1, $term_id2, $term_id3 ), 'wptests_tax' );
 
                 $term1 = get_term( $term_id1, 'wptests_tax' );

tests/phpunit/tests/post/getPages.php

@@ -15 +15 @@
         function test_get_pages_cache() {
                 global $wpdb;
 
-                self::$factory->post->create_many( 3, array( 'post_type' => 'page' ) );
+                self::factory()->post->create_many( 3, array( 'post_type' => 'page' ) );
                 wp_cache_delete( 'last_changed', 'posts' );
                 $this->assertFalse( wp_cache_get( 'last_changed', 'posts' ) );
 
@@ -99 +99 @@
          * @ticket 20376
          */
         function test_get_pages_meta() {
-                $posts = self::$factory->post->create_many( 3, array( 'post_type' => 'page' ) );
+                $posts = self::factory()->post->create_many( 3, array( 'post_type' => 'page' ) );
                 add_post_meta( $posts[0], 'some-meta-key', '0' );
                 add_post_meta( $posts[1], 'some-meta-key', '' );
                 add_post_meta( $posts[2], 'some-meta-key', '1' );
@@ -116 +116 @@
                 $page_ids = array();
 
                 foreach ( range( 1, 20 ) as $i )
-                        $page_ids[] = self::$factory->post->create( array( 'post_type' => 'page' ) );
+                        $page_ids[] = self::factory()->post->create( array( 'post_type' => 'page' ) );
 
                 $inc = array_slice( $page_ids, 0, 10 );
                 sort( $inc );
@@ -138 +138 @@
          * @ticket 9470
          */
         function test_get_pages_parent() {
-                $page_id1 = self::$factory->post->create( array( 'post_type' => 'page' ) );
-                $page_id2 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_id1 ) );
-                $page_id3 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_id2 ) );
-                $page_id4 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_id1 ) );
+                $page_id1 = self::factory()->post->create( array( 'post_type' => 'page' ) );
+                $page_id2 = self::factory()->post->create( array( 'post_type' => 'page', 'post_parent' => $page_id1 ) );
+                $page_id3 = self::factory()->post->create( array( 'post_type' => 'page', 'post_parent' => $page_id2 ) );
+                $page_id4 = self::factory()->post->create( array( 'post_type' => 'page', 'post_parent' => $page_id1 ) );
 
                 $pages = get_pages( array( 'parent' => 0, 'hierarchical' => false ) );
                 $this->assertEqualSets( array( $page_id1 ), wp_list_pluck( $pages, 'ID' ) );
@@ -166 +166 @@
          * @ticket 22389
          */
         function test_wp_dropdown_pages() {
-                self::$factory->post->create_many( 5, array( 'post_type' => 'page' ) );
+                self::factory()->post->create_many( 5, array( 'post_type' => 'page' ) );
 
                 preg_match_all( '#<option#', wp_dropdown_pages( 'echo=0' ), $matches );
 
@@ -177 +177 @@
          * @ticket 22208
          */
         function test_get_chidren_fields_ids() {
-                $post_id = self::$factory->post->create();
-                $child_ids = self::$factory->post->create_many( 5, array( 'post_parent' => $post_id ) );
+                $post_id = self::factory()->post->create();
+                $child_ids = self::factory()->post->create_many( 5, array( 'post_parent' => $post_id ) );
 
                 $post_ids = get_children( array( 'fields' => 'ids', 'post_parent' => $post_id ) );
                 $this->assertEqualSets( $child_ids, $post_ids );
@@ -189 +189 @@
          */
         function test_get_pages_hierarchical_and_no_parent() {
                 global $wpdb;
-                $page_1 = self::$factory->post->create( array( 'post_type' => 'page' ) );
-                $page_2 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
-                $page_3 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
-                $page_4 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_2 ) );
+                $page_1 = self::factory()->post->create( array( 'post_type' => 'page' ) );
+                $page_2 = self::factory()->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
+                $page_3 = self::factory()->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
+                $page_4 = self::factory()->post->create( array( 'post_type' => 'page', 'post_parent' => $page_2 ) );
 
                 $pages = get_pages(); // Defaults: hierarchical = true, parent = -1
                 $pages_default_args = get_pages( array( 'hierarchical' => true, 'parent' => -1 ) );
@@ -218 +218 @@
          * @ticket 18701
          */
         public function test_get_pages_hierarchical_empty_child_of() {
-                $page_1 = self::$factory->post->create( array( 'post_type' => 'page' ) );
-                $page_2 = self::$factory->post->create( array( 'post_type' => 'page' ) );
-                $page_3 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
-                $page_4 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
+                $page_1 = self::factory()->post->create( array( 'post_type' => 'page' ) );
+                $page_2 = self::factory()->post->create( array( 'post_type' => 'page' ) );
+                $page_3 = self::factory()->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
+                $page_4 = self::factory()->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
 
                 $pages = get_pages(); // Defaults: hierarchical = true, child_of = '', parent = -1
                 $default_args = get_pages( array(
@@ -252 +252 @@
          * @ticket 18701
          */
         public function test_get_pages_non_hierarchical_empty_child_of() {
-                $page_1 = self::$factory->post->create( array( 'post_type' => 'page' ) );
-                $page_2 = self::$factory->post->create( array( 'post_type' => 'page' ) );
-                $page_3 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
-                $page_4 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
+                $page_1 = self::factory()->post->create( array( 'post_type' => 'page' ) );
+                $page_2 = self::factory()->post->create( array( 'post_type' => 'page' ) );
+                $page_3 = self::factory()->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
+                $page_4 = self::factory()->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
 
                 $pages = get_pages( array( 'hierarchical' => false ) ); // child_of = '', parent = -1
 
@@ -278 +278 @@
          * @ticket 18701
          */
         public function test_get_pages_hierarchical_non_empty_child_of() {
-                $page_1 = self::$factory->post->create( array( 'post_type' => 'page' ) );
-                $page_2 = self::$factory->post->create( array( 'post_type' => 'page' ) );
-                $page_3 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
-                $page_4 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_3 ) );
-                $page_5 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
+                $page_1 = self::factory()->post->create( array( 'post_type' => 'page' ) );
+                $page_2 = self::factory()->post->create( array( 'post_type' => 'page' ) );
+                $page_3 = self::factory()->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
+                $page_4 = self::factory()->post->create( array( 'post_type' => 'page', 'post_parent' => $page_3 ) );
+                $page_5 = self::factory()->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
 
                 $pages = get_pages( array( 'child_of' => $page_1 ) ); // Defaults: hierarchical = true, parent = -1.
 
@@ -306 +306 @@
          * @ticket 18701
          */
         public function test_get_pages_non_hierarchical_non_empty_child_of() {
-                $page_1 = self::$factory->post->create( array( 'post_type' => 'page' ) );
-                $page_2 = self::$factory->post->create( array( 'post_type' => 'page' ) );
-                $page_3 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
-                $page_4 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_3 ) );
-                $page_5 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
+                $page_1 = self::factory()->post->create( array( 'post_type' => 'page' ) );
+                $page_2 = self::factory()->post->create( array( 'post_type' => 'page' ) );
+                $page_3 = self::factory()->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
+                $page_4 = self::factory()->post->create( array( 'post_type' => 'page', 'post_parent' => $page_3 ) );
+                $page_5 = self::factory()->post->create( array( 'post_type' => 'page', 'post_parent' => $page_1 ) );
 
                 $pages = get_pages( array( 'hierarchical' => false, 'child_of' => $page_1 ) );
 
@@ -338 +338 @@
                 $type = 'taco';
                 register_post_type( $type, array( 'hierarchical' => true, 'public' => true ) );
 
-                $posts = self::$factory->post->create_many( 2, array( 'post_type' => $type ) );
+                $posts = self::factory()->post->create_many( 2, array( 'post_type' => $type ) );
                 $post_id = reset( $posts );
 
                 $this->go_to( "/?p=$post_id&post_type=$type" );
@@ -360 +360 @@
         }
 
         function test_exclude_tree() {
-                $post_id1 = self::$factory->post->create( array( 'post_type' => 'page' ) );
-                $post_id2 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $post_id1 ) );
-                $post_id3 = self::$factory->post->create( array( 'post_type' => 'page' ) );
-                $post_id4 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $post_id3 ) );
+                $post_id1 = self::factory()->post->create( array( 'post_type' => 'page' ) );
+                $post_id2 = self::factory()->post->create( array( 'post_type' => 'page', 'post_parent' => $post_id1 ) );
+                $post_id3 = self::factory()->post->create( array( 'post_type' => 'page' ) );
+                $post_id4 = self::factory()->post->create( array( 'post_type' => 'page', 'post_parent' => $post_id3 ) );
 
                 $all = get_pages();
 
@@ -384 +384 @@
                 $exclude5 = get_pages( array( 'exclude_tree' => array( $post_id1, $post_id3 ) ) );
                 $this->assertCount( 0, $exclude5 );
 
-                $post_id5 = self::$factory->post->create( array( 'post_type' => 'page' ) );
-                $post_id6 = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $post_id5 ) );
+                $post_id5 = self::factory()->post->create( array( 'post_type' => 'page' ) );
+                $post_id6 = self::factory()->post->create( array( 'post_type' => 'page', 'post_parent' => $post_id5 ) );
 
                 $exclude6 = get_pages( array( 'exclude_tree' => array( $post_id1, $post_id3 ) ) );
                 $this->assertCount( 2, $exclude6 );

tests/phpunit/tests/post/getPostClass.php

@@ -9 +9 @@
 
         public function setUp() {
                 parent::setUp();
-                $this->post_id = self::$factory->post->create();
+                $this->post_id = self::factory()->post->create();
         }
 
         public function test_with_tags() {
@@ -22 +22 @@
         }
 
         public function test_with_categories() {
-                $cats = self::$factory->category->create_many( 2 );
+                $cats = self::factory()->category->create_many( 2 );
                 wp_set_post_terms( $this->post_id, $cats, 'category' );
 
                 $cat0 = get_term( $cats[0], 'category' );
@@ -57 +57 @@
          * @ticket 30883
          */
         public function test_with_utf8_category_slugs() {
-                $cat_id1 = self::$factory->category->create( array( 'name' => 'Первая рубрика' ) );
-                $cat_id2 = self::$factory->category->create( array( 'name' => 'Вторая рубрика' ) );
-                $cat_id3 = self::$factory->category->create( array( 'name' => '25кадр' ) );
+                $cat_id1 = self::factory()->category->create( array( 'name' => 'Первая рубрика' ) );
+                $cat_id2 = self::factory()->category->create( array( 'name' => 'Вторая рубрика' ) );
+                $cat_id3 = self::factory()->category->create( array( 'name' => '25кадр' ) );
                 wp_set_post_terms( $this->post_id, array( $cat_id1, $cat_id2, $cat_id3 ), 'category' );
 
                 $found = get_post_class( '', $this->post_id );
@@ -73 +73 @@
          * @ticket 30883
          */
         public function test_with_utf8_tag_slugs() {
-                $tag_id1 = self::$factory->tag->create( array( 'name' => 'Первая метка' ) );
-                $tag_id2 = self::$factory->tag->create( array( 'name' => 'Вторая метка' ) );
-                $tag_id3 = self::$factory->tag->create( array( 'name' => '25кадр' ) );
+                $tag_id1 = self::factory()->tag->create( array( 'name' => 'Первая метка' ) );
+                $tag_id2 = self::factory()->tag->create( array( 'name' => 'Вторая метка' ) );
+                $tag_id3 = self::factory()->tag->create( array( 'name' => '25кадр' ) );
                 wp_set_post_terms( $this->post_id, array( $tag_id1, $tag_id2, $tag_id3 ), 'post_tag' );
 
                 $found = get_post_class( '', $this->post_id );
@@ -90 +90 @@
          */
         public function test_with_utf8_term_slugs() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $term_id1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => 'Первая метка' ) );
-                $term_id2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => 'Вторая метка' ) );
-                $term_id3 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => '25кадр' ) );
+                $term_id1 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => 'Первая метка' ) );
+                $term_id2 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => 'Вторая метка' ) );
+                $term_id3 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => '25кадр' ) );
                 wp_set_post_terms( $this->post_id, array( $term_id1, $term_id2, $term_id3 ), 'wptests_tax' );
 
                 $found = get_post_class( '', $this->post_id );

tests/phpunit/tests/post/getPostsByAuthorSql.php

@@ -59 +59 @@
 
         public function test_public_only_true_should_not_allow_any_private_posts_for_loggedin_user(){
                 $current_user = get_current_user_id();
-                $u = self::$factory->user->create();
+                $u = self::factory()->user->create();
                 wp_set_current_user( $u );
 
                 $maybe_string = get_posts_by_author_sql( 'post', true, $u, true );
@@ -70 +70 @@
 
         public function test_public_only_should_default_to_false(){
                 $current_user = get_current_user_id();
-                $u = self::$factory->user->create();
+                $u = self::factory()->user->create();
                 wp_set_current_user( $u );
 
                 $this->assertSame( get_posts_by_author_sql( 'post', true, $u, false ), get_posts_by_author_sql( 'post', true, $u ) );
@@ -80 +80 @@
 
         public function test_public_only_false_should_allow_current_user_access_to_own_private_posts_when_current_user_matches_post_author(){
                 $current_user = get_current_user_id();
-                $u = self::$factory->user->create();
+                $u = self::factory()->user->create();
                 wp_set_current_user( $u );
 
                 $maybe_string = get_posts_by_author_sql( 'post', true, $u, false );
@@ -91 +91 @@
 
         public function test_public_only_false_should_not_allow_access_to_private_posts_if_current_user_is_not_post_author(){
                 $current_user = get_current_user_id();
-                $u1 = self::$factory->user->create();
-                $u2 = self::$factory->user->create();
+                $u1 = self::factory()->user->create();
+                $u2 = self::factory()->user->create();
                 wp_set_current_user( $u1 );
 
                 $maybe_string = get_posts_by_author_sql( 'post', true, $u2, false );
@@ -103 +103 @@
 
         public function test_public_only_false_should_allow_current_user_access_to_own_private_posts_when_post_author_is_not_provided(){
                 $current_user = get_current_user_id();
-                $u = self::$factory->user->create();
+                $u = self::factory()->user->create();
                 wp_set_current_user( $u );
 
                 $maybe_string = get_posts_by_author_sql( 'post', true, $u, false );
@@ -115 +115 @@
 
         public function test_administrator_should_have_access_to_private_posts_when_public_only_is_false(){
                 $current_user = get_current_user_id();
-                $u = self::$factory->user->create( array( 'role' => 'administrator' ) );
+                $u = self::factory()->user->create( array( 'role' => 'administrator' ) );
                 wp_set_current_user( $u );
 
                 $maybe_string = get_posts_by_author_sql( 'post', true, null, false );
@@ -130 +130 @@
                 register_post_type( 'bar', array( 'capabilities' => array( 'read_private_posts' => 'read_private_bar' ) ) );
                 register_post_type( 'baz', array( 'capabilities' => array( 'read_private_posts' => 'read_private_baz' ) ) );
                 $current_user = get_current_user_id();
-                $u = self::$factory->user->create( array( 'role' => 'editor' ) );
+                $u = self::factory()->user->create( array( 'role' => 'editor' ) );
                 $editor_role = get_role('editor');
                 $editor_role->add_cap( 'read_private_baz' );
                 wp_set_current_user( $u );

tests/phpunit/tests/post/listPages.php

@@ -27 +27 @@
                 global $wpdb;
                 $wpdb->query( 'TRUNCATE ' . $wpdb->prefix . 'posts' );
                 $pages = array();
-                self::$factory->user->create();
-                $pages[] = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'Parent 1' ) );
-                $pages[] = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'Parent 2' ) );
-                $pages[] = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'Parent 3', 'post_author' => '2' ) );
+                self::factory()->user->create();
+                $pages[] = self::factory()->post->create( array( 'post_type' => 'page', 'post_title' => 'Parent 1' ) );
+                $pages[] = self::factory()->post->create( array( 'post_type' => 'page', 'post_title' => 'Parent 2' ) );
+                $pages[] = self::factory()->post->create( array( 'post_type' => 'page', 'post_title' => 'Parent 3', 'post_author' => '2' ) );
 
                 foreach ( $pages as $page ) {
-                        $this->pages[$page] = self::$factory->post->create( array( 'post_parent' => $page, 'post_type' => 'page', 'post_title' => 'Child 1' ) );
-                        $this->pages[$page] = self::$factory->post->create( array( 'post_parent' => $page, 'post_type' => 'page', 'post_title' => 'Child 2' ) );
-                        $this->pages[$page] = self::$factory->post->create( array( 'post_parent' => $page, 'post_type' => 'page', 'post_title' => 'Child 3' ) );
+                        $this->pages[$page] = self::factory()->post->create( array( 'post_parent' => $page, 'post_type' => 'page', 'post_title' => 'Child 1' ) );
+                        $this->pages[$page] = self::factory()->post->create( array( 'post_parent' => $page, 'post_type' => 'page', 'post_title' => 'Child 2' ) );
+                        $this->pages[$page] = self::factory()->post->create( array( 'post_parent' => $page, 'post_type' => 'page', 'post_title' => 'Child 3' ) );
                 }
         }
 

tests/phpunit/tests/post/meta.php

@@ -8 +8 @@
         function setUp() {
                 parent::setUp();
 
-                $this->author = new WP_User( self::$factory->user->create( array( 'role' => 'editor' ) ) );
+                $this->author = new WP_User( self::factory()->user->create( array( 'role' => 'editor' ) ) );
 
                 $post = array(
                         'post_author' => $this->author->ID,

tests/phpunit/tests/post/nav-menu.php

@@ -16 +16 @@
         }
 
         function test_wp_get_associated_nav_menu_items() {
-                $tag_id = self::$factory->tag->create();
-                $cat_id = self::$factory->category->create();
-                $post_id = self::$factory->post->create();
-                $post_2_id = self::$factory->post->create();
-                $page_id = self::$factory->post->create( array( 'post_type' => 'page' ) );
+                $tag_id = self::factory()->tag->create();
+                $cat_id = self::factory()->category->create();
+                $post_id = self::factory()->post->create();
+                $post_2_id = self::factory()->post->create();
+                $page_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
 
                 $tag_insert = wp_update_nav_menu_item( $this->menu_id, 0, array(
                         'menu-item-type' => 'taxonomy',
@@ -119 +119 @@
 
         public function test_wp_get_nav_menu_items_with_taxonomy_term() {
                 register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
-                $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
-                $child_terms = self::$factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax', 'parent' => $t ) );
+                $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $child_terms = self::factory()->term->create_many( 2, array( 'taxonomy' => 'wptests_tax', 'parent' => $t ) );
 
                 $term_menu_item = wp_update_nav_menu_item( $this->menu_id, 0, array(
                         'menu-item-type' => 'taxonomy',

tests/phpunit/tests/post/objects.php

@@ -6 +6 @@
 class Tests_Post_Objects extends WP_UnitTestCase {
 
         function test_get_post() {
-                $id = self::$factory->post->create();
+                $id = self::factory()->post->create();
 
                 $post = get_post( $id );
                 $this->assertInstanceOf( 'WP_Post', $post );
@@ -67 +67 @@
         }
 
         function test_get_post_ancestors() {
-                $parent_id = self::$factory->post->create();
-                $child_id = self::$factory->post->create();
-                $grandchild_id = self::$factory->post->create();
+                $parent_id = self::factory()->post->create();
+                $child_id = self::factory()->post->create();
+                $grandchild_id = self::factory()->post->create();
                 $updated = wp_update_post( array( 'ID' => $child_id, 'post_parent' => $parent_id ) );
                 $this->assertEquals( $updated, $child_id );
                 $updated = wp_update_post( array( 'ID' => $grandchild_id, 'post_parent' => $child_id ) );
@@ -99 +99 @@
         }
 
         function test_get_post_category_property() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
                 $post = get_post( $post_id );
 
                 $this->assertInternalType( 'array', $post->post_category );
@@ -118 +118 @@
         }
 
         function test_get_tags_input_property() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
                 $post = get_post( $post_id );
 
                 $this->assertInternalType( 'array', $post->tags_input );
@@ -135 +135 @@
         }
 
         function test_get_page_template_property() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
                 $post = get_post( $post_id );
 
                 $this->assertInternalType( 'string', $post->page_template );
@@ -155 +155 @@
         }
 
         function test_get_post_filter() {
-                $post = get_post( self::$factory->post->create( array(
+                $post = get_post( self::factory()->post->create( array(
                         'post_title' => "Mary's home"
                 ) ) );
 
@@ -178 +178 @@
         }
 
         function test_get_post_identity() {
-                $post = get_post( self::$factory->post->create() );
+                $post = get_post( self::factory()->post->create() );
 
                 $post->foo = 'bar';
 
@@ -187 +187 @@
         }
 
         function test_get_post_array() {
-                $id = self::$factory->post->create();
+                $id = self::factory()->post->create();
 
                 $post = get_post( $id, ARRAY_A );
 
@@ -202 +202 @@
         function test_get_post_cache() {
                 global $wpdb;
 
-                $id = self::$factory->post->create();
+                $id = self::factory()->post->create();
                 wp_cache_delete( $id, 'posts' );
 
                 // get_post( stdClass ) should not prime the cache

tests/phpunit/tests/post/output.php

@@ -41 +41 @@
 This is the <b>body</b>.
 EOF;
 
-                $post_id = self::$factory->post->create( compact( 'post_content' ) );
+                $post_id = self::factory()->post->create( compact( 'post_content' ) );
 
                 $expected = <<<EOF
 <p><i>This is the excerpt.</i><br />
@@ -76 +76 @@
 
 EOF;
 
-                $post_id = self::$factory->post->create( compact( 'post_content' ) );
+                $post_id = self::factory()->post->create( compact( 'post_content' ) );
                 $this->go_to( get_permalink( $post_id ) );
                 $this->assertTrue( is_single() );
                 $this->assertTrue( have_posts() );
@@ -114 +114 @@
 
 EOF;
 
-                $post_id = self::$factory->post->create( compact( 'post_content' ) );
+                $post_id = self::factory()->post->create( compact( 'post_content' ) );
                 $this->go_to( get_permalink( $post_id ) );
                 $this->assertTrue( is_single() );
                 $this->assertTrue( have_posts() );
@@ -136 +136 @@
 <p><span class="Z3988" title="ctx_ver=Z39.88-2004&amp;rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Ajournal&amp;rft.aulast=Mariat&amp;rft.aufirst=Denis&amp;rft. au=Denis+Mariat&amp;rft.au=Sead+Taourit&amp;rft.au=G%C3%A9rard+Gu%C3%A9rin&amp; rft.title=Genetics+Selection+Evolution&amp;rft.atitle=&amp;rft.date=2003&amp;rft. volume=35&amp;rft.issue=1&amp;rft.spage=119&amp;rft.epage=133&amp;rft.genre=article&amp; rft.id=info:DOI/10.1051%2Fgse%3A2002039"></span>Mariat, D., Taourit, S., Guérin, G. (2003). . <span style="font-style: italic">Genetics Selection Evolution, 35</span>(1), 119-133. DOI: <a rev="review" href="http://dx.doi.org/10.1051/gse:2002039">10.1051/gse:2002039</a></p>
 EOF;
 
-                $post_id = self::$factory->post->create( compact( 'post_content' ) );
+                $post_id = self::factory()->post->create( compact( 'post_content' ) );
                 $this->go_to( get_permalink( $post_id ) );
                 $this->assertTrue( is_single() );
                 $this->assertTrue( have_posts() );
@@ -160 +160 @@
 <p><span title="My friends: Alice, Bob and Carol">foo</span></p>
 EOF;
 
-                $post_id = self::$factory->post->create( compact( 'post_content' ) );
+                $post_id = self::factory()->post->create( compact( 'post_content' ) );
                 $this->go_to( get_permalink( $post_id ) );
                 $this->assertTrue( is_single() );
                 $this->assertTrue( have_posts() );

tests/phpunit/tests/post/query.php

@@ -11 +11 @@
         function test_category__and_var() {
                 $q = new WP_Query();
 
-                $term_id = self::$factory->category->create( array( 'slug' => 'woo', 'name' => 'WOO!' ) );
-                $term_id2 = self::$factory->category->create( array( 'slug' => 'hoo', 'name' => 'HOO!' ) );
-                $post_id = self::$factory->post->create();
+                $term_id = self::factory()->category->create( array( 'slug' => 'woo', 'name' => 'WOO!' ) );
+                $term_id2 = self::factory()->category->create( array( 'slug' => 'hoo', 'name' => 'HOO!' ) );
+                $post_id = self::factory()->post->create();
 
                 wp_set_post_categories( $post_id, $term_id );
 
@@ -41 +41 @@
          * @group taxonomy
          */
         function test_empty_category__in() {
-                $cat_id = self::$factory->category->create();
-                $post_id = self::$factory->post->create();
+                $cat_id = self::factory()->category->create();
+                $post_id = self::factory()->post->create();
                 wp_set_post_categories( $post_id, $cat_id );
 
                 $q1 = get_posts( array( 'category__in' => array( $cat_id ) ) );
@@ -71 +71 @@
          */
         function test_the_posts_filter() {
                 // Create posts and clear their caches.
-                $post_ids = self::$factory->post->create_many( 4 );
+                $post_ids = self::factory()->post->create_many( 4 );
                 foreach ( $post_ids as $post_id )
                         clean_post_cache( $post_id );
 
@@ -115 +115 @@
         }
 
         function test_post__in_ordering() {
-                $post_id1 = self::$factory->post->create( array( 'post_type' => 'page', 'menu_order' => rand( 1, 100 ) ) );
-                $post_id2 = self::$factory->post->create( array( 'post_type' => 'page', 'menu_order' => rand( 1, 100 ) ) );
-                $post_id3 = self::$factory->post->create( array(
+                $post_id1 = self::factory()->post->create( array( 'post_type' => 'page', 'menu_order' => rand( 1, 100 ) ) );
+                $post_id2 = self::factory()->post->create( array( 'post_type' => 'page', 'menu_order' => rand( 1, 100 ) ) );
+                $post_id3 = self::factory()->post->create( array(
                         'post_type' => 'page',
                         'post_parent' => $post_id2,
                         'menu_order' => rand( 1, 100 )
                 ) );
-                $post_id4 = self::$factory->post->create( array(
+                $post_id4 = self::factory()->post->create( array(
                         'post_type' => 'page',
                         'post_parent' => $post_id2,
                         'menu_order' => rand( 1, 100 )
                 ) );
-                $post_id5 = self::$factory->post->create( array( 'post_type' => 'page', 'menu_order' => rand( 1, 100 ) ) );
+                $post_id5 = self::factory()->post->create( array( 'post_type' => 'page', 'menu_order' => rand( 1, 100 ) ) );
 
                 $ordered = array( $post_id2, $post_id4, $post_id3, $post_id1, $post_id5 );
 
@@ -140 +140 @@
         }
 
         function test_post__in_attachment_ordering() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
                 $att_ids = array();
                 $file = DIR_TESTDATA . '/images/canola.jpg';
-                $att_ids[1] = self::$factory->attachment->create_object( $file, $post_id, array(
+                $att_ids[1] = self::factory()->attachment->create_object( $file, $post_id, array(
                         'post_mime_type' => 'image/jpeg',
                         'menu_order' => rand( 1, 100 )
                 ) );
-                $att_ids[2] = self::$factory->attachment->create_object( $file, $post_id, array(
+                $att_ids[2] = self::factory()->attachment->create_object( $file, $post_id, array(
                         'post_mime_type' => 'image/jpeg',
                         'menu_order' => rand( 1, 100 )
                 ) );
-                $att_ids[3] = self::$factory->attachment->create_object( $file, $post_id, array(
+                $att_ids[3] = self::factory()->attachment->create_object( $file, $post_id, array(
                         'post_mime_type' => 'image/jpeg',
                         'menu_order' => rand( 1, 100 )
                 ) );
-                $att_ids[4] = self::$factory->attachment->create_object( $file, $post_id, array(
+                $att_ids[4] = self::factory()->attachment->create_object( $file, $post_id, array(
                         'post_mime_type' => 'image/jpeg',
                         'menu_order' => rand( 1, 100 )
                 ) );
-                $att_ids[5] = self::$factory->attachment->create_object( $file, $post_id, array(
+                $att_ids[5] = self::factory()->attachment->create_object( $file, $post_id, array(
                         'post_mime_type' => 'image/jpeg',
                         'menu_order' => rand( 1, 100 )
                 ) );
@@ -311 +311 @@
         public function test_post_name__in() {
                 $q = new WP_Query();
 
-                $post_ids[0] = self::$factory->post->create( array( 'post_title' => 'woo', 'post_date' => '2015-07-23 00:00:00' ) );
-                $post_ids[1] = self::$factory->post->create( array( 'post_title' => 'hoo', 'post_date' => '2015-07-23 00:00:00' ) );
-                $post_ids[2] = self::$factory->post->create( array( 'post_title' => 'test', 'post_date' => '2015-07-23 00:00:00' ) );
-                $post_ids[3] = self::$factory->post->create( array( 'post_title' => 'me', 'post_date' => '2015-07-23 00:00:00' ) );
+                $post_ids[0] = self::factory()->post->create( array( 'post_title' => 'woo', 'post_date' => '2015-07-23 00:00:00' ) );
+                $post_ids[1] = self::factory()->post->create( array( 'post_title' => 'hoo', 'post_date' => '2015-07-23 00:00:00' ) );
+                $post_ids[2] = self::factory()->post->create( array( 'post_title' => 'test', 'post_date' => '2015-07-23 00:00:00' ) );
+                $post_ids[3] = self::factory()->post->create( array( 'post_title' => 'me', 'post_date' => '2015-07-23 00:00:00' ) );
 
                 $requested = array( $post_ids[0], $post_ids[3] );
                 $q->query( array(

tests/phpunit/tests/post/revisions.php

@@ -144 +144 @@
          * @ticket 16847
          */
         function test_revision_view_caps_post() {
-                $post_id = self::$factory->post->create( array( 'post_type' => 'post', 'post_author' => self::$editor_user_id ) );
+                $post_id = self::factory()->post->create( array( 'post_type' => 'post', 'post_author' => self::$editor_user_id ) );
                 wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
 
                 $revisions = wp_get_post_revisions( $post_id );
@@ -166 +166 @@
          * @ticket 16847
          */
         function test_revision_restore_caps_post() {
-                $post_id = self::$factory->post->create( array( 'post_type' => 'post', 'post_author' => self::$editor_user_id ) );
+                $post_id = self::factory()->post->create( array( 'post_type' => 'post', 'post_author' => self::$editor_user_id ) );
                 wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
 
                 $revisions = wp_get_post_revisions( $post_id );
@@ -186 +186 @@
          * @ticket 16847
          */
         function test_revision_diff_caps_post() {
-                $post_id = self::$factory->post->create( array( 'post_type' => 'post', 'post_author' => self::$editor_user_id ) );
+                $post_id = self::factory()->post->create( array( 'post_type' => 'post', 'post_author' => self::$editor_user_id ) );
                 wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
                 wp_update_post( array( 'post_content' => 'This content is even better', 'ID' => $post_id ) );
 
@@ -214 +214 @@
                         'supports' => array( 'revisions' ),
                 ) );
 
-                $post_id = self::$factory->post->create( array( 'post_type' => $this->post_type, 'post_author' => self::$editor_user_id ) );
+                $post_id = self::factory()->post->create( array( 'post_type' => $this->post_type, 'post_author' => self::$editor_user_id ) );
                 wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
 
                 $revisions = wp_get_post_revisions( $post_id );
@@ -247 +247 @@
                 $editor_user->add_cap( 'edit_published_events' );
 
                 //create a post as Editor
-                $post_id = self::$factory->post->create( array( 'post_type' => $this->post_type, 'post_author' => self::$editor_user_id ) );
+                $post_id = self::factory()->post->create( array( 'post_type' => $this->post_type, 'post_author' => self::$editor_user_id ) );
                 wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
 
                 $revisions = wp_get_post_revisions( $post_id );
@@ -282 +282 @@
                 $old_id = get_current_user_id();
                 wp_set_current_user( self::$editor_user_id );
 
-                $post_id = self::$factory->post->create( array( 'post_type' => $this->post_type, 'post_status' => 'draft' ) );
+                $post_id = self::factory()->post->create( array( 'post_type' => $this->post_type, 'post_status' => 'draft' ) );
                 wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
 
                 $revisions = wp_get_post_revisions( $post_id );
@@ -314 +314 @@
                         'supports' => array( 'revisions' ),
                 ) );
 
-                $post_id = self::$factory->post->create( array( 'post_type' => $this->post_type, 'post_author' => self::$editor_user_id ) );
+                $post_id = self::factory()->post->create( array( 'post_type' => $this->post_type, 'post_author' => self::$editor_user_id ) );
                 wp_update_post( array( 'post_content' => 'This content is much better', 'ID' => $post_id ) );
                 wp_update_post( array( 'post_content' => 'This content is even better', 'ID' => $post_id ) );
 
@@ -337 +337 @@
         function test_wp_get_post_revisions_should_order_by_post_date() {
                 global $wpdb;
 
-                $post = self::$factory->post->create_and_get( array( 'post_title' => 'some-post', 'post_type' => 'post', 'post_content' => 'some_content' ) );
+                $post = self::factory()->post->create_and_get( array( 'post_title' => 'some-post', 'post_type' => 'post', 'post_content' => 'some_content' ) );
 
                 $post = (array) $post;
                 $post_revision_fields = _wp_post_revision_fields( $post );
@@ -365 +365 @@
          * @ticket 26042
          */
         function test_wp_get_post_revisions_should_order_by_ID_when_post_date_matches() {
-                $post = self::$factory->post->create_and_get( array( 'post_title' => 'some-post', 'post_type' => 'post', 'post_content' => 'some_content' ) );
+                $post = self::factory()->post->create_and_get( array( 'post_title' => 'some-post', 'post_type' => 'post', 'post_content' => 'some_content' ) );
 
                 $post = (array) $post;
                 $post_revision_fields = _wp_post_revision_fields( $post );

tests/phpunit/tests/post/slashes.php

@@ -8 +8 @@
 class Tests_Post_Slashes extends WP_UnitTestCase {
         function setUp() {
                 parent::setUp();
-                $this->author_id = self::$factory->user->create( array( 'role' => 'editor' ) );
+                $this->author_id = self::factory()->user->create( array( 'role' => 'editor' ) );
                 $this->old_current_user = get_current_user_id();
                 wp_set_current_user( $this->author_id );
 
@@ -33 +33 @@
          *
          */
         function test_edit_post() {
-                $id = self::$factory->post->create();
+                $id = self::factory()->post->create();
 
                 $_POST = array();
                 $_POST['post_ID'] = $id;
@@ -102 +102 @@
          *
          */
         function test_wp_update_post() {
-                $id = self::$factory->post->create();
+                $id = self::factory()->post->create();
 
                 wp_update_post(array(
                         'ID' => $id,

tests/phpunit/tests/post/template.php

@@ -8 +8 @@
         function test_wp_link_pages() {
                 $contents = array( 'One', 'Two', 'Three' );
                 $content = join( '<!--nextpage-->', $contents );
-                $post_id = self::$factory->post->create( array( 'post_content' => $content ) );
+                $post_id = self::factory()->post->create( array( 'post_content' => $content ) );
 
                 $this->go_to( '?p=' . $post_id );
 
@@ -81 +81 @@
                 $this->assertEmpty( $none );
 
                 $bump = '&nbsp;&nbsp;&nbsp;';
-                $page_id = self::$factory->post->create( array( 'post_type' => 'page' ) );
-                $child_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_id ) );
-                $grandchild_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_parent' => $child_id ) );
+                $page_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
+                $child_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_parent' => $page_id ) );
+                $grandchild_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_parent' => $child_id ) );
 
                 $title1 = get_post( $page_id )->post_title;
                 $title2 = get_post( $child_id )->post_title;
@@ -143 +143 @@
          * @ticket 12494
          */
         public function test_wp_dropdown_pages_value_field_should_default_to_ID() {
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_type' => 'page',
                 ) );
 
@@ -159 +159 @@
          * @ticket 12494
          */
         public function test_wp_dropdown_pages_value_field_ID() {
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_type' => 'page',
                 ) );
 
@@ -175 +175 @@
          * @ticket 12494
          */
         public function test_wp_dropdown_pages_value_field_post_name() {
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_type' => 'page',
                         'post_name' => 'foo',
                 ) );
@@ -192 +192 @@
          * @ticket 12494
          */
         public function test_wp_dropdown_pages_value_field_should_fall_back_on_ID_when_an_invalid_value_is_provided() {
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_type' => 'page',
                         'post_name' => 'foo',
                 ) );
@@ -209 +209 @@
          * @ticket 30082
          */
         public function test_wp_dropdown_pages_should_not_contain_class_attribute_when_no_class_is_passed() {
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_type' => 'page',
                         'post_name' => 'foo',
                 ) );
@@ -225 +225 @@
          * @ticket 30082
          */
         public function test_wp_dropdown_pages_should_obey_class_parameter() {
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_type' => 'page',
                         'post_name' => 'foo',
                 ) );
@@ -242 +242 @@
          * @ticket 31389
          */
         public function test_get_page_template_slug_by_id() {
-                $page_id = self::$factory->post->create( array(
+                $page_id = self::factory()->post->create( array(
                         'post_type' => 'page',
                 ) );
 
@@ -259 +259 @@
          * @ticket 31389
          */
         public function test_get_page_template_slug_from_loop() {
-                $page_id = self::$factory->post->create( array(
+                $page_id = self::factory()->post->create( array(
                         'post_type' => 'page',
                 ) );
 
@@ -273 +273 @@
          * @ticket 31389
          */
         public function test_get_page_template_slug_non_page() {
-                $post_id = self::$factory->post->create( array(
+                $post_id = self::factory()->post->create( array(
                         'post_type' => 'post',
                 ) );
 
@@ -288 +288 @@
          * @ticket 33974
          */
         public function test_wp_page_menu_wp_nav_menu_fallback() {
-                $pages = self::$factory->post->create_many( 3, array( 'post_type' => 'page' ) );
+                $pages = self::factory()->post->create_many( 3, array( 'post_type' => 'page' ) );
 
                 // No menus + wp_nav_menu() falls back to wp_page_menu().
                 $menu = wp_nav_menu( array( 'echo' => false ) );

tests/phpunit/tests/post/wpUniquePostSlug.php

@@ -8 +8 @@
          * @ticket 21013
          */
         public function test_non_latin_slugs() {
-                $author_id = self::$factory->user->create( array( 'role' => 'editor' ) );
+                $author_id = self::factory()->user->create( array( 'role' => 'editor' ) );
 
                 $inputs = array(
                         'Αρνάκι άσπρο και παχύ της μάνας του καμάρι, και άλλα τραγούδια',
@@ -49 +49 @@
                         'post_name' => 'some-slug',
                         'post_status' => 'publish',
                 );
-                $one = self::$factory->post->create( $args );
+                $one = self::factory()->post->create( $args );
                 $args['post_type'] = 'post-type-2';
-                $two = self::$factory->post->create( $args );
+                $two = self::factory()->post->create( $args );
 
                 $this->assertEquals( 'some-slug', get_post( $one )->post_name );
                 $this->assertEquals( 'some-slug', get_post( $two )->post_name );
@@ -74 +74 @@
                         'post_name' => 'some-slug',
                         'post_status' => 'publish',
                 );
-                $one = self::$factory->post->create( $args );
+                $one = self::factory()->post->create( $args );
                 $args['post_name'] = 'some-slug-2';
-                $two = self::$factory->post->create( $args );
+                $two = self::factory()->post->create( $args );
 
                 $this->assertEquals( 'some-slug', get_post( $one )->post_name );
                 $this->assertEquals( 'some-slug-2', get_post( $two )->post_name );
@@ -97 +97 @@
                         'post_name' => 'some-slug',
                         'post_status' => 'publish',
                 );
-                $one = self::$factory->post->create( $args );
+                $one = self::factory()->post->create( $args );
 
                 $args = array(
                         'post_mime_type' => 'image/jpeg',
                         'post_type' => 'attachment',
                         'post_name' => 'image'
                 );
-                $attachment = self::$factory->attachment->create_object( 'image.jpg', $one, $args );
+                $attachment = self::factory()->attachment->create_object( 'image.jpg', $one, $args );
 
                 $args = array(
                         'post_type' => 'post-type-1',
@@ -112 +112 @@
                         'post_status' => 'publish',
                         'post_parent' => $one
                 );
-                $two = self::$factory->post->create( $args );
+                $two = self::factory()->post->create( $args );
 
                 $this->assertEquals( 'some-slug', get_post( $one )->post_name );
                 $this->assertEquals( 'image', get_post( $attachment )->post_name );
@@ -128 +128 @@
          * @dataProvider whitelist_post_statuses
          */
         public function test_whitelisted_post_statuses_should_not_be_forced_to_be_unique( $status ) {
-                $p1 = self::$factory->post->create( array(
+                $p1 = self::factory()->post->create( array(
                         'post_type' => 'post',
                         'post_name' => 'foo',
                 ) );
 
-                $p2 = self::$factory->post->create( array(
+                $p2 = self::factory()->post->create( array(
                         'post_type' => 'post',
                 ) );
 
@@ -151 +151 @@
         }
 
         public function test_revisions_should_not_be_forced_to_be_unique() {
-                $p1 = self::$factory->post->create( array(
+                $p1 = self::factory()->post->create( array(
                         'post_type' => 'post',
                         'post_name' => 'foo',
                 ) );
 
-                $p2 = self::$factory->post->create( array(
+                $p2 = self::factory()->post->create( array(
                         'post_type' => 'post',
                 ) );
 
@@ -171 +171 @@
         public function test_slugs_resulting_in_permalinks_that_resemble_year_archives_should_be_suffixed() {
                 $this->set_permalink_structure( '/%postname%/' );
 
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_type' => 'post',
                         'post_name' => 'foo',
                 ) );
@@ -186 +186 @@
         public function test_slugs_resulting_in_permalinks_that_resemble_year_archives_should_not_be_suffixed_for_already_published_posts() {
                 $this->set_permalink_structure( '/%postname%/' );
 
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_type' => 'post',
                         'post_name' => 'foo',
                         'post_status' => 'publish',
@@ -202 +202 @@
         public function test_yearlike_slugs_should_not_be_suffixed_if_permalink_structure_does_not_result_in_a_clash_with_year_archives() {
                 $this->set_permalink_structure( '/%year%/%postname%/' );
 
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_type' => 'post',
                         'post_name' => 'foo',
                 ) );
@@ -217 +217 @@
         public function test_slugs_resulting_in_permalinks_that_resemble_month_archives_should_be_suffixed() {
                 $this->set_permalink_structure( '/%year%/%postname%/' );
 
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_type' => 'post',
                         'post_name' => 'foo',
                 ) );
@@ -232 +232 @@
         public function test_monthlike_slugs_should_not_be_suffixed_if_permalink_structure_does_not_result_in_a_clash_with_month_archives() {
                 $this->set_permalink_structure( '/%year%/foo/%postname%/' );
 
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_type' => 'post',
                         'post_name' => 'foo',
                 ) );
@@ -247 +247 @@
         public function test_monthlike_slugs_should_not_be_suffixed_for_invalid_month_numbers() {
                 $this->set_permalink_structure( '/%year%/%postname%/' );
 
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_type' => 'post',
                         'post_name' => 'foo',
                 ) );
@@ -262 +262 @@
         public function test_slugs_resulting_in_permalinks_that_resemble_day_archives_should_be_suffixed() {
                 $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
 
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_type' => 'post',
                         'post_name' => 'foo',
                 ) );
@@ -277 +277 @@
         public function test_daylike_slugs_should_not_be_suffixed_if_permalink_structure_does_not_result_in_a_clash_with_day_archives() {
                 $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
 
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_type' => 'post',
                         'post_name' => 'foo',
                 ) );
@@ -292 +292 @@
         public function test_daylike_slugs_should_not_be_suffixed_for_invalid_day_numbers() {
                 $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
 
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'post_type' => 'post',
                         'post_name' => 'foo',
                 ) );

tests/phpunit/tests/query.php

@@ -14 +14 @@
          *
          */
         function test_nested_loop_reset_postdata() {
-                $post_id = self::$factory->post->create();
-                $nested_post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
+                $nested_post_id = self::factory()->post->create();
 
                 $first_query = new WP_Query( array( 'post__in' => array( $post_id ) ) );
                 while ( $first_query->have_posts() ) { $first_query->the_post();
@@ -43 +43 @@
          * @ticket 25380
          */
         function test_pre_posts_per_page() {
-                self::$factory->post->create_many( 10 );
+                self::factory()->post->create_many( 10 );
 
                 add_action( 'pre_get_posts', array( $this, 'filter_posts_per_page' ) );
 
@@ -61 +61 @@
          */
         function test_tag_queried_object() {
                 $slug = 'tag-slug-26627';
-                self::$factory->tag->create( array( 'slug' => $slug ) );
+                self::factory()->tag->create( array( 'slug' => $slug ) );
                 $tag = get_term_by( 'slug', $slug, 'post_tag' );
 
                 add_action( 'pre_get_posts', array( $this, '_tag_queried_object' ), 11 );
@@ -94 +94 @@
                 // Don't override the args provided below.
                 remove_action( 'pre_get_posts', array( $this, 'pre_get_posts_tax_category_tax_query' ) );
                 register_taxonomy( 'wptests_tax', 'post' );
-                $terms = self::$factory->term->create_many( 2, array(
+                $terms = self::factory()->term->create_many( 2, array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 
-                $posts = self::$factory->post->create_many( 2 );
+                $posts = self::factory()->post->create_many( 2 );
 
                 wp_set_object_terms( $posts[0], array( $terms[0] ), 'wptests_tax' );
                 wp_set_object_terms( $posts[1], array( $terms[1] ), 'wptests_tax' );
@@ -130 +130 @@
         }
 
         public function test_cat_querystring_single_term() {
-                $c1 = self::$factory->category->create( array(
+                $c1 = self::factory()->category->create( array(
                         'name' => 'Test Category 1',
                         'slug' => 'test1',
                 ) );
-                $c2 = self::$factory->category->create( array(
+                $c2 = self::factory()->category->create( array(
                         'name' => 'Test Category 2',
                         'slug' => 'test2',
                 ) );
 
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
 
                 wp_set_object_terms( $p1, $c1, 'category' );
                 wp_set_object_terms( $p2, array( $c1, $c2 ), 'category' );
@@ -159 +159 @@
         }
 
         public function test_category_querystring_multiple_terms_comma_separated() {
-                $c1 = self::$factory->category->create( array(
+                $c1 = self::factory()->category->create( array(
                         'name' => 'Test Category 1',
                         'slug' => 'test1',
                 ) );
-                $c2 = self::$factory->category->create( array(
+                $c2 = self::factory()->category->create( array(
                         'name' => 'Test Category 2',
                         'slug' => 'test2',
                 ) );
-                $c3 = self::$factory->category->create( array(
+                $c3 = self::factory()->category->create( array(
                         'name' => 'Test Category 3',
                         'slug' => 'test3',
                 ) );
 
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
-                $p4 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
+                $p4 = self::factory()->post->create();
 
                 wp_set_object_terms( $p1, $c1, 'category' );
                 wp_set_object_terms( $p2, array( $c1, $c2 ), 'category' );
@@ -197 +197 @@
          * @ticket 33532
          */
         public function test_category_querystring_multiple_terms_formatted_as_array() {
-                $c1 = self::$factory->category->create( array(
+                $c1 = self::factory()->category->create( array(
                         'name' => 'Test Category 1',
                         'slug' => 'test1',
                 ) );
-                $c2 = self::$factory->category->create( array(
+                $c2 = self::factory()->category->create( array(
                         'name' => 'Test Category 2',
                         'slug' => 'test2',
                 ) );
-                $c3 = self::$factory->category->create( array(
+                $c3 = self::factory()->category->create( array(
                         'name' => 'Test Category 3',
                         'slug' => 'test3',
                 ) );
 
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
-                $p4 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
+                $p4 = self::factory()->post->create();
 
                 wp_set_object_terms( $p1, $c1, 'category' );
                 wp_set_object_terms( $p2, array( $c1, $c2 ), 'category' );
@@ -233 +233 @@
 
 
         public function test_tag_querystring_single_term() {
-                $t1 = self::$factory->tag->create_and_get( array(
+                $t1 = self::factory()->tag->create_and_get( array(
                         'name' => 'Test Tag 1',
                         'slug' => 'test1',
                 ) );
-                $t2 = self::$factory->tag->create_and_get( array(
+                $t2 = self::factory()->tag->create_and_get( array(
                         'name' => 'Test Tag 2',
                         'slug' => 'test2',
                 ) );
 
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
 
                 wp_set_object_terms( $p1, $t1->slug, 'post_tag' );
                 wp_set_object_terms( $p2, array( $t1->slug, $t2->slug ), 'post_tag' );
@@ -262 +262 @@
         }
 
         public function test_tag_querystring_multiple_terms_comma_separated() {
-                $c1 = self::$factory->tag->create_and_get( array(
+                $c1 = self::factory()->tag->create_and_get( array(
                         'name' => 'Test Tag 1',
                         'slug' => 'test1',
                 ) );
-                $c2 = self::$factory->tag->create_and_get( array(
+                $c2 = self::factory()->tag->create_and_get( array(
                         'name' => 'Test Tag 2',
                         'slug' => 'test2',
                 ) );
-                $c3 = self::$factory->tag->create_and_get( array(
+                $c3 = self::factory()->tag->create_and_get( array(
                         'name' => 'Test Tag 3',
                         'slug' => 'test3',
                 ) );
 
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
-                $p4 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
+                $p4 = self::factory()->post->create();
 
                 wp_set_object_terms( $p1, $c1->slug, 'post_tag' );
                 wp_set_object_terms( $p2, array( $c1->slug, $c2->slug ), 'post_tag' );
@@ -300 +300 @@
          * @ticket 33532
          */
         public function test_tag_querystring_multiple_terms_formatted_as_array() {
-                $c1 = self::$factory->tag->create_and_get( array(
+                $c1 = self::factory()->tag->create_and_get( array(
                         'name' => 'Test Tag 1',
                         'slug' => 'test1',
                 ) );
-                $c2 = self::$factory->tag->create_and_get( array(
+                $c2 = self::factory()->tag->create_and_get( array(
                         'name' => 'Test Tag 2',
                         'slug' => 'test2',
                 ) );
-                $c3 = self::$factory->tag->create_and_get( array(
+                $c3 = self::factory()->tag->create_and_get( array(
                         'name' => 'Test Tag 3',
                         'slug' => 'test3',
                 ) );
 
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
-                $p4 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
+                $p4 = self::factory()->post->create();
 
                 wp_set_object_terms( $p1, $c1->slug, 'post_tag' );
                 wp_set_object_terms( $p2, array( $c1->slug, $c2->slug ), 'post_tag' );
@@ -341 +341 @@
                 wp_insert_term( 'test2', 'test_tax_cat' );
                 wp_insert_term( 'test3', 'test_tax_cat' );
 
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
 
                 wp_set_object_terms( $p1, 'test1', 'test_tax_cat' );
                 wp_set_object_terms( $p2, array( 'test1', 'test2' ), 'test_tax_cat' );
@@ -365 +365 @@
                 wp_insert_term( 'test2', 'test_tax_cat' );
                 wp_insert_term( 'test3', 'test_tax_cat' );
 
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
-                $p4 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
+                $p4 = self::factory()->post->create();
 
                 wp_set_object_terms( $p1, 'test1', 'test_tax_cat' );
                 wp_set_object_terms( $p2, array( 'test1', 'test2' ), 'test_tax_cat' );
@@ -394 +394 @@
                 wp_insert_term( 'test2', 'test_tax_cat' );
                 wp_insert_term( 'test3', 'test_tax_cat' );
 
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
-                $p4 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
+                $p4 = self::factory()->post->create();
 
                 wp_set_object_terms( $p1, 'test1', 'test_tax_cat' );
                 wp_set_object_terms( $p2, array( 'test1', 'test2' ), 'test_tax_cat' );
@@ -417 +417 @@
          * @ticket 31355
          */
         public function test_pages_dont_404_when_queried_post_id_is_modified() {
-                $post_id = self::$factory->post->create( array( 'post_title' => 'A Test Page', 'post_type' => 'page' ) );
+                $post_id = self::factory()->post->create( array( 'post_title' => 'A Test Page', 'post_type' => 'page' ) );
 
                 add_action( 'parse_query', array( $this, 'filter_parse_query_to_modify_queried_post_id' ) );
 
@@ -438 +438 @@
 
                 register_post_type( 'guide', array( 'name' => 'Guide', 'public' => true, 'hierarchical' => true ) );
                 $wp_rewrite->flush_rules();
-                $post_id = self::$factory->post->create( array( 'post_title' => 'A Test Guide', 'post_type' => 'guide' ) );
+                $post_id = self::factory()->post->create( array( 'post_title' => 'A Test Guide', 'post_type' => 'guide' ) );
 
                 add_action( 'parse_query', array( $this, 'filter_parse_query_to_modify_queried_post_id' ) );
 

tests/phpunit/tests/query/conditionals.php

@@ -45 +45 @@
         }
 
         function test_permalink() {
-                $post_id = self::$factory->post->create( array( 'post_title' => 'hello-world' ) );
+                $post_id = self::factory()->post->create( array( 'post_title' => 'hello-world' ) );
                 $this->go_to( get_permalink( $post_id ) );
                 $this->assertQueryTrue('is_single', 'is_singular');
         }
 
         function test_post_comments_feed() {
-                $post_id = self::$factory->post->create( array( 'post_title' => 'hello-world' ) );
-                self::$factory->comment->create_post_comments( $post_id, 2 );
+                $post_id = self::factory()->post->create( array( 'post_title' => 'hello-world' ) );
+                self::factory()->comment->create_post_comments( $post_id, 2 );
                 $this->go_to( get_post_comments_feed_link( $post_id ) );
                 $this->assertQueryTrue('is_feed', 'is_single', 'is_singular', 'is_comment_feed');
         }
 
 
         function test_post_comments_feed_with_no_comments() {
-                $post_id = self::$factory->post->create( array( 'post_title' => 'hello-world' ) );
+                $post_id = self::factory()->post->create( array( 'post_title' => 'hello-world' ) );
                 $this->go_to( get_post_comments_feed_link( $post_id ) );
                 $this->assertQueryTrue('is_feed', 'is_single', 'is_singular', 'is_comment_feed');
         }
 
         function test_page() {
-                $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'about' ) );
+                $page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_title' => 'about' ) );
                 $this->go_to( get_permalink( $page_id ) );
                 $this->assertQueryTrue('is_page','is_singular');
         }
 
         function test_parent_page() {
-                $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
+                $page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
                 $this->go_to( get_permalink( $page_id ) );
 
                 $this->assertQueryTrue('is_page','is_singular');
         }
 
         function test_child_page_1() {
-                $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
-                $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-1', 'post_parent' => $page_id ) );
+                $page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
+                $page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-1', 'post_parent' => $page_id ) );
                 $this->go_to( get_permalink( $page_id ) );
 
                 $this->assertQueryTrue('is_page','is_singular');
         }
 
         function test_child_page_2() {
-                $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
-                $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-1', 'post_parent' => $page_id ) );
-                $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-2', 'post_parent' => $page_id ) );
+                $page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
+                $page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-1', 'post_parent' => $page_id ) );
+                $page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-2', 'post_parent' => $page_id ) );
                 $this->go_to( get_permalink( $page_id ) );
 
                 $this->assertQueryTrue('is_page','is_singular');
@@ -97 +97 @@
         // '(about)/trackback/?$' => 'index.php?pagename=$matches[1]&tb=1'
         function test_page_trackback() {
                 $page_ids = array();
-                $page_ids[] = $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
-                $page_ids[] = $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-1', 'post_parent' => $page_id ) );
-                $page_ids[] = $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-2', 'post_parent' => $page_id ) );
+                $page_ids[] = $page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
+                $page_ids[] = $page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-1', 'post_parent' => $page_id ) );
+                $page_ids[] = $page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-2', 'post_parent' => $page_id ) );
                 foreach ( $page_ids as $page_id ) {
                         $url = get_permalink( $page_id );
                         $this->go_to("{$url}trackback/");
@@ -116 +116 @@
         //'(about)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?pagename=$matches[1]&feed=$matches[2]'
         function test_page_feed() {
                 $page_ids = array();
-                $page_ids[] = $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
-                $page_ids[] = $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-1', 'post_parent' => $page_id ) );
-                $page_ids[] = $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-2', 'post_parent' => $page_id ) );
+                $page_ids[] = $page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
+                $page_ids[] = $page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-1', 'post_parent' => $page_id ) );
+                $page_ids[] = $page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-2', 'post_parent' => $page_id ) );
                 foreach ( $page_ids as $page_id ) {
-                        self::$factory->comment->create_post_comments( $page_id, 2 );
+                        self::factory()->comment->create_post_comments( $page_id, 2 );
                         $url = get_permalink( $page_id );
                         $this->go_to("{$url}feed/");
 
@@ -135 +135 @@
 
         function test_page_feed_with_no_comments() {
                 $page_ids = array();
-                $page_ids[] = $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
-                $page_ids[] = $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-1', 'post_parent' => $page_id ) );
-                $page_ids[] = $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-2', 'post_parent' => $page_id ) );
+                $page_ids[] = $page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
+                $page_ids[] = $page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-1', 'post_parent' => $page_id ) );
+                $page_ids[] = $page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-2', 'post_parent' => $page_id ) );
                 foreach ( $page_ids as $page_id ) {
                         $url = get_permalink( $page_id );
                         $this->go_to("{$url}feed/");
@@ -154 +154 @@
         // '(about)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?pagename=$matches[1]&feed=$matches[2]'
         function test_page_feed_atom() {
                 $page_ids = array();
-                $page_ids[] = $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
-                $page_ids[] = $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-1', 'post_parent' => $page_id ) );
-                $page_ids[] = $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-2', 'post_parent' => $page_id ) );
+                $page_ids[] = $page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_title' => 'parent-page' ) );
+                $page_ids[] = $page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-1', 'post_parent' => $page_id ) );
+                $page_ids[] = $page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_title' => 'child-page-2', 'post_parent' => $page_id ) );
                 foreach ( $page_ids as $page_id ) {
-                        self::$factory->comment->create_post_comments( $page_id, 2 );
+                        self::factory()->comment->create_post_comments( $page_id, 2 );
 
                         $url = get_permalink( $page_id );
                         $this->go_to("{$url}feed/atom/");
@@ -174 +174 @@
 
         // '(about)/page/?([0-9]{1,})/?$' => 'index.php?pagename=$matches[1]&paged=$matches[2]'
         function test_page_page_2() {
-                $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'about', 'post_content' => 'Page 1 <!--nextpage--> Page 2' ) );
+                $page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_title' => 'about', 'post_content' => 'Page 1 <!--nextpage--> Page 2' ) );
                 $this->go_to("/about/page/2/");
 
                 // make sure the correct wp_query flags are set
@@ -187 +187 @@
 
         // '(about)/page/?([0-9]{1,})/?$' => 'index.php?pagename=$matches[1]&paged=$matches[2]'
         function test_page_page_2_no_slash() {
-                $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'about', 'post_content' => 'Page 1 <!--nextpage--> Page 2' ) );
+                $page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_title' => 'about', 'post_content' => 'Page 1 <!--nextpage--> Page 2' ) );
                 $this->go_to("/about/page2/");
 
                 // make sure the correct wp_query flags are set
@@ -201 +201 @@
         // FIXME: what is this for?
         // '(about)(/[0-9]+)?/?$' => 'index.php?pagename=$matches[1]&page=$matches[2]'
         function test_pagination_of_posts_page() {
-                $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_title' => 'about', 'post_content' => 'Page 1 <!--nextpage--> Page 2' ) );
+                $page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_title' => 'about', 'post_content' => 'Page 1 <!--nextpage--> Page 2' ) );
                 update_option( 'show_on_front', 'page' );
                 update_option( 'page_for_posts', $page_id );
 
@@ -223 +223 @@
         // 'feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?&feed=$matches[1]',
         // '(feed|rdf|rss|rss2|atom)/?$' => 'index.php?&feed=$matches[1]',
         function test_main_feed_2() {
-                self::$factory->post->create(); // @test_404
+                self::factory()->post->create(); // @test_404
                 $feeds = array('feed', 'rdf', 'rss', 'rss2', 'atom');
 
                 // long version
@@ -241 +241 @@
         }
 
         function test_main_feed() {
-                self::$factory->post->create(); // @test_404
+                self::factory()->post->create(); // @test_404
                 $types = array('rss2', 'rss', 'atom');
                 foreach ($types as $type) {
                         $this->go_to(get_feed_link($type));
@@ -252 +252 @@
         // 'page/?([0-9]{1,})/?$' => 'index.php?&paged=$matches[1]',
         function test_paged() {
                 update_option( 'posts_per_page', 2 );
-                self::$factory->post->create_many( 5 );
+                self::factory()->post->create_many( 5 );
                 for ( $i = 2; $i <= 3; $i++ ) {
                         $this->go_to("/page/{$i}/");
                         $this->assertQueryTrue('is_home', 'is_paged');
@@ -262 +262 @@
         // 'comments/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?&feed=$matches[1]&withcomments=1',
         // 'comments/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?&feed=$matches[1]&withcomments=1',
         function test_main_comments_feed() {
-                $post_id = self::$factory->post->create( array( 'post_title' => 'hello-world' ) );
-                self::$factory->comment->create_post_comments( $post_id, 2 );
+                $post_id = self::factory()->post->create( array( 'post_title' => 'hello-world' ) );
+                self::factory()->comment->create_post_comments( $post_id, 2 );
 
                 // check the url as generated by get_post_comments_feed_link()
                 $this->go_to( get_post_comments_feed_link( $post_id ) );
@@ -306 +306 @@
         // 'search/(.+)/page/?([0-9]{1,})/?$' => 'index.php?s=$matches[1]&paged=$matches[2]',
         function test_search_paged() {
                 update_option( 'posts_per_page', 2 );
-                self::$factory->post->create_many( 3, array( 'post_title' => 'test' ) );
+                self::factory()->post->create_many( 3, array( 'post_title' => 'test' ) );
                 $this->go_to('/search/test/page/2/');
                 $this->assertQueryTrue('is_search', 'is_paged');
         }
@@ -328 +328 @@
         // 'category/(.+?)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?category_name=$matches[1]&feed=$matches[2]',
         // 'category/(.+?)/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?category_name=$matches[1]&feed=$matches[2]',
         function test_category_feed() {
-                self::$factory->term->create( array( 'name' => 'cat-a', 'taxonomy' => 'category' ) );
+                self::factory()->term->create( array( 'name' => 'cat-a', 'taxonomy' => 'category' ) );
                 // check the long form
                 $types = array('feed', 'rdf', 'rss', 'rss2', 'atom');
                 foreach ($types as $type) {
@@ -347 +347 @@
         // 'category/(.+?)/page/?([0-9]{1,})/?$' => 'index.php?category_name=$matches[1]&paged=$matches[2]',
         function test_category_paged() {
                 update_option( 'posts_per_page', 2 );
-                self::$factory->post->create_many( 3 );
+                self::factory()->post->create_many( 3 );
                 $this->go_to('/category/uncategorized/page/2/');
                 $this->assertQueryTrue('is_archive', 'is_category', 'is_paged');
         }
 
         // 'category/(.+?)/?$' => 'index.php?category_name=$matches[1]',
         function test_category() {
-                self::$factory->term->create( array( 'name' => 'cat-a', 'taxonomy' => 'category' ) );
+                self::factory()->term->create( array( 'name' => 'cat-a', 'taxonomy' => 'category' ) );
                 $this->go_to('/category/cat-a/');
                 $this->assertQueryTrue('is_archive', 'is_category');
         }
@@ -362 +362 @@
         // 'tag/(.+?)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?tag=$matches[1]&feed=$matches[2]',
         // 'tag/(.+?)/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?tag=$matches[1]&feed=$matches[2]',
         function test_tag_feed() {
-                self::$factory->term->create( array( 'name' => 'tag-a', 'taxonomy' => 'post_tag' ) );
+                self::factory()->term->create( array( 'name' => 'tag-a', 'taxonomy' => 'post_tag' ) );
                 // check the long form
                 $types = array('feed', 'rdf', 'rss', 'rss2', 'atom');
                 foreach ($types as $type) {
@@ -381 +381 @@
         // 'tag/(.+?)/page/?([0-9]{1,})/?$' => 'index.php?tag=$matches[1]&paged=$matches[2]',
         function test_tag_paged() {
                 update_option( 'posts_per_page', 2 );
-                $post_ids = self::$factory->post->create_many( 3 );
+                $post_ids = self::factory()->post->create_many( 3 );
                 foreach ( $post_ids as $post_id )
-                        self::$factory->term->add_post_terms( $post_id, 'tag-a', 'post_tag' );
+                        self::factory()->term->add_post_terms( $post_id, 'tag-a', 'post_tag' );
                 $this->go_to('/tag/tag-a/page/2/');
                 $this->assertQueryTrue('is_archive', 'is_tag', 'is_paged');
         }
 
         // 'tag/(.+?)/?$' => 'index.php?tag=$matches[1]',
         function test_tag() {
-                $term_id = self::$factory->term->create( array( 'name' => 'Tag Named A', 'slug' => 'tag-a', 'taxonomy' => 'post_tag' ) );
+                $term_id = self::factory()->term->create( array( 'name' => 'Tag Named A', 'slug' => 'tag-a', 'taxonomy' => 'post_tag' ) );
                 $this->go_to('/tag/tag-a/');
                 $this->assertQueryTrue('is_archive', 'is_tag');
 
@@ -409 +409 @@
         // 'author/([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?author_name=$matches[1]&feed=$matches[2]',
         // 'author/([^/]+)/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?author_name=$matches[1]&feed=$matches[2]',
         function test_author_feed() {
-                self::$factory->user->create( array( 'user_login' => 'user-a' ) );
+                self::factory()->user->create( array( 'user_login' => 'user-a' ) );
                 // check the long form
                 $types = array('feed', 'rdf', 'rss', 'rss2', 'atom');
                 foreach ($types as $type) {
@@ -428 +428 @@
         // 'author/([^/]+)/page/?([0-9]{1,})/?$' => 'index.php?author_name=$matches[1]&paged=$matches[2]',
         function test_author_paged() {
                 update_option( 'posts_per_page', 2 );
-                $user_id = self::$factory->user->create( array( 'user_login' => 'user-a' ) );
-                self::$factory->post->create_many( 3, array( 'post_author' => $user_id ) );
+                $user_id = self::factory()->user->create( array( 'user_login' => 'user-a' ) );
+                self::factory()->post->create_many( 3, array( 'post_author' => $user_id ) );
                 $this->go_to('/author/user-a/page/2/');
                 $this->assertQueryTrue('is_archive', 'is_author', 'is_paged');
         }
 
         // 'author/([^/]+)/?$' => 'index.php?author_name=$matches[1]',
         function test_author() {
-                $user_id = self::$factory->user->create( array( 'user_login' => 'user-a' ) );
-                self::$factory->post->create( array( 'post_author' => $user_id ) );
+                $user_id = self::factory()->user->create( array( 'user_login' => 'user-a' ) );
+                self::factory()->post->create( array( 'post_author' => $user_id ) );
                 $this->go_to('/author/user-a/');
                 $this->assertQueryTrue('is_archive', 'is_author');
         }
 
         function test_author_with_no_posts() {
-                $user_id = self::$factory->user->create( array( 'user_login' => 'user-a' ) );
+                $user_id = self::factory()->user->create( array( 'user_login' => 'user-a' ) );
                 $this->go_to('/author/user-a/');
                 $this->assertQueryTrue('is_archive', 'is_author');
         }
@@ -451 +451 @@
         // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]&feed=$matches[4]',
         // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]&feed=$matches[4]',
         function test_ymd_feed() {
-                self::$factory->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
+                self::factory()->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
                 // check the long form
                 $types = array('feed', 'rdf', 'rss', 'rss2', 'atom');
                 foreach ($types as $type) {
@@ -470 +470 @@
         // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/page/?([0-9]{1,})/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]&paged=$matches[4]',
         function test_ymd_paged() {
                 update_option( 'posts_per_page', 2 );
-                self::$factory->post->create_many( 3, array( 'post_date' => '2007-09-04 00:00:00' ) );
+                self::factory()->post->create_many( 3, array( 'post_date' => '2007-09-04 00:00:00' ) );
                 $this->go_to('/2007/09/04/page/2/');
                 $this->assertQueryTrue('is_archive', 'is_day', 'is_date', 'is_paged');
         }
 
         // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]',
         function test_ymd() {
-                self::$factory->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
+                self::factory()->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
                 $this->go_to('/2007/09/04/');
                 $this->assertQueryTrue('is_archive', 'is_day', 'is_date');
         }
@@ -485 +485 @@
         // '([0-9]{4})/([0-9]{1,2})/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&feed=$matches[3]',
         // '([0-9]{4})/([0-9]{1,2})/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&feed=$matches[3]',
         function test_ym_feed() {
-                self::$factory->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
+                self::factory()->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
                 // check the long form
                 $types = array('feed', 'rdf', 'rss', 'rss2', 'atom');
                 foreach ($types as $type) {
@@ -504 +504 @@
         // '([0-9]{4})/([0-9]{1,2})/page/?([0-9]{1,})/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&paged=$matches[3]',
         function test_ym_paged() {
                 update_option( 'posts_per_page', 2 );
-                self::$factory->post->create_many( 3, array( 'post_date' => '2007-09-04 00:00:00' ) );
+                self::factory()->post->create_many( 3, array( 'post_date' => '2007-09-04 00:00:00' ) );
                 $this->go_to('/2007/09/page/2/');
                 $this->assertQueryTrue('is_archive', 'is_date', 'is_month', 'is_paged');
         }
 
         // '([0-9]{4})/([0-9]{1,2})/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]',
         function test_ym() {
-                self::$factory->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
+                self::factory()->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
                 $this->go_to('/2007/09/');
                 $this->assertQueryTrue('is_archive', 'is_date', 'is_month');
         }
@@ -519 +519 @@
         // '([0-9]{4})/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&feed=$matches[2]',
         // '([0-9]{4})/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&feed=$matches[2]',
         function test_y_feed() {
-                self::$factory->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
+                self::factory()->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
                 // check the long form
                 $types = array('feed', 'rdf', 'rss', 'rss2', 'atom');
                 foreach ($types as $type) {
@@ -538 +538 @@
         // '([0-9]{4})/page/?([0-9]{1,})/?$' => 'index.php?year=$matches[1]&paged=$matches[2]',
         function test_y_paged() {
                 update_option( 'posts_per_page', 2 );
-                self::$factory->post->create_many( 3, array( 'post_date' => '2007-09-04 00:00:00' ) );
+                self::factory()->post->create_many( 3, array( 'post_date' => '2007-09-04 00:00:00' ) );
                 $this->go_to('/2007/page/2/');
                 $this->assertQueryTrue('is_archive', 'is_date', 'is_year', 'is_paged');
         }
 
         // '([0-9]{4})/?$' => 'index.php?year=$matches[1]',
         function test_y() {
-                self::$factory->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
+                self::factory()->post->create( array( 'post_date' => '2007-09-04 00:00:00' ) );
                 $this->go_to('/2007/');
                 $this->assertQueryTrue('is_archive', 'is_date', 'is_year');
         }
 
         // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/([^/]+)/trackback/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]&name=$matches[4]&tb=1',
         function test_post_trackback() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
                 $permalink = get_permalink( $post_id );
                 $this->go_to("{$permalink}trackback/");
                 $this->assertQueryTrue('is_single', 'is_singular', 'is_trackback');
@@ -561 +561 @@
         // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]&name=$matches[4]&feed=$matches[5]',
         // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/([^/]+)/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]&name=$matches[4]&feed=$matches[5]',
         function test_post_comment_feed() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
                 $permalink = get_permalink( $post_id );
 
                 $types = array('feed', 'rdf', 'rss', 'rss2', 'atom');
@@ -580 +580 @@
 
         // '([0-9]{4})/([0-9]{1,2})/([0-9]{1,2})/([^/]+)(/[0-9]+)?/?$' => 'index.php?year=$matches[1]&monthnum=$matches[2]&day=$matches[3]&name=$matches[4]&page=$matches[5]',
         function test_post_paged_short() {
-                $post_id = self::$factory->post->create( array(
+                $post_id = self::factory()->post->create( array(
                         'post_date' => '2007-09-04 00:00:00',
                         'post_title' => 'a-post-with-multiple-pages',
                         'post_content' => 'Page 1 <!--nextpage--> Page 2'
@@ -593 +593 @@
 
         // '[0-9]{4}/[0-9]{1,2}/[0-9]{1,2}/[^/]+/([^/]+)/?$' => 'index.php?attachment=$matches[1]',
         function test_post_attachment() {
-                $post_id = self::$factory->post->create( array( 'post_type' => 'attachment' ) );
+                $post_id = self::factory()->post->create( array( 'post_type' => 'attachment' ) );
                 $permalink = get_attachment_link( $post_id );
                 $this->go_to($permalink);
                 $this->assertQueryTrue('is_single', 'is_attachment', 'is_singular');
@@ -629 +629 @@
                         'public' => true
                 ) );
 
-                $tag_id = self::$factory->tag->create( array( 'slug' => 'tag-slug' ) );
-                $post_id = self::$factory->post->create( array( 'post_type' => $cpt_name ) );
+                $tag_id = self::factory()->tag->create( array( 'slug' => 'tag-slug' ) );
+                $post_id = self::factory()->post->create( array( 'post_type' => $cpt_name ) );
                 wp_set_object_terms( $post_id, $tag_id, 'post_tag' );
 
                 $this->go_to( '/ptawtq/' );
@@ -663 +663 @@
                         'has_archive' => true,
                         'public' => true
                 ) );
-                self::$factory->post->create( array( 'post_type' => $cpt_name ) );
+                self::factory()->post->create( array( 'post_type' => $cpt_name ) );
 
                 $this->go_to( "/$cpt_name/" );
                 $this->assertQueryTrue( 'is_post_type_archive', 'is_archive' );
@@ -683 +683 @@
         }
 
         function test_is_single() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
                 $this->go_to( "/?p=$post_id" );
 
                 $post = get_queried_object();
@@ -714 +714 @@
                 ) );
 
                 // Create parent and child posts
-                $parent_id = self::$factory->post->create( array(
+                $parent_id = self::factory()->post->create( array(
                         'post_type' => $post_type,
                         'post_name' => 'foo'
                 ) );
 
-                $post_id = self::$factory->post->create( array(
+                $post_id = self::factory()->post->create( array(
                         'post_type'   => $post_type,
                         'post_name'   => 'bar',
                         'post_parent' => $parent_id
@@ -750 +750 @@
          * @ticket 24674
          */
         public function test_is_single_with_slug_that_begins_with_a_number_that_clashes_with_another_post_id() {
-                $p1 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
 
                 $p2_name = $p1 . '-post';
-                $p2 = self::$factory->post->create( array(
+                $p2 = self::factory()->post->create( array(
                         'slug' => $p2_name,
                 ) );
 
@@ -768 +768 @@
         }
 
         function test_is_page() {
-                $post_id = self::$factory->post->create( array( 'post_type' => 'page' ) );
+                $post_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
                 $this->go_to( "/?page_id=$post_id" );
 
                 $post = get_queried_object();
@@ -788 +788 @@
          * @ticket 16802
          */
         function test_is_page_with_parent() {
-                $parent_id = self::$factory->post->create( array(
+                $parent_id = self::factory()->post->create( array(
                         'post_type' => 'page',
                         'post_name' => 'foo',
                 ) );
-                $post_id = self::$factory->post->create( array(
+                $post_id = self::factory()->post->create( array(
                         'post_type'   => 'page',
                         'post_name'   => 'bar',
                         'post_parent' => $parent_id,
@@ -818 +818 @@
         }
 
         function test_is_attachment() {
-                $post_id = self::$factory->post->create( array( 'post_type' => 'attachment' ) );
+                $post_id = self::factory()->post->create( array( 'post_type' => 'attachment' ) );
                 $this->go_to( "/?attachment_id=$post_id" );
 
                 $post = get_queried_object();
@@ -839 +839 @@
          * @ticket 24674
          */
         public function test_is_attachment_with_slug_that_begins_with_a_number_that_clashes_with_a_page_ID() {
-                $p1 = self::$factory->post->create( array( 'post_type' => 'attachment' ) );
+                $p1 = self::factory()->post->create( array( 'post_type' => 'attachment' ) );
 
                 $p2_name = $p1 . '-attachment';
-                $p2 = self::$factory->post->create( array(
+                $p2 = self::factory()->post->create( array(
                         'post_type' => 'attachment',
                         'post_name' => $p2_name,
                 ) );
@@ -861 +861 @@
          * @ticket 24674
          */
         public function test_is_author_with_nicename_that_begins_with_a_number_that_clashes_with_another_author_id() {
-                $u1 = self::$factory->user->create();
+                $u1 = self::factory()->user->create();
 
                 $u2_name = $u1 . '_user';
-                $u2 = self::$factory->user->create( array(
+                $u2 = self::factory()->user->create( array(
                         'user_nicename' => $u2_name,
                 ) );
 
@@ -882 +882 @@
          * @ticket 24674
          */
         public function test_is_category_with_slug_that_begins_with_a_number_that_clashes_with_another_category_id() {
-                $c1 = self::$factory->category->create();
+                $c1 = self::factory()->category->create();
 
                 $c2_name = $c1 . '-category';
-                $c2 = self::$factory->category->create( array(
+                $c2 = self::factory()->category->create( array(
                         'slug' => $c2_name,
                 ) );
 
@@ -903 +903 @@
          * @ticket 24674
          */
         public function test_is_tag_with_slug_that_begins_with_a_number_that_clashes_with_another_tag_id() {
-                $t1 = self::$factory->tag->create();
+                $t1 = self::factory()->tag->create();
 
                 $t2_name = $t1 . '-tag';
-                $t2 = self::$factory->tag->create( array(
+                $t2 = self::factory()->tag->create( array(
                         'slug' => $t2_name,
                 ) );
 
@@ -924 +924 @@
          * @ticket 24674
          */
         public function test_is_page_with_page_id_zero_and_random_page_slug() {
-                $post_id = self::$factory->post->create( array( 'post_type' => 'page' ) );
+                $post_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
                 $this->go_to( "/?page_id=$post_id" );
 
                 // override post ID to 0 temporarily for testing
@@ -946 +946 @@
          * @ticket 24674
          */
         public function test_is_page_with_page_slug_that_begins_with_a_number_that_clashes_with_a_page_ID() {
-                $p1 = self::$factory->post->create( array( 'post_type' => 'page' ) );
+                $p1 = self::factory()->post->create( array( 'post_type' => 'page' ) );
 
                 $p2_name = $p1 . '-page';
-                $p2 = self::$factory->post->create( array(
+                $p2 = self::factory()->post->create( array(
                         'post_type' => 'page',
                         'post_name' => $p2_name,
                 ) );
@@ -965 +965 @@
         }
 
         function test_is_page_template() {
-                $post_id = self::$factory->post->create( array( 'post_type' => 'page' ) );
+                $post_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
                 update_post_meta($post_id, '_wp_page_template', 'example.php');
                 $this->go_to( "/?page_id=$post_id" );
                 $this->assertTrue( is_page_template( 'example.php' ) );
@@ -975 +975 @@
          * @ticket 31271
          */
         function test_is_page_template_default() {
-                $post_id = self::$factory->post->create( array( 'post_type' => 'page' ) );
+                $post_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
                 $this->go_to( "/?page_id=$post_id" );
                 $this->assertTrue( is_page_template( 'default' ) );
                 $this->assertTrue( is_page_template( array( 'random', 'default' ) ) );
@@ -985 +985 @@
          * @ticket 31271
          */
         function test_is_page_template_array() {
-                $post_id = self::$factory->post->create( array( 'post_type' => 'page' ) );
+                $post_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
                 update_post_meta($post_id, '_wp_page_template', 'example.php');
                 $this->go_to( "/?page_id=$post_id" );
                 $this->assertFalse( is_page_template( array( 'test.php' ) ) );

tests/phpunit/tests/query/dateQuery.php

@@ -33 +33 @@
         }
 
         public function test_date_query_before_array() {
-                $p1 = self::$factory->post->create( array( 'post_date' => '2007-09-24 07:17:23',) );
-                $p2 = self::$factory->post->create( array( 'post_date' => '2008-03-29 07:17:23',) );
-                $p3 = self::$factory->post->create( array( 'post_date' => '2008-07-15 07:17:23',) );
-                $p4 = self::$factory->post->create( array( 'post_date' => '2009-06-11 07:17:23',) );
+                $p1 = self::factory()->post->create( array( 'post_date' => '2007-09-24 07:17:23',) );
+                $p2 = self::factory()->post->create( array( 'post_date' => '2008-03-29 07:17:23',) );
+                $p3 = self::factory()->post->create( array( 'post_date' => '2008-07-15 07:17:23',) );
+                $p4 = self::factory()->post->create( array( 'post_date' => '2009-06-11 07:17:23',) );
 
                 $posts = $this->_get_query_result( array(
                         'date_query' => array(
@@ -57 +57 @@
          * their minimum values when being used with "before".
          */
         public function test_date_query_before_array_test_defaulting() {
-                $p1 = self::$factory->post->create( array( 'post_date' => '2007-09-24 07:17:23',) );
-                $p2 = self::$factory->post->create( array( 'post_date' => '2008-03-29 07:17:23',) );
+                $p1 = self::factory()->post->create( array( 'post_date' => '2007-09-24 07:17:23',) );
+                $p2 = self::factory()->post->create( array( 'post_date' => '2008-03-29 07:17:23',) );
 
                 $posts = $this->_get_query_result( array(
                         'date_query' => array(
@@ -74 +74 @@
         }
 
         public function test_date_query_before_string() {
-                $p1 = self::$factory->post->create( array( 'post_date' => '2007-09-24 07:17:23',) );
-                $p2 = self::$factory->post->create( array( 'post_date' => '2008-03-29 07:17:23',) );
-                $p3 = self::$factory->post->create( array( 'post_date' => '2008-07-15 07:17:23',) );
-                $p4 = self::$factory->post->create( array( 'post_date' => '2009-06-11 07:17:23',) );
+                $p1 = self::factory()->post->create( array( 'post_date' => '2007-09-24 07:17:23',) );
+                $p2 = self::factory()->post->create( array( 'post_date' => '2008-03-29 07:17:23',) );
+                $p3 = self::factory()->post->create( array( 'post_date' => '2008-07-15 07:17:23',) );
+                $p4 = self::factory()->post->create( array( 'post_date' => '2009-06-11 07:17:23',) );
 
                 $posts = $this->_get_query_result( array(
                         'date_query' => array(
@@ -91 +91 @@
         }
 
         public function test_date_query_after_array() {
-                $p1 = self::$factory->post->create( array( 'post_date' => '2009-10-18 10:42:29', ) );
-                $p2 = self::$factory->post->create( array( 'post_date' => '2009-12-18 10:42:29', ) );
-                $p3 = self::$factory->post->create( array( 'post_date' => '2010-06-11 07:17:23', ) );
+                $p1 = self::factory()->post->create( array( 'post_date' => '2009-10-18 10:42:29', ) );
+                $p2 = self::factory()->post->create( array( 'post_date' => '2009-12-18 10:42:29', ) );
+                $p3 = self::factory()->post->create( array( 'post_date' => '2010-06-11 07:17:23', ) );
 
                 $posts = $this->_get_query_result( array(
                         'date_query' => array(
@@ -115 +115 @@
          * their maximum values when being used with "after".
          */
         public function test_date_query_after_array_test_defaulting() {
-                $p1 = self::$factory->post->create( array( 'post_date' => '2008-12-18 10:42:29', ) );
-                $p2 = self::$factory->post->create( array( 'post_date' => '2009-01-18 10:42:29', ) );
+                $p1 = self::factory()->post->create( array( 'post_date' => '2008-12-18 10:42:29', ) );
+                $p2 = self::factory()->post->create( array( 'post_date' => '2009-01-18 10:42:29', ) );
 
                 $posts = $this->_get_query_result( array(
                         'date_query' => array(
@@ -132 +132 @@
         }
 
         public function test_date_query_after_string() {
-                $p1 = self::$factory->post->create( array( 'post_date' => '2009-12-18 09:42:29', ) );
-                $p2 = self::$factory->post->create( array( 'post_date' => '2009-12-18 10:42:29', ) );
-                $p3 = self::$factory->post->create( array( 'post_date' => '2009-12-19 10:42:29', ) );
+                $p1 = self::factory()->post->create( array( 'post_date' => '2009-12-18 09:42:29', ) );
+                $p2 = self::factory()->post->create( array( 'post_date' => '2009-12-18 10:42:29', ) );
+                $p3 = self::factory()->post->create( array( 'post_date' => '2009-12-19 10:42:29', ) );
 
                 $posts = $this->_get_query_result( array(
                         'date_query' => array(
@@ -148 +148 @@
         }
 
         public function test_date_query_after_string_inclusive() {
-                $p1 = self::$factory->post->create( array( 'post_date' => '2009-12-18 09:42:29', ) );
-                $p2 = self::$factory->post->create( array( 'post_date' => '2009-12-18 10:42:29', ) );
-                $p3 = self::$factory->post->create( array( 'post_date' => '2009-12-19 10:42:29', ) );
+                $p1 = self::factory()->post->create( array( 'post_date' => '2009-12-18 09:42:29', ) );
+                $p2 = self::factory()->post->create( array( 'post_date' => '2009-12-18 10:42:29', ) );
+                $p3 = self::factory()->post->create( array( 'post_date' => '2009-12-19 10:42:29', ) );
 
                 $posts = $this->_get_query_result( array(
                         'date_query' => array(
@@ -168 +168 @@
          * @ticket 26653
          */
         public function test_date_query_inclusive_between_dates() {
-                $p1 = self::$factory->post->create( array( 'post_date' => '2006-12-18 09:42:29', ) );
-                $p2 = self::$factory->post->create( array( 'post_date' => '2007-01-18 10:42:29', ) );
-                $p3 = self::$factory->post->create( array( 'post_date' => '2007-12-19 10:42:29', ) );
-                $p4 = self::$factory->post->create( array( 'post_date' => '2008-12-19 10:42:29', ) );
-                $p5 = self::$factory->post->create( array( 'post_date' => '2009-12-19 10:42:29', ) );
+                $p1 = self::factory()->post->create( array( 'post_date' => '2006-12-18 09:42:29', ) );
+                $p2 = self::factory()->post->create( array( 'post_date' => '2007-01-18 10:42:29', ) );
+                $p3 = self::factory()->post->create( array( 'post_date' => '2007-12-19 10:42:29', ) );
+                $p4 = self::factory()->post->create( array( 'post_date' => '2008-12-19 10:42:29', ) );
+                $p5 = self::factory()->post->create( array( 'post_date' => '2009-12-19 10:42:29', ) );
 
                 $posts = $this->_get_query_result( array(
                         'date_query' => array(
@@ -195 +195 @@
          * @ticket 29908
          */
         public function test_beforeafter_with_date_string_Y() {
-                $p1 = self::$factory->post->create( array(
+                $p1 = self::factory()->post->create( array(
                         'post_date' => '2008-05-06 13:00:00',
                 ) );
-                $p2 = self::$factory->post->create( array(
+                $p2 = self::factory()->post->create( array(
                         'post_date' => '2007-05-07 13:00:00',
                 ) );
 
@@ -228 +228 @@
          * @ticket 29908
          */
         public function test_beforeafter_with_date_string_Y_inclusive() {
-                $p1 = self::$factory->post->create( array(
+                $p1 = self::factory()->post->create( array(
                         'post_date' => '2008-05-06 13:00:00',
                 ) );
-                $p2 = self::$factory->post->create( array(
+                $p2 = self::factory()->post->create( array(
                         'post_date' => '2007-05-07 13:00:00',
                 ) );
 
@@ -263 +263 @@
          * @ticket 29908
          */
         public function test_beforeafter_with_date_string_Ym() {
-                $p1 = self::$factory->post->create( array(
+                $p1 = self::factory()->post->create( array(
                         'post_date' => '2008-05-06 13:00:00',
                 ) );
-                $p2 = self::$factory->post->create( array(
+                $p2 = self::factory()->post->create( array(
                         'post_date' => '2008-04-07 13:00:00',
                 ) );
 
@@ -296 +296 @@
          * @ticket 29908
          */
         public function test_beforeafter_with_date_string_Ym_inclusive() {
-                $p1 = self::$factory->post->create( array(
+                $p1 = self::factory()->post->create( array(
                         'post_date' => '2008-05-06 13:00:00',
                 ) );
-                $p2 = self::$factory->post->create( array(
+                $p2 = self::factory()->post->create( array(
                         'post_date' => '2008-04-07 13:00:00',
                 ) );
 
@@ -331 +331 @@
          * @ticket 29908
          */
         public function test_beforeafter_with_date_string_Ymd() {
-                $p1 = self::$factory->post->create( array(
+                $p1 = self::factory()->post->create( array(
                         'post_date' => '2008-05-06 13:00:00',
                 ) );
-                $p2 = self::$factory->post->create( array(
+                $p2 = self::factory()->post->create( array(
                         'post_date' => '2008-05-05 13:00:00',
                 ) );
 
@@ -364 +364 @@
          * @ticket 29908
          */
         public function test_beforeafter_with_date_string_Ymd_inclusive() {
-                $p1 = self::$factory->post->create( array(
+                $p1 = self::factory()->post->create( array(
                         'post_date' => '2008-05-06 13:00:00',
                 ) );
-                $p2 = self::$factory->post->create( array(
+                $p2 = self::factory()->post->create( array(
                         'post_date' => '2008-05-05 13:00:00',
                 ) );
 
@@ -399 +399 @@
          * @ticket 29908
          */
         public function test_beforeafter_with_date_string_YmdHi() {
-                $p1 = self::$factory->post->create( array(
+                $p1 = self::factory()->post->create( array(
                         'post_date' => '2008-05-06 14:05:00',
                 ) );
-                $p2 = self::$factory->post->create( array(
+                $p2 = self::factory()->post->create( array(
                         'post_date' => '2008-05-06 14:04:00',
                 ) );
 
@@ -432 +432 @@
          * @ticket 29908
          */
         public function test_beforeafter_with_date_string_YmdHi_inclusive() {
-                $p1 = self::$factory->post->create( array(
+                $p1 = self::factory()->post->create( array(
                         'post_date' => '2008-05-06 14:05:00',
                 ) );
-                $p2 = self::$factory->post->create( array(
+                $p2 = self::factory()->post->create( array(
                         'post_date' => '2008-05-06 14:04:00',
                 ) );
 
@@ -467 +467 @@
          * @ticket 29908
          */
         public function test_beforeafter_with_date_string_YmdHis() {
-                $p1 = self::$factory->post->create( array(
+                $p1 = self::factory()->post->create( array(
                         'post_date' => '2008-05-06 14:05:15',
                 ) );
-                $p2 = self::$factory->post->create( array(
+                $p2 = self::factory()->post->create( array(
                         'post_date' => '2008-05-06 14:05:14',
                 ) );
 
@@ -500 +500 @@
          * @ticket 29908
          */
         public function test_beforeafter_with_date_string_YmdHis_inclusive() {
-                $p1 = self::$factory->post->create( array(
+                $p1 = self::factory()->post->create( array(
                         'post_date' => '2008-05-06 14:04:15',
                 ) );
-                $p2 = self::$factory->post->create( array(
+                $p2 = self::factory()->post->create( array(
                         'post_date' => '2008-05-06 14:04:14',
                 ) );
 
@@ -535 +535 @@
          * @ticket 29908
          */
         public function test_beforeafter_with_date_string_non_parseable() {
-                $p1 = self::$factory->post->create( array(
+                $p1 = self::factory()->post->create( array(
                         'post_date' => '2008-05-06 14:05:15',
                 ) );
-                $p2 = self::$factory->post->create( array(
+                $p2 = self::factory()->post->create( array(
                         'post_date' => '2008-05-06 14:05:14',
                 ) );
 
@@ -564 +564 @@
         }
 
         public function test_date_query_year() {
-                $p1 = self::$factory->post->create( array( 'post_date' => '2009-12-19 10:42:29', ) );
-                $p2 = self::$factory->post->create( array( 'post_date' => '2010-12-19 10:42:29', ) );
+                $p1 = self::factory()->post->create( array( 'post_date' => '2009-12-19 10:42:29', ) );
+                $p2 = self::factory()->post->create( array( 'post_date' => '2010-12-19 10:42:29', ) );
                 $posts = $this->_get_query_result( array(
                         'date_query' => array(
                                 array(
@@ -578 +578 @@
         }
 
         public function test_date_query_month() {
-                $p1 = self::$factory->post->create( array( 'post_date' => '2009-12-19 10:42:29', ) );
-                $p2 = self::$factory->post->create( array( 'post_date' => '2010-11-19 10:42:29', ) );
+                $p1 = self::factory()->post->create( array( 'post_date' => '2009-12-19 10:42:29', ) );
+                $p2 = self::factory()->post->create( array( 'post_date' => '2010-11-19 10:42:29', ) );
                 $posts = $this->_get_query_result( array(
                         'date_query' => array(
                                 array(
@@ -592 +592 @@
         }
 
         public function test_date_query_week() {
-                $p1 = self::$factory->post->create( array( 'post_date' => '2009-01-02 10:42:29', ) );
-                $p2 = self::$factory->post->create( array( 'post_date' => '2010-03-19 10:42:29', ) );
+                $p1 = self::factory()->post->create( array( 'post_date' => '2009-01-02 10:42:29', ) );
+                $p2 = self::factory()->post->create( array( 'post_date' => '2010-03-19 10:42:29', ) );
                 $posts = $this->_get_query_result( array(
                         'date_query' => array(
                                 array(
@@ -606 +606 @@
         }
 
         public function test_date_query_day() {
-                $p1 = self::$factory->post->create( array( 'post_date' => '2009-01-17 10:42:29', ) );
-                $p2 = self::$factory->post->create( array( 'post_date' => '2009-01-18 10:42:29', ) );
+                $p1 = self::factory()->post->create( array( 'post_date' => '2009-01-17 10:42:29', ) );
+                $p2 = self::factory()->post->create( array( 'post_date' => '2009-01-18 10:42:29', ) );
 
                 $posts = $this->_get_query_result( array(
                         'date_query' => array(
@@ -621 +621 @@
         }
 
         public function test_date_query_dayofweek() {
-                $p1 = self::$factory->post->create( array( 'post_date' => '2014-10-21 10:42:29', ) );
-                $p2 = self::$factory->post->create( array( 'post_date' => '2014-10-20 10:42:29', ) );
+                $p1 = self::factory()->post->create( array( 'post_date' => '2014-10-21 10:42:29', ) );
+                $p2 = self::factory()->post->create( array( 'post_date' => '2014-10-20 10:42:29', ) );
 
                 $posts = $this->_get_query_result( array(
                         'date_query' => array(
@@ -639 +639 @@
          * @ticket 28063
          */
         public function test_date_query_dayofweek_iso() {
-                $p1 = self::$factory->post->create( array( 'post_date' => '2014-10-31 10:42:29', ) );
-                $p2 = self::$factory->post->create( array( 'post_date' => '2014-10-30 10:42:29', ) );
+                $p1 = self::factory()->post->create( array( 'post_date' => '2014-10-31 10:42:29', ) );
+                $p2 = self::factory()->post->create( array( 'post_date' => '2014-10-30 10:42:29', ) );
 
                 $posts = $this->_get_query_result( array(
                         'date_query' => array(
@@ -654 +654 @@
         }
 
         public function test_date_query_hour() {
-                $p1 = self::$factory->post->create( array( 'post_date' => '2014-10-21 13:42:29', ) );
-                $p2 = self::$factory->post->create( array( 'post_date' => '2014-10-21 12:42:29', ) );
+                $p1 = self::factory()->post->create( array( 'post_date' => '2014-10-21 13:42:29', ) );
+                $p2 = self::factory()->post->create( array( 'post_date' => '2014-10-21 12:42:29', ) );
 
                 $posts = $this->_get_query_result( array(
                         'date_query' => array(
@@ -673 +673 @@
          */
         public function test_date_query_hour_should_not_ignore_0() {
                 return;
-                $p1 = self::$factory->post->create( array( 'post_date' => '2014-10-21 00:42:29', ) );
-                $p2 = self::$factory->post->create( array( 'post_date' => '2014-10-21 01:42:29', ) );
+                $p1 = self::factory()->post->create( array( 'post_date' => '2014-10-21 00:42:29', ) );
+                $p2 = self::factory()->post->create( array( 'post_date' => '2014-10-21 01:42:29', ) );
 
                 $posts = $this->_get_query_result( array(
                         'year' => 2014,
@@ -688 +688 @@
         }
 
         public function test_date_query_minute() {
-                $p1 = self::$factory->post->create( array( 'post_date' => '2014-10-21 10:56:29', ) );
-                $p2 = self::$factory->post->create( array( 'post_date' => '2014-10-21 10:42:29', ) );
+                $p1 = self::factory()->post->create( array( 'post_date' => '2014-10-21 10:56:29', ) );
+                $p2 = self::factory()->post->create( array( 'post_date' => '2014-10-21 10:42:29', ) );
 
                 $posts = $this->_get_query_result( array(
                         'date_query' => array(
@@ -703 +703 @@
         }
 
         public function test_date_query_second() {
-                $p1 = self::$factory->post->create( array( 'post_date' => '2014-10-21 10:42:21', ) );
-                $p2 = self::$factory->post->create( array( 'post_date' => '2014-10-21 10:42:29', ) );
+                $p1 = self::factory()->post->create( array( 'post_date' => '2014-10-21 10:42:21', ) );
+                $p2 = self::factory()->post->create( array( 'post_date' => '2014-10-21 10:42:29', ) );
 
                 $posts = $this->_get_query_result( array(
                         'date_query' => array(
@@ -718 +718 @@
         }
 
         public function test_date_query_between_two_times() {
-                $p1 = self::$factory->post->create( array( 'post_date' => '2005-12-18 08:42:29', ) );
-                $p2 = self::$factory->post->create( array( 'post_date' => '2006-12-18 09:00:29', ) );
-                $p3 = self::$factory->post->create( array( 'post_date' => '2007-12-18 10:42:29', ) );
-                $p4 = self::$factory->post->create( array( 'post_date' => '2008-12-18 17:00:29', ) );
-                $p5 = self::$factory->post->create( array( 'post_date' => '2009-12-18 18:42:29', ) );
+                $p1 = self::factory()->post->create( array( 'post_date' => '2005-12-18 08:42:29', ) );
+                $p2 = self::factory()->post->create( array( 'post_date' => '2006-12-18 09:00:29', ) );
+                $p3 = self::factory()->post->create( array( 'post_date' => '2007-12-18 10:42:29', ) );
+                $p4 = self::factory()->post->create( array( 'post_date' => '2008-12-18 17:00:29', ) );
+                $p5 = self::factory()->post->create( array( 'post_date' => '2009-12-18 18:42:29', ) );
 
                 $posts = $this->_get_query_result( array(
                         'date_query' => array(
@@ -743 +743 @@
         }
 
         public function test_date_query_relation_or() {
-                $p1 = self::$factory->post->create( array( 'post_date' => '2006-12-18 14:42:29', ) );
-                $p2 = self::$factory->post->create( array( 'post_date' => '2007-01-18 10:42:29', ) );
-                $p3 = self::$factory->post->create( array( 'post_date' => '2007-12-19 10:34:29', ) );
+                $p1 = self::factory()->post->create( array( 'post_date' => '2006-12-18 14:42:29', ) );
+                $p2 = self::factory()->post->create( array( 'post_date' => '2007-01-18 10:42:29', ) );
+                $p3 = self::factory()->post->create( array( 'post_date' => '2007-12-19 10:34:29', ) );
 
                 $posts = $this->_get_query_result( array(
                         'date_query' => array(
@@ -763 +763 @@
         }
 
         public function test_date_query_compare_greater_than_or_equal_to() {
-                $p1 = self::$factory->post->create( array( 'post_date' => '2006-12-18 13:42:29', ) );
-                $p2 = self::$factory->post->create( array( 'post_date' => '2007-01-18 14:34:29', ) );
-                $p3 = self::$factory->post->create( array( 'post_date' => '2007-12-19 14:37:29', ) );
-                $p4 = self::$factory->post->create( array( 'post_date' => '2007-12-19 15:34:29', ) );
+                $p1 = self::factory()->post->create( array( 'post_date' => '2006-12-18 13:42:29', ) );
+                $p2 = self::factory()->post->create( array( 'post_date' => '2007-01-18 14:34:29', ) );
+                $p3 = self::factory()->post->create( array( 'post_date' => '2007-12-19 14:37:29', ) );
+                $p4 = self::factory()->post->create( array( 'post_date' => '2007-12-19 15:34:29', ) );
 
                 $posts = $this->_get_query_result( array(
                         'date_query' => array(
@@ -784 +784 @@
         public function test_date_params_monthnum_m_duplicate() {
                 global $wpdb;
 
-                $p1 = self::$factory->post->create( array( 'post_date' => '2006-05-18 13:42:29', ) );
-                $p2 = self::$factory->post->create( array( 'post_date' => '2007-09-18 14:34:29', ) );
-                $p3 = self::$factory->post->create( array( 'post_date' => '2007-01-18 14:34:29', ) );
+                $p1 = self::factory()->post->create( array( 'post_date' => '2006-05-18 13:42:29', ) );
+                $p2 = self::factory()->post->create( array( 'post_date' => '2007-09-18 14:34:29', ) );
+                $p3 = self::factory()->post->create( array( 'post_date' => '2007-01-18 14:34:29', ) );
 
                 $posts = $this->_get_query_result( array(
                         'date_query' => array(
@@ -804 +804 @@
         public function test_date_params_week_w_duplicate() {
                 global $wpdb;
 
-                $p1 = self::$factory->post->create( array( 'post_date' => '2014-10-01 13:42:29', ) );
-                $p2 = self::$factory->post->create( array( 'post_date' => '2014-10-22 14:34:29', ) );
-                $p3 = self::$factory->post->create( array( 'post_date' => '2014-10-15 14:34:29', ) );
+                $p1 = self::factory()->post->create( array( 'post_date' => '2014-10-01 13:42:29', ) );
+                $p2 = self::factory()->post->create( array( 'post_date' => '2014-10-22 14:34:29', ) );
+                $p3 = self::factory()->post->create( array( 'post_date' => '2014-10-15 14:34:29', ) );
 
                 $posts = $this->_get_query_result( array(
                         'date_query' => array(
@@ -825 +825 @@
          * @ticket 25775
          */
         public function test_date_query_with_taxonomy_join() {
-                $p1 = self::$factory->post->create( array(
+                $p1 = self::factory()->post->create( array(
                         'post_date' => '2013-04-27 01:01:01',
                 ) );
-                $p2 = self::$factory->post->create( array(
+                $p2 = self::factory()->post->create( array(
                         'post_date' => '2013-03-21 01:01:01',
                 ) );
 
@@ -857 +857 @@
          * @ticket 29822
          */
         public function test_date_query_one_nested_query() {
-                $p1 = self::$factory->post->create( array( 'post_date' => '2004-10-01 13:42:29', ) );
-                $p2 = self::$factory->post->create( array( 'post_date' => '2004-01-22 14:34:29', ) );
-                $p3 = self::$factory->post->create( array( 'post_date' => '1984-10-15 14:34:29', ) );
-                $p4 = self::$factory->post->create( array( 'post_date' => '1985-10-15 14:34:29', ) );
+                $p1 = self::factory()->post->create( array( 'post_date' => '2004-10-01 13:42:29', ) );
+                $p2 = self::factory()->post->create( array( 'post_date' => '2004-01-22 14:34:29', ) );
+                $p3 = self::factory()->post->create( array( 'post_date' => '1984-10-15 14:34:29', ) );
+                $p4 = self::factory()->post->create( array( 'post_date' => '1985-10-15 14:34:29', ) );
                 $posts = $this->_get_query_result( array(
                         'date_query' => array(
                                 'relation' => 'OR',
@@ -886 +886 @@
          * @ticket 29822
          */
         public function test_date_query_one_nested_query_multiple_columns_relation_and() {
-                $p1 = self::$factory->post->create( array(
+                $p1 = self::factory()->post->create( array(
                         'post_date' => '2012-03-05 15:30:55',
                 ) );
                 $this->update_post_modified( $p1, '2014-11-03 14:43:00' );
 
-                $p2 = self::$factory->post->create( array(
+                $p2 = self::factory()->post->create( array(
                         'post_date' => '2012-05-05 15:30:55',
                 ) );
                 $this->update_post_modified( $p2, '2014-10-03 14:43:00' );
 
-                $p3 = self::$factory->post->create( array(
+                $p3 = self::factory()->post->create( array(
                         'post_date' => '2013-05-05 15:30:55',
                 ) );
                 $this->update_post_modified( $p3, '2014-10-03 14:43:00' );
 
-                $p4 = self::$factory->post->create( array(
+                $p4 = self::factory()->post->create( array(
                         'post_date' => '2012-02-05 15:30:55',
                 ) );
                 $this->update_post_modified( $p4, '2012-12-03 14:43:00' );
@@ -937 +937 @@
          * @ticket 29822
          */
         public function test_date_query_nested_query_multiple_columns_mixed_relations() {
-                $p1 = self::$factory->post->create( array(
+                $p1 = self::factory()->post->create( array(
                         'post_date' => '2012-03-05 15:30:55',
                 ) );
                 $this->update_post_modified( $p1, '2014-11-03 14:43:00' );
 
-                $p2 = self::$factory->post->create( array(
+                $p2 = self::factory()->post->create( array(
                         'post_date' => '2012-05-05 15:30:55',
                 ) );
                 $this->update_post_modified( $p2, '2014-10-03 14:43:00' );
 
-                $p3 = self::$factory->post->create( array(
+                $p3 = self::factory()->post->create( array(
                         'post_date' => '2013-05-05 15:30:55',
                 ) );
                 $this->update_post_modified( $p3, '2014-10-03 14:43:00' );
 
-                $p4 = self::$factory->post->create( array(
+                $p4 = self::factory()->post->create( array(
                         'post_date' => '2012-02-05 15:30:55',
                 ) );
                 $this->update_post_modified( $p4, '2012-12-03 14:43:00' );
 
-                $p5 = self::$factory->post->create( array(
+                $p5 = self::factory()->post->create( array(
                         'post_date' => '2014-02-05 15:30:55',
                 ) );
                 $this->update_post_modified( $p5, '2013-12-03 14:43:00' );

tests/phpunit/tests/query/isTerm.php

@@ -37 +37 @@
 
                 flush_rewrite_rules();
 
-                $this->tag_id = self::$factory->tag->create( array( 'slug' => 'tag-slug' ) );
-                $this->cat_id = self::$factory->category->create( array( 'slug' => 'cat-slug' ) );
-                $this->tax_id = self::$factory->term->create( array( 'taxonomy' => 'testtax', 'slug' => 'tax-slug' ) );
-                $this->tax_id2 = self::$factory->term->create( array( 'taxonomy' => 'testtax', 'slug' => 'tax-slug2' ) );
-                $this->post_id = self::$factory->post->create();
+                $this->tag_id = self::factory()->tag->create( array( 'slug' => 'tag-slug' ) );
+                $this->cat_id = self::factory()->category->create( array( 'slug' => 'cat-slug' ) );
+                $this->tax_id = self::factory()->term->create( array( 'taxonomy' => 'testtax', 'slug' => 'tax-slug' ) );
+                $this->tax_id2 = self::factory()->term->create( array( 'taxonomy' => 'testtax', 'slug' => 'tax-slug2' ) );
+                $this->post_id = self::factory()->post->create();
                 wp_set_object_terms( $this->post_id, $this->cat_id, 'category' );
                 wp_set_object_terms( $this->post_id, array( $this->tax_id, $this->tax_id2 ), 'testtax' );
 
@@ -245 +245 @@
                 remove_action( 'pre_get_posts', array( $this, 'pre_get_posts_tax_category_tax_query' ) );
 
                 register_taxonomy( 'testtax2', 'post' );
-                $testtax2_term_id = self::$factory->term->create( array(
+                $testtax2_term_id = self::factory()->term->create( array(
                         'taxonomy' => 'testtax2',
                         'slug' => 'testtax2-slug',
                 ) );

tests/phpunit/tests/query/metaQuery.php

@@ -6 +6 @@
  */
 class Tests_Query_MetaQuery extends WP_UnitTestCase {
         public function test_meta_query_no_key() {
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
 
                 add_post_meta( $p1, 'foo', 'bar' );
                 add_post_meta( $p2, 'oof', 'bar' );
@@ -30 +30 @@
         }
 
         public function test_meta_query_no_value() {
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
 
                 add_post_meta( $p1, 'foo', 'bar' );
                 add_post_meta( $p2, 'oof', 'bar' );
@@ -54 +54 @@
         }
 
         public function test_meta_query_single_query_compare_default() {
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
 
                 add_post_meta( $p1, 'foo', 'bar' );
 
@@ -76 +76 @@
         }
 
         public function test_meta_query_single_query_compare_equals() {
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
 
                 add_post_meta( $p1, 'foo', 'bar' );
 
@@ -99 +99 @@
         }
 
         public function test_meta_query_single_query_compare_not_equals() {
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
 
                 add_post_meta( $p1, 'foo', 'bar' );
                 add_post_meta( $p2, 'foo', 'baz' );
@@ -124 +124 @@
         }
 
         public function test_meta_query_single_query_compare_arithmetic_comparisons() {
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
 
                 add_post_meta( $p1, 'foo', '1' );
                 add_post_meta( $p2, 'foo', '2' );
@@ -202 +202 @@
         }
 
         public function test_meta_query_single_query_compare_like() {
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
 
                 add_post_meta( $p1, 'foo', 'bar' );
 
@@ -225 +225 @@
         }
 
         public function test_meta_query_single_query_compare_not_like() {
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
 
                 add_post_meta( $p1, 'foo', 'bar' );
                 add_post_meta( $p2, 'foo', 'rab' );
@@ -250 +250 @@
         }
 
         public function test_meta_query_single_query_compare_between_not_between() {
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
 
                 add_post_meta( $p1, 'foo', '1' );
                 add_post_meta( $p2, 'foo', '10' );
@@ -294 +294 @@
         }
 
         public function test_meta_query_single_query_compare_regexp_rlike() {
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
 
                 add_post_meta( $p1, 'foo', 'bar' );
                 add_post_meta( $p2, 'foo', 'baz' );
@@ -335 +335 @@
         }
 
         public function test_meta_query_single_query_compare_not_regexp() {
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
 
                 add_post_meta( $p1, 'foo', 'bar' );
                 add_post_meta( $p2, 'foo', 'baz' );
@@ -359 +359 @@
         }
 
         public function test_meta_query_relation_default() {
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
 
                 add_post_meta( $p1, 'foo', 'foo value 1' );
                 add_post_meta( $p1, 'bar', 'bar value 1' );
@@ -389 +389 @@
         }
 
         public function test_meta_query_relation_or() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
                 add_post_meta( $post_id, 'foo', rand_str() );
                 add_post_meta( $post_id, 'foo', rand_str() );
-                $post_id2 = self::$factory->post->create();
+                $post_id2 = self::factory()->post->create();
                 add_post_meta( $post_id2, 'bar', 'val2' );
-                $post_id3 = self::$factory->post->create();
+                $post_id3 = self::factory()->post->create();
                 add_post_meta( $post_id3, 'baz', rand_str() );
-                $post_id4 = self::$factory->post->create();
+                $post_id4 = self::factory()->post->create();
                 add_post_meta( $post_id4, 'froo', rand_str() );
-                $post_id5 = self::$factory->post->create();
+                $post_id5 = self::factory()->post->create();
                 add_post_meta( $post_id5, 'tango', 'val2' );
-                $post_id6 = self::$factory->post->create();
+                $post_id6 = self::factory()->post->create();
                 add_post_meta( $post_id6, 'bar', 'val1' );
 
                 $query = new WP_Query( array(
@@ -430 +430 @@
         }
 
         public function test_meta_query_relation_and() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
                 add_post_meta( $post_id, 'foo', rand_str() );
                 add_post_meta( $post_id, 'foo', rand_str() );
-                $post_id2 = self::$factory->post->create();
+                $post_id2 = self::factory()->post->create();
                 add_post_meta( $post_id2, 'bar', 'val2' );
                 add_post_meta( $post_id2, 'foo', rand_str() );
-                $post_id3 = self::$factory->post->create();
+                $post_id3 = self::factory()->post->create();
                 add_post_meta( $post_id3, 'baz', rand_str() );
-                $post_id4 = self::$factory->post->create();
+                $post_id4 = self::factory()->post->create();
                 add_post_meta( $post_id4, 'froo', rand_str() );
-                $post_id5 = self::$factory->post->create();
+                $post_id5 = self::factory()->post->create();
                 add_post_meta( $post_id5, 'tango', 'val2' );
-                $post_id6 = self::$factory->post->create();
+                $post_id6 = self::factory()->post->create();
                 add_post_meta( $post_id6, 'bar', 'val1' );
                 add_post_meta( $post_id6, 'foo', rand_str() );
-                $post_id7 = self::$factory->post->create();
+                $post_id7 = self::factory()->post->create();
                 add_post_meta( $post_id7, 'foo', rand_str() );
                 add_post_meta( $post_id7, 'froo', rand_str() );
                 add_post_meta( $post_id7, 'baz', rand_str() );
@@ -499 +499 @@
          * @ticket 30681
          */
         public function test_meta_query_compare_exists() {
-                $posts = self::$factory->post->create_many( 3 );
+                $posts = self::factory()->post->create_many( 3 );
                 add_post_meta( $posts[0], 'foo', 'bar' );
                 add_post_meta( $posts[2], 'foo', 'baz' );
 
@@ -520 +520 @@
          * @ticket 30681
          */
         public function test_meta_query_compare_exists_with_value_should_convert_to_equals() {
-                $posts = self::$factory->post->create_many( 3 );
+                $posts = self::factory()->post->create_many( 3 );
                 add_post_meta( $posts[0], 'foo', 'bar' );
                 add_post_meta( $posts[2], 'foo', 'baz' );
 
@@ -542 +542 @@
          * @ticket 30681
          */
         public function test_meta_query_compare_not_exists_should_ignore_value() {
-                $posts = self::$factory->post->create_many( 3 );
+                $posts = self::factory()->post->create_many( 3 );
                 add_post_meta( $posts[0], 'foo', 'bar' );
                 add_post_meta( $posts[2], 'foo', 'baz' );
 
@@ -564 +564 @@
          * @ticket 18158
          */
         public function test_meta_query_compare_not_exists() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
                 add_post_meta( $post_id, 'foo', rand_str() );
-                $post_id2 = self::$factory->post->create();
+                $post_id2 = self::factory()->post->create();
                 add_post_meta( $post_id2, 'bar', rand_str() );
-                $post_id3 = self::$factory->post->create();
+                $post_id3 = self::factory()->post->create();
                 add_post_meta( $post_id3, 'bar', rand_str() );
-                $post_id4 = self::$factory->post->create();
+                $post_id4 = self::factory()->post->create();
                 add_post_meta( $post_id4, 'baz', rand_str() );
-                $post_id5 = self::$factory->post->create();
+                $post_id5 = self::factory()->post->create();
                 add_post_meta( $post_id5, 'foo', rand_str() );
 
                 $query = new WP_Query( array(
@@ -636 +636 @@
          * @ticket 29062
          */
         public function test_meta_query_compare_not_exists_with_another_condition_relation_or() {
-                $posts = self::$factory->post->create_many( 4 );
+                $posts = self::factory()->post->create_many( 4 );
                 update_post_meta( $posts[0], 'color', 'orange' );
                 update_post_meta( $posts[1], 'color', 'blue' );
                 update_post_meta( $posts[1], 'vegetable', 'onion' );
@@ -672 +672 @@
          * @ticket 24093
          */
         public function test_meta_query_relation_or_compare_equals() {
-                $posts = self::$factory->post->create_many( 4 );
+                $posts = self::factory()->post->create_many( 4 );
                 add_post_meta( $posts[0], 'color', 'orange' );
                 add_post_meta( $posts[1], 'color', 'blue' );
                 add_post_meta( $posts[1], 'vegetable', 'onion' );
@@ -705 +705 @@
          * @ticket 24093
          */
         public function test_meta_query_relation_or_compare_equals_different_keys() {
-                $posts = self::$factory->post->create_many( 4 );
+                $posts = self::factory()->post->create_many( 4 );
                 add_post_meta( $posts[0], 'color', 'orange' );
                 add_post_meta( $posts[1], 'color', 'blue' );
                 add_post_meta( $posts[1], 'vegetable', 'onion' );
@@ -738 +738 @@
          * @ticket 24093
          */
         public function test_meta_query_relation_or_compare_equals_and_in() {
-                $posts = self::$factory->post->create_many( 4 );
+                $posts = self::factory()->post->create_many( 4 );
                 add_post_meta( $posts[0], 'color', 'orange' );
                 add_post_meta( $posts[1], 'color', 'blue' );
                 add_post_meta( $posts[1], 'vegetable', 'onion' );
@@ -771 +771 @@
          * @ticket 24093
          */
         public function test_meta_query_relation_or_compare_equals_and_like() {
-                $posts = self::$factory->post->create_many( 4 );
+                $posts = self::factory()->post->create_many( 4 );
                 add_post_meta( $posts[0], 'color', 'orange' );
                 add_post_meta( $posts[1], 'color', 'blue' );
                 add_post_meta( $posts[1], 'vegetable', 'onion' );
@@ -804 +804 @@
          * @ticket 24093
          */
         public function test_meta_query_relation_or_compare_equals_and_between() {
-                $posts = self::$factory->post->create_many( 4 );
+                $posts = self::factory()->post->create_many( 4 );
                 add_post_meta( $posts[0], 'number_of_colors', '2' );
                 add_post_meta( $posts[1], 'number_of_colors', '5' );
                 add_post_meta( $posts[1], 'vegetable', 'onion' );
@@ -838 +838 @@
          * @ticket 24093
          */
         public function test_meta_query_relation_and_compare_in_same_keys() {
-                $posts = self::$factory->post->create_many( 4 );
+                $posts = self::factory()->post->create_many( 4 );
                 add_post_meta( $posts[0], 'color', 'orange' );
                 add_post_meta( $posts[1], 'color', 'blue' );
                 add_post_meta( $posts[1], 'vegetable', 'onion' );
@@ -873 +873 @@
          * @ticket 24093
          */
         public function test_meta_query_relation_and_compare_in_different_keys() {
-                $posts = self::$factory->post->create_many( 4 );
+                $posts = self::factory()->post->create_many( 4 );
                 add_post_meta( $posts[0], 'color', 'orange' );
                 add_post_meta( $posts[1], 'color', 'blue' );
                 add_post_meta( $posts[1], 'vegetable', 'onion' );
@@ -908 +908 @@
          * @ticket 24093
          */
         public function test_meta_query_relation_and_compare_not_equals() {
-                $posts = self::$factory->post->create_many( 4 );
+                $posts = self::factory()->post->create_many( 4 );
                 add_post_meta( $posts[0], 'color', 'orange' );
                 add_post_meta( $posts[1], 'color', 'blue' );
                 add_post_meta( $posts[1], 'vegetable', 'onion' );
@@ -942 +942 @@
          * @ticket 24093
          */
         public function test_meta_query_relation_and_compare_not_equals_different_keys() {
-                $posts = self::$factory->post->create_many( 4 );
+                $posts = self::factory()->post->create_many( 4 );
 
                 // !shallot, but orange.
                 add_post_meta( $posts[0], 'color', 'orange' );
@@ -983 +983 @@
          * @ticket 24093
          */
         public function test_meta_query_relation_and_compare_not_equals_not_in() {
-                $posts = self::$factory->post->create_many( 4 );
+                $posts = self::factory()->post->create_many( 4 );
                 add_post_meta( $posts[0], 'color', 'orange' );
                 add_post_meta( $posts[1], 'color', 'blue' );
                 add_post_meta( $posts[1], 'vegetable', 'onion' );
@@ -1017 +1017 @@
          * @ticket 24093
          */
         public function test_meta_query_relation_and_compare_not_equals_and_not_like() {
-                $posts = self::$factory->post->create_many( 4 );
+                $posts = self::factory()->post->create_many( 4 );
                 add_post_meta( $posts[0], 'color', 'orange' );
                 add_post_meta( $posts[1], 'color', 'blue' );
                 add_post_meta( $posts[1], 'vegetable', 'onion' );
@@ -1051 +1051 @@
          * @ticket 23033
          */
         public function test_meta_query_decimal_results() {
-                $post_1 = self::$factory->post->create();
-                $post_2 = self::$factory->post->create();
-                $post_3 = self::$factory->post->create();
-                $post_4 = self::$factory->post->create();
+                $post_1 = self::factory()->post->create();
+                $post_2 = self::factory()->post->create();
+                $post_3 = self::factory()->post->create();
+                $post_4 = self::factory()->post->create();
 
                 update_post_meta( $post_1, 'decimal_value', '-0.3' );
                 update_post_meta( $post_2, 'decimal_value', '0.23409844' );
@@ -1226 +1226 @@
          * @ticket 29604
          */
         public function test_meta_query_with_orderby_meta_value_relation_or() {
-                $posts = self::$factory->post->create_many( 4 );
+                $posts = self::factory()->post->create_many( 4 );
                 update_post_meta( $posts[0], 'foo', 5 );
                 update_post_meta( $posts[1], 'foo', 6 );
                 update_post_meta( $posts[2], 'foo', 4 );
@@ -1265 +1265 @@
          * @ticket 29604
          */
         public function test_meta_query_with_orderby_meta_value_relation_and() {
-                $posts = self::$factory->post->create_many( 4 );
+                $posts = self::factory()->post->create_many( 4 );
                 update_post_meta( $posts[0], 'foo', 5 );
                 update_post_meta( $posts[1], 'foo', 6 );
                 update_post_meta( $posts[2], 'foo', 4 );
@@ -1308 +1308 @@
          * @ticket 29642
          */
         public function test_meta_query_nested() {
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
 
                 add_post_meta( $p1, 'foo', 'bar' );
                 add_post_meta( $p2, 'foo2', 'bar' );
@@ -1349 +1349 @@
          * @ticket 29642
          */
         public function test_meta_query_nested_two_levels_deep() {
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
 
                 add_post_meta( $p1, 'foo', 'bar' );
                 add_post_meta( $p3, 'foo2', 'bar' );
@@ -1394 +1394 @@
         }
 
         public function test_meta_between_not_between() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
                 add_post_meta( $post_id, 'time', 500 );
-                $post_id2 = self::$factory->post->create();
+                $post_id2 = self::factory()->post->create();
                 add_post_meta( $post_id2, 'time', 1001 );
-                $post_id3 = self::$factory->post->create();
+                $post_id3 = self::factory()->post->create();
                 add_post_meta( $post_id3, 'time', 0 );
-                $post_id4 = self::$factory->post->create();
+                $post_id4 = self::factory()->post->create();
                 add_post_meta( $post_id4, 'time', 1 );
-                $post_id5 = self::$factory->post->create();
+                $post_id5 = self::factory()->post->create();
                 add_post_meta( $post_id5, 'time', 1000 );
 
                 $args = array(
@@ -1443 +1443 @@
          */
         public function test_meta_default_compare() {
                 // compare should default to IN when meta_value is an array
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
                 add_post_meta( $post_id, 'foo', 'bar' );
-                $post_id2 = self::$factory->post->create();
+                $post_id2 = self::factory()->post->create();
                 add_post_meta( $post_id2, 'bar', 'baz' );
-                $post_id3 = self::$factory->post->create();
+                $post_id3 = self::factory()->post->create();
                 add_post_meta( $post_id3, 'foo', 'baz' );
-                $post_id4 = self::$factory->post->create();
+                $post_id4 = self::factory()->post->create();
                 add_post_meta( $post_id4, 'baz', 'bar' );
-                $post_id5 = self::$factory->post->create();
+                $post_id5 = self::factory()->post->create();
                 add_post_meta( $post_id5, 'foo', rand_str() );
 
                 $posts = get_posts( array(
@@ -1482 +1482 @@
          * @ticket 17264
          */
         public function test_duplicate_posts_when_no_key() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
                 add_post_meta( $post_id, 'city', 'Lorem' );
                 add_post_meta( $post_id, 'address', '123 Lorem St.' );
-                $post_id2 = self::$factory->post->create();
+                $post_id2 = self::factory()->post->create();
                 add_post_meta( $post_id2, 'city', 'Lorem' );
-                $post_id3 = self::$factory->post->create();
+                $post_id3 = self::factory()->post->create();
                 add_post_meta( $post_id3, 'city', 'Loren' );
 
                 $args = array(
@@ -1513 +1513 @@
          * @ticket 15292
          */
         public function test_empty_meta_value() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
                 add_post_meta( $post_id, 'foo', '0' );
                 add_post_meta( $post_id, 'bar', 0 );
-                $post_id2 = self::$factory->post->create();
+                $post_id2 = self::factory()->post->create();
                 add_post_meta( $post_id2, 'foo', 1 );
-                $post_id3 = self::$factory->post->create();
+                $post_id3 = self::factory()->post->create();
                 add_post_meta( $post_id3, 'baz', 0 );
-                $post_id4 = self::$factory->post->create();
+                $post_id4 = self::factory()->post->create();
                 add_post_meta( $post_id4, 'baz', 0 );
-                $post_id5 = self::$factory->post->create();
+                $post_id5 = self::factory()->post->create();
                 add_post_meta( $post_id5, 'baz', 0 );
                 add_post_meta( $post_id5, 'bar', '0' );
-                $post_id6 = self::$factory->post->create();
+                $post_id6 = self::factory()->post->create();
                 add_post_meta( $post_id6, 'baz', 0 );
 
                 $q = new WP_Query( array( 'meta_key' => 'foo', 'meta_value' => '0' ) );
@@ -1577 +1577 @@
          * @ticket 31045
          */
         public function test_orderby_clause_key() {
-                $posts = self::$factory->post->create_many( 3 );
+                $posts = self::factory()->post->create_many( 3 );
                 add_post_meta( $posts[0], 'foo', 'aaa' );
                 add_post_meta( $posts[1], 'foo', 'zzz' );
                 add_post_meta( $posts[2], 'foo', 'jjj' );
@@ -1601 +1601 @@
          * @ticket 31045
          */
         public function test_orderby_clause_key_as_secondary_sort() {
-                $p1 = self::$factory->post->create( array(
+                $p1 = self::factory()->post->create( array(
                         'post_date' => '2015-01-28 03:00:00',
                 ) );
-                $p2 = self::$factory->post->create( array(
+                $p2 = self::factory()->post->create( array(
                         'post_date' => '2015-01-28 05:00:00',
                 ) );
-                $p3 = self::$factory->post->create( array(
+                $p3 = self::factory()->post->create( array(
                         'post_date' => '2015-01-28 03:00:00',
                 ) );
 
@@ -1636 +1636 @@
          * @ticket 31045
          */
         public function test_orderby_more_than_one_clause_key() {
-                $posts = self::$factory->post->create_many( 3 );
+                $posts = self::factory()->post->create_many( 3 );
 
                 add_post_meta( $posts[0], 'foo', 'jjj' );
                 add_post_meta( $posts[1], 'foo', 'zzz' );

tests/phpunit/tests/query/postStatus.php

@@ -211 +211 @@
         public function test_single_post_with_nonpublic_status_should_not_be_shown_to_logged_out_users() {
                 register_post_type( 'foo_pt' );
                 register_post_status( 'foo_ps', array( 'public' => false ) );
-                $p = self::$factory->post->create( array( 'post_status' => 'foo_ps' ) );
+                $p = self::factory()->post->create( array( 'post_status' => 'foo_ps' ) );
 
                 $q = new WP_Query( array(
                         'p' => $p,
@@ -223 +223 @@
         public function test_single_post_with_nonpublic_and_protected_status_should_not_be_shown_for_user_who_cannot_edit_others_posts() {
                 register_post_type( 'foo_pt' );
                 register_post_status( 'foo_ps', array( 'public' => false, 'protected' => true ) );
-                $p = self::$factory->post->create( array( 'post_status' => 'foo_ps', 'post_author' => self::$editor_user_id ) );
+                $p = self::factory()->post->create( array( 'post_status' => 'foo_ps', 'post_author' => self::$editor_user_id ) );
 
                 wp_set_current_user( self::$author_user_id );
 
@@ -237 +237 @@
         public function test_single_post_with_nonpublic_and_protected_status_should_be_shown_for_user_who_can_edit_others_posts() {
                 register_post_type( 'foo_pt' );
                 register_post_status( 'foo_ps', array( 'public' => false, 'protected' => true ) );
-                $p = self::$factory->post->create( array( 'post_status' => 'foo_ps', 'post_author' => self::$author_user_id ) );
+                $p = self::factory()->post->create( array( 'post_status' => 'foo_ps', 'post_author' => self::$author_user_id ) );
 
                 wp_set_current_user( self::$editor_user_id );
 
@@ -251 +251 @@
         public function test_single_post_with_nonpublic_and_private_status_should_not_be_shown_for_user_who_cannot_edit_others_posts() {
                 register_post_type( 'foo_pt' );
                 register_post_status( 'foo_ps', array( 'public' => false, 'private' => true ) );
-                $p = self::$factory->post->create( array( 'post_status' => 'foo_ps', 'post_author' => self::$editor_user_id ) );
+                $p = self::factory()->post->create( array( 'post_status' => 'foo_ps', 'post_author' => self::$editor_user_id ) );
 
                 wp_set_current_user( self::$author_user_id );
 
@@ -265 +265 @@
         public function test_single_post_with_nonpublic_and_private_status_should_be_shown_for_user_who_can_edit_others_posts() {
                 register_post_type( 'foo_pt' );
                 register_post_status( 'foo_ps', array( 'public' => false, 'private' => true ) );
-                $p = self::$factory->post->create( array( 'post_status' => 'foo_ps', 'post_author' => self::$author_user_id ) );
+                $p = self::factory()->post->create( array( 'post_status' => 'foo_ps', 'post_author' => self::$author_user_id ) );
 
                 wp_set_current_user( self::$editor_user_id );
 
@@ -279 +279 @@
         public function test_single_post_with_nonpublic_and_protected_status_should_not_be_shown_for_any_user() {
                 register_post_type( 'foo_pt' );
                 register_post_status( 'foo_ps', array( 'public' => false ) );
-                $p = self::$factory->post->create( array( 'post_status' => 'foo_ps', 'post_author' => self::$author_user_id ) );
+                $p = self::factory()->post->create( array( 'post_status' => 'foo_ps', 'post_author' => self::$author_user_id ) );
 
                 wp_set_current_user( self::$editor_user_id );
 
@@ -294 +294 @@
          * @ticket 29167
          */
         public function test_specific_post_should_be_returned_if_trash_is_one_of_the_requested_post_statuses() {
-                $p1 = self::$factory->post->create( array( 'post_status' => 'trash' ) );
-                $p2 = self::$factory->post->create( array( 'post_status' => 'publish' ) );
+                $p1 = self::factory()->post->create( array( 'post_status' => 'trash' ) );
+                $p2 = self::factory()->post->create( array( 'post_status' => 'publish' ) );
 
                 $q = new WP_Query( array(
                         'p' => $p1,

tests/phpunit/tests/query/results.php

@@ -456 +456 @@
          * @ticket 16854
          */
         function test_query_author_vars() {
-                $author_1 = self::$factory->user->create( array( 'user_login' => 'admin1', 'user_pass' => rand_str(), 'role' => 'author' ) );
-                $post_1 = self::$factory->post->create( array( 'post_title' => rand_str(), 'post_author' => $author_1, 'post_date' => '2007-01-01 00:00:00' ) );
+                $author_1 = self::factory()->user->create( array( 'user_login' => 'admin1', 'user_pass' => rand_str(), 'role' => 'author' ) );
+                $post_1 = self::factory()->post->create( array( 'post_title' => rand_str(), 'post_author' => $author_1, 'post_date' => '2007-01-01 00:00:00' ) );
 
-                $author_2 = self::$factory->user->create( array( 'user_login' => rand_str(), 'user_pass' => rand_str(), 'role' => 'author' ) );
-                $post_2 = self::$factory->post->create( array( 'post_title' => rand_str(), 'post_author' => $author_2, 'post_date' => '2007-01-01 00:00:00' ) );
+                $author_2 = self::factory()->user->create( array( 'user_login' => rand_str(), 'user_pass' => rand_str(), 'role' => 'author' ) );
+                $post_2 = self::factory()->post->create( array( 'post_title' => rand_str(), 'post_author' => $author_2, 'post_date' => '2007-01-01 00:00:00' ) );
 
-                $author_3 = self::$factory->user->create( array( 'user_login' => rand_str(), 'user_pass' => rand_str(), 'role' => 'author' ) );
-                $post_3 = self::$factory->post->create( array( 'post_title' => rand_str(), 'post_author' => $author_3, 'post_date' => '2007-01-01 00:00:00' ) );
+                $author_3 = self::factory()->user->create( array( 'user_login' => rand_str(), 'user_pass' => rand_str(), 'role' => 'author' ) );
+                $post_3 = self::factory()->post->create( array( 'post_title' => rand_str(), 'post_author' => $author_3, 'post_date' => '2007-01-01 00:00:00' ) );
 
-                $author_4 = self::$factory->user->create( array( 'user_login' => rand_str(), 'user_pass' => rand_str(), 'role' => 'author' ) );
-                $post_4 = self::$factory->post->create( array( 'post_title' => rand_str(), 'post_author' => $author_4, 'post_date' => '2007-01-01 00:00:00' ) );
+                $author_4 = self::factory()->user->create( array( 'user_login' => rand_str(), 'user_pass' => rand_str(), 'role' => 'author' ) );
+                $post_4 = self::factory()->post->create( array( 'post_title' => rand_str(), 'post_author' => $author_4, 'post_date' => '2007-01-01 00:00:00' ) );
 
                 $posts = $this->q->query( array(
                         'author' => '',
@@ -623 +623 @@
          * @ticket 20308
          */
         function test_post_password() {
-                $one   = (string) self::$factory->post->create( array( 'post_password' => '' ) );
-                $two   = (string) self::$factory->post->create( array( 'post_password' => 'burrito' ) );
-                $three = (string) self::$factory->post->create( array( 'post_password' => 'burrito' ) );
+                $one   = (string) self::factory()->post->create( array( 'post_password' => '' ) );
+                $two   = (string) self::factory()->post->create( array( 'post_password' => 'burrito' ) );
+                $three = (string) self::factory()->post->create( array( 'post_password' => 'burrito' ) );
 
                 $args = array( 'post__in' => array( $one, $two, $three ), 'fields' => 'ids' );
 
@@ -665 +665 @@
         function test_duplicate_slug_in_hierarchical_post_type() {
                 register_post_type( 'handbook', array( 'hierarchical' => true ) );
 
-                $post_1 = self::$factory->post->create( array( 'post_title' => 'Getting Started', 'post_type' => 'handbook' ) );
-                $post_2 = self::$factory->post->create( array( 'post_title' => 'Contributing to the WordPress Codex', 'post_type' => 'handbook' ) );
-                $post_3 = self::$factory->post->create( array( 'post_title' => 'Getting Started', 'post_parent' => $post_2, 'post_type' => 'handbook' ) );
+                $post_1 = self::factory()->post->create( array( 'post_title' => 'Getting Started', 'post_type' => 'handbook' ) );
+                $post_2 = self::factory()->post->create( array( 'post_title' => 'Contributing to the WordPress Codex', 'post_type' => 'handbook' ) );
+                $post_3 = self::factory()->post->create( array( 'post_title' => 'Getting Started', 'post_parent' => $post_2, 'post_type' => 'handbook' ) );
 
                 $result = $this->q->query( array( 'handbook' => 'getting-started', 'post_type' => 'handbook' ) );
                 $this->assertCount( 1, $result );
@@ -679 +679 @@
         function test_child_post_in_hierarchical_post_type_with_default_permalinks() {
                 register_post_type( 'handbook', array( 'hierarchical' => true ) );
 
-                $post_1 = self::$factory->post->create( array( 'post_title' => 'Contributing to the WordPress Codex', 'post_type' => 'handbook' ) );
-                $post_2 = self::$factory->post->create( array( 'post_title' => 'Getting Started', 'post_parent' => $post_1, 'post_type' => 'handbook' ) );
+                $post_1 = self::factory()->post->create( array( 'post_title' => 'Contributing to the WordPress Codex', 'post_type' => 'handbook' ) );
+                $post_2 = self::factory()->post->create( array( 'post_title' => 'Getting Started', 'post_parent' => $post_1, 'post_type' => 'handbook' ) );
 
                 $this->assertContains( 'contributing-to-the-wordpress-codex/getting-started', get_permalink( $post_2 ) );
 
@@ -690 +690 @@
 
         function test_title() {
                 $title = 'Tacos are Cool';
-                $post_id = self::$factory->post->create( array(
+                $post_id = self::factory()->post->create( array(
                         'post_title' => $title,
                         'post_type' => 'post',
                         'post_status' => 'publish'

tests/phpunit/tests/query/search.php

@@ -31 +31 @@
 
         function test_search_order_title_relevance() {
                 foreach ( range( 1, 7 ) as $i )
-                        self::$factory->post->create( array( 'post_content' => $i . rand_str() . ' about', 'post_type' => $this->post_type ) );
-                $post_id = self::$factory->post->create( array( 'post_title' => 'About', 'post_type' => $this->post_type ) );
+                        self::factory()->post->create( array( 'post_content' => $i . rand_str() . ' about', 'post_type' => $this->post_type ) );
+                $post_id = self::factory()->post->create( array( 'post_title' => 'About', 'post_type' => $this->post_type ) );
 
                 $posts = $this->get_search_results( 'About' );
                 $this->assertEquals( $post_id, reset( $posts )->ID );
@@ -63 +63 @@
          * @ticket 33988
          */
         public function test_s_should_exclude_term_prefixed_with_dash() {
-                $p1 = self::$factory->post->create( array(
+                $p1 = self::factory()->post->create( array(
                         'post_status' => 'publish',
                         'post_content' => 'This post has foo but also bar',
                 ) );
-                $p2 = self::$factory->post->create( array(
+                $p2 = self::factory()->post->create( array(
                         'post_status' => 'publish',
                         'post_content' => 'This post has only foo',
                 ) );
@@ -84 +84 @@
          * @ticket 33988
          */
         public function test_s_should_exclude_first_term_if_prefixed_with_dash() {
-                $p1 = self::$factory->post->create( array(
+                $p1 = self::factory()->post->create( array(
                         'post_status' => 'publish',
                         'post_content' => 'This post has foo but also bar',
                 ) );
-                $p2 = self::$factory->post->create( array(
+                $p2 = self::factory()->post->create( array(
                         'post_status' => 'publish',
                         'post_content' => 'This post has only bar',
                 ) );
@@ -105 +105 @@
          * @ticket 33988
          */
         public function test_s_should_not_exclude_for_dashes_in_the_middle_of_words() {
-                $p1 = self::$factory->post->create( array(
+                $p1 = self::factory()->post->create( array(
                         'post_status' => 'publish',
                         'post_content' => 'This post has foo but also bar',
                 ) );
-                $p2 = self::$factory->post->create( array(
+                $p2 = self::factory()->post->create( array(
                         'post_status' => 'publish',
                         'post_content' => 'This post has only bar',
                 ) );
-                $p3 = self::$factory->post->create( array(
+                $p3 = self::factory()->post->create( array(
                         'post_status' => 'publish',
                         'post_content' => 'This post has only foo-bar',
                 ) );

tests/phpunit/tests/query/setupPostdata.php

@@ -39 +39 @@
         }
 
         public function test_id() {
-                $p = self::$factory->post->create_and_get();
+                $p = self::factory()->post->create_and_get();
                 setup_postdata( $p );
 
                 $this->assertNotEmpty( $p->ID );
@@ -50 +50 @@
          * @ticket 30970
          */
         public function test_setup_by_id() {
-                $p = self::$factory->post->create_and_get();
+                $p = self::factory()->post->create_and_get();
                 setup_postdata( $p->ID );
 
                 $this->assertSame( $p->ID, $GLOBALS['id'] );
@@ -72 +72 @@
          * @ticket 30970
          */
         public function test_setup_by_postish_object() {
-                $p = self::$factory->post->create();
+                $p = self::factory()->post->create();
 
                 $post = new stdClass();
                 $post->ID = $p;
@@ -82 +82 @@
         }
 
         public function test_authordata() {
-                $u = self::$factory->user->create_and_get();
-                $p = self::$factory->post->create_and_get( array(
+                $u = self::factory()->user->create_and_get();
+                $p = self::factory()->post->create_and_get( array(
                         'post_author' => $u->ID,
                 ) );
                 setup_postdata( $p );
@@ -93 +93 @@
         }
 
         public function test_currentday() {
-                $p = self::$factory->post->create_and_get( array(
+                $p = self::factory()->post->create_and_get( array(
                         'post_date' => '1980-09-09 06:30:00',
                 ) );
                 setup_postdata( $p );
@@ -102 +102 @@
         }
 
         public function test_currentmonth() {
-                $p = self::$factory->post->create_and_get( array(
+                $p = self::factory()->post->create_and_get( array(
                         'post_date' => '1980-09-09 06:30:00',
                 ) );
                 setup_postdata( $p );
@@ -111 +111 @@
         }
 
         public function test_secondary_query_post_vars() {
-                $users = self::$factory->user->create_many( 2 );
+                $users = self::factory()->user->create_many( 2 );
 
-                $post1 = self::$factory->post->create_and_get( array(
+                $post1 = self::factory()->post->create_and_get( array(
                         'post_author' => $users[0],
                         'post_date' => '2012-02-02 02:00:00',
                 ) );
 
-                $post2 = self::$factory->post->create_and_get( array(
+                $post2 = self::factory()->post->create_and_get( array(
                         'post_author' => $users[1],
                         'post_date' => '2013-03-03 03:00:00',
                 ) );
@@ -157 +157 @@
         }
 
         public function test_single_page() {
-                $post = self::$factory->post->create_and_get( array(
+                $post = self::factory()->post->create_and_get( array(
                         'post_content' => 'Page 0',
                 ) );
                 setup_postdata( $post );
@@ -168 +168 @@
         }
 
         public function test_multi_page() {
-                $post = self::$factory->post->create_and_get( array(
+                $post = self::factory()->post->create_and_get( array(
                         'post_content' => 'Page 0<!--nextpage-->Page 1<!--nextpage-->Page 2<!--nextpage-->Page 3',
                 ) );
                 setup_postdata( $post );
@@ -182 +182 @@
          * @ticket 16746
          */
         public function test_nextpage_at_start_of_content() {
-                $post = self::$factory->post->create_and_get( array(
+                $post = self::factory()->post->create_and_get( array(
                         'post_content' => '<!--nextpage-->Page 1<!--nextpage-->Page 2<!--nextpage-->Page 3',
                 ) );
                 setup_postdata( $post );
@@ -193 +193 @@
         }
 
         public function test_trim_nextpage_linebreaks() {
-                $post = self::$factory->post->create_and_get( array(
+                $post = self::factory()->post->create_and_get( array(
                         'post_content' => "Page 0\n<!--nextpage-->\nPage 1\nhas a line break\n<!--nextpage-->Page 2<!--nextpage-->\n\nPage 3",
                 ) );
                 setup_postdata( $post );
@@ -205 +205 @@
          * @ticket 25349
          */
         public function test_secondary_query_nextpage() {
-                $post1 = self::$factory->post->create( array(
+                $post1 = self::factory()->post->create( array(
                         'post_content' => 'Post 1 Page 1<!--nextpage-->Post 1 Page 2',
                 ) );
-                $post2 = self::$factory->post->create( array(
+                $post2 = self::factory()->post->create( array(
                         'post_content' => 'Post 2 Page 1<!--nextpage-->Post 2 Page 2',
                 ) );
 
@@ -237 +237 @@
         }
 
         public function test_page_from_wp_query() {
-                $page = self::$factory->post->create_and_get( array(
+                $page = self::factory()->post->create_and_get( array(
                         'post_type' => 'page',
                 ) );
 
@@ -250 +250 @@
         }
 
         public function test_page_when_on_page() {
-                $page = self::$factory->post->create_and_get( array(
+                $page = self::factory()->post->create_and_get( array(
                         'post_type' => 'page',
                 ) );
                 $this->go_to( get_permalink( $page ) );
@@ -263 +263 @@
          * @ticket 20904
          */
         public function test_secondary_query_page() {
-                $post = self::$factory->post->create_and_get();
+                $post = self::factory()->post->create_and_get();
                 $this->go_to( '/?page=3' );
                 setup_postdata( $post );
 
@@ -271 +271 @@
                 $this->assertSame( 3, $GLOBALS['page'] );
 
                 // Secondary loop.
-                $posts = self::$factory->post->create_many( 5 );
+                $posts = self::factory()->post->create_many( 5 );
                 $q = new WP_Query( array(
                         'page' => 4,
                         'posts_per_page' => 1,
@@ -294 +294 @@
          * @ticket 20904
          */
         public function test_more_when_on_setup_post() {
-                $post = self::$factory->post->create_and_get();
+                $post = self::factory()->post->create_and_get();
                 $this->go_to( get_permalink( $post ) );
                 setup_postdata( $post );
 
@@ -307 +307 @@
          * $more should not be true when the set-up post is not the same as the current post.
          */
         public function test_more_when_on_single() {
-                $post1 = self::$factory->post->create_and_get();
-                $post2 = self::$factory->post->create_and_get();
+                $post1 = self::factory()->post->create_and_get();
+                $post2 = self::factory()->post->create_and_get();
                 $this->go_to( get_permalink( $post1 ) );
                 setup_postdata( $post2 );
 
@@ -321 +321 @@
          * $more should not be true when the set-up post is not the same as the current page.
          */
         public function test_more_when_on_page() {
-                $post = self::$factory->post->create_and_get();
-                $page = self::$factory->post->create_and_get( array(
+                $post = self::factory()->post->create_and_get();
+                $page = self::factory()->post->create_and_get( array(
                         'post_type' => 'page',
                 ) );
                 $this->go_to( get_permalink( $page ) );
@@ -335 +335 @@
          * @ticket 20904
          */
         public function test_more_when_on_feed() {
-                $post = self::$factory->post->create_and_get();
+                $post = self::factory()->post->create_and_get();
                 $this->go_to( '/?feed=rss' );
                 setup_postdata( $post );
 
@@ -347 +347 @@
          * @ticket 25349
          */
         public function test_secondary_query_more() {
-                $post = self::$factory->post->create_and_get();
+                $post = self::factory()->post->create_and_get();
                 $this->go_to( get_permalink( $post ) );
                 setup_postdata( $post );
 
@@ -379 +379 @@
          * global $post should use the content of $a_post rather then the global post.
          */
         function test_setup_postdata_loop() {
-                $post_id = self::$factory->post->create( array( 'post_content' => 'global post' ) );
+                $post_id = self::factory()->post->create( array( 'post_content' => 'global post' ) );
                 $GLOBALS['wp_query']->post = $GLOBALS['post'] = get_post( $post_id );
 
-                $ids = self::$factory->post->create_many(5);
+                $ids = self::factory()->post->create_many(5);
                 foreach ( $ids as $id ) {
                         $page = get_post( $id );
                         if ( $page ) {

tests/phpunit/tests/query/taxQuery.php

@@ -6 +6 @@
  */
 class Tests_Query_TaxQuery extends WP_UnitTestCase {
         public function test_tax_query_single_query_single_term_field_slug() {
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'category',
                         'slug' => 'foo',
                         'name' => 'Foo',
                 ) );
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
 
                 wp_set_post_terms( $p1, $t, 'category' );
 
@@ -33 +33 @@
         }
 
         public function test_tax_query_single_query_single_term_field_name() {
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'category',
                         'slug' => 'foo',
                         'name' => 'Foo',
                 ) );
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
 
                 wp_set_post_terms( $p1, $t, 'category' );
 
@@ -65 +65 @@
         public function test_field_name_should_work_for_names_with_spaces() {
                 register_taxonomy( 'wptests_tax', 'post' );
 
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'slug' => 'foo',
                         'name' => 'Foo Bar',
                 ) );
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
 
                 wp_set_object_terms( $p1, $t, 'wptests_tax' );
 
@@ -90 +90 @@
         }
 
         public function test_tax_query_single_query_single_term_field_term_taxonomy_id() {
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'category',
                         'slug' => 'foo',
                         'name' => 'Foo',
                 ) );
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
 
                 $tt_ids = wp_set_post_terms( $p1, $t, 'category' );
 
@@ -117 +117 @@
         }
 
         public function test_tax_query_single_query_single_term_field_term_id() {
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'category',
                         'slug' => 'foo',
                         'name' => 'Foo',
                 ) );
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
 
                 wp_set_post_terms( $p1, $t, 'category' );
 
@@ -144 +144 @@
         }
 
         public function test_tax_query_single_query_single_term_operator_in() {
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'category',
                         'slug' => 'foo',
                         'name' => 'Foo',
                 ) );
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
 
                 wp_set_post_terms( $p1, $t, 'category' );
 
@@ -172 +172 @@
         }
 
         public function test_tax_query_single_query_single_term_operator_not_in() {
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'category',
                         'slug' => 'foo',
                         'name' => 'Foo',
                 ) );
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
 
                 wp_set_post_terms( $p1, $t, 'category' );
 
@@ -200 +200 @@
         }
 
         public function test_tax_query_single_query_single_term_operator_and() {
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'category',
                         'slug' => 'foo',
                         'name' => 'Foo',
                 ) );
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
 
                 wp_set_post_terms( $p1, $t, 'category' );
 
@@ -228 +228 @@
         }
 
         public function test_tax_query_single_query_multiple_terms_operator_in() {
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'category',
                         'slug' => 'foo',
                         'name' => 'Foo',
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'category',
                         'slug' => 'bar',
                         'name' => 'Bar',
                 ) );
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
 
                 wp_set_post_terms( $p1, $t1, 'category' );
                 wp_set_post_terms( $p2, $t2, 'category' );
@@ -263 +263 @@
         }
 
         public function test_tax_query_single_query_multiple_terms_operator_not_in() {
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'category',
                         'slug' => 'foo',
                         'name' => 'Foo',
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'category',
                         'slug' => 'bar',
                         'name' => 'Bar',
                 ) );
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
 
                 wp_set_post_terms( $p1, $t1, 'category' );
                 wp_set_post_terms( $p2, $t2, 'category' );
@@ -301 +301 @@
          * @ticket 18105
          */
         public function test_tax_query_single_query_multiple_queries_operator_not_in() {
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'category',
                         'slug' => 'foo',
                         'name' => 'Foo',
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'category',
                         'slug' => 'bar',
                         'name' => 'Bar',
                 ) );
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
 
                 wp_set_post_terms( $p1, $t1, 'category' );
                 wp_set_post_terms( $p2, $t2, 'category' );
@@ -343 +343 @@
         }
 
         public function test_tax_query_single_query_multiple_terms_operator_and() {
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'category',
                         'slug' => 'foo',
                         'name' => 'Foo',
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'category',
                         'slug' => 'bar',
                         'name' => 'Bar',
                 ) );
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
 
                 wp_set_object_terms( $p1, $t1, 'category' );
                 wp_set_object_terms( $p2, array( $t1, $t2 ), 'category' );
@@ -384 +384 @@
                 register_taxonomy( 'wptests_tax1', 'post' );
                 register_taxonomy( 'wptests_tax2', 'post' );
 
-                $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
-                $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
+                $t1 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+                $t2 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
 
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
 
                 wp_set_object_terms( $p1, array( $t1 ), 'wptests_tax1' );
                 wp_set_object_terms( $p2, array( $t2 ), 'wptests_tax2' );
@@ -416 +416 @@
                 register_taxonomy( 'wptests_tax1', 'post' );
                 register_taxonomy( 'wptests_tax2', 'post' );
 
-                $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
-                $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
+                $t1 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+                $t2 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
 
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
 
                 wp_set_object_terms( $p1, array( $t1 ), 'wptests_tax1' );
                 wp_set_object_terms( $p2, array( $t2 ), 'wptests_tax2' );
@@ -448 +448 @@
                 register_taxonomy( 'wptests_tax1', 'post' );
                 register_taxonomy( 'wptests_tax2', 'post' );
 
-                $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
-                $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
+                $t1 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+                $t2 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
 
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
 
                 wp_set_object_terms( $p1, array( $t1 ), 'wptests_tax1' );
                 wp_set_object_terms( $p2, array( $t2 ), 'wptests_tax2' );
@@ -481 +481 @@
                 register_taxonomy( 'wptests_tax1', 'post' );
                 register_taxonomy( 'wptests_tax2', 'post' );
 
-                $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
-                $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
+                $t1 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+                $t2 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
 
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
 
                 wp_set_object_terms( $p1, array( $t1 ), 'wptests_tax1' );
                 wp_set_object_terms( $p2, array( $t2 ), 'wptests_tax2' );
@@ -506 +506 @@
         }
 
         public function test_tax_query_multiple_queries_relation_and() {
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'category',
                         'slug' => 'foo',
                         'name' => 'Foo',
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'category',
                         'slug' => 'bar',
                         'name' => 'Bar',
                 ) );
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
 
                 wp_set_object_terms( $p1, $t1, 'category' );
                 wp_set_object_terms( $p2, array( $t1, $t2 ), 'category' );
@@ -546 +546 @@
         }
 
         public function test_tax_query_multiple_queries_relation_or() {
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'category',
                         'slug' => 'foo',
                         'name' => 'Foo',
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'category',
                         'slug' => 'bar',
                         'name' => 'Bar',
                 ) );
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
 
                 wp_set_object_terms( $p1, $t1, 'category' );
                 wp_set_object_terms( $p2, array( $t1, $t2 ), 'category' );
@@ -586 +586 @@
         }
 
         public function test_tax_query_multiple_queries_different_taxonomies() {
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'post_tag',
                         'slug' => 'foo',
                         'name' => 'Foo',
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'category',
                         'slug' => 'bar',
                         'name' => 'Bar',
                 ) );
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
 
                 wp_set_object_terms( $p1, $t1, 'post_tag' );
                 wp_set_object_terms( $p2, $t2, 'category' );
@@ -632 +632 @@
                 register_taxonomy( 'foo', 'post' );
                 register_taxonomy( 'bar', 'post' );
 
-                $foo_term_1 = self::$factory->term->create( array(
+                $foo_term_1 = self::factory()->term->create( array(
                         'taxonomy' => 'foo',
                 ) );
-                $foo_term_2 = self::$factory->term->create( array(
+                $foo_term_2 = self::factory()->term->create( array(
                         'taxonomy' => 'foo',
                 ) );
-                $bar_term_1 = self::$factory->term->create( array(
+                $bar_term_1 = self::factory()->term->create( array(
                         'taxonomy' => 'bar',
                 ) );
-                $bar_term_2 = self::$factory->term->create( array(
+                $bar_term_2 = self::factory()->term->create( array(
                         'taxonomy' => 'bar',
                 ) );
 
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
 
                 wp_set_object_terms( $p1, array( $foo_term_1 ), 'foo' );
                 wp_set_object_terms( $p1, array( $bar_term_1 ), 'bar' );
@@ -704 +704 @@
                 register_taxonomy( 'foo', 'post' );
                 register_taxonomy( 'bar', 'post' );
 
-                $foo_term_1 = self::$factory->term->create( array(
+                $foo_term_1 = self::factory()->term->create( array(
                         'taxonomy' => 'foo',
                 ) );
-                $foo_term_2 = self::$factory->term->create( array(
+                $foo_term_2 = self::factory()->term->create( array(
                         'taxonomy' => 'foo',
                 ) );
-                $bar_term_1 = self::$factory->term->create( array(
+                $bar_term_1 = self::factory()->term->create( array(
                         'taxonomy' => 'bar',
                 ) );
-                $bar_term_2 = self::$factory->term->create( array(
+                $bar_term_2 = self::factory()->term->create( array(
                         'taxonomy' => 'bar',
                 ) );
 
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
 
                 wp_set_object_terms( $p1, array( $foo_term_1 ), 'foo' );
                 wp_set_object_terms( $p1, array( $bar_term_1 ), 'bar' );
@@ -768 +768 @@
                 register_taxonomy( 'foo', 'post' );
                 register_taxonomy( 'bar', 'post' );
 
-                $foo_term_1 = self::$factory->term->create( array(
+                $foo_term_1 = self::factory()->term->create( array(
                         'taxonomy' => 'foo',
                 ) );
-                $foo_term_2 = self::$factory->term->create( array(
+                $foo_term_2 = self::factory()->term->create( array(
                         'taxonomy' => 'foo',
                 ) );
-                $bar_term_1 = self::$factory->term->create( array(
+                $bar_term_1 = self::factory()->term->create( array(
                         'taxonomy' => 'bar',
                 ) );
-                $bar_term_2 = self::$factory->term->create( array(
+                $bar_term_2 = self::factory()->term->create( array(
                         'taxonomy' => 'bar',
                 ) );
 
-                $p1 = self::$factory->post->create();
-                $p2 = self::$factory->post->create();
-                $p3 = self::$factory->post->create();
-                $p4 = self::$factory->post->create();
+                $p1 = self::factory()->post->create();
+                $p2 = self::factory()->post->create();
+                $p3 = self::factory()->post->create();
+                $p4 = self::factory()->post->create();
 
                 wp_set_object_terms( $p1, array( $foo_term_1 ), 'foo' );
                 wp_set_object_terms( $p1, array( $bar_term_1 ), 'bar' );
@@ -840 +840 @@
         public function test_tax_query_relation_or_both_clauses_empty_terms() {
                 // An empty tax query should return an empty array, not all posts.
 
-                self::$factory->post->create_many( 2 );
+                self::factory()->post->create_many( 2 );
 
                 $query = new WP_Query( array(
                         'fields' => 'ids',
@@ -873 +873 @@
         public function test_tax_query_relation_or_one_clause_empty_terms() {
                 // An empty tax query should return an empty array, not all posts.
 
-                self::$factory->post->create_many( 2 );
+                self::factory()->post->create_many( 2 );
 
                 $query = new WP_Query( array(
                         'fields' => 'ids',
@@ -901 +901 @@
         }
 
         public function test_tax_query_include_children() {
-                $cat_a = self::$factory->term->create( array( 'taxonomy' => 'category', 'name' => 'Australia' ) );
-                $cat_b = self::$factory->term->create( array( 'taxonomy' => 'category', 'name' => 'Sydney', 'parent' => $cat_a ) );
-                $cat_c = self::$factory->term->create( array( 'taxonomy' => 'category', 'name' => 'East Syndney', 'parent' => $cat_b ) );
-                $cat_d = self::$factory->term->create( array( 'taxonomy' => 'category', 'name' => 'West Syndney', 'parent' => $cat_b ) );
+                $cat_a = self::factory()->term->create( array( 'taxonomy' => 'category', 'name' => 'Australia' ) );
+                $cat_b = self::factory()->term->create( array( 'taxonomy' => 'category', 'name' => 'Sydney', 'parent' => $cat_a ) );
+                $cat_c = self::factory()->term->create( array( 'taxonomy' => 'category', 'name' => 'East Syndney', 'parent' => $cat_b ) );
+                $cat_d = self::factory()->term->create( array( 'taxonomy' => 'category', 'name' => 'West Syndney', 'parent' => $cat_b ) );
 
-                $post_a = self::$factory->post->create( array( 'post_category' => array( $cat_a ) ) );
-                $post_b = self::$factory->post->create( array( 'post_category' => array( $cat_b ) ) );
-                $post_c = self::$factory->post->create( array( 'post_category' => array( $cat_c ) ) );
-                $post_d = self::$factory->post->create( array( 'post_category' => array( $cat_d ) ) );
+                $post_a = self::factory()->post->create( array( 'post_category' => array( $cat_a ) ) );
+                $post_b = self::factory()->post->create( array( 'post_category' => array( $cat_b ) ) );
+                $post_c = self::factory()->post->create( array( 'post_category' => array( $cat_c ) ) );
+                $post_d = self::factory()->post->create( array( 'post_category' => array( $cat_d ) ) );
 
                 $posts = get_posts( array(
                         'fields' => 'ids',
@@ -1009 +1009 @@
                 $q = new WP_Query();
 
                 register_taxonomy_for_object_type( 'post_tag', 'attachment:image' );
-                $tag_id = self::$factory->term->create( array( 'slug' => rand_str(), 'name' => rand_str() ) );
-                $image_id = self::$factory->attachment->create_object( 'image.jpg', 0, array(
+                $tag_id = self::factory()->term->create( array( 'slug' => rand_str(), 'name' => rand_str() ) );
+                $image_id = self::factory()->attachment->create_object( 'image.jpg', 0, array(
                         'post_mime_type' => 'image/jpeg',
                         'post_type' => 'attachment'
                 ) );
@@ -1035 +1035 @@
         }
 
         public function test_tax_query_no_taxonomy() {
-                $cat_id = self::$factory->category->create( array( 'name' => 'alpha' ) );
-                self::$factory->post->create( array( 'post_title' => 'alpha', 'post_category' => array( $cat_id ) ) );
+                $cat_id = self::factory()->category->create( array( 'name' => 'alpha' ) );
+                self::factory()->post->create( array( 'post_title' => 'alpha', 'post_category' => array( $cat_id ) ) );
 
                 $response1 = new WP_Query( array(
                         'tax_query' => array(
@@ -1076 +1076 @@
         public function test_term_taxonomy_id_field_no_taxonomy() {
                 $q = new WP_Query();
 
-                $posts = self::$factory->post->create_many( 5 );
+                $posts = self::factory()->post->create_many( 5 );
 
                 $cats = $tags = array();
 
@@ -1155 +1155 @@
          */
         public function test_populate_taxonomy_query_var_from_tax_query() {
                 register_taxonomy( 'foo', 'post' );
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'foo',
                 ) );
-                $c = self::$factory->term->create( array(
+                $c = self::factory()->term->create( array(
                         'taxonomy' => 'category',
                 ) );
 
@@ -1191 +1191 @@
         public function test_populate_taxonomy_query_var_from_tax_query_taxonomy_already_set() {
                 register_taxonomy( 'foo', 'post' );
                 register_taxonomy( 'foo1', 'post' );
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'foo',
                 ) );
 
@@ -1213 +1213 @@
 
         public function test_populate_term_query_var_from_tax_query() {
                 register_taxonomy( 'foo', 'post' );
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'foo',
                         'slug' => 'bar',
                 ) );
@@ -1235 +1235 @@
 
         public function test_populate_term_id_query_var_from_tax_query() {
                 register_taxonomy( 'foo', 'post' );
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'foo',
                         'slug' => 'bar',
                 ) );
@@ -1260 +1260 @@
          */
         public function test_populate_cat_category_name_query_var_from_tax_query() {
                 register_taxonomy( 'foo', 'post' );
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'foo',
                 ) );
-                $c = self::$factory->term->create( array(
+                $c = self::factory()->term->create( array(
                         'taxonomy' => 'category',
                         'slug' => 'bar',
                 ) );
@@ -1301 +1301 @@
          */
         public function test_populate_tag_id_query_var_from_tax_query() {
                 register_taxonomy( 'foo', 'post' );
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'foo',
                 ) );
-                $tag = self::$factory->term->create( array(
+                $tag = self::factory()->term->create( array(
                         'taxonomy' => 'post_tag',
                         'slug' => 'bar',
                 ) );

tests/phpunit/tests/rest-api/rest-server.php

@@ -136 +136 @@
                         'permission_callback' => '__return_true',
                 ) );
 
-                $editor = self::$factory->user->create( array( 'role' => 'editor' ) );
+                $editor = self::factory()->user->create( array( 'role' => 'editor' ) );
 
                 $request = new WP_REST_Request( 'GET', '/test-ns/test', array() );
 

tests/phpunit/tests/rewrite.php

@@ -85 +85 @@
 
         function test_url_to_postid() {
 
-                $id = self::$factory->post->create();
+                $id = self::factory()->post->create();
                 $this->assertEquals( $id, url_to_postid( get_permalink( $id ) ) );
 
-                $id = self::$factory->post->create( array( 'post_type' => 'page' ) );
+                $id = self::factory()->post->create( array( 'post_type' => 'page' ) );
                 $this->assertEquals( $id, url_to_postid( get_permalink( $id ) ) );
         }
 
         function test_url_to_postid_set_url_scheme_https_to_http() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
                 $permalink = get_permalink( $post_id );
                 $this->assertEquals( $post_id, url_to_postid( set_url_scheme( $permalink, 'https' ) ) );
 
-                $post_id = self::$factory->post->create( array( 'post_type' => 'page' ) );
+                $post_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
                 $permalink = get_permalink( $post_id );
                 $this->assertEquals( $post_id, url_to_postid( set_url_scheme( $permalink, 'https' ) ) );
         }
@@ -109 +109 @@
 
                 $_SERVER['HTTPS'] = 'on';
 
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
                 $permalink = get_permalink( $post_id );
                 $this->assertEquals( $post_id, url_to_postid( set_url_scheme( $permalink, 'http' ) ) );
 
-                $post_id = self::$factory->post->create( array( 'post_type' => 'page' ) );
+                $post_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
                 $permalink = get_permalink( $post_id );
                 $this->assertEquals( $post_id, url_to_postid( set_url_scheme( $permalink, 'http' ) ) );
 
@@ -128 +128 @@
                 $post_type = rand_str( 12 );
                 register_post_type( $post_type, array( 'public' => true ) );
 
-                $id = self::$factory->post->create( array( 'post_type' => $post_type ) );
+                $id = self::factory()->post->create( array( 'post_type' => $post_type ) );
                 $this->assertEquals( $id, url_to_postid( get_permalink( $id ) ) );
 
                 _unregister_post_type( $post_type );
@@ -136 +136 @@
 
         function test_url_to_postid_hierarchical() {
 
-                $parent_id = self::$factory->post->create( array( 'post_title' => 'Parent', 'post_type' => 'page' ) );
-                $child_id = self::$factory->post->create( array( 'post_title' => 'Child', 'post_type' => 'page', 'post_parent' => $parent_id ) );
+                $parent_id = self::factory()->post->create( array( 'post_title' => 'Parent', 'post_type' => 'page' ) );
+                $child_id = self::factory()->post->create( array( 'post_title' => 'Child', 'post_type' => 'page', 'post_parent' => $parent_id ) );
 
                 $this->assertEquals( $parent_id, url_to_postid( get_permalink( $parent_id ) ) );
                 $this->assertEquals( $child_id, url_to_postid( get_permalink( $child_id ) ) );
@@ -145 +145 @@
 
         function test_url_to_postid_hierarchical_with_matching_leaves() {
 
-                $parent_id = self::$factory->post->create( array(
+                $parent_id = self::factory()->post->create( array(
                         'post_name' => 'parent',
                         'post_type' => 'page',
                 ) );
-                $child_id_1 = self::$factory->post->create( array(
+                $child_id_1 = self::factory()->post->create( array(
                         'post_name'   => 'child1',
                         'post_type'   => 'page',
                         'post_parent' => $parent_id,
                 ) );
-                $child_id_2 = self::$factory->post->create( array(
+                $child_id_2 = self::factory()->post->create( array(
                         'post_name'   => 'child2',
                         'post_type'   => 'page',
                         'post_parent' => $parent_id,
                 ) );
-                $grandchild_id_1 = self::$factory->post->create( array(
+                $grandchild_id_1 = self::factory()->post->create( array(
                         'post_name'   => 'grandchild',
                         'post_type'   => 'page',
                         'post_parent' => $child_id_1,
                 ) );
-                $grandchild_id_2 = self::$factory->post->create( array(
+                $grandchild_id_2 = self::factory()->post->create( array(
                         'post_name'   => 'grandchild',
                         'post_type'   => 'page',
                         'post_parent' => $child_id_2,
@@ -180 +180 @@
 
                 update_option( 'home', home_url( '/example/' ) );
 
-                $id = self::$factory->post->create( array( 'post_title' => 'Hi', 'post_type' => 'page', 'post_name' => 'examp' ) );
+                $id = self::factory()->post->create( array( 'post_title' => 'Hi', 'post_type' => 'page', 'post_name' => 'examp' ) );
                 $this->assertEquals( $id, url_to_postid( get_permalink( $id ) ) );
                 $this->assertEquals( $id, url_to_postid( site_url('/example/examp' ) ) );
                 $this->assertEquals( $id, url_to_postid( '/example/examp/' ) );
@@ -244 +244 @@
         function test_url_to_postid_dupe_path() {
                 update_option( 'home', home_url('/example/') );
 
-                $id = self::$factory->post->create( array( 'post_title' => 'Hi', 'post_type' => 'page', 'post_name' => 'example' ) );
+                $id = self::factory()->post->create( array( 'post_title' => 'Hi', 'post_type' => 'page', 'post_name' => 'example' ) );
 
                 $this->assertEquals( $id, url_to_postid( get_permalink( $id ) ) );
                 $this->assertEquals( $id, url_to_postid( site_url( '/example/example/' ) ) );
@@ -258 +258 @@
         function test_url_to_postid_home_url_collision() {
                 update_option( 'home', home_url( '/example' ) );
 
-                self::$factory->post->create( array( 'post_title' => 'Collision', 'post_type' => 'page', 'post_name' => 'collision' ) );
+                self::factory()->post->create( array( 'post_title' => 'Collision', 'post_type' => 'page', 'post_name' => 'collision' ) );
 
                 // This url should NOT return a post ID
                 $badurl = site_url( '/example-collision' );
@@ -277 +277 @@
                         return false;
                 }
 
-                $blog_id = self::$factory->blog->create( array( 'path' => '/example' ) );
+                $blog_id = self::factory()->blog->create( array( 'path' => '/example' ) );
                 switch_to_blog( $blog_id );
 
-                self::$factory->post->create( array( 'post_title' => 'Collision ', 'post_type' => 'page' ) );
+                self::factory()->post->create( array( 'post_title' => 'Collision ', 'post_type' => 'page' ) );
 
                 // This url should NOT return a post ID
                 $badurl = network_home_url( '/example-collision' );
@@ -294 +294 @@
          */
         public function test_is_home_should_be_false_when_visiting_custom_endpoint_without_a_registered_query_var_and_page_on_front_is_set() {
 
-                $page_id = self::$factory->post->create( array( 'post_type' => 'page' ) );
+                $page_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
                 update_option( 'show_on_front', 'page' );
                 update_option( 'page_on_front', $page_id );
 
@@ -313 +313 @@
         function test_url_to_postid_with_post_slug_that_clashes_with_a_trashed_page() {
                 $this->set_permalink_structure( '/%postname%/' );
 
-                $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_status' => 'trash' ) );
-                $post_id = self::$factory->post->create( array( 'post_title' => get_post( $page_id )->post_title ) );
+                $page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_status' => 'trash' ) );
+                $post_id = self::factory()->post->create( array( 'post_title' => get_post( $page_id )->post_title ) );
 
                 $this->assertEquals( $post_id, url_to_postid( get_permalink( $post_id ) ) );
 
@@ -327 +327 @@
         function test_parse_request_with_post_slug_that_clashes_with_a_trashed_page() {
                 $this->set_permalink_structure( '/%postname%/' );
 
-                $page_id = self::$factory->post->create( array( 'post_type' => 'page', 'post_status' => 'trash' ) );
-                $post_id = self::$factory->post->create( array( 'post_title' => get_post( $page_id )->post_title ) );
+                $page_id = self::factory()->post->create( array( 'post_type' => 'page', 'post_status' => 'trash' ) );
+                $post_id = self::factory()->post->create( array( 'post_title' => get_post( $page_id )->post_title ) );
 
                 $this->go_to( get_permalink( $post_id ) );
 

tests/phpunit/tests/rewrite/numericSlugs.php

@@ -9 +9 @@
 
         public function setUp() {
                 parent::setUp();
-                $this->author_id = self::$factory->user->create( array( 'role' => 'editor' ) );
+                $this->author_id = self::factory()->user->create( array( 'role' => 'editor' ) );
 
                 // Override the post/archive slug collision prevention in `wp_unique_post_slug()`.
                 add_filter( 'wp_unique_post_slug', array( $this, 'filter_unique_post_slug' ), 10, 6 );
@@ -23 +23 @@
                 global $wpdb;
                 $this->set_permalink_structure( '/%postname%/' );
 
-                $id = self::$factory->post->create( array(
+                $id = self::factory()->post->create( array(
                         'post_author'  => $this->author_id,
                         'post_status'  => 'publish',
                         'post_content' => rand_str(),
@@ -51 +51 @@
                 global $wpdb;
                 $this->set_permalink_structure( '/%postname%/' );
 
-                $id = self::$factory->post->create( array(
+                $id = self::factory()->post->create( array(
                         'post_author'  => $this->author_id,
                         'post_status'  => 'publish',
                         'post_content' => rand_str(),
@@ -76 +76 @@
         public function test_go_to_year_segment_collision_with_title() {
                 $this->set_permalink_structure( '/%postname%/' );
 
-                $id = self::$factory->post->create( array(
+                $id = self::factory()->post->create( array(
                         'post_author'  => $this->author_id,
                         'post_status'  => 'publish',
                         'post_content' => rand_str(),
@@ -92 +92 @@
         public function test_url_to_postid_year_segment_collision_with_title() {
                 $this->set_permalink_structure( '/%postname%/' );
 
-                $id = self::$factory->post->create( array(
+                $id = self::factory()->post->create( array(
                         'post_author'  => $this->author_id,
                         'post_status'  => 'publish',
                         'post_content' => rand_str(),
@@ -106 +106 @@
         public function test_go_to_month_segment_collision_without_title() {
                 $this->set_permalink_structure( '/%year%/%postname%/' );
 
-                $id = self::$factory->post->create( array(
+                $id = self::factory()->post->create( array(
                         'post_author'  => $this->author_id,
                         'post_status'  => 'publish',
                         'post_content' => rand_str(),
@@ -123 +123 @@
         public function test_url_to_postid_month_segment_collision_without_title() {
                 $this->set_permalink_structure( '/%year%/%postname%/' );
 
-                $id = self::$factory->post->create( array(
+                $id = self::factory()->post->create( array(
                         'post_author'  => $this->author_id,
                         'post_status'  => 'publish',
                         'post_content' => rand_str(),
@@ -138 +138 @@
         public function test_go_to_month_segment_collision_without_title_no_leading_zero() {
                 $this->set_permalink_structure( '/%year%/%postname%/' );
 
-                $id = self::$factory->post->create( array(
+                $id = self::factory()->post->create( array(
                         'post_author'  => $this->author_id,
                         'post_status'  => 'publish',
                         'post_content' => rand_str(),
@@ -155 +155 @@
         public function test_url_to_postid_month_segment_collision_without_title_no_leading_zero() {
                 $this->set_permalink_structure( '/%year%/%postname%/' );
 
-                $id = self::$factory->post->create( array(
+                $id = self::factory()->post->create( array(
                         'post_author'  => $this->author_id,
                         'post_status'  => 'publish',
                         'post_content' => rand_str(),
@@ -170 +170 @@
         public function test_go_to_month_segment_collision_with_title() {
                 $this->set_permalink_structure( '/%year%/%postname%/' );
 
-                $id = self::$factory->post->create( array(
+                $id = self::factory()->post->create( array(
                         'post_author'  => $this->author_id,
                         'post_status'  => 'publish',
                         'post_content' => rand_str(),
@@ -186 +186 @@
         public function test_url_to_postid_month_segment_collision_with_title() {
                 $this->set_permalink_structure( '/%year%/%postname%/' );
 
-                $id = self::$factory->post->create( array(
+                $id = self::factory()->post->create( array(
                         'post_author'  => $this->author_id,
                         'post_status'  => 'publish',
                         'post_content' => rand_str(),
@@ -200 +200 @@
         public function test_go_to_month_segment_collision_with_title_no_leading_zero() {
                 $this->set_permalink_structure( '/%year%/%postname%/' );
 
-                $id = self::$factory->post->create( array(
+                $id = self::factory()->post->create( array(
                         'post_author'  => $this->author_id,
                         'post_status'  => 'publish',
                         'post_content' => rand_str(),
@@ -216 +216 @@
         public function test_url_to_postid_month_segment_collision_with_title_no_leading_zero() {
                 $this->set_permalink_structure( '/%year%/%postname%/' );
 
-                $id = self::$factory->post->create( array(
+                $id = self::factory()->post->create( array(
                         'post_author'  => $this->author_id,
                         'post_status'  => 'publish',
                         'post_content' => rand_str(),
@@ -230 +230 @@
         public function test_go_to_day_segment_collision_without_title() {
                 $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
 
-                $id = self::$factory->post->create( array(
+                $id = self::factory()->post->create( array(
                         'post_author'  => $this->author_id,
                         'post_status'  => 'publish',
                         'post_content' => rand_str(),
@@ -247 +247 @@
         public function test_url_to_postid_day_segment_collision_without_title() {
                 $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
 
-                $id = self::$factory->post->create( array(
+                $id = self::factory()->post->create( array(
                         'post_author'  => $this->author_id,
                         'post_status'  => 'publish',
                         'post_content' => rand_str(),
@@ -262 +262 @@
         public function test_go_to_day_segment_collision_with_title() {
                 $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
 
-                $id = self::$factory->post->create( array(
+                $id = self::factory()->post->create( array(
                         'post_author'  => $this->author_id,
                         'post_status'  => 'publish',
                         'post_content' => rand_str(),
@@ -278 +278 @@
         public function test_url_to_postid_day_segment_collision_with_title() {
                 $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
 
-                $id = self::$factory->post->create( array(
+                $id = self::factory()->post->create( array(
                         'post_author'  => $this->author_id,
                         'post_status'  => 'publish',
                         'post_content' => rand_str(),
@@ -292 +292 @@
         public function test_numeric_slug_permalink_conflicts_should_only_be_resolved_for_the_main_query() {
                 $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
 
-                $id = self::$factory->post->create( array(
+                $id = self::factory()->post->create( array(
                         'post_author'  => $this->author_id,
                         'post_status'  => 'publish',
                         'post_content' => rand_str(),
@@ -314 +314 @@
                 $this->set_permalink_structure( '/%year%/%postname%/' );
 
                 // Make sure a post is published in 2013/02, to avoid 404s.
-                self::$factory->post->create( array(
+                self::factory()->post->create( array(
                         'post_author'  => $this->author_id,
                         'post_status'  => 'publish',
                         'post_content' => 'foo',
@@ -322 +322 @@
                         'post_date'    => '2013-02-01 01:00:00',
                 ) );
 
-                $id = self::$factory->post->create( array(
+                $id = self::factory()->post->create( array(
                         'post_author'  => $this->author_id,
                         'post_status'  => 'publish',
                         'post_content' => 'foo',
@@ -342 +342 @@
                 $this->set_permalink_structure( '/%year%/%monthnum%/%postname%/' );
 
                 // Make sure a post is published on 2015/01/01, to avoid 404s.
-                self::$factory->post->create( array(
+                self::factory()->post->create( array(
                         'post_author'  => $this->author_id,
                         'post_status'  => 'publish',
                         'post_content' => 'foo',
@@ -350 +350 @@
                         'post_date'    => '2015-01-02 01:00:00',
                 ) );
 
-                $id = self::$factory->post->create( array(
+                $id = self::factory()->post->create( array(
                         'post_author'  => $this->author_id,
                         'post_status'  => 'publish',
                         'post_content' => 'foo',
@@ -369 +369 @@
         public function test_date_slug_collision_should_distinguish_valid_pagination_from_date() {
                 $this->set_permalink_structure( '/%year%/%postname%/' );
 
-                $id = self::$factory->post->create( array(
+                $id = self::factory()->post->create( array(
                         'post_author'  => $this->author_id,
                         'post_status'  => 'publish',
                         'post_content' => 'Page 0<!--nextpage-->Page 1<!--nextpage-->Page 2<!--nextpage-->Page 3',
@@ -385 +385 @@
         public function test_date_slug_collision_should_distinguish_too_high_pagination_from_date() {
                 $this->set_permalink_structure( '/%year%/%postname%/' );
 
-                $id = self::$factory->post->create( array(
+                $id = self::factory()->post->create( array(
                         'post_author'  => $this->author_id,
                         'post_status'  => 'publish',
                         'post_content' => 'Page 0<!--nextpage-->Page 1<!--nextpage-->Page 2<!--nextpage-->Page 3',
@@ -401 +401 @@
         public function test_date_slug_collision_should_not_require_pagination_query_var() {
                 $this->set_permalink_structure( '/%year%/%postname%/' );
 
-                $id = self::$factory->post->create( array(
+                $id = self::factory()->post->create( array(
                         'post_author'  => $this->author_id,
                         'post_status'  => 'publish',
                         'post_content' => 'Page 0<!--nextpage-->Page 1<!--nextpage-->Page 2<!--nextpage-->Page 3',
@@ -418 +418 @@
         public function test_date_slug_collision_should_be_ignored_when_pagination_var_is_present_but_post_does_not_have_multiple_pages() {
                 $this->set_permalink_structure( '/%year%/%postname%/' );
 
-                $id = self::$factory->post->create( array(
+                $id = self::factory()->post->create( array(
                         'post_author'  => $this->author_id,
                         'post_status'  => 'publish',
                         'post_content' => 'This post does not have pagination.',

tests/phpunit/tests/rewrite/oldSlugRedirect.php

@@ -12 +12 @@
         public function setUp() {
                 parent::setUp();
 
-                $this->post_id = self::$factory->post->create( array(
+                $this->post_id = self::factory()->post->create( array(
                         'post_title'   => 'Foo Bar',
                         'post_name'   => 'foo-bar',
                 ) );
@@ -99 +99 @@
 
         public function test_old_slug_redirect_attachment() {
                 $file          = DIR_TESTDATA . '/images/canola.jpg';
-                $attachment_id = self::$factory->attachment->create_object( $file, $this->post_id, array(
+                $attachment_id = self::factory()->attachment->create_object( $file, $this->post_id, array(
                         'post_mime_type' => 'image/jpeg',
                         'post_name'      => 'my-attachment',
                 ) );

tests/phpunit/tests/taxonomy.php

@@ -34 +34 @@
         }
 
         function test_get_the_taxonomies() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
 
                 $taxes = get_the_taxonomies( $post_id );
                 $this->assertNotEmpty( $taxes );
                 $this->assertEquals( array( 'category' ), array_keys( $taxes ) );
 
-                $id = self::$factory->tag->create();
+                $id = self::factory()->tag->create();
                 wp_set_post_tags( $post_id, array( $id ) );
 
                 $taxes = get_the_taxonomies( $post_id );
@@ -53 +53 @@
          * @group 27238
          */
         public function test_get_the_taxonomies_term_template() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
 
                 $taxes = get_the_taxonomies( $post_id, array( 'term_template' => '%2$s' ) );
                 $this->assertEquals( 'Categories: Uncategorized.', $taxes['category'] );
@@ -64 +64 @@
         }
 
         function test_the_taxonomies() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
 
                 ob_start();
                 the_taxonomies( array( 'post' => $post_id ) );
@@ -79 +79 @@
          * @group 27238
          */
         function test_the_taxonomies_term_template() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
 
                 $output = get_echo( 'the_taxonomies', array( array( 'post' => $post_id, 'term_template' => '%2$s' ) ) );
                 $this->assertEquals( 'Categories: Uncategorized.', $output );
@@ -262 +262 @@
         }
 
         public function test_get_objects_in_term_should_return_objects_ids() {
-                $tag_id = self::$factory->tag->create();
-                $cat_id = self::$factory->category->create();
+                $tag_id = self::factory()->tag->create();
+                $cat_id = self::factory()->category->create();
                 $posts_with_tag = array();
                 $posts_with_category = array();
 
                 for ( $i = 0; $i < 3; $i++ ) {
-                        $post_id = self::$factory->post->create();
+                        $post_id = self::factory()->post->create();
                         wp_set_post_tags( $post_id, array( $tag_id ) );
                         $posts_with_tag[] = $post_id;
                 }
 
                 for ( $i = 0; $i < 3; $i++ ) {
-                        $post_id = self::$factory->post->create();
+                        $post_id = self::factory()->post->create();
                         wp_set_post_categories( $post_id, array( $cat_id ) );
                         $posts_with_category[] = $post_id;
                 }
 
                 for ( $i = 0; $i < 3; $i++ ) {
-                        self::$factory->post->create();
+                        self::factory()->post->create();
                 }
 
                 $posts_with_terms = array_merge( $posts_with_tag, $posts_with_category );
@@ -295 +295 @@
          * @ticket 25706
          */
         function test_in_category() {
-                $post = self::$factory->post->create_and_get();
+                $post = self::factory()->post->create_and_get();
 
                 // in_category() returns false when first parameter is empty()
                 $this->assertFalse( in_category( '', $post ) );
@@ -346 +346 @@
 
         public function test_get_ancestors_taxonomy_non_hierarchical() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 
@@ -358 +358 @@
                 register_taxonomy( 'wptests_tax', 'post', array(
                         'hierarchical' => true,
                 ) );
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'parent' => $t1,
                 ) );
-                $t3 = self::$factory->term->create( array(
+                $t3 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'parent' => $t2,
                 ) );
-                $t4 = self::$factory->term->create( array(
+                $t4 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'parent' => $t1,
                 ) );
@@ -380 +380 @@
 
         public function test_get_ancestors_post_type_non_hierarchical() {
                 register_post_type( 'wptests_pt' );
-                $p = self::$factory->post->create( array(
+                $p = self::factory()->post->create( array(
                         'taxonomy' => 'wptests_pt',
                 ) );
 
@@ -391 +391 @@
                 register_post_type( 'wptests_pt', array(
                         'hierarchical' => true,
                 ) );
-                $p1 = self::$factory->post->create( array(
+                $p1 = self::factory()->post->create( array(
                         'post_type' => 'wptests_pt',
                 ) );
-                $p2 = self::$factory->post->create( array(
+                $p2 = self::factory()->post->create( array(
                         'post_type' => 'wptests_pt',
                         'post_parent' => $p1,
                 ) );
-                $p3 = self::$factory->post->create( array(
+                $p3 = self::factory()->post->create( array(
                         'post_type' => 'wptests_pt',
                         'post_parent' => $p2,
                 ) );
-                $p4 = self::$factory->post->create( array(
+                $p4 = self::factory()->post->create( array(
                         'post_type' => 'wptests_pt',
                         'post_parent' => $p1,
                 ) );
@@ -418 +418 @@
                 register_post_type( 'wptests_conflict', array(
                         'hierarchical' => true,
                 ) );
-                $p1 = self::$factory->post->create( array(
+                $p1 = self::factory()->post->create( array(
                         'post_type' => 'wptests_conflict',
                 ) );
-                $p2 = self::$factory->post->create( array(
+                $p2 = self::factory()->post->create( array(
                         'post_type' => 'wptests_conflict',
                         'post_parent' => $p1,
                 ) );
@@ -429 +429 @@
                 register_taxonomy( 'wptests_conflict', 'post', array(
                         'hierarchical' => true,
                 ) );
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_conflict',
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_conflict',
                         'parent' => $t1,
                 ) );
@@ -451 +451 @@
                         'public' => false,
                 ) );
 
-                $t = self::$factory->term->create_and_get( array(
+                $t = self::factory()->term->create_and_get( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 
-                $p = self::$factory->post->create();
+                $p = self::factory()->post->create();
                 wp_set_object_terms( $p, $t->slug, 'wptests_tax' );
 
                 $this->go_to( '/?wptests_tax=' . $t->slug );
@@ -471 +471 @@
                         'public' => false,
                 ) );
 
-                $t = self::$factory->term->create_and_get( array(
+                $t = self::factory()->term->create_and_get( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 
-                $p = self::$factory->post->create();
+                $p = self::factory()->post->create();
                 wp_set_object_terms( $p, $t->slug, 'wptests_tax' );
 
                 $this->go_to( '/?taxonomy=wptests_tax&term=' . $t->slug );

tests/phpunit/tests/term.php

@@ -23 +23 @@
                         'hierarchical' => true,
                 ) );
 
-                $parent = self::$factory->term->create( array(
+                $parent = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 
-                $child = self::$factory->term->create( array(
+                $child = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'parent' => $parent,
                         'slug' => 'foo',
@@ -226 +226 @@
         public function test_wp_set_object_terms_append_true() {
                 register_taxonomy( 'wptests_tax', 'post' );
                 $p = self::$post_ids[0];
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 
@@ -247 +247 @@
         public function test_wp_set_object_terms_append_false() {
                 register_taxonomy( 'wptests_tax', 'post' );
                 $p = self::$post_ids[0];
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 
@@ -268 +268 @@
         public function test_wp_set_object_terms_append_default_to_false() {
                 register_taxonomy( 'wptests_tax', 'post' );
                 $p = self::$post_ids[0];
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 
@@ -364 +364 @@
          */
         function test_wp_add_remove_object_terms() {
                 $posts = self::$post_ids;
-                $tags = self::$factory->tag->create_many( 5 );
+                $tags = self::factory()->tag->create_many( 5 );
 
                 $tt = wp_add_object_terms( $posts[0], $tags[1], 'post_tag' );
                 $this->assertEquals( 1, count( $tt ) );
@@ -523 +523 @@
          */
         function test_object_term_cache_when_term_changes() {
                 $post_id = self::$post_ids[0];
-                $tag_id = self::$factory->tag->create( array(
+                $tag_id = self::factory()->tag->create( array(
                         'name' => 'Amaze Tag',
                         'description' => 'My Amazing Tag'
                 ) );
@@ -553 +553 @@
         public function test_get_the_terms_should_not_cache_wp_term_objects() {
                 $p = self::$post_ids[0];
                 register_taxonomy( 'wptests_tax', 'post' );
-                $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
                 wp_set_object_terms( $p, $t, 'wptests_tax' );
 
                 // Prime the cache.
@@ -572 +572 @@
         public function test_get_the_terms_should_return_wp_term_objects_from_cache() {
                 $p = self::$post_ids[0];
                 register_taxonomy( 'wptests_tax', 'post' );
-                $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
                 wp_set_object_terms( $p, $t, 'wptests_tax' );
 
                 // Prime the cache.
@@ -618 +618 @@
          * @ticket 19205
          */
         function test_orphan_category() {
-                $cat_id1 = self::$factory->category->create();
+                $cat_id1 = self::factory()->category->create();
 
                 wp_delete_category( $cat_id1 );
 
-                $cat_id2 = self::$factory->category->create( array( 'parent' => $cat_id1 ) );
+                $cat_id2 = self::factory()->category->create( array( 'parent' => $cat_id1 ) );
                 $this->assertWPError( $cat_id2 );
         }
 }

tests/phpunit/tests/term/cache.php

@@ -15 +15 @@
          */
         function test_category_children_cache() {
                 // Test with only one Parent => Child
-                $term_id1 = self::$factory->category->create();
-                $term_id1_child = self::$factory->category->create( array( 'parent' => $term_id1 ) );
+                $term_id1 = self::factory()->category->create();
+                $term_id1_child = self::factory()->category->create( array( 'parent' => $term_id1 ) );
                 $hierarchy = _get_term_hierarchy( 'category' );
 
                 $this->assertEquals( array( $term_id1 => array( $term_id1_child ) ), $hierarchy );
 
                 // Add another Parent => Child
-                $term_id2 = self::$factory->category->create();
-                $term_id2_child = self::$factory->category->create( array( 'parent' => $term_id2 ) );
+                $term_id2 = self::factory()->category->create();
+                $term_id2_child = self::factory()->category->create( array( 'parent' => $term_id2 ) );
                 $hierarchy = _get_term_hierarchy( 'category' );
 
                 $this->assertEquals( array( $term_id1 => array( $term_id1_child ), $term_id2 => array( $term_id2_child ) ), $hierarchy );
@@ -33 +33 @@
          * @ticket 22526
          */
         function test_category_name_change() {
-                $term = self::$factory->category->create_and_get( array( 'name' => 'Foo' ) );
-                $post_id = self::$factory->post->create();
+                $term = self::factory()->category->create_and_get( array( 'name' => 'Foo' ) );
+                $post_id = self::factory()->post->create();
                 wp_set_post_categories( $post_id, $term->term_id );
 
                 $post = get_post( $post_id );
@@ -98 +98 @@
                 global $wpdb;
 
                 register_taxonomy( 'wptests_tax', 'post' );
-                $term = self::$factory->term->create( array(
+                $term = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 
@@ -124 +124 @@
                 global $wpdb;
 
                 register_taxonomy( 'wptests_tax', 'post' );
-                $term = self::$factory->term->create( array(
+                $term = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 
@@ -151 +151 @@
                 global $wpdb;
 
                 register_taxonomy( 'wptests_tax', 'post' );
-                $term = self::$factory->term->create( array(
+                $term = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 
@@ -182 +182 @@
 
                 register_taxonomy( 'wptests_tax', 'post' );
 
-                $terms = self::$factory->term->create_many( 5, array(
+                $terms = self::factory()->term->create_many( 5, array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 

tests/phpunit/tests/term/categoryExists.php

@@ -5 +5 @@
          * @ticket 30975
          */
         public function test_category_exists_should_return_only_top_level_categories_when_parent_is_0() {
-                $c1 = self::$factory->category->create();
-                $c2 = self::$factory->category->create( array(
+                $c1 = self::factory()->category->create();
+                $c2 = self::factory()->category->create( array(
                         'name' => 'Foo',
                         'parent' => $c1,
                 ) );
-                $c3 = self::$factory->category->create( array(
+                $c3 = self::factory()->category->create( array(
                         'name' => 'Foo',
                 ) );
 
@@ -24 +24 @@
          */
         public function test_category_exists_should_select_oldest_matching_category_when_no_parent_is_specified_1() {
                 // Foo child of c1 is created first.
-                $c1 = self::$factory->category->create();
-                $c2 = self::$factory->category->create( array(
+                $c1 = self::factory()->category->create();
+                $c2 = self::factory()->category->create( array(
                         'name' => 'Foo',
                         'parent' => $c1,
                 ) );
-                $c3 = self::$factory->category->create( array(
+                $c3 = self::factory()->category->create( array(
                         'name' => 'Foo',
                 ) );
 
@@ -43 +43 @@
          */
         public function test_category_exists_should_select_oldest_matching_category_when_no_parent_is_specified_2() {
                 // Top-level Foo is created first.
-                $c1 = self::$factory->category->create();
-                $c2 = self::$factory->category->create( array(
+                $c1 = self::factory()->category->create();
+                $c2 = self::factory()->category->create( array(
                         'name' => 'Foo',
                 ) );
-                $c3 = self::$factory->category->create( array(
+                $c3 = self::factory()->category->create( array(
                         'name' => 'Foo',
                         'parent' => $c1,
                 ) );
@@ -61 +61 @@
          * @ticket 30975
          */
         public function test_category_exists_should_respect_nonempty_parent() {
-                $c1 = self::$factory->category->create();
-                $c2 = self::$factory->category->create( array(
+                $c1 = self::factory()->category->create();
+                $c2 = self::factory()->category->create( array(
                         'name' => 'Foo',
                         'parent' => $c1,
                 ) );
-                $c3 = self::$factory->category->create( array(
+                $c3 = self::factory()->category->create( array(
                         'name' => 'Foo',
                 ) );
 

tests/phpunit/tests/term/getEditTermLink.php

@@ -6 +6 @@
 class Tests_Term_GetEditTermLink extends WP_UnitTestCase {
         public function setUp() {
                 parent::setUp();
-                wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
+                wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
                 register_taxonomy( 'wptests_tax', 'post' );
         }
 
         public function test_get_edit_term_link_default() {
-                $term1 = self::$factory->term->create( array(
+                $term1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'name' => 'foo',
                 ) );
@@ -25 +25 @@
          * @ticket 32786
          */
         public function test_get_edit_term_link_invalid_id() {
-                $term1 = self::$factory->term->create( array(
+                $term1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'name' => 'foo',
                 ) );

tests/phpunit/tests/term/getTerm.php

@@ -24 +24 @@
         public function test_passing_term_object_should_skip_database_query_when_filter_property_is_empty() {
                 global $wpdb;
 
-                $term = self::$factory->term->create_and_get( array( 'taxonomy' => 'wptests_tax' ) );
+                $term = self::factory()->term->create_and_get( array( 'taxonomy' => 'wptests_tax' ) );
                 clean_term_cache( $term->term_id, 'wptests_tax' );
 
                 $num_queries = $wpdb->num_queries;
@@ -46 +46 @@
         public function test_cache_should_be_populated_by_successful_fetch() {
                 global $wpdb;
 
-                $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
                 clean_term_cache( $t, 'wptests_tax' );
 
                 // Prime cache.
@@ -60 +60 @@
         }
 
         public function test_output_object() {
-                $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
                 $this->assertInternalType( 'object', get_term( $t, 'wptests_tax', OBJECT ) );
         }
 
         public function test_output_array_a() {
-                $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
                 $term = get_term( $t, 'wptests_tax', ARRAY_A );
                 $this->assertInternalType( 'array', $term );
                 $this->assertTrue( isset( $term['term_id'] ) );
         }
 
         public function test_output_array_n() {
-                $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
                 $term = get_term( $t, 'wptests_tax', ARRAY_N );
                 $this->assertInternalType( 'array', $term );
                 $this->assertFalse( isset( $term['term_id'] ) );
@@ -82 +82 @@
         }
 
         public function test_output_should_fall_back_to_object_for_invalid_input() {
-                $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
                 $this->assertInternalType( 'object', get_term( $t, 'wptests_tax', 'foo' ) );
         }
 
@@ -92 +92 @@
         public function test_numeric_properties_should_be_cast_to_ints() {
                 global $wpdb;
 
-                $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
 
                 // Get raw data from the database.
                 $term_data = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->terms t JOIN $wpdb->term_taxonomy tt ON ( t.term_id = tt.term_id ) WHERE t.term_id = %d", $t ) );
@@ -111 +111 @@
          * @ticket 34332
          */
          public function test_should_return_null_when_provided_taxonomy_does_not_match_actual_term_taxonomy() {
-                $term_id = self::$factory->term->create( array( 'taxonomy' => 'post_tag' ) );
+                $term_id = self::factory()->term->create( array( 'taxonomy' => 'post_tag' ) );
                 $this->assertNull( get_term( $term_id, 'category' ) );
         }
 }

tests/phpunit/tests/term/getTermBy.php

@@ -28 +28 @@
                 register_taxonomy( 'wptests_tax', 'post' );
 
                 $slug = 'ńaș';
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'slug' => $slug,
                         'taxonomy' => 'wptests_tax',
                 ) );
@@ -44 +44 @@
                 global $wpdb;
 
                 register_taxonomy( 'wptests_tax', 'post' );
-                $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
                 $term = get_term( $t, 'wptests_tax' );
 
                 $new_ttid = $term->term_taxonomy_id + 1;
@@ -67 +67 @@
                 global $wpdb;
 
                 register_taxonomy( 'wptests_tax', 'post' );
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'slug' => 'foo',
                 ) );

tests/phpunit/tests/term/getTermField.php

@@ -17 +17 @@
          * @ticket 34245
          */
         public function test_get_term_field_should_not_return_error_for_empty_taxonomy() {
-                $term = self::$factory->term->create_and_get( array( 'taxonomy' => $this->taxonomy ) );
+                $term = self::factory()->term->create_and_get( array( 'taxonomy' => $this->taxonomy ) );
 
                 $found = get_term_field( 'taxonomy', $term->term_id, '' );
                 $this->assertNotWPError( $found );
@@ -28 +28 @@
          * @ticket 34245
          */
         public function test_get_term_field_supplying_a_taxonomy() {
-                $term = self::$factory->term->create_and_get( array( 'taxonomy' => $this->taxonomy ) );
+                $term = self::factory()->term->create_and_get( array( 'taxonomy' => $this->taxonomy ) );
 
                 $found = get_term_field( 'taxonomy', $term->term_id, $term->taxonomy );
                 $this->assertSame( $this->taxonomy, $found );
@@ -38 +38 @@
          * @ticket 34245
          */
         public function test_get_term_field_supplying_no_taxonomy() {
-                $term = self::$factory->term->create_and_get( array( 'taxonomy' => $this->taxonomy ) );
+                $term = self::factory()->term->create_and_get( array( 'taxonomy' => $this->taxonomy ) );
 
                 $found = get_term_field( 'taxonomy', $term->term_id );
                 $this->assertSame( $this->taxonomy, $found );
@@ -48 +48 @@
          * @ticket 34245
          */
         public function test_get_term_field_should_accept_a_WP_Term_object_or_a_term_id() {
-                $term = self::$factory->term->create_and_get( array( 'taxonomy' => $this->taxonomy ) );
+                $term = self::factory()->term->create_and_get( array( 'taxonomy' => $this->taxonomy ) );
 
                 $this->assertInstanceOf( 'WP_Term', $term );
                 $this->assertSame( $term->term_id, get_term_field( 'term_id', $term ) );
@@ -59 +59 @@
          * @ticket 34245
          */
         public function test_get_term_field_invalid_taxonomy_should_return_WP_Error() {
-                $term = self::$factory->term->create_and_get( array( 'taxonomy' => $this->taxonomy ) );
+                $term = self::factory()->term->create_and_get( array( 'taxonomy' => $this->taxonomy ) );
 
                 $found = get_term_field( 'taxonomy', $term, 'foo-taxonomy' );
                 $this->assertWPError( $found );

tests/phpunit/tests/term/getTermLink.php

@@ -12 +12 @@
         }
 
         public function test_integer_should_be_interpreted_as_term_id() {
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'name' => 'foo',
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'slug' => $t1,
                 ) );
@@ -28 +28 @@
         }
 
         public function test_numeric_string_should_be_interpreted_as_term_slug() {
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'name' => 'foo',
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'slug' => $t1,
                 ) );
@@ -49 +49 @@
         }
 
         public function test_category_should_use_cat_query_var_with_term_id() {
-                $c = self::$factory->category->create();
+                $c = self::factory()->category->create();
 
                 $actual = get_term_link( $c, 'category' );
                 $this->assertContains( 'cat=' . $c, $actual );
@@ -60 +60 @@
                         'query_var' => 'foo',
                 ) );
 
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax2',
                         'slug' => 'bar',
                 ) );
@@ -74 +74 @@
                         'query_var' => false,
                 ) );
 
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax2',
                         'slug' => 'bar',
                 ) );
@@ -97 +97 @@
 
                 flush_rewrite_rules();
 
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax2',
                         'slug' => 'term1',
                 ) );
 
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax2',
                         'slug' => 'term2',
                         'parent' => $t1,
@@ -126 +126 @@
 
                 flush_rewrite_rules();
 
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax2',
                         'slug' => 'term1',
                 ) );
 
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax2',
                         'slug' => 'term2',
                         'parent' => $t1,

tests/phpunit/tests/term/getTerms.php

@@ -105 +105 @@
          * @ticket 23506
          */
         function test_get_terms_should_allow_arbitrary_indexed_taxonomies_array() {
-                $term_id = self::$factory->tag->create();
+                $term_id = self::factory()->tag->create();
                 $terms = get_terms( array( '111' => 'post_tag' ), array( 'hide_empty' => false ) );
                 $this->assertEquals( $term_id, reset( $terms )->term_id );
         }
@@ -114 +114 @@
          * @ticket 13661
          */
         function test_get_terms_fields() {
-                $term_id1 = self::$factory->tag->create( array( 'slug' => 'woo', 'name' => 'WOO!' ) );
-                $term_id2 = self::$factory->tag->create( array( 'slug' => 'hoo', 'name' => 'HOO!', 'parent' => $term_id1 ) );
+                $term_id1 = self::factory()->tag->create( array( 'slug' => 'woo', 'name' => 'WOO!' ) );
+                $term_id2 = self::factory()->tag->create( array( 'slug' => 'hoo', 'name' => 'HOO!', 'parent' => $term_id1 ) );
 
                 $terms_id_parent = get_terms( 'post_tag', array( 'hide_empty' => false, 'fields' => 'id=>parent' ) );
                 $this->assertEquals( array(
@@ -148 +148 @@
         function test_get_terms_include_exclude() {
                 global $wpdb;
 
-                $term_id1 = self::$factory->tag->create();
-                $term_id2 = self::$factory->tag->create();
+                $term_id1 = self::factory()->tag->create();
+                $term_id2 = self::factory()->tag->create();
                 $inc_terms = get_terms( 'post_tag', array(
                         'include' => array( $term_id1, $term_id2 ),
                         'hide_empty' => false
@@ -179 +179 @@
         public function test_exclude_with_hierarchical_true_for_non_hierarchical_taxonomy() {
                 register_taxonomy( 'wptests_tax', 'post' );
 
-                $terms = self::$factory->term->create_many( 2, array(
+                $terms = self::factory()->term->create_many( 2, array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 
@@ -202 +202 @@
 
                 $term_id_uncategorized = get_option( 'default_category' );
 
-                $term_id1 = self::$factory->category->create();
-                $term_id11 = self::$factory->category->create( array( 'parent' => $term_id1 ) );
-                $term_id2 = self::$factory->category->create();
-                $term_id22 = self::$factory->category->create( array( 'parent' => $term_id2 ) );
+                $term_id1 = self::factory()->category->create();
+                $term_id11 = self::factory()->category->create( array( 'parent' => $term_id1 ) );
+                $term_id2 = self::factory()->category->create();
+                $term_id22 = self::factory()->category->create( array( 'parent' => $term_id2 ) );
 
                 $terms = get_terms( 'category', array(
                         'exclude' => $term_id_uncategorized,
@@ -228 +228 @@
          * @ticket 13992
          */
         function test_get_terms_search() {
-                $term_id1 = self::$factory->tag->create( array( 'slug' => 'burrito' ) );
-                $term_id2 = self::$factory->tag->create( array( 'name' => 'Wilbur' ) );
+                $term_id1 = self::factory()->tag->create( array( 'slug' => 'burrito' ) );
+                $term_id2 = self::factory()->tag->create( array( 'name' => 'Wilbur' ) );
 
                 $terms = get_terms( 'post_tag', array( 'hide_empty' => false, 'search' => 'bur', 'fields' => 'ids' ) );
                 $this->assertEqualSets( array( $term_id1, $term_id2 ), $terms );
@@ -239 +239 @@
          * @ticket 8214
          */
         function test_get_terms_like() {
-                $term_id1 = self::$factory->tag->create( array( 'name' => 'burrito', 'description' => 'This is a burrito.' ) );
-                $term_id2 = self::$factory->tag->create( array( 'name' => 'taco', 'description' => 'Burning man.' ) );
+                $term_id1 = self::factory()->tag->create( array( 'name' => 'burrito', 'description' => 'This is a burrito.' ) );
+                $term_id2 = self::factory()->tag->create( array( 'name' => 'taco', 'description' => 'Burning man.' ) );
 
                 $terms = get_terms( 'post_tag', array( 'hide_empty' => false, 'name__like' => 'bur', 'fields' => 'ids' ) );
                 $this->assertEqualSets( array( $term_id1 ), $terms );
@@ -274 +274 @@
                 $tax = 'food';
                 register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
 
-                $cheese = self::$factory->term->create( array( 'name' => 'Cheese', 'taxonomy' => $tax ) );
+                $cheese = self::factory()->term->create( array( 'name' => 'Cheese', 'taxonomy' => $tax ) );
 
-                $cheddar = self::$factory->term->create( array( 'name' => 'Cheddar', 'parent' => $cheese, 'taxonomy' => $tax ) );
+                $cheddar = self::factory()->term->create( array( 'name' => 'Cheddar', 'parent' => $cheese, 'taxonomy' => $tax ) );
 
-                $post_ids = self::$factory->post->create_many( 2 );
+                $post_ids = self::factory()->post->create_many( 2 );
                 foreach ( $post_ids as $id ) {
                         wp_set_post_terms( $id, $cheddar, $tax );
                 }
                 $term = get_term( $cheddar, $tax );
                 $this->assertEquals( 2, $term->count );
 
-                $brie = self::$factory->term->create( array( 'name' => 'Brie', 'parent' => $cheese, 'taxonomy' => $tax ) );
-                $post_id = self::$factory->post->create();
+                $brie = self::factory()->term->create( array( 'name' => 'Brie', 'parent' => $cheese, 'taxonomy' => $tax ) );
+                $post_id = self::factory()->post->create();
                 wp_set_post_terms( $post_id, $brie, $tax );
                 $term = get_term( $brie, $tax );
                 $this->assertEquals( 1, $term->count );
 
-                $crackers = self::$factory->term->create( array( 'name' => 'Crackers', 'taxonomy' => $tax ) );
+                $crackers = self::factory()->term->create( array( 'name' => 'Crackers', 'taxonomy' => $tax ) );
 
-                $butter = self::$factory->term->create( array( 'name' => 'Butter', 'parent' => $crackers, 'taxonomy' => $tax ) );
-                $post_ids = self::$factory->post->create_many( 1 );
+                $butter = self::factory()->term->create( array( 'name' => 'Butter', 'parent' => $crackers, 'taxonomy' => $tax ) );
+                $post_ids = self::factory()->post->create_many( 1 );
                 foreach ( $post_ids as $id ) {
                         wp_set_post_terms( $id, $butter, $tax );
                 }
                 $term = get_term( $butter, $tax );
                 $this->assertEquals( 1, $term->count );
 
-                $multigrain = self::$factory->term->create( array( 'name' => 'Multigrain', 'parent' => $crackers, 'taxonomy' => $tax ) );
-                $post_ids = self::$factory->post->create_many( 1 );
+                $multigrain = self::factory()->term->create( array( 'name' => 'Multigrain', 'parent' => $crackers, 'taxonomy' => $tax ) );
+                $post_ids = self::factory()->post->create_many( 1 );
                 foreach ( $post_ids as $id ) {
                         wp_set_post_terms( $id, $multigrain, $tax );
                 }
                 $term = get_term( $multigrain, $tax );
                 $this->assertEquals( 1, $term->count );
 
-                $fruit = self::$factory->term->create( array( 'name' => 'Fruit', 'taxonomy' => $tax ) );
-                $cranberries = self::$factory->term->create( array( 'name' => 'Cranberries', 'parent' => $fruit, 'taxonomy' => $tax ) );
+                $fruit = self::factory()->term->create( array( 'name' => 'Fruit', 'taxonomy' => $tax ) );
+                $cranberries = self::factory()->term->create( array( 'name' => 'Cranberries', 'parent' => $fruit, 'taxonomy' => $tax ) );
 
                 $terms = get_terms( $tax, array( 'parent' => 0, 'cache_domain' => $tax ) );
                 $this->assertEquals( 2, count( $terms ) );
@@ -324 +324 @@
                 $tax = 'food';
                 register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
 
-                $cheese = self::$factory->term->create( array( 'name' => 'Cheese', 'taxonomy' => $tax ) );
-                $cheddar = self::$factory->term->create( array( 'name' => 'Cheddar', 'parent' => $cheese, 'taxonomy' => $tax ) );
-                $spread = self::$factory->term->create( array( 'name' => 'Spread', 'parent' => $cheddar, 'taxonomy' => $tax ) );
-                $post_id = self::$factory->post->create();
+                $cheese = self::factory()->term->create( array( 'name' => 'Cheese', 'taxonomy' => $tax ) );
+                $cheddar = self::factory()->term->create( array( 'name' => 'Cheddar', 'parent' => $cheese, 'taxonomy' => $tax ) );
+                $spread = self::factory()->term->create( array( 'name' => 'Spread', 'parent' => $cheddar, 'taxonomy' => $tax ) );
+                $post_id = self::factory()->post->create();
                 wp_set_post_terms( $post_id, $spread, $tax );
                 $term = get_term( $spread, $tax );
                 $this->assertEquals( 1, $term->count );
@@ -348 +348 @@
                 $parent = 0;
                 $t = array();
                 foreach ( range( 1, 7 ) as $depth ) {
-                        $t[$depth] = self::$factory->term->create( array( 'name' => 'term' . $depth, 'taxonomy' => $tax, 'parent' => $parent ) );
+                        $t[$depth] = self::factory()->term->create( array( 'name' => 'term' . $depth, 'taxonomy' => $tax, 'parent' => $parent ) );
                         $parent = $t[$depth];
                 }
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
                 wp_set_post_terms( $post_id, $t[7], $tax );
                 $term = get_term( $t[7], $tax );
                 $this->assertEquals( 1, $term->count );
@@ -367 +367 @@
          * @ticket 27123
          */
         function test_get_terms_child_of() {
-                $parent = self::$factory->category->create();
-                $child = self::$factory->category->create( array( 'parent' => $parent ) );
+                $parent = self::factory()->category->create();
+                $child = self::factory()->category->create( array( 'parent' => $parent ) );
 
                 $terms = get_terms( 'category', array( 'child_of' => $parent, 'hide_empty' => false ) );
                 $this->assertEquals( 1, count( $terms ) );
@@ -382 +382 @@
 
                 register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true, ) );
 
-                $terms = self::$factory->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
+                $terms = self::factory()->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
 
                 $num_queries = $wpdb->num_queries;
 
@@ -402 +402 @@
                 register_taxonomy( 'wptests_tax1', 'post', array( 'hierarchical' => true ) );
                 register_taxonomy( 'wptests_tax2', 'post', array( 'hierarchical' => true ) );
 
-                $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
-                $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
-                $t3 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2', 'parent' => $t2 ) );
+                $t1 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+                $t2 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
+                $t3 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax2', 'parent' => $t2 ) );
 
                 $found = get_terms( array( 'wptests_tax1', 'wptests_tax2' ), array(
                         'fields' => 'ids',
@@ -440 +440 @@
         public function test__get_term_children_handles_cycles() {
                 remove_filter( 'wp_update_term_parent', 'wp_check_term_hierarchy_for_loops', 10 );
 
-                $c1 = self::$factory->category->create();
-                $c2 = self::$factory->category->create( array( 'parent' => $c1 ) );
-                $c3 = self::$factory->category->create( array( 'parent' => $c2 ) );
+                $c1 = self::factory()->category->create();
+                $c2 = self::factory()->category->create( array( 'parent' => $c1 ) );
+                $c3 = self::factory()->category->create( array( 'parent' => $c2 ) );
                 wp_update_term( $c1, 'category', array( 'parent' => $c3 ) );
 
                 add_filter( 'wp_update_term_parent', 'wp_check_term_hierarchy_for_loops', 10, 3 );
@@ -459 +459 @@
         public function test__get_term_children_handles_cycles_when_terms_argument_contains_objects() {
                 remove_filter( 'wp_update_term_parent', 'wp_check_term_hierarchy_for_loops', 10 );
 
-                $c1 = self::$factory->category->create_and_get();
-                $c2 = self::$factory->category->create_and_get( array( 'parent' => $c1->term_id ) );
-                $c3 = self::$factory->category->create_and_get( array( 'parent' => $c2->term_id ) );
+                $c1 = self::factory()->category->create_and_get();
+                $c2 = self::factory()->category->create_and_get( array( 'parent' => $c1->term_id ) );
+                $c3 = self::factory()->category->create_and_get( array( 'parent' => $c2->term_id ) );
                 wp_update_term( $c1->term_id, 'category', array( 'parent' => $c3->term_id ) );
 
                 add_filter( 'wp_update_term_parent', 'wp_check_term_hierarchy_for_loops', 10, 3 );
@@ -472 +472 @@
         }
 
         public function test_get_terms_by_slug() {
-                $t1 = self::$factory->tag->create( array( 'slug' => 'foo' ) );
-                $t2 = self::$factory->tag->create( array( 'slug' => 'bar' ) );
+                $t1 = self::factory()->tag->create( array( 'slug' => 'foo' ) );
+                $t2 = self::factory()->tag->create( array( 'slug' => 'bar' ) );
 
                 $found = get_terms( 'post_tag', array(
                         'hide_empty' => false,
@@ -488 +488 @@
          * @ticket 23636
          */
         public function test_get_terms_by_multiple_slugs() {
-                $t1 = self::$factory->tag->create( array( 'slug' => 'foo' ) );
-                $t2 = self::$factory->tag->create( array( 'slug' => 'bar' ) );
-                $t3 = self::$factory->tag->create( array( 'slug' => 'barry' ) );
+                $t1 = self::factory()->tag->create( array( 'slug' => 'foo' ) );
+                $t2 = self::factory()->tag->create( array( 'slug' => 'bar' ) );
+                $t3 = self::factory()->tag->create( array( 'slug' => 'barry' ) );
 
                 $found = get_terms( 'post_tag', array(
                         'hide_empty' => false,
@@ -505 +505 @@
          * @ticket 30611
          */
         public function test_get_terms_by_name() {
-                $t1 = self::$factory->tag->create( array( 'name' => 'Foo' ) );
-                $t2 = self::$factory->tag->create( array( 'name' => 'Bar' ) );
+                $t1 = self::factory()->tag->create( array( 'name' => 'Foo' ) );
+                $t2 = self::factory()->tag->create( array( 'name' => 'Bar' ) );
 
                 $found = get_terms( 'post_tag', array(
                         'hide_empty' => false,
@@ -521 +521 @@
          * @ticket 30611
          */
         public function test_get_terms_by_multiple_names() {
-                $t1 = self::$factory->tag->create( array( 'name' => 'Foo' ) );
-                $t2 = self::$factory->tag->create( array( 'name' => 'Bar' ) );
-                $t3 = self::$factory->tag->create( array( 'name' => 'Barry' ) );
+                $t1 = self::factory()->tag->create( array( 'name' => 'Foo' ) );
+                $t2 = self::factory()->tag->create( array( 'name' => 'Bar' ) );
+                $t3 = self::factory()->tag->create( array( 'name' => 'Barry' ) );
 
                 $found = get_terms( 'post_tag', array(
                         'hide_empty' => false,
@@ -540 +540 @@
         public function test_name_should_match_encoded_html_entities() {
                 register_taxonomy( 'wptests_tax', 'post' );
 
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'name' => 'Foo & Bar',
                         'slug' => 'foo-and-bar',
@@ -569 +569 @@
                 // If run on a flat hierarchy it should return everything.
                 $flat_tax = 'countries';
                 register_taxonomy( $flat_tax, 'post', array( 'hierarchical' => false ) );
-                $australia = self::$factory->term->create( array( 'name' => 'Australia', 'taxonomy' => $flat_tax ) );
-                $china     = self::$factory->term->create( array( 'name' => 'China',     'taxonomy' => $flat_tax ) );
-                $tanzania  =  self::$factory->term->create( array( 'name' => 'Tanzania',  'taxonomy' => $flat_tax ) );
+                $australia = self::factory()->term->create( array( 'name' => 'Australia', 'taxonomy' => $flat_tax ) );
+                $china     = self::factory()->term->create( array( 'name' => 'China',     'taxonomy' => $flat_tax ) );
+                $tanzania  =  self::factory()->term->create( array( 'name' => 'Tanzania',  'taxonomy' => $flat_tax ) );
 
                 $terms = get_terms( $flat_tax, array(
                         'childless' => true,
@@ -601 +601 @@
                         PEI
                 */
                 // Level 1
-                $canada = self::$factory->term->create( array( 'name' => 'Canada', 'taxonomy' => $tax ) );
+                $canada = self::factory()->term->create( array( 'name' => 'Canada', 'taxonomy' => $tax ) );
 
                 // Level 2
-                $ontario = self::$factory->term->create( array( 'name' => 'Ontario', 'parent' => $canada, 'taxonomy' => $tax ) );
-                $quebec  = self::$factory->term->create( array( 'name' => 'Quebec', 'parent' => $canada, 'taxonomy' => $tax ) );
-                $pei     = self::$factory->term->create( array( 'name' => 'PEI', 'parent' => $canada, 'taxonomy' => $tax ) );
+                $ontario = self::factory()->term->create( array( 'name' => 'Ontario', 'parent' => $canada, 'taxonomy' => $tax ) );
+                $quebec  = self::factory()->term->create( array( 'name' => 'Quebec', 'parent' => $canada, 'taxonomy' => $tax ) );
+                $pei     = self::factory()->term->create( array( 'name' => 'PEI', 'parent' => $canada, 'taxonomy' => $tax ) );
 
                 // Level 3
-                $toronto  = self::$factory->term->create( array( 'name' => 'Toronto', 'parent' => $ontario, 'taxonomy' => $tax ) );
-                $ottawa   = self::$factory->term->create( array( 'name' => 'Ottawa', 'parent' => $ontario, 'taxonomy' => $tax ) );
-                $montreal = self::$factory->term->create( array( 'name' => 'Montreal', 'parent' => $quebec, 'taxonomy' => $tax ) );
+                $toronto  = self::factory()->term->create( array( 'name' => 'Toronto', 'parent' => $ontario, 'taxonomy' => $tax ) );
+                $ottawa   = self::factory()->term->create( array( 'name' => 'Ottawa', 'parent' => $ontario, 'taxonomy' => $tax ) );
+                $montreal = self::factory()->term->create( array( 'name' => 'Montreal', 'parent' => $quebec, 'taxonomy' => $tax ) );
 
                 // Level 4
-                $nepean = self::$factory->term->create( array( 'name' => 'Nepean', 'parent' => $ottawa, 'taxonomy' => $tax ) );
+                $nepean = self::factory()->term->create( array( 'name' => 'Nepean', 'parent' => $ottawa, 'taxonomy' => $tax ) );
 
                 $terms = get_terms( $tax, array(
                         'childless' => true,
@@ -633 +633 @@
                 register_taxonomy( $tax, 'post', array( 'hierarchical' => true ) );
 
                 // Level 1
-                $canada = self::$factory->term->create( array( 'name' => 'Canada', 'taxonomy' => $tax ) );
+                $canada = self::factory()->term->create( array( 'name' => 'Canada', 'taxonomy' => $tax ) );
 
                 // Level 2
-                $ontario = self::$factory->term->create( array( 'name' => 'Ontario', 'parent' => $canada, 'taxonomy' => $tax ) );
-                $quebec  = self::$factory->term->create( array( 'name' => 'Quebec', 'parent' => $canada, 'taxonomy' => $tax ) );
+                $ontario = self::factory()->term->create( array( 'name' => 'Ontario', 'parent' => $canada, 'taxonomy' => $tax ) );
+                $quebec  = self::factory()->term->create( array( 'name' => 'Quebec', 'parent' => $canada, 'taxonomy' => $tax ) );
 
                 // Level 3
-                $laval   = self::$factory->term->create( array( 'name' => 'Laval', 'parent' => $quebec, 'taxonomy' => $tax ) );
-                $montreal = self::$factory->term->create( array( 'name' => 'Montreal', 'parent' => $quebec, 'taxonomy' => $tax ) );
+                $laval   = self::factory()->term->create( array( 'name' => 'Laval', 'parent' => $quebec, 'taxonomy' => $tax ) );
+                $montreal = self::factory()->term->create( array( 'name' => 'Montreal', 'parent' => $quebec, 'taxonomy' => $tax ) );
 
                 // Level 4
-                $dorval = self::$factory->term->create( array( 'name' => 'Dorval', 'parent' => $montreal, 'taxonomy' => $tax ) );
+                $dorval = self::factory()->term->create( array( 'name' => 'Dorval', 'parent' => $montreal, 'taxonomy' => $tax ) );
 
                 $terms = get_terms( $tax, array(
                         'childless' => true,
@@ -663 +663 @@
                 register_taxonomy( 'wptests_tax1', 'post', array( 'hierarchical' => true ) );
                 register_taxonomy( 'wptests_tax2', 'post', array( 'hierarchical' => true ) );
 
-                $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
-                $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax1', 'parent' => $t1 ) );
-                $t3 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
-                $t4 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2', 'parent' => $t3 ) );
+                $t1 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+                $t2 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax1', 'parent' => $t1 ) );
+                $t3 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
+                $t4 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax2', 'parent' => $t3 ) );
 
                 $found = get_terms( array( 'wptests_tax1', 'wptests_tax2' ), array(
                         'fields' => 'ids',
@@ -1098 +1098 @@
                 register_taxonomy( 'wptests_tax1', 'post', array( 'hierarchical' => true ) );
                 register_taxonomy( 'wptests_tax2', 'post', array( 'hierarchical' => true ) );
 
-                $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
-                $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax1', 'parent' => $t1 ) );
-                $t3 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax1', 'parent' => $t2 ) );
+                $t1 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+                $t2 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax1', 'parent' => $t1 ) );
+                $t3 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax1', 'parent' => $t2 ) );
 
-                $t4 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
-                $t5 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2', 'parent' => $t4 ) );
-                $t6 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2', 'parent' => $t5 ) );
+                $t4 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
+                $t5 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax2', 'parent' => $t4 ) );
+                $t6 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax2', 'parent' => $t5 ) );
 
-                $p = self::$factory->post->create();
+                $p = self::factory()->post->create();
 
                 wp_set_object_terms( $p, $t3, 'wptests_tax1' );
                 wp_set_object_terms( $p, $t6, 'wptests_tax2' );
@@ -1140 +1140 @@
                 $tax = 'wptests_tax';
                 register_taxonomy( $tax, 'post' );
 
-                $t1 = self::$factory->term->create( array( 'taxonomy' => $tax ) );
-                $t2 = self::$factory->term->create( array( 'taxonomy' => $tax ) );
-                $t3 = self::$factory->term->create( array( 'taxonomy' => $tax ) );
-                $t4 = self::$factory->term->create( array( 'taxonomy' => $tax ) );
+                $t1 = self::factory()->term->create( array( 'taxonomy' => $tax ) );
+                $t2 = self::factory()->term->create( array( 'taxonomy' => $tax ) );
+                $t3 = self::factory()->term->create( array( 'taxonomy' => $tax ) );
+                $t4 = self::factory()->term->create( array( 'taxonomy' => $tax ) );
 
                 $found = get_terms( $tax, array(
                         'fields' => 'ids',
@@ -1164 +1164 @@
                 $tax = 'wptests_tax';
                 register_taxonomy( $tax, 'post' );
 
-                $t1 = self::$factory->term->create( array( 'taxonomy' => $tax, 'description' => 'fff' ) );
-                $t2 = self::$factory->term->create( array( 'taxonomy' => $tax, 'description' => 'aaa' ) );
-                $t3 = self::$factory->term->create( array( 'taxonomy' => $tax, 'description' => 'zzz' ) );
-                $t4 = self::$factory->term->create( array( 'taxonomy' => $tax, 'description' => 'jjj' ) );
+                $t1 = self::factory()->term->create( array( 'taxonomy' => $tax, 'description' => 'fff' ) );
+                $t2 = self::factory()->term->create( array( 'taxonomy' => $tax, 'description' => 'aaa' ) );
+                $t3 = self::factory()->term->create( array( 'taxonomy' => $tax, 'description' => 'zzz' ) );
+                $t4 = self::factory()->term->create( array( 'taxonomy' => $tax, 'description' => 'jjj' ) );
 
                 $found = get_terms( $tax, array(
                         'fields' => 'ids',
@@ -1185 +1185 @@
          */
         public function test_orderby_term_id() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'name' => 'AAA',
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'name' => 'ZZZ',
                 ) );
-                $t3 = self::$factory->term->create( array(
+                $t3 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'name' => 'JJJ',
                 ) );
@@ -1243 +1243 @@
 
         public function test_hierarchical_false_with_child_of_and_direct_child() {
                 $initial_terms = $this->create_hierarchical_terms();
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
                 wp_set_post_terms(
                         $post_id,
                         array( $initial_terms['seven_term']['term_id'] ),
@@ -1323 +1323 @@
 
                 register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true, ) );
 
-                $terms = self::$factory->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
+                $terms = self::factory()->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
 
                 $num_queries = $wpdb->num_queries;
 
@@ -1343 +1343 @@
                 register_taxonomy( 'wptests_tax1', 'post', array( 'hierarchical' => true ) );
                 register_taxonomy( 'wptests_tax2', 'post', array( 'hierarchical' => true ) );
 
-                $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
-                $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
-                $t3 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2', 'parent' => $t2 ) );
+                $t1 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+                $t2 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
+                $t3 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax2', 'parent' => $t2 ) );
 
                 $found = get_terms( array( 'wptests_tax1', 'wptests_tax2' ), array(
                         'fields' => 'ids',
@@ -1395 +1395 @@
         public function test_pad_counts() {
                 register_taxonomy( 'wptests_tax_1', 'post', array( 'hierarchical' => true ) );
 
-                $posts = self::$factory->post->create_many( 3 );
+                $posts = self::factory()->post->create_many( 3 );
 
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax_1',
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax_1',
                         'parent' => $t1,
                 ) );
-                $t3 = self::$factory->term->create( array(
+                $t3 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax_1',
                         'parent' => $t2,
                 ) );
@@ -1436 +1436 @@
         public function test_pad_counts_should_not_recurse_infinitely_when_term_hierarchy_has_a_loop() {
                 remove_filter( 'wp_update_term_parent', 'wp_check_term_hierarchy_for_loops', 10 );
 
-                $c1 = self::$factory->category->create();
-                $c2 = self::$factory->category->create( array( 'parent' => $c1 ) );
-                $c3 = self::$factory->category->create( array( 'parent' => $c2 ) );
+                $c1 = self::factory()->category->create();
+                $c2 = self::factory()->category->create( array( 'parent' => $c1 ) );
+                $c3 = self::factory()->category->create( array( 'parent' => $c2 ) );
                 wp_update_term( $c1, 'category', array( 'parent' => $c3 ) );
 
                 add_filter( 'wp_update_term_parent', 'wp_check_term_hierarchy_for_loops', 10, 3 );
 
-                $posts = self::$factory->post->create_many( 3 );
+                $posts = self::factory()->post->create_many( 3 );
                 wp_set_post_terms( $posts[0], $c1, 'category' );
                 wp_set_post_terms( $posts[1], $c2, 'category' );
                 wp_set_post_terms( $posts[2], $c3, 'category' );
@@ -1466 +1466 @@
                 register_taxonomy( 'wptests_tax1', 'post', array( 'hierarchical' => false ) );
                 register_taxonomy( 'wptests_tax2', 'post', array( 'hierarchical' => true ) );
 
-                $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
-                $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
-                $t3 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2', 'parent' => $t2 ) );
+                $t1 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+                $t2 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
+                $t3 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax2', 'parent' => $t2 ) );
 
-                $posts = self::$factory->post->create_many( 3 );
+                $posts = self::factory()->post->create_many( 3 );
                 wp_set_object_terms( $posts[0], $t1, 'wptests_tax1' );
                 wp_set_object_terms( $posts[1], $t2, 'wptests_tax2' );
                 wp_set_object_terms( $posts[2], $t3, 'wptests_tax2' );
@@ -1499 +1499 @@
                 global $wpdb;
 
                 register_taxonomy( 'wptests_tax', 'post' );
-                $terms = self::$factory->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
+                $terms = self::factory()->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
                 add_term_meta( $terms[0], 'foo', 'bar' );
                 add_term_meta( $terms[1], 'foo', 'bar' );
                 add_term_meta( $terms[2], 'foo', 'bar' );
@@ -1525 +1525 @@
                 global $wpdb;
 
                 register_taxonomy( 'wptests_tax', 'post' );
-                $terms = self::$factory->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
+                $terms = self::factory()->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
                 add_term_meta( $terms[0], 'foo', 'bar' );
                 add_term_meta( $terms[1], 'foo', 'bar' );
                 add_term_meta( $terms[2], 'foo', 'bar' );
@@ -1550 +1550 @@
          */
         public function test_meta_query() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $terms = self::$factory->term->create_many( 5, array( 'taxonomy' => 'wptests_tax' ) );
+                $terms = self::factory()->term->create_many( 5, array( 'taxonomy' => 'wptests_tax' ) );
                 add_term_meta( $terms[0], 'foo', 'bar' );
                 add_term_meta( $terms[1], 'foo', 'bar' );
                 add_term_meta( $terms[2], 'foo', 'baz' );
@@ -1575 +1575 @@
          */
         public function test_should_return_wp_term_objects() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $terms = self::$factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
+                $terms = self::factory()->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
 
                 $found = get_terms( 'wptests_tax', array(
                         'hide_empty' => false,
@@ -1597 +1597 @@
                 global $wpdb;
 
                 register_taxonomy( 'wptests_tax', 'post' );
-                $terms = self::$factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
+                $terms = self::factory()->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
 
                 // Prime the cache.
                 get_terms( 'wptests_tax', array(
@@ -1628 +1628 @@
                 global $wpdb;
 
                 register_taxonomy( 'wptests_tax', 'post' );
-                $terms = self::$factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
+                $terms = self::factory()->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
 
                 $found = get_terms( 'wptests_tax', array(
                         'hide_empty' => false,
@@ -1644 +1644 @@
         protected function create_hierarchical_terms_and_posts() {
                 $terms = array();
 
-                $terms['parent1'] = self::$factory->term->create( array( 'slug' => 'parent-1', 'name' => 'Parent 1', 'taxonomy' => 'hierarchical_fields' ) );
-                $terms['parent2'] = self::$factory->term->create( array( 'slug' => 'parent-2', 'name' => 'Parent 2', 'taxonomy' => 'hierarchical_fields' ) );
-                $terms['child1'] = self::$factory->term->create( array( 'slug' => 'child-1', 'name' => 'Child 1', 'taxonomy' => 'hierarchical_fields', 'parent' => $terms['parent1'] ) );
-                $terms['child2'] = self::$factory->term->create( array( 'slug' => 'child-2', 'name' => 'Child 2', 'taxonomy' => 'hierarchical_fields', 'parent' => $terms['parent1'] ) );
-                $terms['grandchild1'] = self::$factory->term->create( array( 'slug' => 'grandchild-1', 'name' => 'Grandchild 1', 'taxonomy' => 'hierarchical_fields', 'parent' => $terms['child1'] ) );
+                $terms['parent1'] = self::factory()->term->create( array( 'slug' => 'parent-1', 'name' => 'Parent 1', 'taxonomy' => 'hierarchical_fields' ) );
+                $terms['parent2'] = self::factory()->term->create( array( 'slug' => 'parent-2', 'name' => 'Parent 2', 'taxonomy' => 'hierarchical_fields' ) );
+                $terms['child1'] = self::factory()->term->create( array( 'slug' => 'child-1', 'name' => 'Child 1', 'taxonomy' => 'hierarchical_fields', 'parent' => $terms['parent1'] ) );
+                $terms['child2'] = self::factory()->term->create( array( 'slug' => 'child-2', 'name' => 'Child 2', 'taxonomy' => 'hierarchical_fields', 'parent' => $terms['parent1'] ) );
+                $terms['grandchild1'] = self::factory()->term->create( array( 'slug' => 'grandchild-1', 'name' => 'Grandchild 1', 'taxonomy' => 'hierarchical_fields', 'parent' => $terms['child1'] ) );
 
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
                 wp_set_post_terms( $post_id, $terms['parent2'], 'hierarchical_fields', true );
                 wp_set_post_terms( $post_id, $terms['child1'], 'hierarchical_fields', true );
 
@@ -1714 +1714 @@
                 );
 
                 // Ensure child terms are not empty
-                $first_post_id = self::$factory->post->create();
-                $second_post_id = self::$factory->post->create();
+                $first_post_id = self::factory()->post->create();
+                $second_post_id = self::factory()->post->create();
                 wp_set_post_terms( $first_post_id, array( $three_term['term_id'] ), 'category' );
                 wp_set_post_terms( $second_post_id, array( $six_term['term_id'] ), 'category' );
 
@@ -1731 +1731 @@
         }
 
         protected function set_up_three_posts_and_tags() {
-                $posts = self::$factory->post->create_many( 3, array( 'post_type' => 'post' ) );
+                $posts = self::factory()->post->create_many( 3, array( 'post_type' => 'post' ) );
                 foreach ( $posts as $post ) {
                         wp_set_object_terms( $post, rand_str(), 'post_tag' );
                 }

tests/phpunit/tests/term/isObjectInTerm.php

@@ -7 +7 @@
         public function test_terms_are_ints() {
                 register_taxonomy( 'wptests_tax', 'post' );
 
-                $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
-                $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $t1 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $t2 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
 
-                $posts = self::$factory->post->create_many( 2 );
+                $posts = self::factory()->post->create_many( 2 );
                 wp_set_object_terms( $posts[0], array( $t1 ), 'wptests_tax' );
 
                 $this->assertTrue( is_object_in_term( $posts[0], 'wptests_tax', array( $t1, $t2 ) ) );
@@ -22 +22 @@
         public function test_terms_are_strings_and_match_term_id() {
                 register_taxonomy( 'wptests_tax', 'post' );
 
-                $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
-                $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $t1 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $t2 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
 
-                $posts = self::$factory->post->create_many( 2 );
+                $posts = self::factory()->post->create_many( 2 );
                 wp_set_object_terms( $posts[0], array( $t1 ), 'wptests_tax' );
 
                 $t1_str = (string) $t1;
@@ -40 +40 @@
         public function test_terms_are_strings_and_match_term_name() {
                 register_taxonomy( 'wptests_tax', 'post' );
 
-                $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => 'Foo' ) );
-                $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => 'Bar') );
+                $t1 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => 'Foo' ) );
+                $t2 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax', 'name' => 'Bar') );
 
-                $posts = self::$factory->post->create_many( 2 );
+                $posts = self::factory()->post->create_many( 2 );
                 wp_set_object_terms( $posts[0], array( $t1 ), 'wptests_tax' );
 
                 $this->assertTrue( is_object_in_term( $posts[0], 'wptests_tax', array( 'Foo', 'Bar' ) ) );
@@ -55 +55 @@
         public function test_terms_are_strings_and_match_term_slug() {
                 register_taxonomy( 'wptests_tax', 'post' );
 
-                $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax', 'slug' => 'foo' ) );
-                $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax', 'slug' => 'bar') );
+                $t1 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax', 'slug' => 'foo' ) );
+                $t2 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax', 'slug' => 'bar') );
 
-                $posts = self::$factory->post->create_many( 2 );
+                $posts = self::factory()->post->create_many( 2 );
                 wp_set_object_terms( $posts[0], array( $t1 ), 'wptests_tax' );
 
                 $this->assertTrue( is_object_in_term( $posts[0], 'wptests_tax', array( 'foo', 'bar' ) ) );
@@ -70 +70 @@
         public function test_terms_contain_strings_and_ints_and_match_term_id_as_int() {
                 register_taxonomy( 'wptests_tax', 'post' );
 
-                $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax', 'slug' => 'foo' ) );
-                $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax', 'slug' => 'bar') );
+                $t1 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax', 'slug' => 'foo' ) );
+                $t2 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax', 'slug' => 'bar') );
 
-                $posts = self::$factory->post->create_many( 2 );
+                $posts = self::factory()->post->create_many( 2 );
                 wp_set_object_terms( $posts[0], array( $t1 ), 'wptests_tax' );
 
                 $this->assertTrue( is_object_in_term( $posts[0], 'wptests_tax', array( $t1, 'bar' ) ) );
@@ -87 +87 @@
          */
         public function test_should_not_return_true_if_term_name_begins_with_existing_term_id() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
 
-                $post_ID  = self::$factory->post->create();
+                $post_ID  = self::factory()->post->create();
                 wp_set_object_terms( $post_ID, $t, 'wptests_tax' );
 
                 $int_tax_name = $t . '_term_name';
@@ -108 +108 @@
                 global $wpdb;
 
                 register_taxonomy( 'wptests_tax', 'post' );
-                $terms = self::$factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
+                $terms = self::factory()->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
 
                 $o = 12345;
                 wp_set_object_terms( $o, $terms[0], 'wptests_tax' );
@@ -129 +129 @@
                 global $wpdb;
 
                 register_taxonomy( 'wptests_tax', 'post' );
-                $terms = self::$factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
+                $terms = self::factory()->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
 
                 $o = 12345;
                 wp_set_object_terms( $o, $terms[0], 'wptests_tax' );

tests/phpunit/tests/term/meta.php

@@ -12 +12 @@
         }
 
         public function test_add() {
-                $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
 
                 $this->assertNotEmpty( add_term_meta( $t, 'foo', 'bar' ) );
         }
 
         public function test_add_unique() {
-                $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
 
                 $this->assertNotEmpty( add_term_meta( $t, 'foo', 'bar' ) );
                 $this->assertFalse( add_term_meta( $t, 'foo', 'bar', true ) );
         }
 
         public function test_delete() {
-                $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
                 add_term_meta( $t, 'foo', 'bar' );
 
                 $this->assertTrue( delete_term_meta( $t, 'foo' ) );
         }
 
         public function test_delete_with_invalid_meta_key_should_return_false() {
-                $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
 
                 $this->assertFalse( delete_term_meta( $t, 'foo' ) );
         }
 
         public function test_delete_should_respect_meta_value() {
-                $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
                 add_term_meta( $t, 'foo', 'bar' );
                 add_term_meta( $t, 'foo', 'baz' );
 
@@ -49 +49 @@
         }
 
         public function test_get_with_no_key_should_fetch_all_keys() {
-                $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
                 add_term_meta( $t, 'foo', 'bar' );
                 add_term_meta( $t, 'foo1', 'baz' );
 
@@ -63 +63 @@
         }
 
         public function test_get_with_key_should_fetch_all_for_key() {
-                $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
                 add_term_meta( $t, 'foo', 'bar' );
                 add_term_meta( $t, 'foo', 'baz' );
                 add_term_meta( $t, 'foo1', 'baz' );
@@ -75 +75 @@
         }
 
         public function test_get_should_respect_single_true() {
-                $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
                 add_term_meta( $t, 'foo', 'bar' );
                 add_term_meta( $t, 'foo', 'baz' );
 
@@ -84 +84 @@
         }
 
         public function test_update_should_pass_to_add_when_no_value_exists_for_key() {
-                $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
 
                 $actual = update_term_meta( $t, 'foo', 'bar' );
                 $this->assertInternalType( 'int', $actual );
@@ -95 +95 @@
         }
 
         public function test_update_should_return_true_when_updating_existing_value_for_key() {
-                $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
 
                 add_term_meta( $t, 'foo', 'bar' );
 
@@ -109 +109 @@
         public function test_term_meta_should_be_lazy_loaded_for_all_terms_in_wp_query_loop() {
                 global $wpdb;
 
-                $p = self::$factory->post->create( array( 'post_status' => 'publish' ) );
+                $p = self::factory()->post->create( array( 'post_status' => 'publish' ) );
 
                 register_taxonomy( 'wptests_tax', 'post' );
-                $terms = self::$factory->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
+                $terms = self::factory()->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
                 wp_set_object_terms( $p, $terms, 'wptests_tax' );
                 foreach ( $terms as $t ) {
                         add_term_meta( $t, 'foo', 'bar' );
                 }
 
                 // Create another term, which should *not* be lazy loaded because it's unattached.
-                $orphan_term = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $orphan_term = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
                 add_term_meta( $orphan_term, 'foo', 'bar' );
 
                 // Force results to be cached, even when using extended cache.
@@ -154 +154 @@
         public function test_term_meta_should_be_lazy_loaded_only_for_the_queries_in_which_the_term_has_posts() {
                 global $wpdb;
 
-                $posts = self::$factory->post->create_many( 3, array( 'post_status' => 'publish' ) );
+                $posts = self::factory()->post->create_many( 3, array( 'post_status' => 'publish' ) );
                 register_taxonomy( 'wptests_tax', 'post' );
-                $terms = self::$factory->term->create_many( 6, array( 'taxonomy' => 'wptests_tax' ) );
+                $terms = self::factory()->term->create_many( 6, array( 'taxonomy' => 'wptests_tax' ) );
 
                 wp_set_object_terms( $posts[0], array( $terms[0], $terms[1] ), 'wptests_tax' );
                 wp_set_object_terms( $posts[1], array( $terms[2], $terms[3] ), 'wptests_tax' );
@@ -201 +201 @@
         }
 
         public function test_adding_term_meta_should_bust_get_terms_cache() {
-                $terms = self::$factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
+                $terms = self::factory()->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
 
                 add_term_meta( $terms[0], 'foo', 'bar' );
 
@@ -236 +236 @@
         }
 
         public function test_updating_term_meta_should_bust_get_terms_cache() {
-                $terms = self::$factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
+                $terms = self::factory()->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
 
                 add_term_meta( $terms[0], 'foo', 'bar' );
                 add_term_meta( $terms[1], 'foo', 'baz' );
@@ -272 +272 @@
         }
 
         public function test_deleting_term_meta_should_bust_get_terms_cache() {
-                $terms = self::$factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
+                $terms = self::factory()->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
 
                 add_term_meta( $terms[0], 'foo', 'bar' );
                 add_term_meta( $terms[1], 'foo', 'bar' );

tests/phpunit/tests/term/query.php

@@ -125 +125 @@
         }
 
         public function test_transform_query_resulting_field_sanitized() {
-                $t1 = self::$factory->category->create( array( 'slug' => 'foo', ) );
-                $t2 = self::$factory->category->create( array( 'slug' => 'bar', ) );
-                $p = self::$factory->post->create();
+                $t1 = self::factory()->category->create( array( 'slug' => 'foo', ) );
+                $t2 = self::factory()->category->create( array( 'slug' => 'bar', ) );
+                $p = self::factory()->post->create();
                 wp_set_post_categories( $p, $t1 );
 
                 $tq1 = new WP_Tax_Query( array(
@@ -150 +150 @@
         }
 
         public function test_transform_query_field_slug() {
-                $t1 = self::$factory->category->create( array( 'slug' => 'foo', ) );
-                $p = self::$factory->post->create();
+                $t1 = self::factory()->category->create( array( 'slug' => 'foo', ) );
+                $p = self::factory()->post->create();
                 $tt_ids = wp_set_post_categories( $p, $t1 );
 
                 $tq = new WP_Tax_Query( array(
@@ -168 +168 @@
         }
 
         public function test_transform_query_field_name() {
-                $t1 = self::$factory->category->create( array( 'slug' => 'foo', 'name' => 'Foo', ) );
-                $p = self::$factory->post->create();
+                $t1 = self::factory()->category->create( array( 'slug' => 'foo', 'name' => 'Foo', ) );
+                $p = self::factory()->post->create();
                 $tt_ids = wp_set_post_categories( $p, $t1 );
 
                 $tq = new WP_Tax_Query( array(
@@ -186 +186 @@
         }
 
         public function test_transform_query_field_term_taxonomy_id() {
-                $t1 = self::$factory->category->create( array( 'slug' => 'foo', 'name' => 'Foo', ) );
-                $p = self::$factory->post->create();
+                $t1 = self::factory()->category->create( array( 'slug' => 'foo', 'name' => 'Foo', ) );
+                $p = self::factory()->post->create();
                 $tt_ids = wp_set_post_categories( $p, $t1 );
 
                 $tq = new WP_Tax_Query( array(
@@ -204 +204 @@
         }
 
         public function test_transform_query_field_term_taxonomy_default() {
-                $t1 = self::$factory->category->create( array( 'slug' => 'foo', 'name' => 'Foo', ) );
-                $p = self::$factory->post->create();
+                $t1 = self::factory()->category->create( array( 'slug' => 'foo', 'name' => 'Foo', ) );
+                $p = self::factory()->post->create();
                 $tt_ids = wp_set_post_categories( $p, $t1 );
 
                 $tq = new WP_Tax_Query( array(
@@ -240 +240 @@
         public function test_get_sql_relation_or_operator_in() {
                 register_taxonomy( 'wptests_tax', 'post' );
 
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
-                $t3 = self::$factory->term->create( array(
+                $t3 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 
@@ -284 +284 @@
         public function test_get_sql_relation_and_operator_in() {
                 register_taxonomy( 'wptests_tax', 'post' );
 
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
-                $t3 = self::$factory->term->create( array(
+                $t3 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 
@@ -327 +327 @@
         public function test_get_sql_nested_relation_or_operator_in() {
                 register_taxonomy( 'wptests_tax', 'post' );
 
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
-                $t3 = self::$factory->term->create( array(
+                $t3 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 

tests/phpunit/tests/term/slashes.php

@@ -8 +8 @@
 class Tests_Term_Slashes extends WP_Ajax_UnitTestCase {
         function setUp() {
                 parent::setUp();
-                $this->author_id = self::$factory->user->create( array( 'role' => 'administrator' ) );
+                $this->author_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
                 $this->old_current_user = get_current_user_id();
                 wp_set_current_user( $this->author_id );
 
@@ -84 +84 @@
                         'post_tag'
                 );
                 foreach ( $taxonomies as $taxonomy ) {
-                        $id = self::$factory->term->create(array(
+                        $id = self::factory()->term->create(array(
                                 'taxonomy' => $taxonomy
                         ));
 

tests/phpunit/tests/term/termExists.php

@@ -9 +9 @@
         }
 
         public function test_term_exists_term_int_taxonomy_nonempty_term_exists() {
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'post_tag',
                 ) );
 
@@ -22 +22 @@
         }
 
         public function test_term_exists_term_int_taxonomy_nonempty_wrong_taxonomy() {
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'post_tag',
                 ) );
 
@@ -30 +30 @@
         }
 
         public function test_term_exists_term_int_taxonomy_empty_term_exists() {
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'post_tag',
                 ) );
 
@@ -43 +43 @@
         }
 
         public function test_term_exists_unslash_term() {
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'post_tag',
                         'name' => 'I "love" WordPress\'s taxonomy system',
                 ) );
@@ -53 +53 @@
         }
 
         public function test_term_exists_trim_term() {
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'post_tag',
                         'slug' => 'foo',
                 ) );
@@ -84 +84 @@
                         'hierarchical' => true,
                 ) );
 
-                $parent_term = self::$factory->term->create( array(
+                $parent_term = self::factory()->term->create( array(
                         'taxonomy' => 'foo',
                 ) );
 
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'foo',
                         'parent' => $parent_term,
                         'slug' => 'child-term',
@@ -110 +110 @@
                         'hierarchical' => true,
                 ) );
 
-                $parent_term = self::$factory->term->create( array(
+                $parent_term = self::factory()->term->create( array(
                         'taxonomy' => 'foo',
                 ) );
 
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'foo',
                         'parent' => $parent_term,
                         'slug' => 'child-term',
@@ -132 +132 @@
                         'hierarchical' => true,
                 ) );
 
-                $parent_term = self::$factory->term->create( array(
+                $parent_term = self::factory()->term->create( array(
                         'taxonomy' => 'foo',
                 ) );
 
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'foo',
                         'parent' => $parent_term,
                         'name' => 'Child Term',
@@ -153 +153 @@
         public function test_term_exists_taxonomy_nonempty_parent_empty_match_slug() {
                 register_taxonomy( 'foo', 'post', array() );
 
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'foo',
                         'slug' => 'kewl-dudez',
                 ) );
@@ -169 +169 @@
         public function test_term_exists_taxonomy_nonempty_parent_empty_match_name() {
                 register_taxonomy( 'foo', 'post', array() );
 
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'foo',
                         'name' => 'Kewl Dudez',
                 ) );
@@ -185 +185 @@
         public function test_term_exists_taxonomy_empty_parent_empty_match_slug() {
                 register_taxonomy( 'foo', 'post', array() );
 
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'foo',
                         'name' => 'juicy-fruit',
                 ) );
@@ -201 +201 @@
         public function test_term_exists_taxonomy_empty_parent_empty_match_name() {
                 register_taxonomy( 'foo', 'post', array() );
 
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'foo',
                         'name' => 'Juicy Fruit',
                 ) );

tests/phpunit/tests/term/wpDeleteObjectTermRelationships.php

@@ -9 +9 @@
                 register_taxonomy( 'wptests_tax1', 'post' );
                 register_taxonomy( 'wptests_tax2', 'post' );
 
-                $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
-                $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
+                $t1 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+                $t2 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
 
                 $object_id = 567;
 
@@ -33 +33 @@
                 register_taxonomy( 'wptests_tax2', 'post' );
                 register_taxonomy( 'wptests_tax3', 'post' );
 
-                $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
-                $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
-                $t3 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax3' ) );
+                $t1 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+                $t2 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
+                $t3 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax3' ) );
 
                 $object_id = 567;
 

tests/phpunit/tests/term/wpDeleteTerm.php

@@ -12 +12 @@
         public function test_count_property_passed_to_filters_should_reflect_pre_deleted_term() {
                 register_taxonomy( 'wptests_tax', 'post' );
 
-                $terms = self::$factory->term->create_many( 2, array(
+                $terms = self::factory()->term->create_many( 2, array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 
-                $p = self::$factory->post->create();
+                $p = self::factory()->post->create();
 
                 wp_set_object_terms( $p, array( $terms[0] ), 'wptests_tax' );
 

tests/phpunit/tests/term/wpGenerateTagCloud.php

@@ -27 +27 @@
          * @param $args     Options for `wp_generate_tag_cloud()`.
          */
         function test_empty_tags_list_returned( $expected, $args ) {
-                $term_ids = self::$factory->term->create_many( 4, array( 'taxonomy' => 'post_tag' ) );
+                $term_ids = self::factory()->term->create_many( 4, array( 'taxonomy' => 'post_tag' ) );
                 $this->terms = array();
                 foreach ( $term_ids as $term_id ) {
                         $this->terms[] = get_term( $term_id, 'post_tag' );
@@ -71 +71 @@
         }
 
         function test_hide_empty_false() {
-                $term_id = self::$factory->tag->create();
+                $term_id = self::factory()->tag->create();
                 $term = get_term( $term_id, 'post_tag' );
 
                 $tags = $this->retrieve_terms( array(
@@ -85 +85 @@
         }
 
         function test_hide_empty_false_format_array() {
-                $term_id = self::$factory->tag->create();
+                $term_id = self::factory()->tag->create();
                 $term = get_term( $term_id, 'post_tag' );
 
                 $tags = $this->retrieve_terms( array(
@@ -101 +101 @@
         }
 
         function test_hide_empty_false_format_list() {
-                $term_id = self::$factory->tag->create();
+                $term_id = self::factory()->tag->create();
                 $term = get_term( $term_id, 'post_tag' );
 
                 $tags = $this->retrieve_terms( array(
@@ -117 +117 @@
         }
 
         function test_hide_empty_false_multi() {
-                $term_ids = self::$factory->tag->create_many( 4 );
+                $term_ids = self::factory()->tag->create_many( 4 );
                 $terms = array();
                 foreach ( $term_ids as $term_id ) {
                         $terms[] = get_term( $term_id, 'post_tag' );
@@ -139 +139 @@
         }
 
         function test_hide_empty_false_multi_format_list() {
-                $term_ids = self::$factory->tag->create_many( 4 );
+                $term_ids = self::factory()->tag->create_many( 4 );
                 $terms = array();
                 foreach ( $term_ids as $term_id ) {
                         $terms[] = get_term( $term_id, 'post_tag' );
@@ -166 +166 @@
 
         public function test_topic_count_text() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $term_ids = self::$factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
+                $term_ids = self::factory()->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
                 $this->terms = array();
                 foreach ( $term_ids as $term_id ) {
                         $this->terms[] = get_term( $term_id, 'post_tag' );
                 }
-                $posts = self::$factory->post->create_many( 2 );
+                $posts = self::factory()->post->create_many( 2 );
 
                 wp_set_post_terms( $posts[0], $term_ids, 'wptests_tax' );
                 wp_set_post_terms( $posts[1], array( $term_ids[1] ), 'wptests_tax' );
@@ -196 +196 @@
 
         public function test_topic_count_text_callback() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $term_ids = self::$factory->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
+                $term_ids = self::factory()->term->create_many( 2, array( 'taxonomy' => 'wptests_tax' ) );
                 $this->terms = array();
                 foreach ( $term_ids as $term_id ) {
                         $this->terms[] = get_term( $term_id, 'post_tag' );
                 }
-                $posts = self::$factory->post->create_many( 2 );
+                $posts = self::factory()->post->create_many( 2 );
 
                 wp_set_post_terms( $posts[0], $term_ids, 'wptests_tax' );
                 wp_set_post_terms( $posts[1], array( $term_ids[1] ), 'wptests_tax' );

tests/phpunit/tests/term/wpGetObjectTerms.php

@@ -13 +13 @@
         }
 
         public function test_get_object_terms_by_slug() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
 
                 $terms_1 = array('Foo', 'Bar', 'Baz');
                 $terms_1_slugs = array('foo', 'bar', 'baz');
@@ -31 +31 @@
          * @ticket 11003
          */
         public function test_should_not_filter_out_duplicate_terms_associated_with_different_objects() {
-                $post_id1 = self::$factory->post->create();
-                $post_id2 = self::$factory->post->create();
-                $cat_id = self::$factory->category->create();
-                $cat_id2 = self::$factory->category->create();
+                $post_id1 = self::factory()->post->create();
+                $post_id2 = self::factory()->post->create();
+                $cat_id = self::factory()->category->create();
+                $cat_id2 = self::factory()->category->create();
                 wp_set_post_categories( $post_id1, array( $cat_id, $cat_id2 ) );
                 wp_set_post_categories( $post_id2, $cat_id );
 
@@ -54 +54 @@
          * @ticket 17646
          */
         public function test_should_return_objects_with_int_properties() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
                 $term = wp_insert_term( 'one', $this->taxonomy );
                 wp_set_object_terms( $post_id, $term, $this->taxonomy );
 
@@ -73 +73 @@
          * @ticket 26339
          */
         public function test_references_should_be_reset_after_wp_get_object_terms_filter() {
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
                 $terms_1 = array('foo', 'bar', 'baz');
 
                 wp_set_object_terms( $post_id, $terms_1, $this->taxonomy );
@@ -86 +86 @@
         }
 
         public function test_orderby_name() {
-                $p = self::$factory->post->create();
+                $p = self::factory()->post->create();
 
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                         'name' => 'AAA',
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                         'name' => 'ZZZ',
                 ) );
-                $t3 = self::$factory->term->create( array(
+                $t3 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                         'name' => 'JJJ',
                 ) );
@@ -112 +112 @@
         }
 
         public function test_orderby_count() {
-                $posts = self::$factory->post->create_many( 3 );
+                $posts = self::factory()->post->create_many( 3 );
 
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                         'name' => 'AAA',
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                         'name' => 'ZZZ',
                 ) );
-                $t3 = self::$factory->term->create( array(
+                $t3 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                         'name' => 'JJJ',
                 ) );
@@ -140 +140 @@
         }
 
         public function test_orderby_slug() {
-                $p = self::$factory->post->create();
+                $p = self::factory()->post->create();
 
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                         'slug' => 'aaa',
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                         'slug' => 'zzz',
                 ) );
-                $t3 = self::$factory->term->create( array(
+                $t3 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                         'slug' => 'jjj',
                 ) );
@@ -166 +166 @@
         }
 
         public function test_orderby_term_group() {
-                $p = self::$factory->post->create();
+                $p = self::factory()->post->create();
 
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                 ) );
-                $t3 = self::$factory->term->create( array(
+                $t3 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                 ) );
 
@@ -195 +195 @@
         }
 
         public function test_orderby_term_order() {
-                $p = self::$factory->post->create();
+                $p = self::factory()->post->create();
 
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                 ) );
-                $t3 = self::$factory->term->create( array(
+                $t3 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                 ) );
 
@@ -231 +231 @@
          * @ticket 28688
          */
         public function test_orderby_parent() {
-                $p = self::$factory->post->create();
+                $p = self::factory()->post->create();
 
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                 ) );
-                $t3 = self::$factory->term->create( array(
+                $t3 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                 ) );
 
@@ -269 +269 @@
                 register_taxonomy( 'wptests_tax_2', 'post' );
                 register_taxonomy( 'wptests_tax_3', 'post' );
 
-                $p = self::$factory->post->create();
+                $p = self::factory()->post->create();
 
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax_3',
                 ) );
-                $t3 = self::$factory->term->create( array(
+                $t3 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax_2',
                 ) );
 
@@ -297 +297 @@
          * @ticket 28688
          */
         public function test_orderby_tt_id() {
-                $p = self::$factory->post->create();
+                $p = self::factory()->post->create();
 
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                 ) );
-                $t3 = self::$factory->term->create( array(
+                $t3 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                 ) );
 
@@ -330 +330 @@
         }
 
         public function test_order_desc() {
-                $p = self::$factory->post->create();
+                $p = self::factory()->post->create();
 
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                         'name' => 'AAA',
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                         'name' => 'ZZZ',
                 ) );
-                $t3 = self::$factory->term->create( array(
+                $t3 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                         'name' => 'JJJ',
                 ) );
@@ -360 +360 @@
          * @ticket 15675
          */
         public function test_parent() {
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                 ) );
-                $t3 = self::$factory->term->create( array(
+                $t3 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                         'parent' => $t1,
                 ) );
-                $t4 = self::$factory->term->create( array(
+                $t4 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                         'parent' => $t2,
                 ) );
 
-                $p = self::$factory->post->create();
+                $p = self::factory()->post->create();
 
                 wp_set_object_terms( $p, array( $t1, $t2, $t3, $t3 ), $this->taxonomy );
 
@@ -391 +391 @@
          * @ticket 15675
          */
         public function test_parent_0() {
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                 ) );
-                $t3 = self::$factory->term->create( array(
+                $t3 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                         'parent' => $t1,
                 ) );
-                $t4 = self::$factory->term->create( array(
+                $t4 = self::factory()->term->create( array(
                         'taxonomy' => $this->taxonomy,
                         'parent' => $t2,
                 ) );
 
-                $p = self::$factory->post->create();
+                $p = self::factory()->post->create();
 
                 wp_set_object_terms( $p, array( $t1, $t2, $t3, $t3 ), $this->taxonomy );
 
@@ -425 +425 @@
                 global $wpdb;
 
                 register_taxonomy( 'wptests_tax', 'post' );
-                $terms = self::$factory->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
+                $terms = self::factory()->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
                 add_term_meta( $terms[0], 'foo', 'bar' );
                 add_term_meta( $terms[1], 'foo', 'bar' );
                 add_term_meta( $terms[2], 'foo', 'bar' );
 
-                $p = self::$factory->post->create();
+                $p = self::factory()->post->create();
                 wp_set_object_terms( $p, $terms, 'wptests_tax' );
 
                 $found = wp_get_object_terms( $p, 'wptests_tax' );
@@ -451 +451 @@
                 global $wpdb;
 
                 register_taxonomy( 'wptests_tax', 'post' );
-                $terms = self::$factory->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
+                $terms = self::factory()->term->create_many( 3, array( 'taxonomy' => 'wptests_tax' ) );
                 add_term_meta( $terms[0], 'foo', 'bar' );
                 add_term_meta( $terms[1], 'foo', 'bar' );
                 add_term_meta( $terms[2], 'foo', 'bar' );
 
-                $p = self::$factory->post->create();
+                $p = self::factory()->post->create();
                 wp_set_object_terms( $p, $terms, 'wptests_tax' );
 
                 $found = wp_get_object_terms( $p, 'wptests_tax', array(
@@ -477 +477 @@
          */
         public function test_meta_query() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $terms = self::$factory->term->create_many( 5, array( 'taxonomy' => 'wptests_tax' ) );
+                $terms = self::factory()->term->create_many( 5, array( 'taxonomy' => 'wptests_tax' ) );
                 add_term_meta( $terms[0], 'foo', 'bar' );
                 add_term_meta( $terms[1], 'foo', 'bar' );
                 add_term_meta( $terms[2], 'foo', 'baz' );
                 add_term_meta( $terms[3], 'foob', 'ar' );
 
-                $p = self::$factory->post->create();
+                $p = self::factory()->post->create();
                 wp_set_object_terms( $p, $terms, 'wptests_tax' );
 
                 $found = wp_get_object_terms( $p, 'wptests_tax', array(
@@ -503 +503 @@
          */
         public function test_should_return_wp_term_objects_for_fields_all() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $p = self::$factory->post->create();
-                $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $p = self::factory()->post->create();
+                $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
                 wp_set_object_terms( $p, $t, 'wptests_tax' );
 
                 $found = wp_get_object_terms( $p, 'wptests_tax', array(
@@ -522 +522 @@
          */
         public function test_should_return_wp_term_objects_for_fields_all_with_object_id() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $p = self::$factory->post->create();
-                $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $p = self::factory()->post->create();
+                $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
                 wp_set_object_terms( $p, $t, 'wptests_tax' );
 
                 $found = wp_get_object_terms( $p, 'wptests_tax', array(
@@ -543 +543 @@
                 global $wpdb;
 
                 register_taxonomy( 'wptests_tax', 'post' );
-                $p = self::$factory->post->create();
-                $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $p = self::factory()->post->create();
+                $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
                 wp_set_object_terms( $p, $t, 'wptests_tax' );
 
                 $found = wp_get_object_terms( $p, 'wptests_tax', array(
@@ -561 +561 @@
          */
         public function test_object_id_should_not_be_cached_with_term_object() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $p = self::$factory->post->create();
-                $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $p = self::factory()->post->create();
+                $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
                 wp_set_object_terms( $p, $t, 'wptests_tax' );
 
                 $found = wp_get_object_terms( $p, 'wptests_tax', array(
@@ -585 +585 @@
 
                 register_taxonomy( 'wptests_tax1', 'post' );
                 register_taxonomy( 'wptests_tax2', 'post' );
-                $p = self::$factory->post->create();
-                $t1 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
-                $t2 = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
+                $p = self::factory()->post->create();
+                $t1 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax1' ) );
+                $t2 = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax2' ) );
                 wp_set_object_terms( $p, $t1, 'wptests_tax1' );
                 wp_set_object_terms( $p, $t2, 'wptests_tax2' );
 
@@ -611 +611 @@
          */
         public function test_object_id_should_be_set_on_objects_that_share_terms() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $posts = self::$factory->post->create_many( 2 );
-                $t = self::$factory->term->create( array( 'taxonomy' => 'wptests_tax' ) );
+                $posts = self::factory()->post->create_many( 2 );
+                $t = self::factory()->term->create( array( 'taxonomy' => 'wptests_tax' ) );
                 wp_set_object_terms( $posts[0], $t, 'wptests_tax' );
                 wp_set_object_terms( $posts[1], $t, 'wptests_tax' );
 

tests/phpunit/tests/term/wpInsertTerm.php

@@ -160 +160 @@
          * @ticket 17689
          */
         public function test_wp_insert_term_duplicate_name() {
-                $term = self::$factory->tag->create_and_get( array( 'name' => 'Bozo' ) );
+                $term = self::factory()->tag->create_and_get( array( 'name' => 'Bozo' ) );
                 $this->assertNotWPError( $term );
                 $this->assertTrue( empty( $term->errors ) );
 
                 // Test existing term name with unique slug
-                $term1 = self::$factory->tag->create( array( 'name' => 'Bozo', 'slug' => 'bozo1' ) );
+                $term1 = self::factory()->tag->create( array( 'name' => 'Bozo', 'slug' => 'bozo1' ) );
                 $this->assertNotWPError( $term1 );
 
                 // Test an existing term name
-                $term2 = self::$factory->tag->create( array( 'name' => 'Bozo' ) );
+                $term2 = self::factory()->tag->create( array( 'name' => 'Bozo' ) );
                 $this->assertTrue( is_wp_error( $term2 ) );
                 $this->assertNotEmpty( $term2->errors );
 
                 // Test named terms ending in special characters
-                $term3 = self::$factory->tag->create( array( 'name' => 'T$' ) );
-                $term4 = self::$factory->tag->create( array( 'name' => 'T$$' ) );
-                $term5 = self::$factory->tag->create( array( 'name' => 'T$$$' ) );
-                $term6 = self::$factory->tag->create( array( 'name' => 'T$$$$' ) );
-                $term7 = self::$factory->tag->create( array( 'name' => 'T$$$$' ) );
+                $term3 = self::factory()->tag->create( array( 'name' => 'T$' ) );
+                $term4 = self::factory()->tag->create( array( 'name' => 'T$$' ) );
+                $term5 = self::factory()->tag->create( array( 'name' => 'T$$$' ) );
+                $term6 = self::factory()->tag->create( array( 'name' => 'T$$$$' ) );
+                $term7 = self::factory()->tag->create( array( 'name' => 'T$$$$' ) );
                 $this->assertTrue( is_wp_error( $term7 ) );
                 $this->assertNotEmpty( $term7->errors );
                 $this->assertEquals( $term6, $term7->error_data['term_exists'] );
@@ -187 +187 @@
                 $this->assertCount( 4, array_unique( wp_list_pluck( $terms, 'slug' ) ) );
 
                 // Test named terms with only special characters
-                $term8 = self::$factory->tag->create( array( 'name' => '$' ) );
-                $term9 = self::$factory->tag->create( array( 'name' => '$$' ) );
-                $term10 = self::$factory->tag->create( array( 'name' => '$$$' ) );
-                $term11 = self::$factory->tag->create( array( 'name' => '$$$$' ) );
-                $term12 = self::$factory->tag->create( array( 'name' => '$$$$' ) );
+                $term8 = self::factory()->tag->create( array( 'name' => '$' ) );
+                $term9 = self::factory()->tag->create( array( 'name' => '$$' ) );
+                $term10 = self::factory()->tag->create( array( 'name' => '$$$' ) );
+                $term11 = self::factory()->tag->create( array( 'name' => '$$$$' ) );
+                $term12 = self::factory()->tag->create( array( 'name' => '$$$$' ) );
                 $this->assertTrue( is_wp_error( $term12 ) );
                 $this->assertNotEmpty( $term12->errors );
                 $this->assertEquals( $term11, $term12->error_data['term_exists'] );
@@ -199 +199 @@
                 $terms = array_map( 'get_tag', array( $term8, $term9, $term10, $term11 ) );
                 $this->assertCount( 4, array_unique( wp_list_pluck( $terms, 'slug' ) ) );
 
-                $term13 = self::$factory->tag->create( array( 'name' => 'A' ) );
+                $term13 = self::factory()->tag->create( array( 'name' => 'A' ) );
                 $this->assertNotWPError( $term13 );
-                $term14 = self::$factory->tag->create( array( 'name' => 'A' ) );
+                $term14 = self::factory()->tag->create( array( 'name' => 'A' ) );
                 $this->assertTrue( is_wp_error( $term14 ) );
-                $term15 = self::$factory->tag->create( array( 'name' => 'A+', 'slug' => 'a' ) );
+                $term15 = self::factory()->tag->create( array( 'name' => 'A+', 'slug' => 'a' ) );
                 $this->assertNotWPError( $term15 );
-                $term16 = self::$factory->tag->create( array( 'name' => 'A+' ) );
+                $term16 = self::factory()->tag->create( array( 'name' => 'A+' ) );
                 $this->assertTrue( is_wp_error( $term16 ) );
-                $term17 = self::$factory->tag->create( array( 'name' => 'A++' ) );
+                $term17 = self::factory()->tag->create( array( 'name' => 'A++' ) );
                 $this->assertNotWPError( $term17 );
-                $term18 = self::$factory->tag->create( array( 'name' => 'A-', 'slug' => 'a' ) );
+                $term18 = self::factory()->tag->create( array( 'name' => 'A-', 'slug' => 'a' ) );
                 $this->assertNotWPError( $term18 );
-                $term19 = self::$factory->tag->create( array( 'name' => 'A-' ) );
+                $term19 = self::factory()->tag->create( array( 'name' => 'A-' ) );
                 $this->assertTrue( is_wp_error( $term19 ) );
-                $term20 = self::$factory->tag->create( array( 'name' => 'A--' ) );
+                $term20 = self::factory()->tag->create( array( 'name' => 'A--' ) );
                 $this->assertNotWPError( $term20 );
         }
 
@@ -222 +222 @@
          */
         public function test_wp_insert_term_should_not_allow_duplicate_names_when_slug_is_a_duplicate_of_the_same_term_in_non_hierarchical_taxonomy() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'name' => 'Foo',
                         'slug' => 'foo',
                         'taxonomy' => 'wptests_tax',
@@ -241 +241 @@
          */
         public function test_wp_insert_term_should_not_allow_duplicate_names_when_slug_is_a_duplicate_of_a_different_term_in_non_hierarchical_taxonomy() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'name' => 'Foo',
                         'slug' => 'foo',
                         'taxonomy' => 'wptests_tax',
                 ) );
 
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'name' => 'Bar',
                         'slug' => 'bar',
                         'taxonomy' => 'wptests_tax',
@@ -266 +266 @@
          */
         public function test_wp_insert_term_should_allow_duplicate_names_when_a_unique_slug_has_been_provided_in_non_hierarchical_taxonomy() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'name' => 'Foo',
                         'slug' => 'foo',
                         'taxonomy' => 'wptests_tax',
@@ -288 +288 @@
          */
         public function test_wp_insert_term_should_not_allow_duplicate_names_when_the_slug_is_not_provided_in_non_hierarchical_taxonomy() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'name' => 'Foo',
                         'slug' => 'foo',
                         'taxonomy' => 'wptests_tax',
@@ -305 +305 @@
          */
         public function test_wp_insert_term_should_not_allow_duplicate_names_when_slug_is_a_duplicate_of_the_same_term_in_hierarchical_taxonomy() {
                 register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'name' => 'Foo',
                         'slug' => 'foo',
                         'taxonomy' => 'wptests_tax',
@@ -324 +324 @@
          */
         public function test_wp_insert_term_should_not_allow_duplicate_names_when_slug_is_a_duplicate_of_a_different_term_at_same_hierarchy_level_in_hierarchical_taxonomy() {
                 register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'name' => 'Foo',
                         'slug' => 'foo',
                         'taxonomy' => 'wptests_tax',
                 ) );
 
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'name' => 'Bar',
                         'slug' => 'bar',
                         'taxonomy' => 'wptests_tax',
@@ -349 +349 @@
          */
         public function test_wp_insert_term_should_allow_duplicate_names_when_slug_is_a_duplicate_of_a_term_at_different_hierarchy_level_in_hierarchical_taxonomy() {
                 register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'name' => 'Foo',
                         'slug' => 'foo',
                         'taxonomy' => 'wptests_tax',
                 ) );
 
-                $t2 = self::$factory->term->create();
+                $t2 = self::factory()->term->create();
 
-                $t3 = self::$factory->term->create( array(
+                $t3 = self::factory()->term->create( array(
                         'name' => 'Bar',
                         'slug' => 'bar',
                         'parent' => $t2,
@@ -381 +381 @@
          */
         public function test_wp_insert_term_should_allow_duplicate_names_when_a_unique_slug_has_been_provided_in_hierarchical_taxonomy() {
                 register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'name' => 'Foo',
                         'slug' => 'foo',
                         'taxonomy' => 'wptests_tax',
@@ -403 +403 @@
          */
         public function test_wp_insert_term_should_not_allow_duplicate_names_when_the_slug_is_not_provided_in_hierarchical_taxonomy() {
                 register_taxonomy( 'wptests_tax', 'post', array( 'hierarchical' => true ) );
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'name' => 'Foo',
                         'slug' => 'foo',
                         'taxonomy' => 'wptests_tax',
@@ -419 +419 @@
          */
         public function test_wp_insert_term_duplicate_slug_same_taxonomy() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'name' => 'Foo',
                         'slug' => 'foo',
                         'taxonomy' => 'wptests_tax',
@@ -443 +443 @@
         public function test_wp_insert_term_duplicate_slug_different_taxonomy() {
                 register_taxonomy( 'wptests_tax', 'post' );
                 register_taxonomy( 'wptests_tax_2', 'post' );
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'name' => 'Foo',
                         'slug' => 'foo',
                         'taxonomy' => 'wptests_tax',
@@ -473 +473 @@
 
                 register_taxonomy( 'wptests_tax', 'post' );
                 register_taxonomy( 'wptests_tax_2', 'post' );
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'name' => 'Foo',
                         'slug' => 'foo',
                         'taxonomy' => 'wptests_tax',
@@ -501 +501 @@
 
         public function test_wp_insert_term_alias_of_no_term_group() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
                 $term_1 = get_term( $t1, 'wptests_tax' );
@@ -523 +523 @@
 
         public function test_wp_insert_term_alias_of_existing_term_group() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
                 $term_1 = get_term( $t1, 'wptests_tax' );
 
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'alias_of' => $term_1->slug,
                 ) );
@@ -591 +591 @@
                         'hierarchical' => true,
                 ) );
 
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 
@@ -623 +623 @@
         public function test_wp_insert_term_with_and_without_accents() {
                 register_taxonomy( 'wptests_tax', 'post' );
 
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'name' => 'Foó',
                         'taxonomy' => 'wptests_tax',
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'name' => 'Foo',
                         'taxonomy' => 'wptests_tax',
                 ) );

tests/phpunit/tests/term/wpUniqueTermSlug.php

@@ -11 +11 @@
         }
 
         public function test_unique_slug_should_be_unchanged() {
-                $term = self::$factory->term->create_and_get( array(
+                $term = self::factory()->term->create_and_get( array(
                         'taxonomy' => 'wptests_tax1',
                         'name' => 'foo',
                         'slug' => 'foo',
@@ -22 +22 @@
         }
 
         public function test_nonunique_slug_in_different_taxonomy_should_be_unchanged() {
-                $term1 = self::$factory->term->create( array(
+                $term1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax2',
                         'name' => 'bar',
                         'slug' => 'bar',
                 ) );
 
-                $term2 = self::$factory->term->create( array(
+                $term2 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax1',
                         'name' => 'foo',
                         'slug' => 'foo',
@@ -40 +40 @@
         }
 
         public function test_nonunique_slug_in_same_nonhierarchical_taxonomy_should_be_changed() {
-                $term1 = self::$factory->term->create( array(
+                $term1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax1',
                         'name' => 'bar',
                         'slug' => 'bar',
                 ) );
 
-                $term2 = self::$factory->term->create( array(
+                $term2 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax1',
                         'name' => 'foo',
                         'slug' => 'foo',
@@ -58 +58 @@
         }
 
         public function test_nonunique_slug_in_same_hierarchical_taxonomy_with_same_parent_should_be_suffixed_with_parent_slug() {
-                $parent = self::$factory->term->create( array(
+                $parent = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax2',
                         'slug' => 'parent-term',
                 ) );
 
-                $term1 = self::$factory->term->create( array(
+                $term1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax2',
                         'name' => 'bar',
                         'slug' => 'bar',
                         'parent' => $parent,
                 ) );
 
-                $term2 = self::$factory->term->create( array(
+                $term2 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax2',
                         'name' => 'foo',
                         'slug' => 'foo',
@@ -83 +83 @@
         }
 
         public function test_nonunique_slug_in_same_hierarchical_taxonomy_at_different_level_of_hierarchy_should_be_suffixed_with_number() {
-                $parent = self::$factory->term->create( array(
+                $parent = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax2',
                         'slug' => 'parent-term',
                 ) );
 
-                $term1 = self::$factory->term->create( array(
+                $term1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax2',
                         'name' => 'bar',
                         'slug' => 'bar',
                         'parent' => $parent,
                 ) );
 
-                $term2 = self::$factory->term->create( array(
+                $term2 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax2',
                         'name' => 'foo',
                         'slug' => 'foo',

tests/phpunit/tests/term/wpUpdateTerm.php

@@ -20 +20 @@
 
         public function test_wp_update_term_unslash_name() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 
@@ -36 +36 @@
 
         public function test_wp_update_term_unslash_description() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 
@@ -52 +52 @@
 
         public function test_wp_update_term_name_empty_string() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 
@@ -76 +76 @@
 
                 $this->assertNull( term_exists( $fake_term_id, 'wptests_tax' ) );
 
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 
@@ -94 +94 @@
 
         public function test_wp_update_term_slug_empty_string_while_not_updating_name() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'name' => 'Foo Bar',
                 ) );
@@ -110 +110 @@
 
         public function test_wp_update_term_slug_empty_string_while_updating_name() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 
@@ -126 +126 @@
 
         public function test_wp_update_term_slug_set_slug() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 
@@ -145 +145 @@
         public function test_wp_update_term_should_not_create_duplicate_slugs_within_the_same_taxonomy() {
                 register_taxonomy( 'wptests_tax', 'post' );
 
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'name' => 'Foo',
                         'slug' => 'foo',
                         'taxonomy' => 'wptests_tax',
                 ) );
 
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'name' => 'Bar',
                         'slug' => 'bar',
                         'taxonomy' => 'wptests_tax',
@@ -172 +172 @@
                 register_taxonomy( 'wptests_tax', 'post' );
                 register_taxonomy( 'wptests_tax_2', 'post' );
 
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'name' => 'Foo',
                         'slug' => 'foo',
                         'taxonomy' => 'wptests_tax',
                 ) );
 
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'name' => 'Foo',
                         'slug' => 'bar',
                         'taxonomy' => 'wptests_tax_2',
@@ -202 +202 @@
                 register_taxonomy( 'wptests_tax', 'post' );
                 register_taxonomy( 'wptests_tax_2', 'post' );
 
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'name' => 'Foo',
                         'slug' => 'foo',
                         'taxonomy' => 'wptests_tax',
                 ) );
 
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'name' => 'Bar',
                         'slug' => 'bar',
                         'taxonomy' => 'wptests_tax_2',
@@ -232 +232 @@
                         'hierarchical' => true,
                 ) );
 
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'name' => 'Foo',
                         'slug' => 'foo',
                         'taxonomy' => 'wptests_tax',
                 ) );
 
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'name' => 'Bar',
                         'slug' => 'bar',
                         'taxonomy' => 'wptests_tax',
                         'parent' => $t1,
                 ) );
 
-                $t3 = self::$factory->term->create( array(
+                $t3 = self::factory()->term->create( array(
                         'name' => 'Bar Child',
                         'slug' => 'bar-child',
                         'taxonomy' => 'wptests_tax',
@@ -282 +282 @@
                         array( '%d' )
                 );
 
-                $posts = self::$factory->post->create_many( 2 );
+                $posts = self::factory()->post->create_many( 2 );
                 wp_set_object_terms( $posts[0], array( 'Foo' ), 'wptests_tax' );
                 wp_set_object_terms( $posts[1], array( 'Foo' ), 'wptests_tax_2' );
 
@@ -302 +302 @@
 
         public function test_wp_update_term_alias_of_no_term_group() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
                 $term_1 = get_term( $t1, 'wptests_tax' );
@@ -323 +323 @@
 
         public function test_wp_update_term_alias_of_existing_term_group() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
                 $term_1 = get_term( $t1, 'wptests_tax' );
 
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'alias_of' => $term_1->slug,
                 ) );
@@ -359 +359 @@
 
         public function test_wp_update_term_slug_same_as_old_slug() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'slug' => 'foo',
                 ) );
@@ -377 +377 @@
 
         public function test_wp_update_term_duplicate_slug_generated_due_to_empty_slug_param() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'slug' => 'foo-bar',
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'name' => 'not foo bar',
                 ) );
@@ -402 +402 @@
                 register_taxonomy( 'wptests_tax', 'post', array(
                         'hierarchical' => true,
                 ) );
-                $p = self::$factory->term->create( array(
+                $p = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'slug' => 'foo-bar',
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 
@@ -428 +428 @@
 
         public function test_wp_update_term_duplicate_slug_failure() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'slug' => 'foo-bar',
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'slug' => 'my-old-slug',
                 ) );
@@ -451 +451 @@
 
         public function test_wp_update_term_should_return_term_id_and_term_taxonomy_id() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
                 $found = wp_update_term( $t, 'wptests_tax', array(
@@ -477 +477 @@
          */
         public function test_wp_update_term_should_return_int_values_for_term_id_and_term_taxonomy_id() {
                 register_taxonomy( 'wptests_tax', 'post' );
-                $t = self::$factory->term->create( array(
+                $t = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
                 $found = wp_update_term( $t, 'wptests_tax', array(
@@ -491 +491 @@
         public function test_wp_update_term_should_clean_object_term_cache() {
                 register_taxonomy( 'wptests_tax_for_post', 'post' );
                 register_taxonomy( 'wptests_tax_for_page', 'page' );
-                $post = self::$factory->post->create();
-                $page = self::$factory->post->create( array(
+                $post = self::factory()->post->create();
+                $page = self::factory()->post->create( array(
                         'post_type' => 'page',
                 ) );
 
-                $t_for_post = self::$factory->term->create( array(
+                $t_for_post = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax_for_post',
                 ) );
-                $t_for_page = self::$factory->term->create( array(
+                $t_for_page = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax_for_page',
                 ) );
 
@@ -527 +527 @@
                         'hierarchical' => true,
                 ) );
 
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                 ) );
 
@@ -567 +567 @@
                         'hierarchical' => true,
                 ) );
 
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'slug' => 'parent-term',
                 ) );
 
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'slug' => 'foo',
                 ) );
@@ -599 +599 @@
                         'hierarchical' => true,
                 ) );
 
-                $t1 = self::$factory->term->create( array(
+                $t1 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'slug' => 'parent-term',
                 ) );
 
                 // Same slug but in a different tax.
-                $t2 = self::$factory->term->create( array(
+                $t2 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax_2',
                         'slug' => 'foo',
                 ) );
 
-                $t3 = self::$factory->term->create( array(
+                $t3 = self::factory()->term->create( array(
                         'taxonomy' => 'wptests_tax',
                         'slug' => 'foo',
                 ) );
@@ -630 +630 @@
          * @ticket 31954
          */
         public function test_wp_update_term_with_null_get_term() {
-                $t = self::$factory->term->create( array( 'taxonomy' => 'category' ) );
+                $t = self::factory()->term->create( array( 'taxonomy' => 'category' ) );
                 $found = wp_update_term( $t, 'post_tag', array( 'slug' => 'foo' ) );
 
                 $this->assertWPError( $found );

tests/phpunit/tests/url.php

@@ -272 +272 @@
 
         public function test_get_adjacent_post() {
                 $now = time();
-                $post_id = self::$factory->post->create( array( 'post_date' => date( 'Y-m-d H:i:s', $now - 1 ) ) );
-                $post_id2 = self::$factory->post->create( array( 'post_date' => date( 'Y-m-d H:i:s', $now ) ) );
+                $post_id = self::factory()->post->create( array( 'post_date' => date( 'Y-m-d H:i:s', $now - 1 ) ) );
+                $post_id2 = self::factory()->post->create( array( 'post_date' => date( 'Y-m-d H:i:s', $now ) ) );
 
                 if ( ! isset( $GLOBALS['post'] ) )
                         $GLOBALS['post'] = null;
@@ -305 +305 @@
          * @ticket 30287
          */
         public function test_get_adjacent_post_should_return_private_posts_belonging_to_the_current_user() {
-                $u = self::$factory->user->create( array( 'role' => 'author' ) );
+                $u = self::factory()->user->create( array( 'role' => 'author' ) );
                 $old_uid = get_current_user_id();
                 wp_set_current_user( $u );
 
                 $now = time();
-                $p1 = self::$factory->post->create( array( 'post_author' => $u, 'post_status' => 'private', 'post_date' => date( 'Y-m-d H:i:s', $now - 1 ) ) );
-                $p2 = self::$factory->post->create( array( 'post_author' => $u, 'post_date' => date( 'Y-m-d H:i:s', $now ) ) );
+                $p1 = self::factory()->post->create( array( 'post_author' => $u, 'post_status' => 'private', 'post_date' => date( 'Y-m-d H:i:s', $now - 1 ) ) );
+                $p2 = self::factory()->post->create( array( 'post_author' => $u, 'post_date' => date( 'Y-m-d H:i:s', $now ) ) );
 
                 if ( ! isset( $GLOBALS['post'] ) ) {
                         $GLOBALS['post'] = null;
@@ -331 +331 @@
          * @ticket 30287
          */
         public function test_get_adjacent_post_should_return_private_posts_belonging_to_other_users_if_the_current_user_can_read_private_posts() {
-                $u1 = self::$factory->user->create( array( 'role' => 'author' ) );
-                $u2 = self::$factory->user->create( array( 'role' => 'administrator' ) );
+                $u1 = self::factory()->user->create( array( 'role' => 'author' ) );
+                $u2 = self::factory()->user->create( array( 'role' => 'administrator' ) );
                 $old_uid = get_current_user_id();
                 wp_set_current_user( $u2 );
 
                 $now = time();
-                $p1 = self::$factory->post->create( array( 'post_author' => $u1, 'post_status' => 'private', 'post_date' => date( 'Y-m-d H:i:s', $now - 1 ) ) );
-                $p2 = self::$factory->post->create( array( 'post_author' => $u1, 'post_date' => date( 'Y-m-d H:i:s', $now ) ) );
+                $p1 = self::factory()->post->create( array( 'post_author' => $u1, 'post_status' => 'private', 'post_date' => date( 'Y-m-d H:i:s', $now - 1 ) ) );
+                $p2 = self::factory()->post->create( array( 'post_author' => $u1, 'post_date' => date( 'Y-m-d H:i:s', $now ) ) );
 
                 if ( ! isset( $GLOBALS['post'] ) ) {
                         $GLOBALS['post'] = null;
@@ -358 +358 @@
          * @ticket 30287
          */
         public function test_get_adjacent_post_should_not_return_private_posts_belonging_to_other_users_if_the_current_user_cannot_read_private_posts() {
-                $u1 = self::$factory->user->create( array( 'role' => 'author' ) );
-                $u2 = self::$factory->user->create( array( 'role' => 'author' ) );
+                $u1 = self::factory()->user->create( array( 'role' => 'author' ) );
+                $u2 = self::factory()->user->create( array( 'role' => 'author' ) );
                 $old_uid = get_current_user_id();
                 wp_set_current_user( $u2 );
 
                 $now = time();
-                $p1 = self::$factory->post->create( array( 'post_author' => $u1, 'post_date' => date( 'Y-m-d H:i:s', $now - 2 ) ) );
-                $p2 = self::$factory->post->create( array( 'post_author' => $u1, 'post_status' => 'private', 'post_date' => date( 'Y-m-d H:i:s', $now - 1 ) ) );
-                $p3 = self::$factory->post->create( array( 'post_author' => $u1, 'post_date' => date( 'Y-m-d H:i:s', $now ) ) );
+                $p1 = self::factory()->post->create( array( 'post_author' => $u1, 'post_date' => date( 'Y-m-d H:i:s', $now - 2 ) ) );
+                $p2 = self::factory()->post->create( array( 'post_author' => $u1, 'post_status' => 'private', 'post_date' => date( 'Y-m-d H:i:s', $now - 1 ) ) );
+                $p3 = self::factory()->post->create( array( 'post_author' => $u1, 'post_date' => date( 'Y-m-d H:i:s', $now ) ) );
 
                 if ( ! isset( $GLOBALS['post'] ) ) {
                         $GLOBALS['post'] = null;

tests/phpunit/tests/user.php

@@ -43 +43 @@
                 // add one of each user role
                 $nusers = array();
                 foreach ( array('administrator', 'editor', 'author', 'contributor', 'subscriber' ) as $role ) {
-                        $id = self::$factory->user->create( array( 'role' => $role ) );
+                        $id = self::factory()->user->create( array( 'role' => $role ) );
                         $nusers[ $id ] = $id;
                 }
 
@@ -244 +244 @@
                 );
 
                 foreach ( $roles as $role => $level ) {
-                        $user_id = self::$factory->user->create( array( 'role' => $role ) );
+                        $user_id = self::factory()->user->create( array( 'role' => $role ) );
                         $user = new WP_User( $user_id );
 
                         $this->assertTrue( isset( $user->user_level ) );
@@ -292 +292 @@
         }
 
         function test_get() {
-                $user_id = self::$factory->user->create( array(
+                $user_id = self::factory()->user->create( array(
                         'role' => 'author',
                         'user_login' => 'test_wp_user_get',
                         'user_pass' => 'password',
@@ -310 +310 @@
         }
 
         function test_has_prop() {
-                $user_id = self::$factory->user->create( array(
+                $user_id = self::factory()->user->create( array(
                         'role' => 'author',
                         'user_login' => 'test_wp_user_has_prop',
                         'user_pass' => 'password',
@@ -327 +327 @@
         }
 
         function test_update_user() {
-                $user_id = self::$factory->user->create( array(
+                $user_id = self::factory()->user->create( array(
                         'role' => 'author',
                         'user_login' => 'test_wp_update_user',
                         'user_pass' => 'password',
@@ -383 +383 @@
         function test_global_userdata() {
                 global $userdata, $wpdb;
 
-                $user_id = self::$factory->user->create( array( 'role' => 'subscriber' ) );
+                $user_id = self::factory()->user->create( array( 'role' => 'subscriber' ) );
                 wp_set_current_user( $user_id );
 
                 $this->assertNotEmpty( $userdata );
@@ -497 +497 @@
          * @ticket 21431
          */
         function test_count_many_users_posts() {
-                $user_id_a = self::$factory->user->create( array( 'role' => 'author' ) );
-                $user_id_b = self::$factory->user->create( array( 'role' => 'author' ) );
-                $post_id_a = self::$factory->post->create( array( 'post_author' => $user_id_a ) );
-                $post_id_b = self::$factory->post->create( array( 'post_author' => $user_id_b ) );
-                $post_id_c = self::$factory->post->create( array( 'post_author' => $user_id_b, 'post_status' => 'private' ) );
+                $user_id_a = self::factory()->user->create( array( 'role' => 'author' ) );
+                $user_id_b = self::factory()->user->create( array( 'role' => 'author' ) );
+                $post_id_a = self::factory()->post->create( array( 'post_author' => $user_id_a ) );
+                $post_id_b = self::factory()->post->create( array( 'post_author' => $user_id_b ) );
+                $post_id_c = self::factory()->post->create( array( 'post_author' => $user_id_b, 'post_status' => 'private' ) );
 
                 wp_set_current_user( $user_id_a );
                 $counts = count_many_users_posts( array( $user_id_a, $user_id_b), 'post', false );
@@ -771 +771 @@
          * @ticket 33793
          */
         public function test_wp_insert_user_should_not_truncate_to_a_duplicate_user_nicename() {
-                $u1 = self::$factory->user->create( array(
+                $u1 = self::factory()->user->create( array(
                         'user_nicename' => str_repeat( 'a', 50 ),
                 ) );
 
@@ -792 +792 @@
          * @ticket 33793
          */
         public function test_wp_insert_user_should_not_truncate_to_a_duplicate_user_nicename_when_suffix_has_more_than_one_character() {
-                $users = self::$factory->user->create_many( 4, array(
+                $users = self::factory()->user->create_many( 4, array(
                         'user_nicename' => str_repeat( 'a', 50 ),
                 ) );
 
@@ -876 +876 @@
          */
         function test_email_case() {
                 // Create a test user with a lower-case email address.
-                $user_id = self::$factory->user->create( array(
+                $user_id = self::factory()->user->create( array(
                         'user_email' => 'test@test.com',
                 ) );
 
@@ -895 +895 @@
          */
         function test_email_change() {
                 // Create a test user.
-                $user_id = self::$factory->user->create( array(
+                $user_id = self::factory()->user->create( array(
                         'user_email' => 'test@test.com',
                 ) );
 
@@ -983 +983 @@
          * @expectedDeprecated wp_new_user_notification
          */
         function test_wp_new_user_notification_old_signature_throws_deprecated_warning() {
-                $user = self::$factory->user->create( array(
+                $user = self::factory()->user->create( array(
                         'role'       => 'author',
                         'user_login' => 'test_wp_new_user_notification',
                         'user_pass'  => 'password',

tests/phpunit/tests/user/author.php

@@ -15 +15 @@
         function setUp() {
                 parent::setUp();
 
-                $this->author_id = self::$factory->user->create( array(
+                $this->author_id = self::factory()->user->create( array(
                         'role' => 'author',
                         'user_login' => 'test_author',
                         'description' => 'test_author',
@@ -31 +31 @@
                 );
 
                 // insert a post and make sure the ID is ok
-                $this->post_id = self::$factory->post->create( $post );
+                $this->post_id = self::factory()->post->create( $post );
 
                 setup_postdata( get_post( $this->post_id ) );
         }
@@ -90 +90 @@
         function test_get_the_author_posts_with_custom_post_type() {
                 register_post_type( 'wptests_pt' );
 
-                $cpt_ids = self::$factory->post->create_many( 2, array(
+                $cpt_ids = self::factory()->post->create_many( 2, array(
                         'post_author' => $this->author_id,
                         'post_type'   => 'wptests_pt',
                 ) );
@@ -105 +105 @@
          * @ticket 30355
          */
         public function test_get_the_author_posts_link_no_permalinks() {
-                $author = self::$factory->user->create_and_get( array(
+                $author = self::factory()->user->create_and_get( array(
                         'display_name'  => 'Foo',
                         'user_nicename' => 'bar'
                 ) );
@@ -129 +129 @@
         public function test_get_the_author_posts_link_with_permalinks() {
                 $this->set_permalink_structure( '/%postname%/' );
 
-                $author = self::$factory->user->create_and_get( array(
+                $author = self::factory()->user->create_and_get( array(
                         'display_name'  => 'Foo',
                         'user_nicename' => 'bar'
                 ) );

tests/phpunit/tests/user/capabilities.php

@@ -222 +222 @@
         // test the default roles and caps
         function test_all_roles_and_caps() {
                 $users = array(
-                        'administrator' => self::$factory->user->create_and_get( array( 'role' => 'administrator' ) ),
-                        'editor'        => self::$factory->user->create_and_get( array( 'role' => 'editor' ) ),
-                        'author'        => self::$factory->user->create_and_get( array( 'role' => 'author' ) ),
-                        'contributor'   => self::$factory->user->create_and_get( array( 'role' => 'contributor' ) ),
-                        'subscriber'    => self::$factory->user->create_and_get( array( 'role' => 'subscriber' ) ),
+                        'administrator' => self::factory()->user->create_and_get( array( 'role' => 'administrator' ) ),
+                        'editor'        => self::factory()->user->create_and_get( array( 'role' => 'editor' ) ),
+                        'author'        => self::factory()->user->create_and_get( array( 'role' => 'author' ) ),
+                        'contributor'   => self::factory()->user->create_and_get( array( 'role' => 'contributor' ) ),
+                        'subscriber'    => self::factory()->user->create_and_get( array( 'role' => 'subscriber' ) ),
                 );
                 $caps = $this->getCapsAndRoles();
 
@@ -258 +258 @@
         // special case for the link manager
         function test_link_manager_caps() {
                 $users = array(
-                        'administrator' => self::$factory->user->create_and_get( array( 'role' => 'administrator' ) ),
-                        'editor'        => self::$factory->user->create_and_get( array( 'role' => 'editor' ) ),
-                        'author'        => self::$factory->user->create_and_get( array( 'role' => 'author' ) ),
-                        'contributor'   => self::$factory->user->create_and_get( array( 'role' => 'contributor' ) ),
-                        'subscriber'    => self::$factory->user->create_and_get( array( 'role' => 'subscriber' ) ),
+                        'administrator' => self::factory()->user->create_and_get( array( 'role' => 'administrator' ) ),
+                        'editor'        => self::factory()->user->create_and_get( array( 'role' => 'editor' ) ),
+                        'author'        => self::factory()->user->create_and_get( array( 'role' => 'author' ) ),
+                        'contributor'   => self::factory()->user->create_and_get( array( 'role' => 'contributor' ) ),
+                        'subscriber'    => self::factory()->user->create_and_get( array( 'role' => 'subscriber' ) ),
                 );
                 $caps = array(
                         'manage_links' => array( 'administrator', 'editor' ),
@@ -305 +305 @@
                 }
                 $caps = $this->getCapsAndRoles();
 
-                $user = self::$factory->user->create_and_get( array( 'role' => 'administrator' ) );
+                $user = self::factory()->user->create_and_get( array( 'role' => 'administrator' ) );
                 grant_super_admin( $user->ID );
 
                 $this->assertTrue( is_super_admin( $user->ID ) );
@@ -321 +321 @@
 
         // a role that doesn't exist
         function test_bogus_role() {
-                $user = self::$factory->user->create_and_get( array( 'role' => 'invalid_role' ) );
+                $user = self::factory()->user->create_and_get( array( 'role' => 'invalid_role' ) );
 
                 // make sure the user is valid
                 $this->assertTrue( $user->exists(), "User does not exist" );
@@ -339 +339 @@
 
         // a user with multiple roles
         function test_user_subscriber_contributor() {
-                $user = self::$factory->user->create_and_get( array( 'role' => 'subscriber' ) );
+                $user = self::factory()->user->create_and_get( array( 'role' => 'subscriber' ) );
 
                 // make sure the user is valid
                 $this->assertTrue( $user->exists(), "User does not exist" );
@@ -372 +372 @@
                 $this->_flush_roles();
                 $this->assertTrue( $wp_roles->is_role( $role_name ) );
 
-                $user = self::$factory->user->create_and_get( array( 'role' => $role_name ) );
+                $user = self::factory()->user->create_and_get( array( 'role' => $role_name ) );
 
                 // make sure the user is valid
                 $this->assertTrue( $user->exists(), "User does not exist" );
@@ -409 +409 @@
                 $this->_flush_roles();
                 $this->assertTrue( $wp_roles->is_role( $role_name ) );
 
-                $user = self::$factory->user->create_and_get( array( 'role' => $role_name ) );
+                $user = self::factory()->user->create_and_get( array( 'role' => $role_name ) );
 
                 // make sure the user is valid
                 $this->assertTrue( $user->exists(), "User does not exist" );
@@ -446 +446 @@
                 $this->assertTrue( $wp_roles->is_role($role_name) );
 
                 // assign a user to that role
-                $id = self::$factory->user->create( array( 'role' => $role_name ) );
+                $id = self::factory()->user->create( array( 'role' => $role_name ) );
 
                 // now add a cap to the role
                 $wp_roles->add_cap($role_name, 'sweep_floor');
@@ -484 +484 @@
                 $this->assertTrue( $wp_roles->is_role($role_name) );
 
                 // assign a user to that role
-                $id = self::$factory->user->create( array( 'role' => $role_name ) );
+                $id = self::factory()->user->create( array( 'role' => $role_name ) );
 
                 // now remove a cap from the role
                 $wp_roles->remove_cap($role_name, 'polish_doorknobs');
@@ -513 +513 @@
                 // add an extra capability to a user
 
                 // there are two contributors
-                $id_1 = self::$factory->user->create( array( 'role' => 'contributor' ) );
-                $id_2 = self::$factory->user->create( array( 'role' => 'contributor' ) );
+                $id_1 = self::factory()->user->create( array( 'role' => 'contributor' ) );
+                $id_2 = self::factory()->user->create( array( 'role' => 'contributor' ) );
 
                 // user 1 has an extra capability
                 $user_1 = new WP_User($id_1);
@@ -550 +550 @@
                 // add an extra capability to a user then remove it
 
                 // there are two contributors
-                $id_1 = self::$factory->user->create( array( 'role' => 'contributor' ) );
-                $id_2 = self::$factory->user->create( array( 'role' => 'contributor' ) );
+                $id_1 = self::factory()->user->create( array( 'role' => 'contributor' ) );
+                $id_2 = self::factory()->user->create( array( 'role' => 'contributor' ) );
 
                 // user 1 has an extra capability
                 $user_1 = new WP_User($id_1);
@@ -581 +581 @@
                 // make sure the user_level is correctly set and changed with the user's role
 
                 // user starts as an author
-                $id = self::$factory->user->create( array( 'role' => 'author' ) );
+                $id = self::factory()->user->create( array( 'role' => 'author' ) );
                 $user = new WP_User($id);
                 $this->assertTrue($user->exists(), "Problem getting user $id");
 
@@ -604 +604 @@
 
         function test_user_remove_all_caps() {
                 // user starts as an author
-                $id = self::$factory->user->create( array( 'role' => 'author' ) );
+                $id = self::factory()->user->create( array( 'role' => 'author' ) );
                 $user = new WP_User($id);
                 $this->assertTrue($user->exists(), "Problem getting user $id");
 
@@ -646 +646 @@
                 // simple tests for some common meta capabilities
 
                 // Make our author
-                $author = new WP_User( self::$factory->user->create( array( 'role' => 'author' ) ) );
+                $author = new WP_User( self::factory()->user->create( array( 'role' => 'author' ) ) );
 
                 // make a post
-                $post = self::$factory->post->create( array( 'post_author' => $author->ID, 'post_type' => 'post' ) );
+                $post = self::factory()->post->create( array( 'post_author' => $author->ID, 'post_type' => 'post' ) );
 
                 // the author of the post
                 $this->assertTrue($author->exists(), "Problem getting user $author->ID");
 
                 // add some other users
-                $admin = new WP_User( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
-                $author_2 = new WP_User( self::$factory->user->create( array( 'role' => 'author' ) ) );
-                $editor = new WP_User( self::$factory->user->create( array( 'role' => 'editor' ) ) );
-                $contributor = new WP_User( self::$factory->user->create( array( 'role' => 'contributor' ) ) );
+                $admin = new WP_User( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
+                $author_2 = new WP_User( self::factory()->user->create( array( 'role' => 'author' ) ) );
+                $editor = new WP_User( self::factory()->user->create( array( 'role' => 'editor' ) ) );
+                $contributor = new WP_User( self::factory()->user->create( array( 'role' => 'contributor' ) ) );
 
                 // administrators, editors and the post owner can edit it
                 $this->assertTrue($admin->has_cap('edit_post', $post));
@@ -732 +732 @@
          */
         function test_authorless_post( $status ) {
                 // Make a post without an author
-                $post = self::$factory->post->create( array( 'post_author' => 0, 'post_type' => 'post', 'post_status' => $status ) );
+                $post = self::factory()->post->create( array( 'post_author' => 0, 'post_type' => 'post', 'post_status' => $status ) );
 
                 // Add an editor and contributor
-                $editor = self::$factory->user->create_and_get( array( 'role' => 'editor' ) );
-                $contributor = self::$factory->user->create_and_get( array( 'role' => 'contributor' ) );
+                $editor = self::factory()->user->create_and_get( array( 'role' => 'editor' ) );
+                $contributor = self::factory()->user->create_and_get( array( 'role' => 'contributor' ) );
 
                 // editor can edit, view, and trash
                 $this->assertTrue( $editor->has_cap( 'edit_post', $post ) );
@@ -753 +753 @@
          * @ticket 16714
          */
         function test_create_posts_caps() {
-                $author = new WP_User( self::$factory->user->create( array( 'role' => 'author' ) ) );
-                $admin = new WP_User( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
-                $author_2 = new WP_User( self::$factory->user->create( array( 'role' => 'author' ) ) );
-                $editor = new WP_User( self::$factory->user->create( array( 'role' => 'editor' ) ) );
-                $contributor = new WP_User( self::$factory->user->create( array( 'role' => 'contributor' ) ) );
+                $author = new WP_User( self::factory()->user->create( array( 'role' => 'author' ) ) );
+                $admin = new WP_User( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
+                $author_2 = new WP_User( self::factory()->user->create( array( 'role' => 'author' ) ) );
+                $editor = new WP_User( self::factory()->user->create( array( 'role' => 'editor' ) ) );
+                $contributor = new WP_User( self::factory()->user->create( array( 'role' => 'contributor' ) ) );
 
                 // create_posts isn't a real cap.
                 $this->assertFalse($admin->has_cap('create_posts'));
@@ -818 +818 @@
                 // simple tests for some common meta capabilities
 
                 // Make our author
-                $author = new WP_User( self::$factory->user->create( array( 'role' => 'author' ) ) );
+                $author = new WP_User( self::factory()->user->create( array( 'role' => 'author' ) ) );
 
                 // make a page
-                $page = self::$factory->post->create( array( 'post_author' => $author->ID, 'post_type' => 'page' ) );
+                $page = self::factory()->post->create( array( 'post_author' => $author->ID, 'post_type' => 'page' ) );
 
                 // the author of the page
                 $this->assertTrue($author->exists(), "Problem getting user " . $author->ID);
 
                 // add some other users
-                $admin = new WP_User( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
-                $author_2 = new WP_User( self::$factory->user->create( array( 'role' => 'author' ) ) );
-                $editor = new WP_User( self::$factory->user->create( array( 'role' => 'editor' ) ) );
-                $contributor = new WP_User( self::$factory->user->create( array( 'role' => 'contributor' ) ) );
+                $admin = new WP_User( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
+                $author_2 = new WP_User( self::factory()->user->create( array( 'role' => 'author' ) ) );
+                $editor = new WP_User( self::factory()->user->create( array( 'role' => 'editor' ) ) );
+                $contributor = new WP_User( self::factory()->user->create( array( 'role' => 'contributor' ) ) );
 
                 // administrators, editors and the post owner can edit it
                 $this->assertTrue($admin->has_cap('edit_page', $page));
@@ -853 +853 @@
          * @ticket 21786
          */
         function test_negative_caps() {
-                $author = new WP_User( self::$factory->user->create( array( 'role' => 'author' ) ) );
+                $author = new WP_User( self::factory()->user->create( array( 'role' => 'author' ) ) );
                 $author->add_cap( 'foo', false );
                 $this->assertTrue ( isset( $author->caps['foo'] ) );
                 $author->remove_cap( 'foo' );
@@ -864 +864 @@
          * @ticket 18932
          */
         function test_set_role_same_role() {
-                $user = new WP_User( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
+                $user = new WP_User( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
                 $caps = $user->caps;
                 $this->assertNotEmpty( $user->caps );
                 $user->set_role( 'administrator' );
@@ -875 +875 @@
         function test_current_user_can_for_blog() {
                 global $wpdb;
 
-                $user = new WP_User( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
+                $user = new WP_User( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
                 $old_uid = get_current_user_id();
                 wp_set_current_user( $user->ID );
 
@@ -890 +890 @@
                 $this->assertFalse( current_user_can_for_blog( 12345, 'edit_posts' ) );
                 $wpdb->suppress_errors( $suppress );
 
-                $blog_id = self::$factory->blog->create( array( 'user_id' => $user->ID ) );
+                $blog_id = self::factory()->blog->create( array( 'user_id' => $user->ID ) );
                 $this->assertTrue( current_user_can_for_blog( $blog_id, 'edit_posts' ) );
                 $this->assertFalse( current_user_can_for_blog( $blog_id, 'foo_the_bar' ) );
 
@@ -904 +904 @@
                 }
 
                 $orig_blog_id = get_current_blog_id();
-                $blog_id = self::$factory->blog->create();
+                $blog_id = self::factory()->blog->create();
 
                 $this->_nullify_current_user();
 
@@ -932 +932 @@
          * @ticket 28374
          */
         function test_current_user_edit_caps() {
-                $user = new WP_User( self::$factory->user->create( array( 'role' => 'contributor' ) ) );
+                $user = new WP_User( self::factory()->user->create( array( 'role' => 'contributor' ) ) );
                 wp_set_current_user( $user->ID );
 
                 $user->add_cap( 'publish_posts' );
@@ -945 +945 @@
         }
 
         function test_subscriber_cant_edit_posts() {
-                $user = new WP_User( self::$factory->user->create( array( 'role' => 'subscriber' ) ) );
+                $user = new WP_User( self::factory()->user->create( array( 'role' => 'subscriber' ) ) );
                 wp_set_current_user( $user->ID );
 
-                $post = self::$factory->post->create( array( 'post_author' => 1 ) );
+                $post = self::factory()->post->create( array( 'post_author' => 1 ) );
 
                 $this->assertFalse( current_user_can( 'edit_post', $post ) );
                 $this->assertFalse( current_user_can( 'edit_post', $post + 1 ) );
@@ -960 +960 @@
                         return;
                 }
 
-                $user = new WP_User( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
-                $other_user = new WP_User( self::$factory->user->create( array( 'role' => 'subscriber' ) ) );
+                $user = new WP_User( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
+                $other_user = new WP_User( self::factory()->user->create( array( 'role' => 'subscriber' ) ) );
 
                 wp_set_current_user( $user->ID );
 
@@ -974 +974 @@
                         return;
                 }
 
-                $user = new WP_User( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
+                $user = new WP_User( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
 
                 wp_set_current_user( $user->ID );
 
@@ -987 +987 @@
                         return;
                 }
 
-                $user = new WP_User( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
+                $user = new WP_User( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
                 $user->add_cap( 'manage_network_users' );
-                $other_user = new WP_User( self::$factory->user->create( array( 'role' => 'subscriber' ) ) );
+                $other_user = new WP_User( self::factory()->user->create( array( 'role' => 'subscriber' ) ) );
 
                 wp_set_current_user( $user->ID );
 
@@ -1002 +1002 @@
                         return;
                 }
 
-                $user = new WP_User( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
+                $user = new WP_User( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
                 $user->add_cap( 'manage_network_users' );
-                $super_admin = new WP_User( self::$factory->user->create( array( 'role' => 'subscriber' ) ) );
+                $super_admin = new WP_User( self::factory()->user->create( array( 'role' => 'subscriber' ) ) );
                 grant_super_admin( $super_admin->ID );
 
                 wp_set_current_user( $user->ID );
@@ -1017 +1017 @@
          */
         function test_require_edit_others_posts_if_post_type_doesnt_exist() {
                 register_post_type( 'existed' );
-                $post_id = self::$factory->post->create( array( 'post_type' => 'existed' ) );
+                $post_id = self::factory()->post->create( array( 'post_type' => 'existed' ) );
                 _unregister_post_type( 'existed' );
 
-                $subscriber_id = self::$factory->user->create( array( 'role' => 'subscriber' ) );
-                $editor_id = self::$factory->user->create( array( 'role' => 'editor' ) );
+                $subscriber_id = self::factory()->user->create( array( 'role' => 'subscriber' ) );
+                $editor_id = self::factory()->user->create( array( 'role' => 'editor' ) );
 
                 $this->setExpectedIncorrectUsage( 'map_meta_cap' );
                 foreach ( array( 'delete_post', 'edit_post', 'read_post', 'publish_post' ) as $cap ) {
@@ -1046 +1046 @@
 
                 $cpt = get_post_type_object( 'page_capability' );
 
-                $admin       = self::$factory->user->create_and_get( array( 'role' => 'administrator' ) );
-                $editor      = self::$factory->user->create_and_get( array( 'role' => 'editor' ) );
-                $author      = self::$factory->user->create_and_get( array( 'role' => 'author' ) );
-                $contributor = self::$factory->user->create_and_get( array( 'role' => 'contributor' ) );
+                $admin       = self::factory()->user->create_and_get( array( 'role' => 'administrator' ) );
+                $editor      = self::factory()->user->create_and_get( array( 'role' => 'editor' ) );
+                $author      = self::factory()->user->create_and_get( array( 'role' => 'author' ) );
+                $contributor = self::factory()->user->create_and_get( array( 'role' => 'contributor' ) );
 
                 $this->assertEquals( 'edit_pages', $cpt->cap->edit_posts );
                 $this->assertTrue( user_can( $admin->ID, $cpt->cap->edit_posts ) );
@@ -1057 +1057 @@
                 $this->assertFalse( user_can( $author->ID, $cpt->cap->edit_posts ) );
                 $this->assertFalse( user_can( $contributor->ID, $cpt->cap->edit_posts ) );
 
-                $admin_post = self::$factory->post->create_and_get( array(
+                $admin_post = self::factory()->post->create_and_get( array(
                         'post_author' => $admin->ID,
                         'post_type'   => 'page_capability',
                 ) );
@@ -1067 +1067 @@
                 $this->assertFalse( user_can( $author->ID, 'edit_post', $admin_post->ID ) );
                 $this->assertFalse( user_can( $contributor->ID, 'edit_post', $admin_post->ID ) );
 
-                $author_post = self::$factory->post->create_and_get( array(
+                $author_post = self::factory()->post->create_and_get( array(
                         'post_author' => $author->ID,
                         'post_type'   => 'page_capability',
                 ) );

tests/phpunit/tests/user/countUsers.php

@@ -17 +17 @@
                 }
 
                 // Setup users
-                $admin = self::$factory->user->create( array(
+                $admin = self::factory()->user->create( array(
                         'role' => 'administrator',
                 ) );
-                $editor = self::$factory->user->create( array(
+                $editor = self::factory()->user->create( array(
                         'role' => 'editor',
                 ) );
-                $author = self::$factory->user->create( array(
+                $author = self::factory()->user->create( array(
                         'role' => 'author',
                 ) );
-                $contributor = self::$factory->user->create( array(
+                $contributor = self::factory()->user->create( array(
                         'role' => 'contributor',
                 ) );
-                $subscriber = self::$factory->user->create( array(
+                $subscriber = self::factory()->user->create( array(
                         'role' => 'subscriber',
                 ) );
-                $none = self::$factory->user->create( array(
+                $none = self::factory()->user->create( array(
                         'role' => '',
                 ) );
-                $nobody = self::$factory->user->create( array(
+                $nobody = self::factory()->user->create( array(
                         'role' => '',
                 ) );
 
@@ -67 +67 @@
                 }
 
                 // Setup users
-                $admin = self::$factory->user->create( array(
+                $admin = self::factory()->user->create( array(
                         'role' => 'administrator',
                 ) );
-                $editor = self::$factory->user->create( array(
+                $editor = self::factory()->user->create( array(
                         'role' => 'editor',
                 ) );
-                $author = self::$factory->user->create( array(
+                $author = self::factory()->user->create( array(
                         'role' => 'author',
                 ) );
-                $contributor = self::$factory->user->create( array(
+                $contributor = self::factory()->user->create( array(
                         'role' => 'contributor',
                 ) );
-                $subscriber = self::$factory->user->create( array(
+                $subscriber = self::factory()->user->create( array(
                         'role' => 'subscriber',
                 ) );
-                $none = self::$factory->user->create( array(
+                $none = self::factory()->user->create( array(
                         'role' => '',
                 ) );
-                $nobody = self::$factory->user->create( array(
+                $nobody = self::factory()->user->create( array(
                         'role' => '',
                 ) );
 
                 // Setup blogs
-                $blog_1 = (int) self::$factory->blog->create( array(
+                $blog_1 = (int) self::factory()->blog->create( array(
                         'user_id' => $editor,
                 ) );
-                $blog_2 = (int) self::$factory->blog->create( array(
+                $blog_2 = (int) self::factory()->blog->create( array(
                         'user_id' => $author,
                 ) );
 

tests/phpunit/tests/user/dateQuery.php

@@ -9 +9 @@
          * @ticket 27283
          */
         public function test_user_registered() {
-                $u1 = self::$factory->user->create( array(
+                $u1 = self::factory()->user->create( array(
                         'user_registered' => '2012-02-14 05:05:05',
                 ) );
-                $u2 = self::$factory->user->create( array(
+                $u2 = self::factory()->user->create( array(
                         'user_registered' => '2013-02-14 05:05:05',
                 ) );
 
@@ -31 +31 @@
          * @ticket 27283
          */
         public function test_user_registered_relation_or() {
-                $u1 = self::$factory->user->create( array(
+                $u1 = self::factory()->user->create( array(
                         'user_registered' => '2012-02-14 05:05:05',
                 ) );
-                $u2 = self::$factory->user->create( array(
+                $u2 = self::factory()->user->create( array(
                         'user_registered' => '2013-02-14 05:05:05',
                 ) );
-                $u3 = self::$factory->user->create( array(
+                $u3 = self::factory()->user->create( array(
                         'user_registered' => '2014-02-14 05:05:05',
                 ) );
 

tests/phpunit/tests/user/listAuthors.php

@@ -71 +71 @@
         }
 
         function test_wp_list_authors_exclude_admin() {
-                self::$factory->post->create( array( 'post_type' => 'post', 'post_author' => 1 ) );
+                self::factory()->post->create( array( 'post_type' => 'post', 'post_author' => 1 ) );
                 $expected['exclude_admin'] = '<li><a href="' . get_author_posts_url( 1 ) . '" title="Posts by admin">admin</a></li><li><a href="' . self::$user_urls[1] . '" title="Posts by bob">bob</a></li><li><a href="' . self::$user_urls[2] . '" title="Posts by paul">paul</a></li><li><a href="' . self::$user_urls[0] . '" title="Posts by zack">zack</a></li>';
                 $this->AssertEquals( $expected['exclude_admin'], wp_list_authors( array( 'echo' => false, 'exclude_admin' => 0 ) ) );
         }

tests/phpunit/tests/user/mapMetaCap.php

@@ -12 +12 @@
 
                 $this->user_ids = array();
 
-                $this->user_id   = self::$factory->user->create( array( 'role' => 'administrator' ) );
-                $this->author_id = self::$factory->user->create( array( 'role' => 'administrator' ) );
+                $this->user_id   = self::factory()->user->create( array( 'role' => 'administrator' ) );
+                $this->author_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
 
                 if ( isset( $GLOBALS['super_admins'] ) )
                         $this->super_admins = $GLOBALS['super_admins'];
@@ -248 +248 @@
          * @ticket 27020
          */
         function test_authorless_posts_capabilties() {
-                $post_id = self::$factory->post->create( array( 'post_author' => 0, 'post_type' => 'post', 'post_status' => 'publish' ) );
-                $editor = self::$factory->user->create( array( 'role' => 'editor' ) );
+                $post_id = self::factory()->post->create( array( 'post_author' => 0, 'post_type' => 'post', 'post_status' => 'publish' ) );
+                $editor = self::factory()->user->create( array( 'role' => 'editor' ) );
 
                 $this->assertEquals( array( 'edit_others_posts', 'edit_published_posts' ), map_meta_cap( 'edit_post', $editor, $post_id ) );
                 $this->assertEquals( array( 'delete_others_posts', 'delete_published_posts' ), map_meta_cap( 'delete_post', $editor, $post_id ) );

tests/phpunit/tests/user/multisite.php

@@ -25 +25 @@
         }
 
         function test_remove_user_from_blog() {
-                $user1 = self::$factory->user->create_and_get();
-                $user2 = self::$factory->user->create_and_get();
+                $user1 = self::factory()->user->create_and_get();
+                $user2 = self::factory()->user->create_and_get();
 
-                $post_id = self::$factory->post->create( array( 'post_author' => $user1->ID ) );
+                $post_id = self::factory()->post->create( array( 'post_author' => $user1->ID ) );
 
                 remove_user_from_blog( $user1->ID, 1, $user2->ID );
 
@@ -42 +42 @@
          * Test the returned data from get_blogs_of_user()
          */
         function test_get_blogs_of_user() {
-                $user1_id = self::$factory->user->create( array( 'role' => 'administrator' ) );
+                $user1_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
 
                 // Maintain a list of 6 total sites and include the primary network site.
-                $blog_ids = self::$factory->blog->create_many( 5, array( 'user_id' => $user1_id ) );
+                $blog_ids = self::factory()->blog->create_many( 5, array( 'user_id' => $user1_id ) );
                 $blog_ids = array_merge( array( 1 ), $blog_ids );
 
                 // All sites are new and not marked as spam, archived, or deleted.
@@ -114 +114 @@
         function test_is_blog_user() {
                 global $wpdb;
 
-                $user1_id = self::$factory->user->create( array( 'role' => 'administrator' ) );
+                $user1_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
 
                 $old_current = get_current_user_id();
                 wp_set_current_user( $user1_id );
@@ -124 +124 @@
 
                 $blog_ids = array();
 
-                $blog_ids = self::$factory->blog->create_many( 5 );
+                $blog_ids = self::factory()->blog->create_many( 5 );
                 foreach ( $blog_ids as $blog_id ) {
                         $this->assertInternalType( 'int', $blog_id );
                         $this->assertTrue( is_blog_user( $blog_id ) );
@@ -138 +138 @@
         function test_is_user_member_of_blog() {
                 global $wpdb;
 
-                $user1_id = self::$factory->user->create( array( 'role' => 'administrator' ) );
-                $user2_id = self::$factory->user->create( array( 'role' => 'administrator' ) );
+                $user1_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
+                $user2_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
 
                 $old_current = get_current_user_id();
 
@@ -156 +156 @@
                 $this->assertTrue( is_user_member_of_blog( $user1_id ) );
                 $this->assertTrue( is_user_member_of_blog( $user1_id, $wpdb->blogid ) );
 
-                $blog_ids = self::$factory->blog->create_many( 5 );
+                $blog_ids = self::factory()->blog->create_many( 5 );
                 foreach ( $blog_ids as $blog_id ) {
                         $this->assertInternalType( 'int', $blog_id );
 
@@ -197 +197 @@
          * @ticket 23192
          */
         function test_is_user_spammy() {
-                $user_id = self::$factory->user->create( array(
+                $user_id = self::factory()->user->create( array(
                         'role' => 'author',
                         'user_login' => 'testuser1',
                 ) );
 
                 $spam_username = (string) $user_id;
-                $spam_user_id = self::$factory->user->create( array(
+                $spam_user_id = self::factory()->user->create( array(
                         'role' => 'author',
                         'user_login' => $spam_username,
                 ) );
@@ -219 +219 @@
         function test_user_member_of_blog() {
                 global $wp_rewrite;
 
-                self::$factory->blog->create();
-                $user_id = self::$factory->user->create();
-                self::$factory->blog->create( array( 'user_id' => $user_id ) );
+                self::factory()->blog->create();
+                $user_id = self::factory()->user->create();
+                self::factory()->blog->create( array( 'user_id' => $user_id ) );
 
                 $blogs = get_blogs_of_user( $user_id );
                 $this->assertCount( 2, $blogs );
@@ -261 +261 @@
                         unset( $GLOBALS['super_admins'] );
                 }
 
-                $user_id = self::$factory->user->create();
+                $user_id = self::factory()->user->create();
                 grant_super_admin( $user_id );
                 revoke_super_admin( $user_id );
 
@@ -278 +278 @@
                         unset( $GLOBALS['super_admins'] );
                 }
 
-                $user_id = self::$factory->user->create();
+                $user_id = self::factory()->user->create();
                 grant_super_admin( $user_id );
                 revoke_super_admin( $user_id );
                 wpmu_delete_user( $user_id );
@@ -297 +297 @@
                         unset( $GLOBALS['super_admins'] );
                 }
 
-                $user_id = self::$factory->user->create();
+                $user_id = self::factory()->user->create();
                 grant_super_admin( $user_id );
 
                 $this->assertFalse( wpmu_delete_user( $user_id ) );
@@ -316 +316 @@
                         unset( $GLOBALS['super_admins'] );
                 }
 
-                $user_id = self::$factory->user->create();
+                $user_id = self::factory()->user->create();
 
                 $this->assertFalse( is_super_admin( $user_id ) );
                 $this->assertFalse( revoke_super_admin( $user_id ) );
@@ -329 +329 @@
                 $this->assertFalse( isset( $GLOBALS['super_admins'] ) );
 
                 // Try with two users.
-                $second_user = self::$factory->user->create();
+                $second_user = self::factory()->user->create();
                 $this->assertTrue( grant_super_admin( $user_id ) );
                 $this->assertTrue( grant_super_admin( $second_user ) );
                 $this->assertTrue( is_super_admin( $second_user ) );
@@ -343 +343 @@
         }
 
         public function test_numeric_string_user_id() {
-                $u = self::$factory->user->create();
+                $u = self::factory()->user->create();
 
                 $u_string = (string) $u;
                 $this->assertTrue( wpmu_delete_user( $u_string ) );
@@ -361 +361 @@
          * @ticket 33800
          */
         public function test_should_return_false_for_object_user_id() {
-                $u_obj = self::$factory->user->create_and_get();
+                $u_obj = self::factory()->user->create_and_get();
                 $this->assertFalse( wpmu_delete_user( $u_obj ) );
                 $this->assertEquals( $u_obj->ID, username_exists( $u_obj->user_login ) );
         }

tests/phpunit/tests/user/query.php

@@ -245 +245 @@
          * @ticket 31265
          */
         public function test_orderby_clause_key_as_secondary_sort() {
-                $u1 = self::$factory->user->create( array(
+                $u1 = self::factory()->user->create( array(
                         'user_registered' => '2015-01-28 03:00:00',
                 ) );
-                $u2 = self::$factory->user->create( array(
+                $u2 = self::factory()->user->create( array(
                         'user_registered' => '2015-01-28 05:00:00',
                 ) );
-                $u3 = self::$factory->user->create( array(
+                $u3 = self::factory()->user->create( array(
                         'user_registered' => '2015-01-28 03:00:00',
                 ) );
 
@@ -598 +598 @@
                         $this->markTestSkipped( __METHOD__ . ' is a multisite-only test.' );
                 }
 
-                $b = self::$factory->blog->create();
+                $b = self::factory()->blog->create();
 
                 add_user_to_blog( $b, self::$author_ids[0], 'author' );
 
@@ -624 +624 @@
                         $this->markTestSkipped( __METHOD__ . ' is a multisite-only test.' );
                 }
 
-                $b = self::$factory->blog->create();
+                $b = self::factory()->blog->create();
                 add_user_to_blog( $b, self::$author_ids[0], 'author' );
 
                 $query = new WP_User_Query( array(
@@ -649 +649 @@
                         $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
                 }
 
-                $b = self::$factory->blog->create();
+                $b = self::factory()->blog->create();
 
                 add_user_to_blog( $b, self::$author_ids[0], 'subscriber' );
                 add_user_to_blog( $b, self::$author_ids[1], 'author' );
@@ -675 +675 @@
                         $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
                 }
 
-                $b = self::$factory->blog->create();
+                $b = self::factory()->blog->create();
 
                 add_user_to_blog( $b, self::$author_ids[0], 'subscriber' );
                 add_user_to_blog( $b, self::$author_ids[1], 'author' );
@@ -707 +707 @@
                 register_post_type( 'wptests_pt_public', array( 'public' => true ) );
                 register_post_type( 'wptests_pt_private', array( 'public' => false ) );
 
-                self::$factory->post->create( array( 'post_author' => self::$author_ids[0], 'post_status' => 'publish', 'post_type' => 'wptests_pt_public' ) );
-                self::$factory->post->create( array( 'post_author' => self::$author_ids[1], 'post_status' => 'publish', 'post_type' => 'wptests_pt_private' ) );
+                self::factory()->post->create( array( 'post_author' => self::$author_ids[0], 'post_status' => 'publish', 'post_type' => 'wptests_pt_public' ) );
+                self::factory()->post->create( array( 'post_author' => self::$author_ids[1], 'post_status' => 'publish', 'post_type' => 'wptests_pt_private' ) );
 
                 $q = new WP_User_Query( array(
                         'has_published_posts' => true,
@@ -727 +727 @@
                 register_post_type( 'wptests_pt_public', array( 'public' => true ) );
                 register_post_type( 'wptests_pt_private', array( 'public' => false ) );
 
-                self::$factory->post->create( array( 'post_author' => self::$author_ids[0], 'post_status' => 'publish', 'post_type' => 'wptests_pt_public' ) );
-                self::$factory->post->create( array( 'post_author' => self::$author_ids[1], 'post_status' => 'publish', 'post_type' => 'wptests_pt_private' ) );
-                self::$factory->post->create( array( 'post_author' => self::$author_ids[2], 'post_status' => 'publish', 'post_type' => 'post' ) );
+                self::factory()->post->create( array( 'post_author' => self::$author_ids[0], 'post_status' => 'publish', 'post_type' => 'wptests_pt_public' ) );
+                self::factory()->post->create( array( 'post_author' => self::$author_ids[1], 'post_status' => 'publish', 'post_type' => 'wptests_pt_private' ) );
+                self::factory()->post->create( array( 'post_author' => self::$author_ids[2], 'post_status' => 'publish', 'post_type' => 'post' ) );
 
                 $q = new WP_User_Query( array(
                         'has_published_posts' => array( 'wptests_pt_private', 'post' ),
@@ -748 +748 @@
                 register_post_type( 'wptests_pt_public', array( 'public' => true ) );
                 register_post_type( 'wptests_pt_private', array( 'public' => false ) );
 
-                self::$factory->post->create( array( 'post_author' => self::$author_ids[0], 'post_status' => 'draft', 'post_type' => 'wptests_pt_public' ) );
-                self::$factory->post->create( array( 'post_author' => self::$author_ids[1], 'post_status' => 'inherit', 'post_type' => 'wptests_pt_private' ) );
-                self::$factory->post->create( array( 'post_author' => self::$author_ids[2], 'post_status' => 'publish', 'post_type' => 'post' ) );
+                self::factory()->post->create( array( 'post_author' => self::$author_ids[0], 'post_status' => 'draft', 'post_type' => 'wptests_pt_public' ) );
+                self::factory()->post->create( array( 'post_author' => self::$author_ids[1], 'post_status' => 'inherit', 'post_type' => 'wptests_pt_private' ) );
+                self::factory()->post->create( array( 'post_author' => self::$author_ids[2], 'post_status' => 'publish', 'post_type' => 'post' ) );
 
                 $q = new WP_User_Query( array(
                         'has_published_posts' => array( 'wptests_pt_public', 'wptests_pt_private', 'post' ),
@@ -770 +770 @@
                         $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
                 }
 
-                $blogs = self::$factory->blog->create_many( 2 );
+                $blogs = self::factory()->blog->create_many( 2 );
 
                 add_user_to_blog( $blogs[0], self::$author_ids[0], 'author' );
                 add_user_to_blog( $blogs[0], self::$author_ids[1], 'author' );
@@ -778 +778 @@
                 add_user_to_blog( $blogs[1], self::$author_ids[1], 'author' );
 
                 switch_to_blog( $blogs[0] );
-                self::$factory->post->create( array( 'post_author' => self::$author_ids[0], 'post_status' => 'publish', 'post_type' => 'post' ) );
+                self::factory()->post->create( array( 'post_author' => self::$author_ids[0], 'post_status' => 'publish', 'post_type' => 'post' ) );
                 restore_current_blog();
 
                 switch_to_blog( $blogs[1] );
-                self::$factory->post->create( array( 'post_author' => self::$author_ids[1], 'post_status' => 'publish', 'post_type' => 'post' ) );
+                self::factory()->post->create( array( 'post_author' => self::$author_ids[1], 'post_status' => 'publish', 'post_type' => 'post' ) );
                 restore_current_blog();
 
                 $q = new WP_User_Query( array(
@@ -931 +931 @@
          * @ticket 22212
          */
         public function test_get_single_role_by_string_which_is_similar() {
-                $another_editor = self::$factory->user->create( array(
+                $another_editor = self::factory()->user->create( array(
                         'role' => 'another-editor',
                 ) );
 
@@ -1148 +1148 @@
                         $this->markTestSkipped( __METHOD__ . ' requires multisite.' );
                 }
 
-                $sites = self::$factory->blog->create_many( 2 );
+                $sites = self::factory()->blog->create_many( 2 );
 
                 add_user_to_blog( $sites[0], self::$author_ids[0], 'author' );
                 add_user_to_blog( $sites[1], self::$author_ids[1], 'author' );

tests/phpunit/tests/user/session.php

@@ -10 +10 @@
         function setUp() {
                 parent::setUp();
                 remove_all_filters( 'session_token_manager' );
-                $user_id = self::$factory->user->create();
+                $user_id = self::factory()->user->create();
                 $this->manager = WP_Session_Tokens::get_instance( $user_id );
                 $this->assertInstanceOf( 'WP_Session_Tokens', $this->manager );
                 $this->assertInstanceOf( 'WP_User_Meta_Session_Tokens', $this->manager );

tests/phpunit/tests/user/slashes.php

@@ -8 +8 @@
 class Tests_User_Slashes extends WP_UnitTestCase {
         function setUp() {
                 parent::setUp();
-                $this->author_id = self::$factory->user->create( array( 'role' => 'administrator' ) );
+                $this->author_id = self::factory()->user->create( array( 'role' => 'administrator' ) );
                 $this->old_current_user = get_current_user_id();
                 wp_set_current_user( $this->author_id );
 
@@ -83 +83 @@
          *
          */
         function test_edit_user() {
-                $id = self::$factory->user->create();
+                $id = self::factory()->user->create();
 
                 $_POST = $_GET = $_REQUEST = array();
                 $_POST['role'] = 'subscriber';
@@ -173 +173 @@
          *
          */
         function test_wp_update_user() {
-                $id = self::$factory->user->create();
+                $id = self::factory()->user->create();
                 $id = wp_update_user(array(
                         'ID' => $id,
                         'role' => 'subscriber',

tests/phpunit/tests/user/updateUserCaches.php

@@ -7 +7 @@
         public function test_should_store_entire_database_row_in_users_bucket() {
                 global $wpdb;
 
-                $u = self::$factory->user->create();
+                $u = self::factory()->user->create();
                 $raw_userdata = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE ID = %d", $u ) );
 
                 update_user_caches( $raw_userdata );
@@ -57 +57 @@
         public function test_should_store_raw_data_in_users_bucket_when_passed_a_wp_user_object() {
                 global $wpdb;
 
-                $u = self::$factory->user->create();
+                $u = self::factory()->user->create();
                 $raw_userdata = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE ID = %d", $u ) );
                 $user_object = new WP_User( $u );
 

tests/phpunit/tests/user/wpDeleteUser.php

@@ -14 +14 @@
                 // Logged out users don't have blogs.
                 $this->assertEquals( array(), get_blogs_of_user( 0 ) );
 
-                $user_id = self::$factory->user->create( array( 'role' => 'subscriber' ) );
+                $user_id = self::factory()->user->create( array( 'role' => 'subscriber' ) );
                 $blogs = get_blogs_of_user( $user_id );
                 $this->assertEquals( array( 1 ), array_keys( $blogs ) );
 
@@ -34 +34 @@
         function test_is_user_member_of_blog() {
                 $old_current = get_current_user_id();
 
-                $user_id = self::$factory->user->create( array( 'role' => 'subscriber' ) );
+                $user_id = self::factory()->user->create( array( 'role' => 'subscriber' ) );
                 wp_set_current_user( $user_id );
 
                 $this->assertTrue( is_user_member_of_blog() );
@@ -54 +54 @@
         }
 
         function test_delete_user() {
-                $user_id = self::$factory->user->create( array( 'role' => 'author' ) );
+                $user_id = self::factory()->user->create( array( 'role' => 'author' ) );
                 $user = new WP_User( $user_id );
 
                 $post = array(
@@ -111 +111 @@
          * @ticket 20447
          */
         function test_wp_delete_user_reassignment_clears_post_caches() {
-                $user_id   = self::$factory->user->create();
-                $reassign  = self::$factory->user->create();
-                $post_id   = self::$factory->post->create( array( 'post_author' => $user_id ) );
+                $user_id   = self::factory()->user->create();
+                $reassign  = self::factory()->user->create();
+                $post_id   = self::factory()->post->create( array( 'post_author' => $user_id ) );
 
                 get_post( $post_id ); // Ensure this post is in the cache.
 
@@ -128 +128 @@
                         $this->markTestSkipped( 'wp_delete_user() does not delete user records in Multisite.' );
                 }
 
-                $u = self::$factory->user->create();
+                $u = self::factory()->user->create();
 
                 $u_string = (string) $u;
                 $this->assertTrue( wp_delete_user( $u_string ) );
@@ -150 +150 @@
                         $this->markTestSkipped( 'wp_delete_user() does not delete user records in Multisite.' );
                 }
 
-                $u_obj = self::$factory->user->create_and_get();
+                $u_obj = self::factory()->user->create_and_get();
                 $this->assertFalse( wp_delete_user( $u_obj ) );
                 $this->assertEquals( $u_obj->ID, username_exists( $u_obj->user_login ) );
         }

tests/phpunit/tests/user/wpGetUsersWithNoRole.php

@@ -15 +15 @@
                 }
 
                 // Setup users
-                $admin = self::$factory->user->create( array(
+                $admin = self::factory()->user->create( array(
                         'role' => 'administrator',
                 ) );
-                $editor = self::$factory->user->create( array(
+                $editor = self::factory()->user->create( array(
                         'role' => 'editor',
                 ) );
-                $nobody = self::$factory->user->create( array(
+                $nobody = self::factory()->user->create( array(
                         'role' => '',
                 ) );
-                $nobody_else = self::$factory->user->create( array(
+                $nobody_else = self::factory()->user->create( array(
                         'role' => '',
                 ) );
 
@@ -49 +49 @@
                 }
 
                 // Setup users
-                $admin = self::$factory->user->create( array(
+                $admin = self::factory()->user->create( array(
                         'role' => 'administrator',
                 ) );
-                $editor = self::$factory->user->create( array(
+                $editor = self::factory()->user->create( array(
                         'role' => 'editor',
                 ) );
-                $nobody = self::$factory->user->create( array(
+                $nobody = self::factory()->user->create( array(
                         'role' => '',
                 ) );
 
                 // Setup blogs
-                $blog_1 = (int) self::$factory->blog->create( array(
+                $blog_1 = (int) self::factory()->blog->create( array(
                         'user_id' => $editor,
                 ) );
 

tests/phpunit/tests/user/wpSetCurrentUser.php

@@ -5 +5 @@
  */
 class Tests_User_WpSetCurrentUser extends WP_UnitTestCase {
         public function test_set_by_id() {
-                $u = self::$factory->user->create();
+                $u = self::factory()->user->create();
 
                 $user = wp_set_current_user( $u );
 
@@ -15 +15 @@
         }
 
         public function test_name_should_be_ignored_if_id_is_not_null() {
-                $u = self::$factory->user->create();
+                $u = self::factory()->user->create();
 
                 $user = wp_set_current_user( $u, 'foo' );
 
@@ -25 +25 @@
         }
 
         public function test_should_set_by_name_if_id_is_null_and_current_user_is_nonempty() {
-                $u1 = self::$factory->user->create();
+                $u1 = self::factory()->user->create();
                 wp_set_current_user( $u1 );
                 $this->assertSame( $u1, get_current_user_id() );
 
-                $u2 = self::$factory->user->create( array(
+                $u2 = self::factory()->user->create( array(
                         'user_login' => 'foo',
                 ) );
 
@@ -49 +49 @@
                 wp_set_current_user( 0 );
                 $this->assertSame( 0, get_current_user_id() );
 
-                $u = self::$factory->user->create( array(
+                $u = self::factory()->user->create( array(
                         'user_login' => 'foo',
                 ) );
 

tests/phpunit/tests/widgets.php

@@ -438 +438 @@
                 $this->assertEmpty( $wp_customize );
                 $this->assertFalse( $widget->is_preview() );
 
-                wp_set_current_user( self::$factory->user->create( array( 'role' => 'administrator' ) ) );
+                wp_set_current_user( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
                 require_once ABSPATH . WPINC . '/class-wp-customize-manager.php';
                 $wp_customize = new WP_Customize_Manager();
                 $wp_customize->start_previewing_theme();

tests/phpunit/tests/xmlrpc/mt/getRecentPostTitles.php

@@ -22 +22 @@
         function test_no_editable_posts() {
                 $this->make_user_by_role( 'author' );
                 $editor = $this->make_user_by_role( 'editor' );
-                self::$factory->post->create( array( 'post_author' => $editor ) );
+                self::factory()->post->create( array( 'post_author' => $editor ) );
 
                 $result = $this->myxmlrpcserver->mt_getRecentPostTitles( array( 1, 'author', 'author' ) );
                 $this->assertNotInstanceOf( 'IXR_Error', $result );
@@ -32 +32 @@
         function test_date() {
                 $this->make_user_by_role( 'author' );
 
-                self::$factory->post->create();
+                self::factory()->post->create();
 
                 $results = $this->myxmlrpcserver->mt_getRecentPostTitles( array( 1, 'author', 'author' ) );
                 $this->assertNotInstanceOf( 'IXR_Error', $results );

tests/phpunit/tests/xmlrpc/mw/editPost.php

@@ -126 +126 @@
 
                 // create attachment
                 $filename = ( DIR_TESTDATA.'/images/a2-small.jpg' );
-                $attachment_id = self::$factory->attachment->create_upload_object( $filename, $post_id );
+                $attachment_id = self::factory()->attachment->create_upload_object( $filename, $post_id );
 
                 // add post thumbnail to post that does not have one
                 $post2 = array( 'wp_post_thumbnail' => $attachment_id );
@@ -141 +141 @@
                 $this->assertEquals( $attachment_id, get_post_meta( $post_id, '_thumbnail_id', true ) );
 
                 // create another attachment
-                $attachment2_id = self::$factory->attachment->create_upload_object( $filename, $post_id );
+                $attachment2_id = self::factory()->attachment->create_upload_object( $filename, $post_id );
 
                 // change the post's post_thumbnail
                 $post4 = array( 'wp_post_thumbnail' => $attachment2_id );
@@ -228 +228 @@
 
                 $editor_id = $this->make_user_by_role( 'editor' );
 
-                $post_id = self::$factory->post->create( array(
+                $post_id = self::factory()->post->create( array(
                         'post_author' => $editor_id
                 ) );
 
@@ -251 +251 @@
         function test_empty_not_null() {
                 $editor_id = $this->make_user_by_role( 'editor' );
 
-                $post_id = self::$factory->post->create( array(
+                $post_id = self::factory()->post->create( array(
                         'post_title' => 'Title',
                         'post_author' => $editor_id,
                         'tags_input' => 'taco'

tests/phpunit/tests/xmlrpc/mw/getPost.php

@@ -95 +95 @@
 
                 // create attachment
                 $filename = ( DIR_TESTDATA.'/images/a2-small.jpg' );
-                $attachment_id = self::$factory->attachment->create_upload_object( $filename );
+                $attachment_id = self::factory()->attachment->create_upload_object( $filename );
 
                 set_post_thumbnail( $this->post_id, $attachment_id );
 

tests/phpunit/tests/xmlrpc/mw/getRecentPosts.php

@@ -100 +100 @@
 
                 // create attachment
                 $filename = ( DIR_TESTDATA.'/images/a2-small.jpg' );
-                $attachment_id = self::$factory->attachment->create_upload_object( $filename, $this->post_id );
+                $attachment_id = self::factory()->attachment->create_upload_object( $filename, $this->post_id );
                 set_post_thumbnail( $this->post_id, $attachment_id );
 
                 $results = $this->myxmlrpcserver->mw_getRecentPosts( array( $this->post_id, 'author', 'author' ) );

tests/phpunit/tests/xmlrpc/mw/newPost.php

@@ -117 +117 @@
 
                 // create attachment
                 $filename = ( DIR_TESTDATA.'/images/a2-small.jpg' );
-                $attachment_id = self::$factory->attachment->create_upload_object( $filename );
+                $attachment_id = self::factory()->attachment->create_upload_object( $filename );
 
                 $post = array( 'title' => 'Post Thumbnail Test', 'wp_post_thumbnail' => $attachment_id );
                 $result = $this->myxmlrpcserver->mw_newPost( array( 1, 'author', 'author', $post ) );

tests/phpunit/tests/xmlrpc/wp/deletePost.php

@@ -21 +21 @@
 
         function test_incapable_user() {
                 $this->make_user_by_role( 'subscriber' );
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
 
                 $result = $this->myxmlrpcserver->wp_deletePost( array( 1, 'subscriber', 'subscriber', $post_id ) );
                 $this->assertInstanceOf( 'IXR_Error', $result );
@@ -30 +30 @@
 
         function test_post_deleted() {
                 $this->make_user_by_role( 'editor' );
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
 
                 $result = $this->myxmlrpcserver->wp_deletePost( array( 1, 'editor', 'editor', $post_id ) );
                 $this->assertNotInstanceOf( 'IXR_Error', $result );

tests/phpunit/tests/xmlrpc/wp/editComment.php

@@ -7 +7 @@
 
         function test_author_can_edit_own_comment() {
                 $author_id = $this->make_user_by_role( 'author' );
-                $post_id = self::$factory->post->create( array(
+                $post_id = self::factory()->post->create( array(
                         'post_title' => 'Post test by author',
                         'post_author' => $author_id
                 ) );
@@ -29 +29 @@
         function test_author_cannot_edit_others_comment() {
                 $this->make_user_by_role( 'author' );
                 $editor_id = $this->make_user_by_role( 'editor' );
-                $post_id = self::$factory->post->create( array(
+                $post_id = self::factory()->post->create( array(
                         'post_title' => 'Post test by editor',
                         'post_author' => $editor_id
                 ) );
@@ -49 +49 @@
 
         function test_trash_comment() {
                 $this->make_user_by_role( 'administrator' );
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
 
                 $comment_data = array(
                         'comment_post_ID' => $post_id,
@@ -78 +78 @@
                 update_option( 'timezone_string', 'America/New_York' );
 
                 $this->make_user_by_role( 'administrator' );
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
 
                 $comment_data = array(
                         'comment_post_ID' => $post_id,

tests/phpunit/tests/xmlrpc/wp/editPost.php

@@ -126 +126 @@
 
                 // create attachment
                 $filename = ( DIR_TESTDATA.'/images/a2-small.jpg' );
-                $attachment_id = self::$factory->attachment->create_upload_object( $filename, $post_id );
+                $attachment_id = self::factory()->attachment->create_upload_object( $filename, $post_id );
 
                 // add post thumbnail to post that does not have one
                 $post2 = array( 'post_thumbnail' => $attachment_id );
@@ -148 +148 @@
                 $this->assertEquals( $attachment_id, get_post_meta( $post_id, '_thumbnail_id', true ) );
 
                 // create another attachment
-                $attachment2_id = self::$factory->attachment->create_upload_object( $filename, $post_id );
+                $attachment2_id = self::factory()->attachment->create_upload_object( $filename, $post_id );
 
                 // change the post's post_thumbnail
                 $post4 = array( 'post_thumbnail' => $attachment2_id );
@@ -208 +208 @@
         function test_capable_unsticky() {
                 $editor_id = $this->make_user_by_role( 'editor' );
 
-                $post_id = self::$factory->post->create( array( 'post_author' => $editor_id ) );
+                $post_id = self::factory()->post->create( array( 'post_author' => $editor_id ) );
                 stick_post( $post_id );
 
                 $post2 = array( 'sticky' => false );
@@ -220 +220 @@
         function test_password_transition_unsticky() {
                 // when transitioning to private status or adding a post password, post should be un-stuck
                 $editor_id = $this->make_user_by_role( 'editor' );
-                $post_id = self::$factory->post->create( array( 'post_author' => $editor_id ) );
+                $post_id = self::factory()->post->create( array( 'post_author' => $editor_id ) );
                 stick_post( $post_id );
 
                 $post2 = array( 'post_password' => 'foobar',  'sticky' => false );
@@ -234 +234 @@
 
                 $yesterday = strtotime( '-1 day' );
 
-                $post_id = self::$factory->post->create( array(
+                $post_id = self::factory()->post->create( array(
                         'post_title'   => 'Post Revision Test',
                         'post_content' => 'Not edited',
                         'post_author'  => $editor_id,
@@ -263 +263 @@
         function test_edit_attachment() {
                 $editor_id = $this->make_user_by_role( 'editor' );
 
-                $post_id = self::$factory->post->create( array(
+                $post_id = self::factory()->post->create( array(
                         'post_title'   => 'Post Revision Test',
                         'post_content' => 'Not edited',
                         'post_status'  => 'inherit',
@@ -282 +282 @@
         function test_use_invalid_post_status() {
                 $editor_id = $this->make_user_by_role( 'editor' );
 
-                $post_id = self::$factory->post->create( array(
+                $post_id = self::factory()->post->create( array(
                         'post_title'   => 'Post Revision Test',
                         'post_content' => 'Not edited',
                         'post_author'  => $editor_id,
@@ -302 +302 @@
         function test_loss_of_categories_on_edit() {
                 $editor_id = $this->make_user_by_role( 'editor' );
 
-                $post_id = self::$factory->post->create( array( 'post_author'  => $editor_id ) );
-                $term_id = self::$factory->category->create();
-                self::$factory->term->add_post_terms( $post_id, $term_id, 'category', true );
+                $post_id = self::factory()->post->create( array( 'post_author'  => $editor_id ) );
+                $term_id = self::factory()->category->create();
+                self::factory()->term->add_post_terms( $post_id, $term_id, 'category', true );
                 $term_ids = wp_list_pluck( get_the_category( $post_id ), 'term_id' );
                 $this->assertContains( $term_id, $term_ids );
 
@@ -322 +322 @@
         function test_clear_categories_on_edit() {
                 $editor_id = $this->make_user_by_role( 'editor' );
 
-                $post_id = self::$factory->post->create( array( 'post_author'  => $editor_id ) );
-                $term_id = self::$factory->category->create();
-                self::$factory->term->add_post_terms( $post_id, $term_id, 'category', true );
+                $post_id = self::factory()->post->create( array( 'post_author'  => $editor_id ) );
+                $term_id = self::factory()->category->create();
+                self::factory()->term->add_post_terms( $post_id, $term_id, 'category', true );
                 $term_ids = wp_list_pluck( get_the_category( $post_id ), 'term_id' );
                 $this->assertContains( $term_id, $term_ids );
 
@@ -365 +365 @@
                 $editor_id = $this->make_user_by_role( 'editor' );
 
                 // Add a dummy post
-                $post_id = self::$factory->post->create( array(
+                $post_id = self::factory()->post->create( array(
                         'post_title'   => 'Post Enclosure Test',
                         'post_content' => 'Fake content',
                         'post_author'  => $editor_id,

tests/phpunit/tests/xmlrpc/wp/getComment.php

@@ -13 +13 @@
         function setUp() {
                 parent::setUp();
 
-                $this->post_id = self::$factory->post->create();
+                $this->post_id = self::factory()->post->create();
 
                 $this->parent_comment_data = array(
                         'comment_post_ID' => $this->post_id,

tests/phpunit/tests/xmlrpc/wp/getComments.php

@@ -21 +21 @@
         }
 
         function test_capable_user() {
-                $this->post_id = self::$factory->post->create();
-                self::$factory->comment->create_post_comments( $this->post_id, 2 );
+                $this->post_id = self::factory()->post->create();
+                self::factory()->comment->create_post_comments( $this->post_id, 2 );
 
                 $this->make_user_by_role( 'editor' );
 
@@ -36 +36 @@
         }
 
         function test_post_filter() {
-                $this->post_id = self::$factory->post->create();
-                self::$factory->comment->create_post_comments( $this->post_id, 2 );
+                $this->post_id = self::factory()->post->create();
+                self::factory()->comment->create_post_comments( $this->post_id, 2 );
 
                 $this->make_user_by_role( 'editor' );
 
@@ -52 +52 @@
         }
 
         function test_number_filter() {
-                $this->post_id = self::$factory->post->create();
-                self::$factory->comment->create_post_comments( $this->post_id, 11 );
+                $this->post_id = self::factory()->post->create();
+                self::factory()->comment->create_post_comments( $this->post_id, 11 );
 
                 $this->make_user_by_role( 'editor' );
 
@@ -76 +76 @@
         function test_contributor_capabilities() {
                 $this->make_user_by_role( 'contributor' );
                 $author_id = $this->make_user_by_role( 'author' );
-                $author_post_id = self::$factory->post->create( array(
+                $author_post_id = self::factory()->post->create( array(
                         'post_title' => 'Author',
                         'post_author' => $author_id,
                         'post_status' => 'publish'
                 ) );
 
-                self::$factory->comment->create( array(
+                self::factory()->comment->create( array(
                         'comment_post_ID' => $author_post_id,
                         'comment_author' => "Commenter 1",
                         'comment_author_url' => "http://example.com/1/",
@@ -90 +90 @@
                 ) );
 
                 $editor_id = $this->make_user_by_role( 'editor' );
-                $editor_post_id = self::$factory->post->create( array(
+                $editor_post_id = self::factory()->post->create( array(
                         'post_title' => 'Editor',
                         'post_author' => $editor_id,
                         'post_status' => 'publish'
                 ) );
 
-                self::$factory->comment->create( array(
+                self::factory()->comment->create( array(
                         'comment_post_ID' => $editor_post_id,
                         'comment_author' => 'Commenter 2',
                         'comment_author_url' => 'http://example.com/2/',
@@ -110 +110 @@
 
         function test_author_capabilities() {
                 $author_id = $this->make_user_by_role( 'author' );
-                $author_post_id = self::$factory->post->create( array(
+                $author_post_id = self::factory()->post->create( array(
                         'post_title' => 'Author',
                         'post_author' => $author_id,
                         'post_status' => 'publish'
                 ) );
 
-                self::$factory->comment->create( array(
+                self::factory()->comment->create( array(
                         'comment_post_ID' => $author_post_id,
                         'comment_author' => 'Commenter 1',
                         'comment_author_url' => 'http://example.com/1/',
@@ -124 +124 @@
                 ) );
 
                 $editor_id = $this->make_user_by_role( 'editor' );
-                $editor_post_id = self::$factory->post->create( array(
+                $editor_post_id = self::factory()->post->create( array(
                         'post_title' => 'Editor',
                         'post_author' => $editor_id,
                         'post_status' => 'publish'
                 ) );
 
-                self::$factory->comment->create( array(
+                self::factory()->comment->create( array(
                         'comment_post_ID' => $editor_post_id,
                         'comment_author' => 'Commenter 2',
                         'comment_author_url' => 'http://example.com/2/',
@@ -166 +166 @@
 
         function test_editor_capabilities() {
                 $author_id = $this->make_user_by_role( 'author' );
-                $author_post_id = self::$factory->post->create( array(
+                $author_post_id = self::factory()->post->create( array(
                         'post_title' => 'Author',
                         'post_author' => $author_id,
                         'post_status' => 'publish'
                 ) );
 
-                self::$factory->comment->create( array(
+                self::factory()->comment->create( array(
                         'comment_post_ID' => $author_post_id,
                         'comment_author' => 'Commenter 1',
                         'comment_author_url' => 'http://example.com/1/',
@@ -180 +180 @@
                 ));
 
                 $editor_id = $this->make_user_by_role( 'editor' );
-                $editor_post_id = self::$factory->post->create( array(
+                $editor_post_id = self::factory()->post->create( array(
                         'post_title' => 'Editor',
                         'post_author' => $editor_id,
                         'post_status' => 'publish'
                 ) );
 
-                self::$factory->comment->create(array(
+                self::factory()->comment->create(array(
                         'comment_post_ID' => $editor_post_id,
                         'comment_author' => 'Commenter 2',
                         'comment_author_url' => 'http://example.com/2/',

tests/phpunit/tests/xmlrpc/wp/getPost.php

@@ -122 +122 @@
         function test_valid_page() {
                 $this->make_user_by_role( 'editor' );
 
-                $parent_page_id = self::$factory->post->create( array( 'post_type' => 'page' ) );
-                $child_page_id = self::$factory->post->create( array(
+                $parent_page_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
+                $child_page_id = self::factory()->post->create( array(
                         'post_type' => 'page',
                         'post_parent' => $parent_page_id,
                         'menu_order' => 2

tests/phpunit/tests/xmlrpc/wp/getPosts.php

@@ -54 +54 @@
                 $post_ids = array();
                 $num_posts = 4;
                 foreach ( range( 1, $num_posts ) as $i ) {
-                        $post_ids[] = self::$factory->post->create( array(
+                        $post_ids[] = self::factory()->post->create( array(
                                 'post_type' => $cpt_name,
                                 'post_date' => date( 'Y-m-d H:i:s', time() + $i )
                         ) );
@@ -80 +80 @@
                 // add comments to some of the posts
                 foreach ( $post_ids as $key => $post_id ) {
                         // Larger post IDs will get more comments.
-                        self::$factory->comment->create_post_comments( $post_id, $key );
+                        self::factory()->comment->create_post_comments( $post_id, $key );
                 }
 
                 // get results ordered by comment count
@@ -109 +109 @@
 
         function test_fields() {
                 $this->make_user_by_role( 'editor' );
-                self::$factory->post->create();
+                self::factory()->post->create();
 
                 // check default fields
                 $results = $this->myxmlrpcserver->wp_getPosts( array( 1, 'editor', 'editor' ) );
@@ -136 +136 @@
         function test_search() {
                 $this->make_user_by_role( 'editor' );
 
-                $post_ids[] = self::$factory->post->create( array( 'post_title' => 'First: ' . rand_str() ) );
-                $post_ids[] = self::$factory->post->create( array( 'post_title' => 'Second: ' . rand_str() ) );
+                $post_ids[] = self::factory()->post->create( array( 'post_title' => 'First: ' . rand_str() ) );
+                $post_ids[] = self::factory()->post->create( array( 'post_title' => 'Second: ' . rand_str() ) );
 
                 // Search for none of them
                 $filter = array( 's' => rand_str() );

tests/phpunit/tests/xmlrpc/wp/getRevisions.php

@@ -14 +14 @@
         function test_incapable_user() {
                 $this->make_user_by_role( 'subscriber' );
 
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
 
                 $result = $this->myxmlrpcserver->wp_getRevisions( array( 1, 'subscriber', 'subscriber', $post_id ) );
                 $this->assertInstanceOf( 'IXR_Error', $result );
@@ -24 +24 @@
         function test_capable_user() {
                 $this->make_user_by_role( 'editor' );
 
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
                 $result = $this->myxmlrpcserver->wp_getRevisions( array( 1, 'editor', 'editor', $post_id ) );
                 $this->assertNotInstanceOf( 'IXR_Error', $result );
         }
@@ -32 +32 @@
         function test_revision_count() {
                 $this->make_user_by_role( 'editor' );
 
-                $post_id = self::$factory->post->create();
+                $post_id = self::factory()->post->create();
                 wp_insert_post( array( 'ID' => $post_id, 'post_content' => 'Edit 1' ) ); // Create the initial revision
 
                 $result = $this->myxmlrpcserver->wp_getRevisions( array( 1, 'editor', 'editor', $post_id ) );

tests/phpunit/tests/xmlrpc/wp/getTerms.php

@@ -106 +106 @@
                 $cat1 = wp_create_category( 'wp.getTerms_' . rand_str( 16 ) );
                 $cat2 = wp_create_category( 'wp.getTerms_' . rand_str( 16 ) );
 
-                self::$factory->post->create_many( 5, array( 'post_category' => array( $cat1 ) ) );
-                self::$factory->post->create_many( 3, array( 'post_category' => array( $cat2 ) ) );
+                self::factory()->post->create_many( 5, array( 'post_category' => array( $cat1 ) ) );
+                self::factory()->post->create_many( 3, array( 'post_category' => array( $cat2 ) ) );
 
                 $filter = array( 'orderby' => 'count', 'order' => 'DESC' );
                 $results = $this->myxmlrpcserver->wp_getTerms( array( 1, 'editor', 'editor', 'category', $filter ) );

tests/phpunit/tests/xmlrpc/wp/getUsers.php

@@ -79 +79 @@
                 if ( is_multisite() )
                         grant_super_admin( $administrator_id );
 
-                self::$factory->user->create_many( 5 );
+                self::factory()->user->create_many( 5 );
 
                 $user_ids = get_users( array( 'fields' => 'ID' ) );
 

tests/phpunit/tests/xmlrpc/wp/newComment.php

@@ -6 +6 @@
 class Tests_XMLRPC_wp_newComment extends WP_XMLRPC_UnitTestCase {
         function test_new_comment_post_closed() {
                 $this->make_user_by_role( 'administrator' );
-                $post = self::$factory->post->create_and_get( array(
+                $post = self::factory()->post->create_and_get( array(
                         'comment_status' => 'closed'
                 ) );
 

tests/phpunit/tests/xmlrpc/wp/newPost.php

@@ -128 +128 @@
 
                 // create attachment
                 $filename = ( DIR_TESTDATA.'/images/a2-small.jpg' );
-                $attachment_id = self::$factory->attachment->create_upload_object( $filename );
+                $attachment_id = self::factory()->attachment->create_upload_object( $filename );
 
                 $post = array( 'post_title' => 'Post Thumbnail Test', 'post_thumbnail' => $attachment_id );
                 $result = $this->myxmlrpcserver->wp_newPost( array( 1, 'author', 'author', $post ) );

tests/phpunit/tests/xmlrpc/wp/restoreRevision.php

@@ -10 +10 @@
         function setUp() {
                 parent::setUp();
 
-                $this->post_id = self::$factory->post->create( array( 'post_content' => 'edit1' ) ); // Not saved as a revision
+                $this->post_id = self::factory()->post->create( array( 'post_content' => 'edit1' ) ); // Not saved as a revision
                 // First saved revision on update, see https://core.trac.wordpress.org/changeset/24650
                 wp_insert_post( array( 'ID' => $this->post_id, 'post_content' => 'edit2' ) );