dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert OutputHandler functions to a class
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
api
/
format
/
ApiFormatPhpTest.php
diff --git
a/tests/phpunit/includes/api/format/ApiFormatPhpTest.php
b/tests/phpunit/includes/api/format/ApiFormatPhpTest.php
index
3aa1db3
..
66e620e
100644
(file)
--- a/
tests/phpunit/includes/api/format/ApiFormatPhpTest.php
+++ b/
tests/phpunit/includes/api/format/ApiFormatPhpTest.php
@@
-20,7
+20,7
@@
class ApiFormatPhpTest extends ApiFormatTestBase {
}
public static function provideGeneralEncoding() {
}
public static function provideGeneralEncoding() {
- //
@codingStandardsIgnoreStart
Generic.Files.LineLength
+ //
phpcs:disable
Generic.Files.LineLength
return array_merge(
self::addFormatVersion( 1, [
// Basic types
return array_merge(
self::addFormatVersion( 1, [
// Basic types
@@
-97,7
+97,7
@@
class ApiFormatPhpTest extends ApiFormatTestBase {
'a:1:{s:3:"foo";s:3:"foo";}' ],
] )
);
'a:1:{s:3:"foo";s:3:"foo";}' ],
] )
);
- //
@codingStandardsIgnoreEnd
+ //
phpcs:enable
}
public function testCrossDomainMangling() {
}
public function testCrossDomainMangling() {
@@
-110,14
+110,8
@@
class ApiFormatPhpTest extends ApiFormatTestBase {
$main = new ApiMain( $context );
$main->getResult()->addValue( null, null, '< Cross-Domain-Policy >' );
$main = new ApiMain( $context );
$main->getResult()->addValue( null, null, '< Cross-Domain-Policy >' );
- if ( !function_exists( 'wfOutputHandler' ) ) {
- function wfOutputHandler( $s ) {
- return $s;
- }
- }
-
$printer = $main->createPrinterByName( 'php' );
$printer = $main->createPrinterByName( 'php' );
- ob_start( '
wfOutputHandler
' );
+ ob_start( '
MediaWiki\\OutputHandler::handle
' );
$printer->initPrinter();
$printer->execute();
$printer->closePrinter();
$printer->initPrinter();
$printer->execute();
$printer->closePrinter();
@@
-126,7
+120,7
@@
class ApiFormatPhpTest extends ApiFormatTestBase {
$config->set( 'MangleFlashPolicy', true );
$printer = $main->createPrinterByName( 'php' );
$config->set( 'MangleFlashPolicy', true );
$printer = $main->createPrinterByName( 'php' );
- ob_start( '
wfOutputHandler
' );
+ ob_start( '
MediaWiki\\OutputHandler::handle
' );
try {
$printer->initPrinter();
$printer->execute();
try {
$printer->initPrinter();
$printer->execute();