X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2FMediaWikiTestCase.php;h=f04eec73b4d6e1801711107e648a19ca1920d2bc;hb=a7f7bc798161b9279fef38f6d44b8ee9b6055397;hp=c844e13fd3fa0347c6ed76cb14f1fc2306e83a8e;hpb=9bd7c7f66058fe26e130759090e7a73beee4d3d0;p=lhc%2Fweb%2Fwiklou.git diff --git a/tests/phpunit/MediaWikiTestCase.php b/tests/phpunit/MediaWikiTestCase.php index c844e13fd3..f04eec73b4 100644 --- a/tests/phpunit/MediaWikiTestCase.php +++ b/tests/phpunit/MediaWikiTestCase.php @@ -213,6 +213,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { * * @param Config|null $bootstrapConfig The bootstrap config to use with the new * MediaWikiServices. + * @return MediaWikiServices */ protected static function resetGlobalServices( Config $bootstrapConfig = null ) { $oldServices = MediaWikiServices::getInstance(); @@ -1303,7 +1304,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { private function resetDB( $db, $tablesUsed ) { if ( $db ) { $userTables = [ 'user', 'user_groups', 'user_properties' ]; - $pageTables = [ 'page', 'revision', 'revision_comment_temp', 'comment' ]; + $pageTables = [ 'page', 'revision', 'ip_changes', 'revision_comment_temp', 'comment' ]; $coreDBDataTables = array_merge( $userTables, $pageTables ); // If any of the user or page tables were marked as used, we should clear all of them. @@ -1591,7 +1592,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { * * @since 1.20 * - * @param array $array + * @param array &$array */ protected function objectAssociativeSort( array &$array ) { uasort( @@ -1609,7 +1610,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { * * @since 1.20 * - * @param mixed $r The array to remove string keys from. + * @param mixed &$r The array to remove string keys from. */ protected static function stripStringKeys( &$r ) { if ( !is_array( $r ) ) { @@ -1832,6 +1833,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { /** * Used as a marker to prevent wfResetOutputBuffers from breaking PHPUnit. + * @param string $buffer * @return string */ public static function wfResetOutputBuffersBarrier( $buffer ) {