Merge "Better grouping for code adding elements to arrays"

includes/FileDeleteForm.php

@@ -255,17 +255,18 @@ class FileDeleteForm {
 
 		$wgOut->enableOOUI();
 
+		$fields = [];
+
+		$fields[] = new OOUI\LabelWidget( [ 'label' => new OOUI\HtmlSnippet(
+			$this->prepareMessage( 'filedelete-intro' ) ) ]
+		);
+
 		$options = Xml::listDropDownOptions(
 			$wgOut->msg( 'filedelete-reason-dropdown' )->inContentLanguage()->text(),
 			[ 'other' => $wgOut->msg( 'filedelete-reason-otherlist' )->inContentLanguage()->text() ]
 		);
 		$options = Xml::listDropDownOptionsOoui( $options );
 
-		$fields = [];
-		$fields[] = new OOUI\LabelWidget( [ 'label' => new OOUI\HtmlSnippet(
-			$this->prepareMessage( 'filedelete-intro' ) ) ]
-		);
-
 		$fields[] = new OOUI\FieldLayout(
 			new OOUI\DropdownInputWidget( [
 				'name' => 'wpDeleteReasonList',

includes/LinkFilter.php

@@ -311,6 +311,7 @@ class LinkFilter {
 	 */
 	public static function makeLikeArray( $filterEntry, $protocol = 'http://' ) {
 		$db = wfGetDB( DB_REPLICA );
+		$like = [];
 
 		$target = $protocol . $filterEntry;
 		$bits = wfParseUrl( $target );
@@ -338,7 +339,6 @@ class LinkFilter {
 			}
 		}
 
-		$like = [];
 		$like[] = $bits['scheme'] . $bits['delimiter'] . $bits['host'];
 
 		if ( $subdomains ) {

includes/api/ApiBlock.php

@@ -140,9 +140,10 @@ class ApiBlock extends ApiBase {
 			$this->dieStatus( $this->errorArrayToStatus( $retval ) );
 		}
 
-		list( $target, /*...*/ ) = SpecialBlock::getTargetAndType( $params['user'] );
 		$res = [];
+
 		$res['user'] = $params['user'];
+		list( $target, /*...*/ ) = SpecialBlock::getTargetAndType( $params['user'] );
 		$res['userID'] = $target instanceof User ? $target->getId() : 0;
 
 		$block = DatabaseBlock::newFromTarget( $target, null, true );

includes/api/ApiUpload.php

@@ -793,8 +793,8 @@ class ApiUpload extends ApiBase {
 			}
 		}
 
-		$result = [];
 		// No errors, no warnings: do the upload
+		$result = [];
 		if ( $this->mParams['async'] ) {
 			$progress = UploadBase::getSessionStatus( $this->getUser(), $this->mParams['filekey'] );
 			if ( $progress && $progress['result'] === 'Poll' ) {

includes/page/Article.php

@@ -1929,13 +1929,14 @@ class Article implements Page {
 
 		$outputPage->enableOOUI();
 
+		$fields = [];
+
 		$options = Xml::listDropDownOptions(
 			$ctx->msg( 'deletereason-dropdown' )->inContentLanguage()->text(),
 			[ 'other' => $ctx->msg( 'deletereasonotherlist' )->inContentLanguage()->text() ]
 		);
 		$options = Xml::listDropDownOptionsOoui( $options );
 
-		$fields = [];
 		$fields[] = new OOUI\FieldLayout(
 			new OOUI\DropdownInputWidget( [
 				'name' => 'wpDeleteReasonList',