Ticket #35199: 35199.diff

tests/phpunit/includes/factory/class-wp-unittest-factory-for-thing.php

@@ -62 +62 @@
                 if ( is_null( $generation_definitions ) )
                         $generation_definitions = $this->default_generation_definitions;
 
+                $gen = new WP_UnitTest_Generator_Sequence();
+                $incr = $gen->get_incr();
+
                 foreach( array_keys( $generation_definitions ) as $field_name ) {
                         if ( !isset( $args[$field_name] ) ) {
                                 $generator = $generation_definitions[$field_name];
-                                if ( is_scalar( $generator ) )
+                                if ( is_scalar( $generator ) ) {
                                         $args[$field_name] = $generator;
-                                elseif ( is_object( $generator ) && method_exists( $generator, 'call' ) ) {
+                                } elseif ( is_object( $generator ) && method_exists( $generator, 'call' ) ) {
                                         $callbacks[$field_name] = $generator;
-                                } elseif ( is_object( $generator ) )
-                                        $args[$field_name] = $generator->next();
-                                else
+                                } elseif ( is_object( $generator ) ) {
+                                        $args[ $field_name ] = sprintf( $generator->get_template_string(), $incr );
+                                } else {
                                         return new WP_Error( 'invalid_argument', 'Factory default value should be either a scalar or an generator object.' );
+                                }
                         }
                 }
+
                 return $args;
         }
 

tests/phpunit/includes/factory/class-wp-unittest-generator-sequence.php

@@ -20 +20 @@
                 $this->next++;
                 return $generated;
         }
+
+        /**
+         * Get the incrementor.
+         *
+         * @since 4.6.0
+         *
+         * @return int
+         */
+        public function get_incr() {
+                return self::$incr;
+        }
+
+        /**
+         * Get the template string.
+         *
+         * @since 4.6.0
+         *
+         * @return string
+         */
+        public function get_template_string() {
+                return $this->template_string;
+        }
 }