wikimedia/mediawiki-extensions-Gadgets
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Gadgets synced 2024-11-13 17:53:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix parsing logic when comments or hidden characters are present"

Browse source
This commit is contained in:
jenkins-bot 2024-01-06 16:22:33 +00:00 committed by Gerrit Code Review
parent 3e871f2015 18204a4b0d
commit 95e524ffe7
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
includes/MediaWikiGadgetsDefinitionRepo.php
View file

@ -303,8 +303,7 @@ class MediaWikiGadgetsDefinitionRepo extends GadgetRepo {
} }
foreach ( preg_split( '/\s*\|\s*/', $pages, -1, PREG_SPLIT_NO_EMPTY ) as $page ) { foreach ( preg_split( '/\s*\|\s*/', $pages, -1, PREG_SPLIT_NO_EMPTY ) as $page ) {
$page = $this->titlePrefix . $page; $info['pages'][] = $this->titlePrefix . trim( $page );
$info['pages'][] = $page;
} }
return new Gadget( $info ); return new Gadget( $info );

7
tests/phpunit/integration/MediaWikiGadgetsDefinitionRepoTest.php
View file

@ -18,6 +18,8 @@ class MediaWikiGadgetsDefinitionRepoTest extends MediaWikiIntegrationTestCase {
* baz [rights=read] |baz.js * baz [rights=read] |baz.js
==keep-section2== ==keep-section2==
* quux [rights=read] | quux.js * quux [rights=read] | quux.js
* g1 [ResourceLoader | default | namespaces=2 | rights=editmyuserjs] | g1.js <!-- comment -->
* g2 [ResourceLoader | default | namespaces=2 | rights=editmyuserjs] | <!-- comment --> g2.js
EOT; EOT;
$this->editPage( 'MediaWiki:Gadgets-definition', $gadgetsDef ); $this->editPage( 'MediaWiki:Gadgets-definition', $gadgetsDef );
@ -25,10 +27,13 @@ EOT;
$repo = new MediaWikiGadgetsDefinitionRepo( $services->getMainWANObjectCache(), $repo = new MediaWikiGadgetsDefinitionRepo( $services->getMainWANObjectCache(),
$services->getRevisionLookup() ); $services->getRevisionLookup() );
$gadgets = $repo->fetchStructuredList(); $gadgets = $repo->fetchStructuredList();
$this->assertCount( 4, $gadgets ); $this->assertCount( 6, $gadgets );
$bar = $repo->getGadget( 'bar' ); $bar = $repo->getGadget( 'bar' );
$this->assertEquals( 'keep-section1', $bar->toArray()['category'] ); $this->assertEquals( 'keep-section1', $bar->toArray()['category'] );
$this->assertEquals( [ 'MediaWiki:Gadget-g1.js' ], $repo->getGadget( 'g1' )->getScripts() );
$this->assertEquals( [ 'MediaWiki:Gadget-g2.js' ], $repo->getGadget( 'g2' )->getScripts() );
} }
/** /**