| Index: trunk/phase3/tests/phpunit/includes/GlobalTest.php |
| — | — | @@ -523,8 +523,7 @@ |
| 524 | 524 | $old_wgOut = $wgOut; |
| 525 | 525 | $old_wgShowDebug = $wgShowDebug; |
| 526 | 526 | |
| 527 | | - $wgOut = new StubObject( 'wgOut', 'MockOutputPage' ); |
| 528 | | - $wgOut->doNothing(); //just to unstub it |
| | 527 | + $wgOut = new MockOutputPage; |
| 529 | 528 | |
| 530 | 529 | $wgShowDebug = true; |
| 531 | 530 | |
| — | — | @@ -879,7 +878,5 @@ |
| 880 | 879 | function debug( $message ) { |
| 881 | 880 | $this->message = "JAJA is a stupid error message. Anyway, here's your message: $message"; |
| 882 | 881 | } |
| 883 | | - |
| 884 | | - function doNothing() {} |
| 885 | 882 | } |
| 886 | 883 | |
| Index: trunk/phase3/tests/phpunit/includes/parser/NewParserTest.php |
| — | — | @@ -76,8 +76,9 @@ |
| 77 | 77 | |
| 78 | 78 | // $tmpGlobals['wgContLang'] = new StubContLang; |
| 79 | 79 | $tmpGlobals['wgUser'] = new User; |
| 80 | | - $tmpGlobals['wgLang'] = new StubUserLang; |
| 81 | | - $tmpGlobals['wgOut'] = new StubObject( 'wgOut', 'OutputPage' ); |
| | 80 | + $context = new RequestContext(); |
| | 81 | + $tmpGlobals['wgLang'] = $context->lang; |
| | 82 | + $tmpGlobals['wgOut'] = $context->output; |
| 82 | 83 | $tmpGlobals['wgParser'] = new StubObject( 'wgParser', $GLOBALS['wgParserConf']['class'], array( $GLOBALS['wgParserConf'] ) ); |
| 83 | 84 | $tmpGlobals['wgRequest'] = new WebRequest; |
| 84 | 85 | |
| Index: trunk/phase3/tests/phpunit/suites/UploadFromUrlTestSuite.php |
| — | — | @@ -48,8 +48,9 @@ |
| 49 | 49 | |
| 50 | 50 | // $wgContLang = new StubContLang; |
| 51 | 51 | $wgUser = new User; |
| 52 | | - $wgLang = new StubUserLang; |
| 53 | | - $wgOut = new StubObject( 'wgOut', 'OutputPage' ); |
| | 52 | + $context = new RequestContext; |
| | 53 | + $wgLang = $context->lang; |
| | 54 | + $wgOut = $context->output; |
| 54 | 55 | $wgParser = new StubObject( 'wgParser', $wgParserConf['class'], array( $wgParserConf ) ); |
| 55 | 56 | $wgRequest = new WebRequest; |
| 56 | 57 | |