From: RazeSoldier <razesoldier@outlook.com>
Date: Thu, 23 Aug 2018 16:18:07 +0000 (+0800)
Subject: Use "break" instead of "continue"
X-Git-Tag: 1.31.2~90
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=942728ab20e01bba200031b01eb606ee59279bd2

Use "break" instead of "continue"

"continue" statements are equivalent to "break". In PHP 7.3, will generate a
warning.

Bug: T200595
Change-Id: I244ecb2e1ce5a76295f014fb1becd8d263196846
(cherry picked from commit 24ffbd9bd182944daa8b12244b729562cd5f50db)
---

diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index cf8e6e99aa..b4f95ca349 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -9,6 +9,8 @@ THIS IS NOT A RELEASE YET
 * (T200254) Add pear/Net_SMTP 1.7.3 to composer dependencies.
 * (T206765) Load installer i18n when running update.php.
 * (T109121) Remove deprecated pear/mail_mime-decode from composer suggested libraries.
+* (T200595) Fix PHP 7.3 warnings of using "continue" in some scenarios instead
+  of "break".
 
 == MediaWiki 1.31.1 ==
 
diff --git a/includes/json/FormatJson.php b/includes/json/FormatJson.php
index 0c77a7bcc2..bd6a365466 100644
--- a/includes/json/FormatJson.php
+++ b/includes/json/FormatJson.php
@@ -294,7 +294,7 @@ class FormatJson {
 					$lookAhead = ( $idx + 1 < $maxLen ) ? $str[$idx + 1] : '';
 					$lookBehind = ( $idx - 1 >= 0 ) ? $str[$idx - 1] : '';
 					if ( $inString ) {
-						continue;
+						break;
 
 					} elseif ( !$inComment &&
 						( $lookAhead === '/' || $lookAhead === '*' )
diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index f611358d94..24b1d0c076 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -770,7 +770,7 @@ class LanguageConverter {
 							$warningDone = true;
 						}
 						$startPos += 2;
-						continue;
+						break;
 					}
 					// Recursively parse another rule
 					$inner .= $this->recursiveConvertRule( $text, $variant, $startPos, $depth + 1 );