Fix php code style

Preparation change for updating mediawiki code sniffer to 0.8.0

Change-Id: Ib0b3fe4afea9096ffa3a1347b4f7e07d3398b0b2

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 6424ca6..0d3c74f 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -3170,7 +3170,6 @@ class EditPage {
                        );
                        $wgOut->addHTML( "{$label} {$input}" );
                }
                        );
                        $wgOut->addHTML( "{$label} {$input}" );
                }

-

        }
 
        /**
        }
 
        /**

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index c7f132a..d21cc1d 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1436,7 +1436,6 @@ function wfMsgReplaceArgs( $message, $args ) {
 function wfHostname() {
        static $host;
        if ( is_null( $host ) ) {
 function wfHostname() {
        static $host;
        if ( is_null( $host ) ) {

-

                # Hostname overriding
                global $wgOverrideHostname;
                if ( $wgOverrideHostname !== false ) {
                # Hostname overriding
                global $wgOverrideHostname;
                if ( $wgOverrideHostname !== false ) {

diff --git a/includes/content/FileContentHandler.php b/includes/content/FileContentHandler.php
index 843d540..3028dfd 100644 (file)
--- a/includes/content/FileContentHandler.php
+++ b/includes/content/FileContentHandler.php
@@ -6,7 +6,7 @@
  * but instead manually called by WikitextHandler.
  * This should be fixed in the future.
  */
  * but instead manually called by WikitextHandler.
  * This should be fixed in the future.
  */

-class FileContentHandler extends WikitextContentHandler  {
+class FileContentHandler extends WikitextContentHandler {

 
        public function getFieldsForSearchIndex( SearchEngine $engine ) {
                $fields['file_media_type'] =
 
        public function getFieldsForSearchIndex( SearchEngine $engine ) {
                $fields['file_media_type'] =

diff --git a/includes/jobqueue/jobs/RecentChangesUpdateJob.php b/includes/jobqueue/jobs/RecentChangesUpdateJob.php
index c123619..eb367af 100644 (file)
--- a/includes/jobqueue/jobs/RecentChangesUpdateJob.php
+++ b/includes/jobqueue/jobs/RecentChangesUpdateJob.php
@@ -231,7 +231,6 @@ class RecentChangesUpdateJob extends Job {
                                        ],
                                        __METHOD__
                                );
                                        ],
                                        __METHOD__
                                );

-

                        },
                        __METHOD__
                );
                        },
                        __METHOD__
                );

diff --git a/includes/libs/IEUrlExtension.php b/includes/libs/IEUrlExtension.php
index 4a6e3fb..e55bebc 100644 (file)
--- a/includes/libs/IEUrlExtension.php
+++ b/includes/libs/IEUrlExtension.php
@@ -63,8 +63,8 @@ class IEUrlExtension {
                // Check QUERY_STRING or REQUEST_URI
                if ( isset( $vars['SERVER_SOFTWARE'] )
                        && isset( $vars['REQUEST_URI'] )
                // Check QUERY_STRING or REQUEST_URI
                if ( isset( $vars['SERVER_SOFTWARE'] )
                        && isset( $vars['REQUEST_URI'] )

-                       && self::haveUndecodedRequestUri( $vars['SERVER_SOFTWARE'] ) )
-               {
+                       && self::haveUndecodedRequestUri( $vars['SERVER_SOFTWARE'] )
+               ) {

                        $urlPart = $vars['REQUEST_URI'];
                } elseif ( isset( $vars['QUERY_STRING'] ) ) {
                        $urlPart = $vars['QUERY_STRING'];
                        $urlPart = $vars['REQUEST_URI'];
                } elseif ( isset( $vars['QUERY_STRING'] ) ) {
                        $urlPart = $vars['QUERY_STRING'];


@@ -79,8 +79,8 @@ class IEUrlExtension {
                // Some servers have PATH_INFO but not REQUEST_URI, so we check both
                // to be on the safe side.
                if ( isset( $vars['PATH_INFO'] )
                // Some servers have PATH_INFO but not REQUEST_URI, so we check both
                // to be on the safe side.
                if ( isset( $vars['PATH_INFO'] )

-                       && self::isUrlExtensionBad( $vars['PATH_INFO'], $extWhitelist ) )
-               {
+                       && self::isUrlExtensionBad( $vars['PATH_INFO'], $extWhitelist )
+               ) {

                        return true;
                }
 
                        return true;
                }
 


@@ -223,8 +223,8 @@ class IEUrlExtension {
                                // If the extension is NOT exe, dll or cgi, return it
                                $extension = substr( $url, $pos, $nextPos - $pos );
                                if ( strcasecmp( $extension, 'exe' ) && strcasecmp( $extension, 'dll' ) &&
                                // If the extension is NOT exe, dll or cgi, return it
                                $extension = substr( $url, $pos, $nextPos - $pos );
                                if ( strcasecmp( $extension, 'exe' ) && strcasecmp( $extension, 'dll' ) &&

-                                       strcasecmp( $extension, 'cgi' ) )
-                               {
+                                       strcasecmp( $extension, 'cgi' )
+                               ) {

                                        return $extension;
                                }
                                // Else continue looking
                                        return $extension;
                                }
                                // Else continue looking

diff --git a/includes/libs/mime/IEContentAnalyzer.php b/includes/libs/mime/IEContentAnalyzer.php
index 0d1e527..badcb2b 100644 (file)
--- a/includes/libs/mime/IEContentAnalyzer.php
+++ b/includes/libs/mime/IEContentAnalyzer.php
@@ -399,8 +399,8 @@ class IEContentAnalyzer {
                $proposedFormat = $this->getDataFormat( $version, $proposed );
                if ( $proposedFormat == 'unknown'
                        && $proposed != 'multipart/mixed'
                $proposedFormat = $this->getDataFormat( $version, $proposed );
                if ( $proposedFormat == 'unknown'
                        && $proposed != 'multipart/mixed'

-                       && $proposed != 'multipart/x-mixed-replace' )
-               {
+                       && $proposed != 'multipart/x-mixed-replace'
+               ) {

                        return $proposed;
                }
                if ( strval( $chunk ) === '' ) {
                        return $proposed;
                }
                if ( strval( $chunk ) === '' ) {


@@ -426,15 +426,15 @@ class IEContentAnalyzer {
                        return 'image/gif';
                }
                if ( ( $proposed == 'image/pjpeg' || $proposed == 'image/jpeg' )
                        return 'image/gif';
                }
                if ( ( $proposed == 'image/pjpeg' || $proposed == 'image/jpeg' )

-                       && $binaryType == 'image/pjpeg' )
-               {
+                       && $binaryType == 'image/pjpeg'
+               ) {

                        return $proposed;
                }
                // PNG check added in IE 7
                if ( $version >= 'ie07'
                        && ( $proposed == 'image/x-png' || $proposed == 'image/png' )
                        return $proposed;
                }
                // PNG check added in IE 7
                if ( $version >= 'ie07'
                        && ( $proposed == 'image/x-png' || $proposed == 'image/png' )

-                       && $binaryType == 'image/x-png' )
-               {
+                       && $binaryType == 'image/x-png'
+               ) {

                        return $proposed;
                }
 
                        return $proposed;
                }
 


@@ -450,8 +450,8 @@ class IEContentAnalyzer {
                }
                if ( isset( $sampleFound['rdf-tag'] )
                        && isset( $sampleFound['rdf-url'] )
                }
                if ( isset( $sampleFound['rdf-tag'] )
                        && isset( $sampleFound['rdf-url'] )

-                       && isset( $sampleFound['rdf-purl'] ) )
-               {
+                       && isset( $sampleFound['rdf-purl'] )
+               ) {

                        return 'application/rss+xml';
                }
                if ( isset( $sampleFound['atom'] ) ) {
                        return 'application/rss+xml';
                }
                if ( isset( $sampleFound['atom'] ) ) {


@@ -497,8 +497,8 @@ class IEContentAnalyzer {
                // Freaky heuristics to determine if the data is text or binary
                // The heuristic is of course broken for non-ASCII text
                if ( $counters['ctrl'] != 0 && ( $counters['ff'] + $counters['low'] )
                // Freaky heuristics to determine if the data is text or binary
                // The heuristic is of course broken for non-ASCII text
                if ( $counters['ctrl'] != 0 && ( $counters['ff'] + $counters['low'] )

-                       < ( $counters['ctrl'] + $counters['high'] ) * 16 )
-               {
+                       < ( $counters['ctrl'] + $counters['high'] ) * 16
+               ) {

                        $kindOfBinary = true;
                        $type = $binaryType ? $binaryType : $textType;
                        if ( $type === false ) {
                        $kindOfBinary = true;
                        $type = $binaryType ? $binaryType : $textType;
                        if ( $type === false ) {


@@ -599,13 +599,13 @@ class IEContentAnalyzer {
 
                if ( $chunk2 == 'BM'
                        && substr( $chunk, 6, 2 ) == "\000\000"
 
                if ( $chunk2 == 'BM'
                        && substr( $chunk, 6, 2 ) == "\000\000"

-                       && substr( $chunk, 8, 2 ) == "\000\000" )
-               {
+                       && substr( $chunk, 8, 2 ) == "\000\000"
+               ) {

                        return 'image/bmp'; // another non-standard MIME
                }
                if ( $chunk4 == 'RIFF'
                        return 'image/bmp'; // another non-standard MIME
                }
                if ( $chunk4 == 'RIFF'

-                       && substr( $chunk, 8, 4 ) == 'WAVE' )
-               {
+                       && substr( $chunk, 8, 4 ) == 'WAVE'
+               ) {

                        return 'audio/wav';
                }
                // These were integer literals in IE
                        return 'audio/wav';
                }
                // These were integer literals in IE


@@ -613,8 +613,8 @@ class IEContentAnalyzer {
                if ( $chunk4 == ".sd\000"
                        || $chunk4 == ".snd"
                        || $chunk4 == "\000ds."
                if ( $chunk4 == ".sd\000"
                        || $chunk4 == ".snd"
                        || $chunk4 == "\000ds."

-                       || $chunk4 == "dns." )
-               {
+                       || $chunk4 == "dns."
+               ) {

                        return 'audio/basic';
                }
                if ( $chunk3 == "MM\000" ) {
                        return 'audio/basic';
                }
                if ( $chunk3 == "MM\000" ) {


@@ -648,8 +648,8 @@ class IEContentAnalyzer {
                        return 'video/mpeg';
                }
                if ( $chunk4 == "\001\000\000\000"
                        return 'video/mpeg';
                }
                if ( $chunk4 == "\001\000\000\000"

-                       && substr( $chunk, 40, 4 ) == ' EMF' )
-               {
+                       && substr( $chunk, 40, 4 ) == ' EMF'
+               ) {

                        return 'image/x-emf';
                }
                if ( $chunk4 == "\xd7\xcd\xc6\x9a" ) {
                        return 'image/x-emf';
                }
                if ( $chunk4 == "\xd7\xcd\xc6\x9a" ) {


@@ -789,8 +789,8 @@ class IEContentAnalyzer {
                        if ( !strncasecmp( $remainder, $rdfUrl, strlen( $rdfUrl ) ) ) {
                                $found['rdf-url'] = true;
                                if ( isset( $found['rdf-tag'] )
                        if ( !strncasecmp( $remainder, $rdfUrl, strlen( $rdfUrl ) ) ) {
                                $found['rdf-url'] = true;
                                if ( isset( $found['rdf-tag'] )

-                                       && isset( $found['rdf-purl'] ) ) // [sic]
-                               {
+                                       && isset( $found['rdf-purl'] ) // [sic]
+                               ) {

                                        break;
                                }
                                continue;
                                        break;
                                }
                                continue;


@@ -798,8 +798,8 @@ class IEContentAnalyzer {
 
                        if ( !strncasecmp( $remainder, $rdfPurl, strlen( $rdfPurl ) ) ) {
                                if ( isset( $found['rdf-tag'] )
 
                        if ( !strncasecmp( $remainder, $rdfPurl, strlen( $rdfPurl ) ) ) {
                                if ( isset( $found['rdf-tag'] )

-                                       && isset( $found['rdf-url'] ) ) // [sic]
-                               {
+                                       && isset( $found['rdf-url'] ) // [sic]
+                               ) {

                                        break;
                                }
                                continue;
                                        break;
                                }
                                continue;

diff --git a/includes/libs/mime/MimeAnalyzer.php b/includes/libs/mime/MimeAnalyzer.php
index 6ea3c21..d03bc48 100644 (file)
--- a/includes/libs/mime/MimeAnalyzer.php
+++ b/includes/libs/mime/MimeAnalyzer.php
@@ -735,8 +735,8 @@ EOT;
                        ( strpos( $head, "<\x00?\x00 " ) !== false ) ||
                        ( strpos( $head, "<\x00?\x00\n" ) !== false ) ||
                        ( strpos( $head, "<\x00?\x00\t" ) !== false ) ||
                        ( strpos( $head, "<\x00?\x00 " ) !== false ) ||
                        ( strpos( $head, "<\x00?\x00\n" ) !== false ) ||
                        ( strpos( $head, "<\x00?\x00\t" ) !== false ) ||

-                       ( strpos( $head, "<\x00?\x00=" ) !== false ) ) {
-
+                       ( strpos( $head, "<\x00?\x00=" ) !== false )
+               ) {

                        $this->logger->info( __METHOD__ . ": recognized $file as application/x-php\n" );
                        return 'application/x-php';
                }
                        $this->logger->info( __METHOD__ . ": recognized $file as application/x-php\n" );
                        return 'application/x-php';
                }


@@ -1035,7 +1035,6 @@ EOT;
                // Special code for ogg - detect if it's video (theora),
                // else label it as sound.
                if ( $mime == 'application/ogg' && file_exists( $path ) ) {
                // Special code for ogg - detect if it's video (theora),
                // else label it as sound.
                if ( $mime == 'application/ogg' && file_exists( $path ) ) {

-

                        // Read a chunk of the file
                        $f = fopen( $path, "rt" );
                        if ( !$f ) {
                        // Read a chunk of the file
                        $f = fopen( $path, "rt" );
                        if ( !$f ) {

diff --git a/includes/libs/rdbms/loadmonitor/LoadMonitorNull.php b/includes/libs/rdbms/loadmonitor/LoadMonitorNull.php
index 613dac5..8bbf9e5 100644 (file)
--- a/includes/libs/rdbms/loadmonitor/LoadMonitorNull.php
+++ b/includes/libs/rdbms/loadmonitor/LoadMonitorNull.php
@@ -28,14 +28,12 @@ class LoadMonitorNull implements ILoadMonitor {
        public function __construct(
                ILoadBalancer $lb, BagOStuff $sCache, BagOStuff $cCache, array $options = []
        ) {
        public function __construct(
                ILoadBalancer $lb, BagOStuff $sCache, BagOStuff $cCache, array $options = []
        ) {

-

        }
 
        public function setLogger( LoggerInterface $logger ) {
        }
 
        public function scaleLoads( array &$loads, $domain ) {
        }
 
        public function setLogger( LoggerInterface $logger ) {
        }
 
        public function scaleLoads( array &$loads, $domain ) {

-

        }
 
        public function getLagTimes( array $serverIndexes, $domain ) {
        }
 
        public function getLagTimes( array $serverIndexes, $domain ) {


@@ -43,6 +41,5 @@ class LoadMonitorNull implements ILoadMonitor {
        }
 
        public function clearCaches() {
        }
 
        public function clearCaches() {

-

        }
 }
        }
 }

diff --git a/includes/libs/stats/SamplingStatsdClient.php b/includes/libs/stats/SamplingStatsdClient.php
index dd1976c..a8af714 100644 (file)
--- a/includes/libs/stats/SamplingStatsdClient.php
+++ b/includes/libs/stats/SamplingStatsdClient.php
@@ -69,7 +69,7 @@ class SamplingStatsdClient extends StatsdClient {
                return $data;
        }
 
                return $data;
        }
 

-       /*
+       /**

         * Send the metrics over UDP
         * Sample the metrics according to their sample rate and send the remaining ones.
         *
         * Send the metrics over UDP
         * Sample the metrics according to their sample rate and send the remaining ones.
         *

diff --git a/includes/libs/xmp/XMP.php b/includes/libs/xmp/XMP.php
index f1df7f1..9d886bf 100644 (file)
--- a/includes/libs/xmp/XMP.php
+++ b/includes/libs/xmp/XMP.php
@@ -272,7 +272,6 @@ class XMPReader implements LoggerAwareInterface {
                if ( isset( $data['xmp-exif']['GPSAltitudeRef'] )
                        && isset( $data['xmp-exif']['GPSAltitude'] )
                ) {
                if ( isset( $data['xmp-exif']['GPSAltitudeRef'] )
                        && isset( $data['xmp-exif']['GPSAltitude'] )
                ) {

-

                        // Must convert to a real before multiplying by -1
                        // XMPValidate guarantees there will always be a '/' in this value.
                        list( $nom, $denom ) = explode( '/', $data['xmp-exif']['GPSAltitude'] );
                        // Must convert to a real before multiplying by -1
                        // XMPValidate guarantees there will always be a '/' in this value.
                        list( $nom, $denom ) = explode( '/', $data['xmp-exif']['GPSAltitude'] );


@@ -1004,7 +1003,6 @@ class XMPReader implements LoggerAwareInterface {
         */
        private function startElementModeInitial( $ns, $tag, $attribs ) {
                if ( $ns !== self::NS_RDF ) {
         */
        private function startElementModeInitial( $ns, $tag, $attribs ) {
                if ( $ns !== self::NS_RDF ) {

-

                        if ( isset( $this->items[$ns][$tag] ) ) {
                                if ( isset( $this->items[$ns][$tag]['structPart'] ) ) {
                                        // If this element is supposed to appear only as
                        if ( isset( $this->items[$ns][$tag] ) ) {
                                if ( isset( $this->items[$ns][$tag]['structPart'] ) ) {
                                        // If this element is supposed to appear only as


@@ -1066,7 +1064,6 @@ class XMPReader implements LoggerAwareInterface {
         */
        private function startElementModeStruct( $ns, $tag, $attribs ) {
                if ( $ns !== self::NS_RDF ) {
         */
        private function startElementModeStruct( $ns, $tag, $attribs ) {
                if ( $ns !== self::NS_RDF ) {

-

                        if ( isset( $this->items[$ns][$tag] ) ) {
                                if ( isset( $this->items[$ns][$this->ancestorStruct]['children'] )
                                        && !isset( $this->items[$ns][$this->ancestorStruct]['children'][$tag] )
                        if ( isset( $this->items[$ns][$tag] ) ) {
                                if ( isset( $this->items[$ns][$this->ancestorStruct]['children'] )
                                        && !isset( $this->items[$ns][$this->ancestorStruct]['children'][$tag] )

diff --git a/includes/parser/ParserDiffTest.php b/includes/parser/ParserDiffTest.php
index d0b66f8..353825a 100644 (file)
--- a/includes/parser/ParserDiffTest.php
+++ b/includes/parser/ParserDiffTest.php
@@ -24,8 +24,7 @@
 /**
  * @ingroup Parser
  */
 /**
  * @ingroup Parser
  */

-class ParserDiffTest
-{
+class ParserDiffTest {

        public $parsers;
        public $conf;
        public $shortOutput = false;
        public $parsers;
        public $conf;
        public $shortOutput = false;

diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php
index 6bb4e5a..4473bb2 100644 (file)
--- a/includes/search/SearchEngine.php
+++ b/includes/search/SearchEngine.php
@@ -455,8 +455,8 @@ abstract class SearchEngine {
                        $title = Title::newFromText( $search . 'Dummy' );
                        if ( $title && $title->getText() == 'Dummy'
                                        && $title->getNamespace() != NS_MAIN
                        $title = Title::newFromText( $search . 'Dummy' );
                        if ( $title && $title->getText() == 'Dummy'
                                        && $title->getNamespace() != NS_MAIN

-                                       && !$title->isExternal() )
-                       {
+                                       && !$title->isExternal()
+                       ) {

                                $ns = [ $title->getNamespace() ];
                                $search = '';
                        } else {
                                $ns = [ $title->getNamespace() ];
                                $search = '';
                        } else {

diff --git a/includes/services/ServiceContainer.php b/includes/services/ServiceContainer.php
index bad0ef9..633cfc9 100644 (file)
--- a/includes/services/ServiceContainer.php
+++ b/includes/services/ServiceContainer.php
@@ -303,7 +303,7 @@ class ServiceContainer implements DestructibleService {
 
                $instance = $this->peekService( $name );
 
 
                $instance = $this->peekService( $name );
 

-               if ( $destroy && $instance instanceof DestructibleService )  {
+               if ( $destroy && $instance instanceof DestructibleService ) {

                        $instance->destroy();
                }
 
                        $instance->destroy();
                }
 

diff --git a/includes/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php
index 268f0b0..7e70df2 100644 (file)
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -1022,7 +1022,6 @@ abstract class ChangesListSpecialPage extends SpecialPage {
                }
 
                return false;
                }
 
                return false;

-

        }
 
        /**
        }
 
        /**

diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php
index f9164a1..c10dbdd 100644 (file)
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -167,7 +167,7 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
                        $jsData = $this->getStructuredFilterJsData();
 
                        $messages = [];
                        $jsData = $this->getStructuredFilterJsData();
 
                        $messages = [];

-                       foreach ( $jsData['messageKeys'] as $key ){
+                       foreach ( $jsData['messageKeys'] as $key ) {

                                $messages[$key] = $this->msg( $key )->plain();
                        }
 
                                $messages[$key] = $this->msg( $key )->plain();
                        }
 

diff --git a/includes/user/User.php b/includes/user/User.php
index bb1e751..5dd4be1 100644 (file)
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -522,7 +522,6 @@ class User implements IDBAccessObject {
                                }
 
                                return $data;
                                }
 
                                return $data;

-

                        },
                        [ 'pcTTL' => $cache::TTL_PROC_LONG, 'version' => self::VERSION ]
                );
                        },
                        [ 'pcTTL' => $cache::TTL_PROC_LONG, 'version' => self::VERSION ]
                );

diff --git a/includes/utils/AutoloadGenerator.php b/includes/utils/AutoloadGenerator.php
index 1dac0b1..54a8677 100644 (file)
--- a/includes/utils/AutoloadGenerator.php
+++ b/includes/utils/AutoloadGenerator.php
@@ -212,7 +212,6 @@ global \${$this->variableName};
 ];
 
 EOD;
 ];
 
 EOD;

-

        }
 
        /**
        }
 
        /**

diff --git a/includes/utils/BatchRowIterator.php b/includes/utils/BatchRowIterator.php
index e107fb1..cab6a3d 100644 (file)
--- a/includes/utils/BatchRowIterator.php
+++ b/includes/utils/BatchRowIterator.php
@@ -87,9 +87,9 @@ class BatchRowIterator implements RecursiveIterator {
 
        /**
         * @param IDatabase $db The database to read from
 
        /**
         * @param IDatabase $db The database to read from

-        * @param string|array $table      The name or names of the table to read from
+        * @param string|array $table The name or names of the table to read from

         * @param string|array $primaryKey The name or names of the primary key columns
         * @param string|array $primaryKey The name or names of the primary key columns

-        * @param integer      $batchSize  The number of rows to fetch per iteration
+        * @param integer $batchSize The number of rows to fetch per iteration

         * @throws InvalidArgumentException
         */
        public function __construct( IDatabase $db, $table, $primaryKey, $batchSize ) {
         * @throws InvalidArgumentException
         */
        public function __construct( IDatabase $db, $table, $primaryKey, $batchSize ) {

diff --git a/includes/widget/search/SimpleSearchResultSetWidget.php b/includes/widget/search/SimpleSearchResultSetWidget.php
index 04e1e21..4df2eb5 100644 (file)
--- a/includes/widget/search/SimpleSearchResultSetWidget.php
+++ b/includes/widget/search/SimpleSearchResultSetWidget.php
@@ -14,7 +14,7 @@ use Html;
  * interwiki prefix. Includes a per-wiki header indicating where
  * the results are from.
  */
  * interwiki prefix. Includes a per-wiki header indicating where
  * the results are from.
  */

-class SimpleSearchResultSetWidget implements SearchResultSetWidget{
+class SimpleSearchResultSetWidget implements SearchResultSetWidget {

        /** @var SpecialSearch */
        protected $specialSearch;
        /** @var SearchResultWidget */
        /** @var SpecialSearch */
        protected $specialSearch;
        /** @var SearchResultWidget */

diff --git a/maintenance/updateCredits.php b/maintenance/updateCredits.php
index eb717e8..287a40c 100644 (file)
--- a/maintenance/updateCredits.php
+++ b/maintenance/updateCredits.php
@@ -59,7 +59,7 @@ unset( $lines );
 
 $lines = explode( "\n", shell_exec( 'git log --format="%aN"' ) );
 foreach ( $lines as $line ) {
 
 $lines = explode( "\n", shell_exec( 'git log --format="%aN"' ) );
 foreach ( $lines as $line ) {

-       if ( empty( $line ) )  {
+       if ( empty( $line ) ) {

                continue;
        }
        if ( substr( $line, 0, 5 ) === '[BOT]' ) {
                continue;
        }
        if ( substr( $line, 0, 5 ) === '[BOT]' ) {

diff --git a/tests/phpunit/includes/changes/ChangesListFilterTest.php b/tests/phpunit/includes/changes/ChangesListFilterTest.php
index 5546de8..0015453 100644 (file)
--- a/tests/phpunit/includes/changes/ChangesListFilterTest.php
+++ b/tests/phpunit/includes/changes/ChangesListFilterTest.php
@@ -23,7 +23,6 @@ class ChangesListFilterTest extends MediaWikiTestCase {
                                'filters' => [],
                        ]
                );
                                'filters' => [],
                        ]
                );

-

        }
 
        // @codingStandardsIgnoreStart
        }
 
        // @codingStandardsIgnoreStart

diff --git a/tests/phpunit/includes/db/DatabaseMysqlBaseTest.php b/tests/phpunit/includes/db/DatabaseMysqlBaseTest.php
index 97e9b26..f61569a 100644 (file)
--- a/tests/phpunit/includes/db/DatabaseMysqlBaseTest.php
+++ b/tests/phpunit/includes/db/DatabaseMysqlBaseTest.php
@@ -91,7 +91,6 @@ class FakeDatabaseMysqlBase extends DatabaseMysqlBase {
        }
 
        protected function mysqlRealEscapeString( $s ) {
        }
 
        protected function mysqlRealEscapeString( $s ) {

-

        }
 
        function insertId() {
        }
 
        function insertId() {

diff --git a/tests/phpunit/includes/deferred/DeferredUpdatesTest.php b/tests/phpunit/includes/deferred/DeferredUpdatesTest.php
index d7ad1d1..2c199bc 100644 (file)
--- a/tests/phpunit/includes/deferred/DeferredUpdatesTest.php
+++ b/tests/phpunit/includes/deferred/DeferredUpdatesTest.php
@@ -13,8 +13,7 @@ class DeferredUpdatesTest extends MediaWikiTestCase {
                $post = DeferredUpdates::POSTSEND;
                $all = DeferredUpdates::ALL;
 
                $post = DeferredUpdates::POSTSEND;
                $all = DeferredUpdates::ALL;
 

-               $update = $this->getMockBuilder( 'DeferrableUpdate' )
-                             ->getMock();
+               $update = $this->getMock( DeferrableUpdate::class );

                $update->expects( $this->never() )
                        ->method( 'doUpdate' );
 
                $update->expects( $this->never() )
                        ->method( 'doUpdate' );
 

diff --git a/tests/phpunit/includes/libs/DnsSrvDiscovererTest.php b/tests/phpunit/includes/libs/DnsSrvDiscovererTest.php
index 9d12b10..cfc2d91 100644 (file)
--- a/tests/phpunit/includes/libs/DnsSrvDiscovererTest.php
+++ b/tests/phpunit/includes/libs/DnsSrvDiscovererTest.php
@@ -10,7 +10,6 @@ class DnsSrvDiscovererTest extends PHPUnit_Framework_TestCase {
                $record = $discoverer->pickServer( $params );
 
                $this->assertEquals( $expected, $record );
                $record = $discoverer->pickServer( $params );
 
                $this->assertEquals( $expected, $record );

-

        }
 
        public static function provideRecords() {
        }
 
        public static function provideRecords() {

diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderWikiModuleTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderWikiModuleTest.php
index 4cf4071..78eec6a 100644 (file)
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderWikiModuleTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderWikiModuleTest.php
@@ -323,7 +323,6 @@ class ResourceLoaderWikiModuleTest extends ResourceLoaderTestCase {
                        $expected,
                        $module->getContent( $titleText )
                );
                        $expected,
                        $module->getContent( $titleText )
                );

-

        }
 
        /**
        }
 
        /**

diff --git a/tests/phpunit/includes/search/SearchIndexFieldTest.php b/tests/phpunit/includes/search/SearchIndexFieldTest.php
index 6b12229..bb7508c 100644 (file)
--- a/tests/phpunit/includes/search/SearchIndexFieldTest.php
+++ b/tests/phpunit/includes/search/SearchIndexFieldTest.php
@@ -51,7 +51,6 @@ class SearchIndexFieldTest extends MediaWikiTestCase {
                        }
                );
                $this->assertEquals( "test", $field1->merge( $field2 ) );
                        }
                );
                $this->assertEquals( "test", $field1->merge( $field2 ) );

-

        }
 
 }
        }
 
 }

diff --git a/tests/phpunit/includes/specials/SpecialWatchlistTest.php b/tests/phpunit/includes/specials/SpecialWatchlistTest.php
index 7f9f25f..b0490ec 100644 (file)
--- a/tests/phpunit/includes/specials/SpecialWatchlistTest.php
+++ b/tests/phpunit/includes/specials/SpecialWatchlistTest.php
@@ -43,7 +43,6 @@ class SpecialWatchlistTest extends SpecialPageTestBase {
                                'watchlistreloadautomatically' => 0,
                        ]
                );
                                'watchlistreloadautomatically' => 0,
                        ]
                );

-

        }
 
        /**
        }
 
        /**