Fixed spacing

- Added newline at end of file
- Removed double spaces/newlines
- Added space after if/function and parentheses/brackets
- Removed space before comma/cast
- Fixed indent of some lines

Change-Id: I29867ffdffdfb7d2b56997e9393497c7dc12f7d3

diff --git a/includes/MovePage.php b/includes/MovePage.php
index cea91d2..5c9490b 100644 (file)
--- a/includes/MovePage.php
+++ b/includes/MovePage.php
@@ -423,5 +423,4 @@ class MovePage {
                $logid = $logEntry->insert();
                $logEntry->publish( $logid );
        }
-
-}
\ No newline at end of file
+}

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 3321747..e1b6e0e 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2769,7 +2769,6 @@ $templates
                                );
                                $context = new ResourceLoaderContext( $resourceLoader, new FauxRequest( $query ) );
 
-
                                // Extract modules that know they're empty and see if we have one or more
                                // raw modules
                                $isRaw = false;

diff --git a/includes/PrefixSearch.php b/includes/PrefixSearch.php
index 718750f..1f684fb 100644 (file)
--- a/includes/PrefixSearch.php
+++ b/includes/PrefixSearch.php
@@ -195,7 +195,7 @@ abstract class PrefixSearch {
                // Unlike SpecialPage itself, we want the canonical forms of both
                // canonical and alias title forms...
                $keys = array();
-               foreach ( SpecialPageFactory::getNames() as $page  ) {
+               foreach ( SpecialPageFactory::getNames() as $page ) {
                        $keys[$wgContLang->caseFold( $page )] = $page;
                }
 

diff --git a/includes/cache/bloom/BloomCache.php b/includes/cache/bloom/BloomCache.php
index 236db95..a15b461 100644 (file)
--- a/includes/cache/bloom/BloomCache.php
+++ b/includes/cache/bloom/BloomCache.php
@@ -318,6 +318,6 @@ class EmptyBloomCache extends BloomCache {
        }
 
        protected function doGetStatus( $virtualKey ) {
-               return array( 'lastID' => null, 'asOfTime' => null, 'epoch' => null ) ;
+               return array( 'lastID' => null, 'asOfTime' => null, 'epoch' => null );
        }
 }

diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php
index af3cc72..ab8d366 100644 (file)
--- a/includes/db/DatabaseMssql.php
+++ b/includes/db/DatabaseMssql.php
@@ -692,7 +692,7 @@ class DatabaseMssql extends DatabaseBase {
                        if ( !is_null( $identity ) ) {
                                // then we want to get the identity column value we were assigned and save it off
                                $row = $ret->fetchObject();
-                               if( is_object( $row ) ){
+                               if ( is_object( $row ) ) {
                                        $this->mInsertId = $row->$identity;
                                }
                        }

diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php
index b574c5e..7563d64 100644 (file)
--- a/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@ -1237,7 +1237,7 @@ abstract class File {
                        $that = $this;
                        $work = new PoolCounterWorkViaCallback( 'GetLocalFileCopy', sha1( $this->getName() ),
                                array(
-                                       'doWork' => function() use ( $that ) {
+                                       'doWork' => function () use ( $that ) {
                                                return $that->getLocalRefPath();
                                        }
                                )

diff --git a/includes/mail/MailAddress.php b/includes/mail/MailAddress.php
index 6817908..7a228bd 100644 (file)
--- a/includes/mail/MailAddress.php
+++ b/includes/mail/MailAddress.php
@@ -38,7 +38,7 @@ class MailAddress {
        function __construct( $address, $name = null, $realName = null ) {
                if ( is_object( $address ) && $address instanceof User ) {
                        // Old calling format, now deprecated
-                       wfDeprecated( __METHOD__ . ' with a User object' , '1.24' );
+                       wfDeprecated( __METHOD__ . ' with a User object', '1.24' );
                        $this->address = $address->getEmail();
                        $this->name = $address->getName();
                        $this->realName = $address->getRealName();

diff --git a/includes/pager/IndexPager.php b/includes/pager/IndexPager.php
index ce6dc50..9398e30 100644 (file)
--- a/includes/pager/IndexPager.php
+++ b/includes/pager/IndexPager.php
@@ -478,7 +478,6 @@ abstract class IndexPager extends ContextSource implements Pager {
                        $attrs['class'] = "mw-{$type}link";
                }
 
-
                return Linker::linkKnown(
                        $this->getTitle(),
                        $text,

diff --git a/includes/resourceloader/ResourceLoaderWikiModule.php b/includes/resourceloader/ResourceLoaderWikiModule.php
index 99a8739..2a1736d 100644 (file)
--- a/includes/resourceloader/ResourceLoaderWikiModule.php
+++ b/includes/resourceloader/ResourceLoaderWikiModule.php
@@ -170,7 +170,7 @@ abstract class ResourceLoaderWikiModule extends ResourceLoaderModule {
                $modifiedTime = 1; // wfTimestamp() interprets 0 as "now"
                $titleInfo = $this->getTitleInfo( $context );
                if ( count( $titleInfo ) ) {
-                       $mtimes = array_map( function( $value ) {
+                       $mtimes = array_map( function ( $value ) {
                                return $value['timestamp'];
                        }, $titleInfo );
                        $modifiedTime = max( $modifiedTime, max( $mtimes ) );

diff --git a/includes/site/SiteSQLStore.php b/includes/site/SiteSQLStore.php
index d133468..e5d05be 100644 (file)
--- a/includes/site/SiteSQLStore.php
+++ b/includes/site/SiteSQLStore.php
@@ -395,7 +395,7 @@ class SiteSQLStore implements SiteStore {
                $dbw->startAtomic( __METHOD__ );
                $ok = $dbw->delete( 'sites', '*', __METHOD__ );
                $ok = $dbw->delete( 'site_identifiers', '*', __METHOD__ ) && $ok;
-               $dbw->endAtomic( __METHOD__);
+               $dbw->endAtomic( __METHOD__ );
 
                $this->reset();
 

diff --git a/includes/specials/SpecialCategories.php b/includes/specials/SpecialCategories.php
index 371cd9f..bf6bb35 100644 (file)
--- a/includes/specials/SpecialCategories.php
+++ b/includes/specials/SpecialCategories.php
@@ -192,7 +192,7 @@ class CategoryPager extends AlphabeticPager {
                                        $this->msg( 'categories' )->text(),
                                        Xml::inputLabel(
                                                $this->msg( 'categoriesfrom' )->text(),
-                                               'from', 'from', 20, $from, array( 'class' => 'mw-ui-input-inline') ) .
+                                               'from', 'from', 20, $from, array( 'class' => 'mw-ui-input-inline' ) ) .
                                                ' ' .
                                                Xml::submitButton(
                                                        $this->msg( 'allpagessubmit' )->text(),

diff --git a/includes/specials/SpecialWantedfiles.php b/includes/specials/SpecialWantedfiles.php
index 937a503..16127d9 100644 (file)
--- a/includes/specials/SpecialWantedfiles.php
+++ b/includes/specials/SpecialWantedfiles.php
@@ -102,7 +102,7 @@ class WantedFilesPage extends WantedQueryPage {
         * @return boolean
         */
        protected function existenceCheck( Title $title ) {
-               return (bool) wfFindFile( $title );
+               return (bool)wfFindFile( $title );
        }
 
        function getQueryInfo() {

diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 2419299..7741c35 100644 (file)
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -767,7 +767,7 @@ abstract class UploadBase {
                rsort( $sizes );
 
                foreach ( $sizes as $size ) {
-                       $jobs []= new ThumbnailRenderJob( $this->getLocalFile()->getTitle(), array(
+                       $jobs[] = new ThumbnailRenderJob( $this->getLocalFile()->getTitle(), array(
                                'transformParams' => array( 'width' => $size ),
                        ) );
                }

diff --git a/tests/phpunit/includes/changes/EnhancedChangesListTest.php b/tests/phpunit/includes/changes/EnhancedChangesListTest.php
index 40a11d2..7a82680 100644 (file)
--- a/tests/phpunit/includes/changes/EnhancedChangesListTest.php
+++ b/tests/phpunit/includes/changes/EnhancedChangesListTest.php
@@ -31,7 +31,7 @@ class EnhancedChangesListTest extends MediaWikiLangTestCase {
                        'mediawiki.special.changeslist',
                        $styleModules,
                        'has mediawiki.special.changeslist'
-                );
+               );
 
                $this->assertContains(
                        'mediawiki.special.changeslist.enhanced',
@@ -75,10 +75,10 @@ class EnhancedChangesListTest extends MediaWikiLangTestCase {
                $this->assertEquals( '', $html );
        }
 
-         /**
-          * @todo more tests for actual formatting, this is more of a smoke test
-          */
-         public function testEndRecentChangesList() {
+       /**
+        * @todo more tests for actual formatting, this is more of a smoke test
+        */
+       public function testEndRecentChangesList() {
                $enhancedChangesList = $this->newEnhancedChangesList();
                $enhancedChangesList->beginRecentChangesList();
 
@@ -92,7 +92,7 @@ class EnhancedChangesListTest extends MediaWikiLangTestCase {
 
                preg_match_all( '/td class="mw-enhanced-rc-nested"/', $html, $matches );
                $this->assertCount( 2, $matches[0] );
-         }
+       }
 
        /**
         * @return EnhancedChangesList

diff --git a/tests/phpunit/includes/config/HashConfigTest.php b/tests/phpunit/includes/config/HashConfigTest.php
index 3ad3bfb..06973b0 100644 (file)
--- a/tests/phpunit/includes/config/HashConfigTest.php
+++ b/tests/phpunit/includes/config/HashConfigTest.php
@@ -60,4 +60,4 @@ class HashConfigTest extends MediaWikiTestCase {
                $conf->set( 'one', '3' );
                $this->assertEquals( '3', $conf->get( 'one' ) );
        }
-}
\ No newline at end of file
+}

diff --git a/tests/phpunit/includes/mail/MailAddressTest.php b/tests/phpunit/includes/mail/MailAddressTest.php
index 76566eb..dd8ab3e 100644 (file)
--- a/tests/phpunit/includes/mail/MailAddressTest.php
+++ b/tests/phpunit/includes/mail/MailAddressTest.php
@@ -60,5 +60,4 @@ class MailAddressTest extends MediaWikiTestCase {
                $ma = new MailAddress( 'some@email.com', 'UserName', 'A real name' );
                $this->assertEquals( $ma->toString(), (string)$ma );
        }
-
-}
\ No newline at end of file
+}

diff --git a/tests/phpunit/includes/specialpage/SpecialPageFactoryTest.php b/tests/phpunit/includes/specialpage/SpecialPageFactoryTest.php
index 4619c2e..42602dc 100644 (file)
--- a/tests/phpunit/includes/specialpage/SpecialPageFactoryTest.php
+++ b/tests/phpunit/includes/specialpage/SpecialPageFactoryTest.php
@@ -35,10 +35,10 @@ class SpecialPageFactoryTest extends MediaWikiTestCase {
        public function specialPageProvider() {
                return array(
                        'class name' => array( 'SpecialAllPages', false ),
-                       'closure' => array( function() {
+                       'closure' => array( function () {
                                return new SpecialAllPages();
                        }, false ),
-                       'function' => array( array( $this, 'newSpecialAllPages' ), false  ),
+                       'function' => array( array( $this, 'newSpecialAllPages' ), false ),
                );
        }