Ticket #33968: fix-blown-up-factory.diff

tests/phpunit/includes/testcase.php

@@ -17 +17 @@
         /**
          * @var WP_UnitTest_Factory
          */
-        protected static $factory;
+        protected static $_factory;
+        protected $factory;
 
         public static function get_called_class() {
                 if ( function_exists( 'get_called_class' ) ) {
@@ -37 +38 @@
         public static function setUpBeforeClass() {
                 parent::setUpBeforeClass();
 
-                if ( ! self::$factory ) {
-                        self::$factory = new WP_UnitTest_Factory();
-                }
+                self::_get_factory();
 
                 $c = self::get_called_class();
                 if ( ! method_exists( $c, 'wpSetUpBeforeClass' ) ) {
@@ -64 +63 @@
                 self::commit_transaction();
         }
 
+
+        protected static function _get_factory() {
+                if ( ! self::$_factory instanceof WP_UnitTest_Factory ) {
+                        self::$_factory = new WP_UnitTest_Factory();
+                }
+                return self::$_factory;
+        }
+
+
         function setUp() {
                 set_time_limit(0);
 
@@ -80 +88 @@
                 $wpdb->show_errors = true;
                 $wpdb->db_connect();
                 ini_set('display_errors', 1 );
+                $this->factory = self::_get_factory();
                 $this->clean_up_global_scope();
 
                 /*
@@ -682 +691 @@
                 $wp_rewrite->set_permalink_structure( $structure );
                 $wp_rewrite->flush_rules();
         }
+
 }