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

Merge "MagicWord::replace*: Make sure we don't pass null into preg_match/preg_replace" into REL1_43

Browse source
This commit is contained in:
jenkins-bot 2025-03-17 16:44:20 +00:00 committed by Gerrit Code Review
commit 6beb3946d5
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
includes/parser/MagicWord.php
View file

@ -178,7 +178,7 @@ class MagicWord {
* @return bool * @return bool
*/ */
public function match( $text ): bool { public function match( $text ): bool {
return (bool)preg_match( $this->getRegex(), $text ); return (bool)preg_match( $this->getRegex(), $text ?? '' );
} }
/** /**
@ -189,7 +189,7 @@ class MagicWord {
* @since 1.23 * @since 1.23
*/ */
public function matchStartToEnd( $text ): bool { public function matchStartToEnd( $text ): bool {
return (bool)preg_match( $this->getRegexStartToEnd(), $text ); return (bool)preg_match( $this->getRegexStartToEnd(), $text ?? '' );
} }
/** /**
@ -203,7 +203,7 @@ class MagicWord {
* @return bool * @return bool
*/ */
public function matchAndRemove( &$text ): bool { public function matchAndRemove( &$text ): bool {
$text = preg_replace( $this->getRegex(), '', $text, -1, $count ); $text = preg_replace( $this->getRegex(), '', $text ?? '', -1, $count );
return (bool)$count; return (bool)$count;
} }
@ -212,7 +212,7 @@ class MagicWord {
* @return bool * @return bool
*/ */
public function matchStartAndRemove( &$text ): bool { public function matchStartAndRemove( &$text ): bool {
$text = preg_replace( $this->getRegexStart(), '', $text, -1, $count ); $text = preg_replace( $this->getRegexStart(), '', $text ?? '', -1, $count );
return (bool)$count; return (bool)$count;
} }
@ -229,7 +229,7 @@ class MagicWord {
$res = preg_replace( $res = preg_replace(
$this->getRegex(), $this->getRegex(),
StringUtils::escapeRegexReplacement( $replacement ), StringUtils::escapeRegexReplacement( $replacement ),
$subject, $subject ?? '',
$limit $limit
); );
return $res; return $res;