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
Merge "Warn if stateful ParserOutput transforms are used"
[lhc/web/wiklou.git]
/
tests
/
parser
/
ParserTestRunner.php
diff --git
a/tests/parser/ParserTestRunner.php
b/tests/parser/ParserTestRunner.php
index
6cf1fca
..
4dd4bc6
100644
(file)
--- a/
tests/parser/ParserTestRunner.php
+++ b/
tests/parser/ParserTestRunner.php
@@
-290,10
+290,10
@@
class ParserTestRunner {
// Set up null lock managers
$setup['wgLockManagers'] = [ [
'name' => 'fsLockManager',
// Set up null lock managers
$setup['wgLockManagers'] = [ [
'name' => 'fsLockManager',
- 'class' =>
'NullLockManager'
,
+ 'class' =>
NullLockManager::class
,
], [
'name' => 'nullLockManager',
], [
'name' => 'nullLockManager',
- 'class' =>
'NullLockManager'
,
+ 'class' =>
NullLockManager::class
,
] ];
$reset = function () {
LockManagerGroup::destroySingletons();
] ];
$reset = function () {
LockManagerGroup::destroySingletons();
@@
-435,7
+435,7
@@
class ParserTestRunner {
return new RepoGroup(
[
return new RepoGroup(
[
- 'class' =>
'MockLocalRepo'
,
+ 'class' =>
MockLocalRepo::class
,
'name' => 'local',
'url' => 'http://example.com/images',
'hashLevels' => 2,
'name' => 'local',
'url' => 'http://example.com/images',
'hashLevels' => 2,
@@
-811,10
+811,6
@@
class ParserTestRunner {
$options = ParserOptions::newFromContext( $context );
$options->setTimestamp( $this->getFakeTimestamp() );
$options = ParserOptions::newFromContext( $context );
$options->setTimestamp( $this->getFakeTimestamp() );
- if ( !isset( $opts['wrap'] ) ) {
- $options->setWrapOutputClass( false );
- }
-
if ( isset( $opts['tidy'] ) ) {
if ( !$this->tidySupport->isEnabled() ) {
$this->recorder->skipped( $test, 'tidy extension is not installed' );
if ( isset( $opts['tidy'] ) ) {
if ( !$this->tidySupport->isEnabled() ) {
$this->recorder->skipped( $test, 'tidy extension is not installed' );
@@
-854,7
+850,8
@@
class ParserTestRunner {
} else {
$output = $parser->parse( $test['input'], $title, $options, true, true, 1337 );
$out = $output->getText( [
} else {
$output = $parser->parse( $test['input'], $title, $options, true, true, 1337 );
$out = $output->getText( [
- 'allowTOC' => !isset( $opts['notoc'] )
+ 'allowTOC' => !isset( $opts['notoc'] ),
+ 'unwrap' => !isset( $opts['wrap'] ),
] );
if ( isset( $opts['tidy'] ) ) {
$out = preg_replace( '/\s+$/', '', $out );
] );
if ( isset( $opts['tidy'] ) ) {
$out = preg_replace( '/\s+$/', '', $out );