Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "parser: Gracefully handle invalid ParsoidRenderID keys" into REL1_43

Browse source
This commit is contained in:
jenkins-bot 2025-02-04 15:58:58 +00:00 committed by Gerrit Code Review
commit ce24650bfa
2 changed files with 36 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
includes/edit/ParsoidRenderID.php
View file

@ -5,6 +5,7 @@ namespace MediaWiki\Edit;
use InvalidArgumentException; use InvalidArgumentException;
use MediaWiki\Parser\ParserOutput; use MediaWiki\Parser\ParserOutput;
use Stringable; use Stringable;
use function count;
/** /**
* Represents the identity of a specific rendering of a specific revision * Represents the identity of a specific rendering of a specific revision
@ -37,12 +38,14 @@ class ParsoidRenderID implements Stringable {
* *
*/ */
public static function newFromKey( string $key ): self { public static function newFromKey( string $key ): self {
[ $revisionID, $uniqueID ] = explode( '/', $key, 2 ); $parts = explode( '/', $key, 2 );
if ( $revisionID === null || $uniqueID === null ) { if ( count( $parts ) < 2 ) {
throw new InvalidArgumentException( 'Bad key: ' . $key ); throw new InvalidArgumentException( 'Bad key: ' . $key );
} }
[ $revisionID, $uniqueID ] = $parts;
return new self( (int)$revisionID, $uniqueID ); return new self( (int)$revisionID, $uniqueID );
} }

31
tests/phpunit/unit/includes/edit/ParsoidRenderIdTest.php
View file

@ -2,6 +2,7 @@
namespace MediaWiki\Tests\Unit\Edit; namespace MediaWiki\Tests\Unit\Edit;
use InvalidArgumentException;
use MediaWiki\Edit\ParsoidRenderID; use MediaWiki\Edit\ParsoidRenderID;
use MediaWikiUnitTestCase; use MediaWikiUnitTestCase;
@ -68,4 +69,34 @@ class ParsoidRenderIdTest extends MediaWikiUnitTestCase {
yield [ '"1/foo"XXX' ]; yield [ '"1/foo"XXX' ];
yield [ 'XXX"1/foo"' ]; yield [ 'XXX"1/foo"' ];
} }
/**
* @dataProvider provideNewFromKey
* @covers \MediaWiki\Edit\ParsoidRenderID::newFromKey
*/
public function testNewFromKey( string $key, ParsoidRenderID $expected ): void {
$actual = ParsoidRenderID::newFromKey( $key );
$this->assertSame( $expected->getKey(), $actual->getKey() );
}
public static function provideNewFromKey(): iterable {
yield [ '1/abc', new ParsoidRenderID( 1, 'abc' ) ];
yield [ '2/bar', new ParsoidRenderID( 2, 'bar' ) ];
}
/**
* @dataProvider provideBadKeys
* @covers \MediaWiki\Edit\ParsoidRenderID::newFromKey
*/
public function testBadNewFromKey( $key ): void {
$this->expectException( InvalidArgumentException::class );
$this->expectExceptionMessage( "Bad key: $key" );
ParsoidRenderID::newFromKey( $key );
}
public static function provideBadKeys(): iterable {
yield [ '' ];
yield [ '1' ];
}
} }