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/fields/HTMLFormFieldCloner.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/fields/HTMLFormFieldCloner.php')
| -rw-r--r-- | includes/htmlform/fields/HTMLFormFieldCloner.php | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/includes/htmlform/fields/HTMLFormFieldCloner.php b/includes/htmlform/fields/HTMLFormFieldCloner.php index 53c6835949e5..6beb9966672f 100644 --- a/includes/htmlform/fields/HTMLFormFieldCloner.php +++ b/includes/htmlform/fields/HTMLFormFieldCloner.php @@ -273,9 +273,7 @@ class HTMLFormFieldCloner extends HTMLFormField { * @return string */ protected function getInputHTMLForKey( $key, array $values ) { - $displayFormat = isset( $this->mParams['format'] ) - ? $this->mParams['format'] - : $this->mParent->getDisplayFormat(); + $displayFormat = $this->mParams['format'] ?? $this->mParent->getDisplayFormat(); // Conveniently, PHP method names are case-insensitive. $getFieldHtmlMethod = $displayFormat == 'table' ? 'getTableRow' : ( 'get' . $displayFormat ); @@ -306,9 +304,7 @@ class HTMLFormFieldCloner extends HTMLFormField { if ( !isset( $fields['delete'] ) ) { $name = "{$this->mName}[$key][delete]"; - $label = isset( $this->mParams['delete-button-message'] ) - ? $this->mParams['delete-button-message'] - : 'htmlform-cloner-delete'; + $label = $this->mParams['delete-button-message'] ?? 'htmlform-cloner-delete'; $field = HTMLForm::loadInputFromParameters( $name, [ 'type' => 'submit', 'formnovalidate' => true, @@ -379,9 +375,7 @@ class HTMLFormFieldCloner extends HTMLFormField { ], $html ); $name = "{$this->mName}[create]"; - $label = isset( $this->mParams['create-button-message'] ) - ? $this->mParams['create-button-message'] - : 'htmlform-cloner-create'; + $label = $this->mParams['create-button-message'] ?? 'htmlform-cloner-create'; $field = HTMLForm::loadInputFromParameters( $name, [ 'type' => 'submit', 'formnovalidate' => true, |