diff options
| author | Bartosz Dziewoński <matma.rex@gmail.com> | 2017-10-07 00:17:58 +0200 |
|---|---|---|
| committer | James D. Forrester <jforrester@wikimedia.org> | 2018-05-30 18:06:13 -0700 |
| commit | 485f66f1744fea056e20a5bef619989bf1749202 (patch) | |
| tree | 10f1fa9496adf8a6057e28138c941bb2671fbeec /includes/htmlform/HTMLFormField.php | |
| parent | b191e5e860f24e1dd05e3d3d782364e4ea75b176 (diff) | |
| download | mediawikicore-485f66f1744fea056e20a5bef619989bf1749202.tar.gz mediawikicore-485f66f1744fea056e20a5bef619989bf1749202.zip | |
Use PHP 7 '??' operator instead of '?:' with 'isset()' where convenient
Find: /isset\(\s*([^()]+?)\s*\)\s*\?\s*\1\s*:\s*/
Replace with: '\1 ?? '
(Everywhere except includes/PHPVersionCheck.php)
(Then, manually fix some line length and indentation issues)
Then manually reviewed the replacements for cases where confusing
operator precedence would result in incorrect results
(fixing those in I478db046a1cc162c6767003ce45c9b56270f3372).
Change-Id: I33b421c8cb11cdd4ce896488c9ff5313f03a38cf
Diffstat (limited to 'includes/htmlform/HTMLFormField.php')
| -rw-r--r-- | includes/htmlform/HTMLFormField.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/includes/htmlform/HTMLFormField.php b/includes/htmlform/HTMLFormField.php index 5066f28ee432..cd4d4b749f87 100644 --- a/includes/htmlform/HTMLFormField.php +++ b/includes/htmlform/HTMLFormField.php @@ -546,8 +546,7 @@ abstract class HTMLFormField { 'mw-htmlform-nolabel' => ( $label === '' ) ]; - $horizontalLabel = isset( $this->mParams['horizontal-label'] ) - ? $this->mParams['horizontal-label'] : false; + $horizontalLabel = $this->mParams['horizontal-label'] ?? false; if ( $horizontalLabel ) { $field = ' ' . $inputHtml . "\n$errors"; @@ -950,8 +949,7 @@ abstract class HTMLFormField { $displayFormat = $this->mParent->getDisplayFormat(); $html = ''; - $horizontalLabel = isset( $this->mParams['horizontal-label'] ) - ? $this->mParams['horizontal-label'] : false; + $horizontalLabel = $this->mParams['horizontal-label'] ?? false; if ( $displayFormat === 'table' ) { $html = |