wikimedia/mediawiki-extensions-Cite
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Cite synced 2024-11-23 22:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make message key parser accept more than just underscores

Browse source 
The best practice for message keys is to use dashes, not underscores.
This codebase is quite old and traditionally uses underscores. I
think we can make it flexible enough to work with both.

Required for Ie64f4ab.

Change-Id: I6f0584299a4f279ed929784927392eb0f72cbc80
This commit is contained in:
Thiemo Kreuz 2022-06-01 10:34:57 +02:00
parent bb62d762ab
commit 11255770c5
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ErrorReporter.php
View file

@ -68,7 +68,7 @@ class ErrorReporter {
$language = $this->getInterfaceLanguageAndSplitCache( $parser ); $language = $this->getInterfaceLanguageAndSplitCache( $parser );
$msg = $this->messageLocalizer->msg( $key, ...$params )->inLanguage( $language ); $msg = $this->messageLocalizer->msg( $key, ...$params )->inLanguage( $language );
[ $type, ] = $this->parseTypeAndIdFromMessageKey( $msg->getKey() ); [ $type ] = $this->parseTypeAndIdFromMessageKey( $msg->getKey() );
if ( $type === 'error' ) { if ( $type === 'error' ) {
// Take care; this is a sideeffect that might not belong to this class. // Take care; this is a sideeffect that might not belong to this class.
@ -124,10 +124,10 @@ class ErrorReporter {
/** /**
* @param string $messageKey Expected to be a message key like "cite_error_ref_too_many_keys" * @param string $messageKey Expected to be a message key like "cite_error_ref_too_many_keys"
* *
* @return string[] * @return string[] Two elements, e.g. "error" and "ref_too_many_keys"
*/ */
private function parseTypeAndIdFromMessageKey( string $messageKey ): array { private function parseTypeAndIdFromMessageKey( string $messageKey ): array {
return array_slice( explode( '_', $messageKey, 3 ), 1 ); return array_slice( explode( '_', str_replace( '-', '_', $messageKey ), 3 ), 1 );
} }
} }

2
tests/phpunit/unit/AnchorFormatterTest.php
View file

@ -14,7 +14,7 @@ use Wikimedia\TestingAccessWrapper;
*/ */
class AnchorFormatterTest extends \MediaWikiUnitTestCase { class AnchorFormatterTest extends \MediaWikiUnitTestCase {
public function setUp(): void { protected function setUp(): void {
parent::setUp(); parent::setUp();
global $wgFragmentMode; global $wgFragmentMode;