From 2dca5bbbf5decc4b4d5be6f7fe7cf02378a5f595 Mon Sep 17 00:00:00 2001 From: Derick Alangi Date: Wed, 12 Jun 2019 14:35:59 +0100 Subject: [PATCH] Remove unnecessary semi-colons Change-Id: I9eb65bdfbd3aa581effc14ead801b9e89b0359c3 --- includes/EditPage.php | 2 +- includes/Revision/RevisionStore.php | 2 +- includes/api/ApiLogin.php | 2 +- includes/export/WikiExporter.php | 2 +- includes/installer/PostgresUpdater.php | 4 ++-- includes/libs/StatusValue.php | 2 +- includes/libs/mime/MimeAnalyzer.php | 2 +- includes/page/ImagePage.php | 2 +- includes/password/LayeredParameterizedPassword.php | 2 +- includes/resourceloader/ResourceLoaderFileModule.php | 2 +- maintenance/importTextFiles.php | 2 +- tests/phpunit/includes/jobqueue/JobQueueTest.php | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/includes/EditPage.php b/includes/EditPage.php index e4adb48b2c..d27ef9c7a9 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -4130,7 +4130,7 @@ ERROR; if ( !Hooks::run( 'EditPageBeforeEditToolbar', [ &$toolbar ] ) ) { return null; - }; + } // Don't add a pointless `
` to the page unless a hook caller populated it return ( $toolbar === $startingToolbar ) ? null : $toolbar; } diff --git a/includes/Revision/RevisionStore.php b/includes/Revision/RevisionStore.php index 29d7848455..00c9d042df 100644 --- a/includes/Revision/RevisionStore.php +++ b/includes/Revision/RevisionStore.php @@ -1644,7 +1644,7 @@ class RevisionStore throw new RevisionAccessException( 'Main slot of revision ' . $revId . ' not found in database!' ); - }; + } return $slots; } diff --git a/includes/api/ApiLogin.php b/includes/api/ApiLogin.php index c3c531802a..de5257e47d 100644 --- a/includes/api/ApiLogin.php +++ b/includes/api/ApiLogin.php @@ -287,7 +287,7 @@ class ApiLogin extends ApiBase { ]; if ( $response->message ) { $ret['message'] = $response->message->inLanguage( 'en' )->plain(); - }; + } $reqs = [ 'neededRequests' => $response->neededRequests, 'createRequest' => $response->createRequest, diff --git a/includes/export/WikiExporter.php b/includes/export/WikiExporter.php index e8044af455..8b42be1315 100644 --- a/includes/export/WikiExporter.php +++ b/includes/export/WikiExporter.php @@ -320,7 +320,7 @@ class WikiExporter { } $lastLogId = $this->outputLogStream( $result ); - }; + } } /** diff --git a/includes/installer/PostgresUpdater.php b/includes/installer/PostgresUpdater.php index 008240a38c..31827a1ab7 100644 --- a/includes/installer/PostgresUpdater.php +++ b/includes/installer/PostgresUpdater.php @@ -1071,7 +1071,7 @@ END; $this->db->query( $command ); } else { $this->output( "...foreign key constraint on '$table.$field' already does not exist\n" ); - }; + } } protected function changeFkeyDeferrable( $table, $field, $clause ) { @@ -1235,7 +1235,7 @@ END; if ( $this->updateRowExists( 'patch-textsearch_bug66650.sql' ) ) { $this->output( "...T68650 already fixed or not applicable.\n" ); return; - }; + } $this->applyPatch( 'patch-textsearch_bug66650.sql', false, 'Rebuilding text search for T68650' ); } diff --git a/includes/libs/StatusValue.php b/includes/libs/StatusValue.php index 16cb1ed1d3..71a0e348dd 100644 --- a/includes/libs/StatusValue.php +++ b/includes/libs/StatusValue.php @@ -107,7 +107,7 @@ class StatusValue { } else { $errorsOnlyStatusValue->errors[] = $item; } - }; + } return [ $errorsOnlyStatusValue, $warningsOnlyStatusValue ]; } diff --git a/includes/libs/mime/MimeAnalyzer.php b/includes/libs/mime/MimeAnalyzer.php index a326df2bc2..e7dc926b1e 100644 --- a/includes/libs/mime/MimeAnalyzer.php +++ b/includes/libs/mime/MimeAnalyzer.php @@ -849,7 +849,7 @@ EOT; $callback = $this->guessCallback; if ( $callback ) { $callback( $this, $head, $tail, $file, $mime /* by reference */ ); - }; + } return $mime; } diff --git a/includes/page/ImagePage.php b/includes/page/ImagePage.php index e929ed8a73..12cfe831f5 100644 --- a/includes/page/ImagePage.php +++ b/includes/page/ImagePage.php @@ -935,7 +935,7 @@ EOT ) . "\n" ); - }; + } $out->addHTML( Html::closeElement( 'ul' ) . "\n" ); $res->free(); diff --git a/includes/password/LayeredParameterizedPassword.php b/includes/password/LayeredParameterizedPassword.php index 841305481a..f3d8d03e30 100644 --- a/includes/password/LayeredParameterizedPassword.php +++ b/includes/password/LayeredParameterizedPassword.php @@ -109,7 +109,7 @@ class LayeredParameterizedPassword extends ParameterizedPassword { foreach ( $this->config['types'] as $i => $type ) { if ( $i == 0 ) { continue; - }; + } // Construct pseudo-hash based on params and arguments /** @var ParameterizedPassword $passObj */ diff --git a/includes/resourceloader/ResourceLoaderFileModule.php b/includes/resourceloader/ResourceLoaderFileModule.php index 031541b559..015c8285f1 100644 --- a/includes/resourceloader/ResourceLoaderFileModule.php +++ b/includes/resourceloader/ResourceLoaderFileModule.php @@ -617,7 +617,7 @@ class ResourceLoaderFileModule extends ResourceLoaderModule { 'raw', ] as $member ) { $options[$member] = $this->{$member}; - }; + } $summary[] = [ 'options' => $options, diff --git a/maintenance/importTextFiles.php b/maintenance/importTextFiles.php index c99aa15531..0b5cdf99bd 100644 --- a/maintenance/importTextFiles.php +++ b/maintenance/importTextFiles.php @@ -76,7 +76,7 @@ class ImportTextFiles extends Maintenance { $this->fatalError( "Fatal error: The file '$arg' does not exist!" ); } } - }; + } $count = count( $files ); $this->output( "Importing $count pages...\n" ); diff --git a/tests/phpunit/includes/jobqueue/JobQueueTest.php b/tests/phpunit/includes/jobqueue/JobQueueTest.php index ce07f78bab..8f8dde5559 100644 --- a/tests/phpunit/includes/jobqueue/JobQueueTest.php +++ b/tests/phpunit/includes/jobqueue/JobQueueTest.php @@ -48,7 +48,7 @@ class JobQueueTest extends MediaWikiTestCase { } catch ( MWException $e ) { // unsupported? // @todo What if it was another error? - }; + } } } -- 2.20.1