Fixed spacing
authorumherirrender <umherirrender_de.wp@web.de>
Thu, 27 Nov 2014 17:03:07 +0000 (18:03 +0100)
committerumherirrender <umherirrender_de.wp@web.de>
Fri, 5 Dec 2014 21:28:07 +0000 (22:28 +0100)
- Added/removed spaces around parenthesis
- Added newline in empty blocks
- Added space after switch/foreach/function
- Use tabs at begin of line
- Add newline at end of file

Change-Id: I244cdb2c333489e1020931bf4ac5266a87439f0d

29 files changed:
includes/CdbCompat.php
includes/PrefixSearch.php
includes/Status.php
includes/api/ApiOpenSearch.php
includes/api/ApiQuerySearch.php
includes/cache/LocalisationCache.php
includes/db/Database.php
includes/db/LBFactory.php
includes/filebackend/FSFileBackend.php
includes/installer/DatabaseUpdater.php
includes/installer/WebInstallerOutput.php
includes/media/Bitmap.php
includes/parser/MWTidy.php
includes/parser/Parser.php
includes/profiler/ProfilerStandard.php
includes/profiler/ProfilerStub.php
includes/profiler/ProfilerXhprof.php
includes/profiler/SectionProfiler.php
includes/profiler/output/ProfilerOutputDb.php
includes/profiler/output/ProfilerOutputText.php
includes/profiler/output/ProfilerOutputUdp.php
includes/site/SiteListFileCache.php
includes/site/SiteListFileCacheBuilder.php
includes/utils/AutoloadGenerator.php
maintenance/backupTextPass.inc
tests/phpunit/includes/PrefixSearchTest.php
tests/phpunit/includes/db/DatabaseSqliteTest.php
tests/phpunit/includes/media/FormatMetadataTest.php
tests/phpunit/maintenance/backupTextPassTest.php

index 0c00b39..0074cc9 100644 (file)
 /**
  * @deprecated since 1.25
  */
-abstract class CdbReader extends \Cdb\Reader {}
+abstract class CdbReader extends \Cdb\Reader {
+}
 
 /**
  * @deprecated since 1.25
  */
-abstract class CdbWriter extends \Cdb\Writer {}
+abstract class CdbWriter extends \Cdb\Writer {
+}
 
 /**
  * @deprecated since 1.25
  */
-class CdbException extends \Cdb\Exception {}
+class CdbException extends \Cdb\Exception {
+}
index a4e64ee..4df6a9e 100644 (file)
@@ -199,19 +199,19 @@ abstract class PrefixSearch {
                                return $this->pullFront( $key, $srchres );
                        }
                        $redirectTargetsToRedirect = $this->redirectTargetsToRedirect( $srchres );
-                       if ( isset( $redirectTargetsToRedirect[ $target ] ) ) {
+                       if ( isset( $redirectTargetsToRedirect[$target] ) ) {
                                // The exact match and something in the results list are both redirects
                                // to the same thing!  In this case we'll pull the returned match to the
                                // top following the same logic above.  Again, it might not be a perfect
                                // choice but it'll do.
-                               return $this->pullFront( $redirectTargetsToRedirect[ $target ], $srchres );
+                               return $this->pullFront( $redirectTargetsToRedirect[$target], $srchres );
                        }
                } else {
                        $redirectTargetsToRedirect = $this->redirectTargetsToRedirect( $srchres );
-                       if ( isset( $redirectTargetsToRedirect[ $string ] ) ) {
+                       if ( isset( $redirectTargetsToRedirect[$string] ) ) {
                                // The exact match is the target of a redirect already in the results list so remove
                                // the redirect from the results list and push the exact match to the front
-                               array_splice( $srchres, $redirectTargetsToRedirect[ $string ], 1 );
+                               array_splice( $srchres, $redirectTargetsToRedirect[$string], 1 );
                                array_unshift( $srchres, $string );
                                return $srchres;
                        }
@@ -242,7 +242,7 @@ abstract class PrefixSearch {
                        if ( !$target ) {
                                continue;
                        }
-                       $result[ $target ] = $key;
+                       $result[$target] = $key;
                }
                return $result;
        }
index 265eae1..fb267bd 100644 (file)
@@ -469,7 +469,7 @@ class Status {
        public function __toString() {
                $status = $this->isOK() ? "OK" : "Error";
                if ( count( $this->errors ) ) {
-                       $errorcount = "collected " . ( count($this->errors) ) . " error(s) on the way";
+                       $errorcount = "collected " . ( count( $this->errors ) ) . " error(s) on the way";
                } else {
                        $errorcount = "no errors detected";
                }
@@ -486,16 +486,16 @@ class Status {
                        $errorcount,
                        $valstr
                );
-               if ( count ($this->errors ) > 0 ) {
+               if ( count$this->errors ) > 0 ) {
                        $hdr = sprintf( "+-%'-4s-+-%'-25s-+-%'-40s-+\n", "", "", "" );
                        $i = 1;
                        $out .= "\n";
                        $out .= $hdr;
-                       foreach( $this->getStatusArray() as $stat ) {
+                       foreach ( $this->getStatusArray() as $stat ) {
                                $out .= sprintf( "| %4d | %-25.25s | %-40.40s |\n",
                                        $i,
                                        $stat[0],
-                                       implode(" ", array_slice( $stat, 1 ) )
+                                       implode( " ", array_slice( $stat, 1 ) )
                                );
                                $i += 1;
                        }
index 4a9e216..2235ba9 100644 (file)
@@ -59,7 +59,7 @@ class ApiOpenSearch extends ApiBase {
        }
 
        public function getCustomPrinter() {
-               switch( $this->getFormat() ) {
+               switch ( $this->getFormat() ) {
                        case 'json':
                                return $this->getMain()->createPrinterByName( 'json' . $this->fm );
 
index c6999df..16a491e 100644 (file)
@@ -206,7 +206,7 @@ class ApiQuerySearch extends ApiQueryGeneratorBase {
                $hasInterwikiResults = false;
                $totalhits = null;
                if ( $interwiki && $resultPageSet === null && $matches->hasInterwikiResults() ) {
-                       foreach( $matches->getInterwikiResults() as $matches ) {
+                       foreach ( $matches->getInterwikiResults() as $matches ) {
                                $matches = $matches->getInterwikiResults();
                                $hasInterwikiResults = true;
 
index 7d5450e..c79d008 100644 (file)
@@ -23,6 +23,7 @@
 use Cdb\Exception as CdbException;
 use Cdb\Reader as CdbReader;
 use Cdb\Writer as CdbWriter;
+
 /**
  * Class for caching the contents of localisation files, Messages*.php
  * and *.i18n.php.
index 6c53f6a..edce918 100644 (file)
@@ -1003,7 +1003,7 @@ abstract class DatabaseBase implements IDatabase {
                if ( $queryProf != '' ) {
                        $queryStartTime = microtime( true );
                        $queryProfile = new ScopedCallback(
-                               function() use ( $queryStartTime, $queryProf, $isMaster ) {
+                               function () use ( $queryStartTime, $queryProf, $isMaster ) {
                                        $trxProfiler = Profiler::instance()->getTransactionProfiler();
                                        $trxProfiler->recordQueryCompletion( $queryProf, $queryStartTime, $isMaster );
                                }
index e049a5d..fdf1703 100644 (file)
@@ -172,7 +172,7 @@ abstract class LBFactory {
         * @param array $args
         */
        private function forEachLBCallMethod( $methodName, array $args = array() ) {
-               $this->forEachLB( function( LoadBalancer $loadBalancer, $methodName, array $args ) {
+               $this->forEachLB( function ( LoadBalancer $loadBalancer, $methodName, array $args ) {
                        call_user_func_array( array( $loadBalancer, $methodName ), $args );
                }, array( $methodName, $args ) );
        }
index 9aa4ca8..c00fb81 100644 (file)
@@ -454,10 +454,10 @@ class FSFileBackend extends FileBackendStore {
                        wfDebugLog( 'FSFileBackend', __METHOD__ . ": cannot create directory $dir" );
                        $status->fatal( 'directorycreateerror', $params['dir'] ); // fails on races
                } elseif ( !is_writable( $dir ) ) {
-                       wfDebugLog( 'FSFileBackend',  __METHOD__ . ": directory $dir is read-only" );
+                       wfDebugLog( 'FSFileBackend', __METHOD__ . ": directory $dir is read-only" );
                        $status->fatal( 'directoryreadonlyerror', $params['dir'] );
                } elseif ( !is_readable( $dir ) ) {
-                       wfDebugLog( 'FSFileBackend',  __METHOD__ . ": directory $dir is not readable" );
+                       wfDebugLog( 'FSFileBackend', __METHOD__ . ": directory $dir is not readable" );
                        $status->fatal( 'directorynotreadableerror', $params['dir'] );
                }
                $this->untrapWarnings();
index a5540db..c34d09e 100644 (file)
@@ -1073,7 +1073,7 @@ abstract class DatabaseUpdater {
                        $out = $wgProfiler['output'];
                        if ( $out === 'db' ) {
                                $profileToDb = true;
-                       } elseif( is_array( $out ) && in_array( 'db', $out ) ) {
+                       } elseif ( is_array( $out ) && in_array( 'db', $out ) ) {
                                $profileToDb = true;
                        }
                }
index 8ff3d2f..44ca7d3 100644 (file)
@@ -298,7 +298,7 @@ class WebInstallerOutput {
        </div>
 <?php
        $message = wfMessage( 'config-sidebar' )->plain();
-       foreach( explode( '----', $message ) as $section ) {
+       foreach ( explode( '----', $message ) as $section ) {
                echo '<div class="portal"><div class="body">';
                echo $this->parent->parse( $section, true );
                echo '</div></div>';
index 0292af8..3c23ab9 100644 (file)
@@ -344,7 +344,7 @@ class BitmapHandler extends TransformationalImageHandler {
 
                $src_image = call_user_func( $loader, $params['srcPath'] );
 
-               $rotation = function_exists( 'imagerotate' ) && !isset( $params['disableRotation'] )  ? $this->getRotation( $image ) : 0;
+               $rotation = function_exists( 'imagerotate' ) && !isset( $params['disableRotation'] ) ? $this->getRotation( $image ) : 0;
                list( $width, $height ) = $this->extractPreRotationDimensions( $params, $rotation );
                $dst_image = imagecreatetruecolor( $width, $height );
 
index ff62e9b..3cb35f7 100644 (file)
@@ -172,7 +172,7 @@ class MWTidy {
                if ( $wgTidyInternal ) {
                        if ( wfIsHHVM() ) {
                                if ( $stderr ) {
-                                       throw new MWException( __METHOD__.": error text return from HHVM tidy is not supported" );
+                                       throw new MWException( __METHOD__ . ": error text return from HHVM tidy is not supported" );
                                }
                                return self::hhvmClean( $text, $retval );
                        } else {
index 1b926c4..7ea57be 100644 (file)
@@ -532,14 +532,14 @@ class Parser {
 
                        // Add on template profiling data
                        $dataByFunc = $this->mProfiler->getFunctionStats();
-                       uasort( $dataByFunc, function( $a, $b ) {
+                       uasort( $dataByFunc, function ( $a, $b ) {
                                return $a['real'] < $b['real']; // descending order
                        } );
                        $profileReport = "Transclusion expansion time report (%,ms,calls,template)\n";
                        foreach ( array_slice( $dataByFunc, 0, 10 ) as $item ) {
                                $profileReport .= sprintf( "%6.2f%% %8.3f %6d - %s\n",
                                        $item['%real'], $item['real'], $item['calls'],
-                                       htmlspecialchars($item['name'] ) );
+                                       htmlspecialchars( $item['name'] ) );
                        }
                        $text .= "\n<!-- \n$profileReport-->\n";
 
index 87706e6..ffcd7d9 100644 (file)
@@ -222,7 +222,7 @@ class ProfilerStandard extends Profiler {
                $this->profileIn( $section );
 
                $that = $this;
-               return new ScopedCallback( function() use ( $that, $section ) {
+               return new ScopedCallback( function () use ( $that, $section ) {
                        $that->profileOut( $section );
                } );
        }
index 2db06e4..9a7ec8c 100644 (file)
@@ -34,7 +34,7 @@ class ProfilerStub extends Profiler {
        }
 
        public function scopedProfileIn( $section ) {
-               return new ScopedCallback( function() {
+               return new ScopedCallback( function () {
                        // no-op
                } );
        }
index d91b429..a4a7b30 100644 (file)
@@ -126,12 +126,12 @@ class ProfilerXhprof extends Profiler {
 
                if ( $exists ) {
                        xhprof_frame_begin( $section );
-                       return new ScopedCallback( function() {
+                       return new ScopedCallback( function () {
                                xhprof_frame_end();
                        } );
                }
 
-               return new ScopedCallback( function() {
+               return new ScopedCallback( function () {
                        // no-op
                } );
        }
index 89eebbe..5591c99 100644 (file)
@@ -59,7 +59,7 @@ class SectionProfiler {
                $this->profileInInternal( $section );
 
                $that = $this;
-               return new ScopedCallback( function() use ( $that, $section ) {
+               return new ScopedCallback( function () use ( $that, $section ) {
                        $that->profileOutInternal( $section );
                } );
        }
index ab42802..76d62d2 100644 (file)
@@ -38,7 +38,7 @@ class ProfilerOutputDb extends ProfilerOutput {
                // Initialize per-host profiling from config, back-compat if available
                if ( isset( $this->params['perHost'] ) ) {
                        $this->perHost = $this->params['perHost'];
-               } elseif( $wgProfilePerHost ) {
+               } elseif ( $wgProfilePerHost ) {
                        $this->perHost = $wgProfilePerHost;
                }
        }
index b24bbef..d37d74f 100644 (file)
@@ -43,11 +43,11 @@ class ProfilerOutputText extends ProfilerOutput {
 
                        // Filter out really tiny entries
                        $min = $this->thresholdMs;
-                       $stats = array_filter( $stats, function( $a ) use ( $min ) {
+                       $stats = array_filter( $stats, function ( $a ) use ( $min ) {
                                return $a['real'] > $min;
                        } );
                        // Sort descending by time elapsed
-                       usort( $stats, function( $a, $b ) {
+                       usort( $stats, function ( $a, $b ) {
                                return $a['real'] < $b['real'];
                        } );
 
index d5c7e5c..7da03c1 100644 (file)
@@ -45,19 +45,19 @@ class ProfilerOutputUdp extends ProfilerOutput {
                // Initialize port, host, and format from config, back-compat if available
                if ( isset( $this->params['udpport'] ) ) {
                        $this->port = $this->params['udpport'];
-               } elseif( $wgUDPProfilerPort ) {
+               } elseif ( $wgUDPProfilerPort ) {
                        $this->port = $wgUDPProfilerPort;
                }
 
                if ( isset( $this->params['udphost'] ) ) {
                        $this->host = $this->params['udphost'];
-               } elseif( $wgUDPProfilerHost ) {
+               } elseif ( $wgUDPProfilerHost ) {
                        $this->host = $wgUDPProfilerHost;
                }
 
                if ( isset( $this->params['udpformat'] ) ) {
                        $this->format = $this->params['udpformat'];
-               } elseif( $wgUDPProfilerFormatString ) {
+               } elseif ( $wgUDPProfilerFormatString ) {
                        $this->format = $wgUDPProfilerFormatString;
                }
        }
index c0ecab1..f2a95a8 100644 (file)
@@ -72,7 +72,7 @@ class SiteListFileCache {
                $sites = new SiteList();
 
                // @todo lazy initialize the site objects in the site list (e.g. only when needed to access)
-               foreach( $data['sites'] as $siteArray ) {
+               foreach ( $data['sites'] as $siteArray ) {
                        $sites[] = $this->newSiteFromArray( $siteArray );
                }
 
@@ -116,7 +116,7 @@ class SiteListFileCache {
                $site->setExtraData( $data['data'] );
                $site->setExtraConfig( $data['config'] );
 
-               foreach( $data['identifiers'] as $identifier ) {
+               foreach ( $data['identifiers'] as $identifier ) {
                        $site->addLocalId( $identifier['type'], $identifier['key'] );
                }
 
index 0a71aae..7307a6f 100644 (file)
@@ -81,7 +81,7 @@ class SiteListFileCacheBuilder {
                $siteIdentifiers = $this->buildLocalIdentifiers( $site );
                $identifiersArray = array();
 
-               foreach( $siteIdentifiers as $identifier ) {
+               foreach ( $siteIdentifiers as $identifier ) {
                        $identifiersArray[] = $identifier;
                }
 
index 727f485..4e65e11 100644 (file)
@@ -227,7 +227,7 @@ class ClassCollector {
                if ( is_string( $token ) ) {
                        return;
                }
-               switch( $token[0] ) {
+               switch ( $token[0] ) {
                case T_NAMESPACE:
                case T_CLASS:
                case T_INTERFACE:
@@ -241,7 +241,7 @@ class ClassCollector {
         * @param array
         */
        protected function tryEndExpect( $token ) {
-               switch( $this->startToken[0] ) {
+               switch ( $this->startToken[0] ) {
                case T_NAMESPACE:
                        if ( $token === ';' || $token === '{' ) {
                                $this->namespace = $this->implodeTokens() . '\\';
index f13cb44..85ebd51 100644 (file)
@@ -895,10 +895,10 @@ class TextPassDumper extends BackupDumper {
                                $this->thisPage .= $data;
                        }
                }
-               elseif ( $this->lastName == "model"  ) {
+               elseif ( $this->lastName == "model" ) {
                        $this->thisRevModel .= $data;
                }
-               elseif ( $this->lastName == "format"  ) {
+               elseif ( $this->lastName == "format" ) {
                        $this->thisRevFormat .= $data;
                }
 
index d0f6208..e737056 100644 (file)
@@ -42,12 +42,12 @@ class PrefixSearchTest extends MediaWikiLangTestCase {
                $this->insertPage( 'Example Foo/Bar' );
                $this->insertPage( 'Example/Baz' );
                $this->insertPage( 'Redirect test', '#REDIRECT [[Redirect Test]]' );
-               $this->insertPage( 'Redirect Test');
-               $this->insertPage( 'Redirect Test Worse Result');
+               $this->insertPage( 'Redirect Test' );
+               $this->insertPage( 'Redirect Test Worse Result' );
                $this->insertPage( 'Redirect test2', '#REDIRECT [[Redirect Test2]]' );
                $this->insertPage( 'Redirect TEST2', '#REDIRECT [[Redirect Test2]]' );
-               $this->insertPage( 'Redirect Test2');
-               $this->insertPage( 'Redirect Test2 Worse Result');
+               $this->insertPage( 'Redirect Test2' );
+               $this->insertPage( 'Redirect Test2 Worse Result' );
 
                $this->insertPage( 'Talk:Sandbox' );
                $this->insertPage( 'Talk:Example' );
@@ -171,7 +171,7 @@ class PrefixSearchTest extends MediaWikiLangTestCase {
                array_shift( $case['results'] );
                // And sometimes we expect a different last result
                $expected = isset( $case['offsetresult'] ) ?
-                       array_merge( $case['results'], $case['offsetresult'] ):
+                       array_merge( $case['results'], $case['offsetresult'] ) :
                        $case['results'];
 
                $this->assertEquals(
index 588e544..d32c1a6 100644 (file)
@@ -297,7 +297,7 @@ class DatabaseSqliteTest extends MediaWikiTestCase {
                        $out = $wgProfiler['output'];
                        if ( $out === 'db' ) {
                                $profileToDb = true;
-                       } elseif( is_array( $out ) && in_array( 'db', $out ) ) {
+                       } elseif ( is_array( $out ) && in_array( 'db', $out ) ) {
                                $profileToDb = true;
                        }
                }
index 97aa0a3..54758f9 100644 (file)
@@ -90,14 +90,14 @@ class FormatMetadataTest extends MediaWikiMediaTestCase {
                        'multiValue' => array( array( 'first', 'second', 'third', '_type' => 'ol' ), 'first' ),
                        'noType' => array( array( 'first', 'second', 'third' ), 'first' ),
                        'typeFirst' => array( array( '_type' => 'ol', 'first', 'second', 'third' ), 'first' ),
-                   'multilang' => array(
-                           array( 'en' => 'first', 'de' => 'Erste', '_type' => 'lang' ),
-                           array( 'en' => 'first', 'de' => 'Erste', '_type' => 'lang' ),
-                   ),
-                   'multilang-multivalue' => array(
-                           array( 'en' => array( 'first', 'second' ), 'de' => array( 'Erste', 'Zweite' ), '_type' => 'lang' ),
-                           array( 'en' => 'first', 'de' => 'Erste', '_type' => 'lang' ),
-                   ),
+                       'multilang' => array(
+                               array( 'en' => 'first', 'de' => 'Erste', '_type' => 'lang' ),
+                               array( 'en' => 'first', 'de' => 'Erste', '_type' => 'lang' ),
+                       ),
+                       'multilang-multivalue' => array(
+                               array( 'en' => array( 'first', 'second' ), 'de' => array( 'Erste', 'Zweite' ), '_type' => 'lang' ),
+                               array( 'en' => 'first', 'de' => 'Erste', '_type' => 'lang' ),
+                       ),
                );
        }
 }
index 26662d5..6ef2e23 100644 (file)
@@ -608,4 +608,4 @@ class BackupTextPassTestModelHandler extends TextContentHandler {
                return strtoupper( $text );
        }
 
-}
\ No newline at end of file
+}