X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FActorMigrationTest.php;h=d28be7a53ca2c592f03cb60e783e6e79b2bc933c;hb=754d08f8ad32a197ad563aa45ea4d6dadcaf2b75;hp=1b0c848bb62230f20950c7bfc24b1adbaa64a87b;hpb=05bdcdbbd9c52f14b6de3897187b90174f49130a;p=lhc%2Fweb%2Fwiklou.git diff --git a/tests/phpunit/includes/ActorMigrationTest.php b/tests/phpunit/includes/ActorMigrationTest.php index 1b0c848bb6..d28be7a53c 100644 --- a/tests/phpunit/includes/ActorMigrationTest.php +++ b/tests/phpunit/includes/ActorMigrationTest.php @@ -470,16 +470,17 @@ class ActorMigrationTest extends MediaWikiLangTestCase { } $stages = [ - MIGRATION_OLD => [ MIGRATION_OLD, MIGRATION_WRITE_NEW ], - MIGRATION_WRITE_BOTH => [ MIGRATION_OLD, MIGRATION_NEW ], - MIGRATION_WRITE_NEW => [ MIGRATION_WRITE_BOTH, MIGRATION_NEW ], - MIGRATION_NEW => [ MIGRATION_WRITE_BOTH, MIGRATION_NEW ], + MIGRATION_OLD => [ MIGRATION_OLD, MIGRATION_WRITE_BOTH, MIGRATION_WRITE_NEW ], + MIGRATION_WRITE_BOTH => [ MIGRATION_OLD, MIGRATION_WRITE_BOTH, MIGRATION_WRITE_NEW, + MIGRATION_NEW ], + MIGRATION_WRITE_NEW => [ MIGRATION_WRITE_BOTH, MIGRATION_WRITE_NEW, MIGRATION_NEW ], + MIGRATION_NEW => [ MIGRATION_WRITE_BOTH, MIGRATION_WRITE_NEW, MIGRATION_NEW ], ]; $nameKey = $key . '_text'; $actorKey = $key === 'ipb_by' ? 'ipb_by_actor' : substr( $key, 0, -5 ) . '_actor'; - foreach ( $stages as $writeStage => $readRange ) { + foreach ( $stages as $writeStage => $possibleReadStages ) { if ( $key === 'ipb_by' ) { $extraFields['ipb_address'] = __CLASS__ . "#$writeStage"; } @@ -512,7 +513,7 @@ class ActorMigrationTest extends MediaWikiLangTestCase { $callback( $id, $extraFields ); } - for ( $readStage = $readRange[0]; $readStage <= $readRange[1]; $readStage++ ) { + foreach ( $possibleReadStages as $readStage ) { $r = $this->makeMigration( $readStage ); $queryInfo = $r->getJoin( $key );