diff options
author | Antoine Musso <hashar@free.fr> | 2013-01-30 15:29:40 +0100 |
---|---|---|
committer | Antoine Musso <hashar@free.fr> | 2013-02-03 15:04:39 +0100 |
commit | f6b92231fd584e407dc2aab39c3574448c5615c5 (patch) | |
tree | 5e8a5701de42b33ee424d751188e343511c45c30 | |
parent | 0b52d57797c78031ffaeadcdb62df6c73f716b4f (diff) |
style: normalize end of filesorigin/sandbox/bouron/karachay-converter
By PSR2 PHP Standard, the files should ends with exactly one newline.
Some of our files have 2 or more and some other were missing a newline.
Fix almost all occurences of CodeSniffer sniff:
PSR2.Files.EndFileNewline.TooMany
I have not fixed the selenium files, I believe we will drop them.
Change-Id: I89fca8c1786fee94855b7b77bb0f364001ee84b6
55 files changed, 4 insertions, 61 deletions
@@ -107,4 +107,3 @@ if ( $wgAPIRequestLog ) { // get here to worry about whether this should be = or =&, but the file has to parse properly. $lb = wfGetLBFactory(); $lb->shutdown(); - diff --git a/includes/ArrayUtils.php b/includes/ArrayUtils.php index 4ff31b863dda..8d1884b49c26 100644 --- a/includes/ArrayUtils.php +++ b/includes/ArrayUtils.php @@ -31,4 +31,3 @@ class ArrayUtils { } ); } } - diff --git a/includes/Cdb.php b/includes/Cdb.php index 2a6a3d2d4109..960e76a86f25 100644 --- a/includes/Cdb.php +++ b/includes/Cdb.php @@ -183,4 +183,3 @@ class CdbWriter_DBA { } } } - diff --git a/includes/Collation.php b/includes/Collation.php index 3cc7902855d1..f53ce02c665c 100644 --- a/includes/Collation.php +++ b/includes/Collation.php @@ -375,4 +375,3 @@ class IcuCollation extends Collation { return false; } } - diff --git a/includes/ConfEditor.php b/includes/ConfEditor.php index e563416c1601..699e83a091d3 100644 --- a/includes/ConfEditor.php +++ b/includes/ConfEditor.php @@ -1095,4 +1095,3 @@ class ConfEditorToken { return $this->type == 'END'; } } - diff --git a/includes/api/ApiQueryStashImageInfo.php b/includes/api/ApiQueryStashImageInfo.php index 1b973172b1c6..7128920f07c7 100644 --- a/includes/api/ApiQueryStashImageInfo.php +++ b/includes/api/ApiQueryStashImageInfo.php @@ -139,4 +139,3 @@ class ApiQueryStashImageInfo extends ApiQueryImageInfo { } } - diff --git a/includes/content/ContentHandler.php b/includes/content/ContentHandler.php index 0dc7455caa79..b49371545b5a 100644 --- a/includes/content/ContentHandler.php +++ b/includes/content/ContentHandler.php @@ -1114,4 +1114,3 @@ abstract class ContentHandler { return $ok; } } - diff --git a/includes/db/DatabaseUtility.php b/includes/db/DatabaseUtility.php index c846788d7591..064bc41cdb3e 100644 --- a/includes/db/DatabaseUtility.php +++ b/includes/db/DatabaseUtility.php @@ -306,4 +306,3 @@ class LikeMatch { */ interface DBMasterPos { } - diff --git a/includes/db/IORMRow.php b/includes/db/IORMRow.php index 1ea4b12671e9..6a7a5bb3aac6 100644 --- a/includes/db/IORMRow.php +++ b/includes/db/IORMRow.php @@ -272,4 +272,4 @@ interface IORMRow { */ public function getTable(); -}
\ No newline at end of file +} diff --git a/includes/db/LoadMonitor.php b/includes/db/LoadMonitor.php index 146ac61e6af1..22938aaa4ef9 100644 --- a/includes/db/LoadMonitor.php +++ b/includes/db/LoadMonitor.php @@ -199,4 +199,3 @@ class LoadMonitor_MySQL implements LoadMonitor { } } } - diff --git a/includes/db/ORMIterator.php b/includes/db/ORMIterator.php index 754279765ad9..077eab0fd893 100644 --- a/includes/db/ORMIterator.php +++ b/includes/db/ORMIterator.php @@ -28,4 +28,4 @@ */ interface ORMIterator extends Iterator { -}
\ No newline at end of file +} diff --git a/includes/db/ORMTable.php b/includes/db/ORMTable.php index 8abfdb648432..06f88c182939 100644 --- a/includes/db/ORMTable.php +++ b/includes/db/ORMTable.php @@ -901,4 +901,4 @@ class ORMTable extends DBAccessBase implements IORMTable { return array_key_exists( $name, $this->getFields() ); } -}
\ No newline at end of file +} diff --git a/includes/filerepo/LocalRepo.php b/includes/filerepo/LocalRepo.php index 118e9810c3ce..89a458b70855 100644 --- a/includes/filerepo/LocalRepo.php +++ b/includes/filerepo/LocalRepo.php @@ -323,4 +323,3 @@ class LocalRepo extends FileRepo { } } } - diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php index 68e8e11109a4..572360a045f7 100644 --- a/includes/installer/WebInstallerPage.php +++ b/includes/installer/WebInstallerPage.php @@ -1302,4 +1302,3 @@ class WebInstaller_UpgradeDoc extends WebInstaller_Document { class WebInstaller_Copying extends WebInstaller_Document { protected function getFileName() { return 'COPYING'; } } - diff --git a/includes/job/jobs/DoubleRedirectJob.php b/includes/job/jobs/DoubleRedirectJob.php index fb73bf1ee2bc..3cb589408dac 100644 --- a/includes/job/jobs/DoubleRedirectJob.php +++ b/includes/job/jobs/DoubleRedirectJob.php @@ -207,4 +207,3 @@ class DoubleRedirectJob extends Job { return self::$user; } } - diff --git a/includes/libs/IEContentAnalyzer.php b/includes/libs/IEContentAnalyzer.php index cfc7f536ecf0..fae06ad6f430 100644 --- a/includes/libs/IEContentAnalyzer.php +++ b/includes/libs/IEContentAnalyzer.php @@ -848,4 +848,3 @@ class IEContentAnalyzer { return 'unknown'; } } - diff --git a/includes/media/Exif.php b/includes/media/Exif.php index bdacbc86d95c..f0b4536c3707 100644 --- a/includes/media/Exif.php +++ b/includes/media/Exif.php @@ -843,4 +843,3 @@ class Exif { } } } - diff --git a/includes/media/ExifBitmap.php b/includes/media/ExifBitmap.php index 34a1f51156e9..cd7ec198dd1a 100644 --- a/includes/media/ExifBitmap.php +++ b/includes/media/ExifBitmap.php @@ -225,4 +225,3 @@ class ExifBitmapHandler extends BitmapHandler { return 0; } } - diff --git a/includes/media/Jpeg.php b/includes/media/Jpeg.php index a15b652454c0..86f5030d0217 100644 --- a/includes/media/Jpeg.php +++ b/includes/media/Jpeg.php @@ -60,4 +60,3 @@ class JpegHandler extends ExifBitmapHandler { } } - diff --git a/includes/objectcache/HashBagOStuff.php b/includes/objectcache/HashBagOStuff.php index d3f358351eb0..d061eff0ec09 100644 --- a/includes/objectcache/HashBagOStuff.php +++ b/includes/objectcache/HashBagOStuff.php @@ -110,4 +110,3 @@ class HashBagOStuff extends BagOStuff { return true; } } - diff --git a/includes/objectcache/MemcachedBagOStuff.php b/includes/objectcache/MemcachedBagOStuff.php index aebcbe73bb54..4f8209d9f863 100644 --- a/includes/objectcache/MemcachedBagOStuff.php +++ b/includes/objectcache/MemcachedBagOStuff.php @@ -185,4 +185,3 @@ class MemcachedBagOStuff extends BagOStuff { wfDebugLog( 'memcached', $text ); } } - diff --git a/includes/objectcache/MemcachedPhpBagOStuff.php b/includes/objectcache/MemcachedPhpBagOStuff.php index 5a9ee508b936..33a134c774b6 100644 --- a/includes/objectcache/MemcachedPhpBagOStuff.php +++ b/includes/objectcache/MemcachedPhpBagOStuff.php @@ -100,4 +100,3 @@ class MemcachedPhpBagOStuff extends MemcachedBagOStuff { return $this->client->decr( $this->encodeKey( $key ), $value ); } } - diff --git a/includes/objectcache/RedisBagOStuff.php b/includes/objectcache/RedisBagOStuff.php index bd5b354c5da0..2946407030aa 100644 --- a/includes/objectcache/RedisBagOStuff.php +++ b/includes/objectcache/RedisBagOStuff.php @@ -449,4 +449,3 @@ class RedisBagOStuff extends BagOStuff { ( $result === false ? "failure" : "success" ) ); } } - diff --git a/includes/objectcache/SqlBagOStuff.php b/includes/objectcache/SqlBagOStuff.php index 80c670e4feb9..0fc117a6c512 100644 --- a/includes/objectcache/SqlBagOStuff.php +++ b/includes/objectcache/SqlBagOStuff.php @@ -697,4 +697,3 @@ class SqlBagOStuff extends BagOStuff { * Backwards compatibility alias */ class MediaWikiBagOStuff extends SqlBagOStuff { } - diff --git a/includes/parser/StripState.php b/includes/parser/StripState.php index 57f623de8584..5f3f18eaebf3 100644 --- a/includes/parser/StripState.php +++ b/includes/parser/StripState.php @@ -233,4 +233,3 @@ class StripState { return preg_replace( $this->regex, '', $text ); } } - diff --git a/includes/search/SearchMssql.php b/includes/search/SearchMssql.php index 23dd479ffae0..85fe148af2b6 100644 --- a/includes/search/SearchMssql.php +++ b/includes/search/SearchMssql.php @@ -253,5 +253,3 @@ class MssqlSearchResultSet extends SearchResultSet { return new SearchResult( $row ); } } - - diff --git a/includes/site/SiteList.php b/includes/site/SiteList.php index 97848b5d57ba..d21520cc00ab 100644 --- a/includes/site/SiteList.php +++ b/includes/site/SiteList.php @@ -297,4 +297,4 @@ class SiteList extends GenericArrayObject { /** * @deprecated */ -class SiteArray extends SiteList {}
\ No newline at end of file +class SiteArray extends SiteList {} diff --git a/includes/specials/SpecialMostlinkedtemplates.php b/includes/specials/SpecialMostlinkedtemplates.php index 22932e5cc9c5..a2d51db81a46 100644 --- a/includes/specials/SpecialMostlinkedtemplates.php +++ b/includes/specials/SpecialMostlinkedtemplates.php @@ -125,4 +125,3 @@ class MostlinkedTemplatesPage extends QueryPage { return Linker::link( $wlh, $label ); } } - diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php index 73c7e2aefdc2..c146eb4b6286 100644 --- a/includes/specials/SpecialUpload.php +++ b/includes/specials/SpecialUpload.php @@ -1142,4 +1142,3 @@ class UploadSourceField extends HTMLTextField { : 60; } } - diff --git a/maintenance/archives/upgradeLogging.php b/maintenance/archives/upgradeLogging.php index a957957f34fe..f0806458923f 100644 --- a/maintenance/archives/upgradeLogging.php +++ b/maintenance/archives/upgradeLogging.php @@ -211,4 +211,3 @@ EOT; $ul = new UpdateLogging; $ul->execute(); - diff --git a/maintenance/checkSyntax.php b/maintenance/checkSyntax.php index 0a22f58c329c..1e44e239e073 100644 --- a/maintenance/checkSyntax.php +++ b/maintenance/checkSyntax.php @@ -368,4 +368,3 @@ class CheckSyntax extends Maintenance { $maintClass = "CheckSyntax"; require_once( RUN_MAINTENANCE_IF_MAIN ); - diff --git a/maintenance/deleteOldRevisions.php b/maintenance/deleteOldRevisions.php index 4f82a63d2f8c..114aefd7ec74 100644 --- a/maintenance/deleteOldRevisions.php +++ b/maintenance/deleteOldRevisions.php @@ -101,4 +101,3 @@ class DeleteOldRevisions extends Maintenance { $maintClass = "DeleteOldRevisions"; require_once( RUN_MAINTENANCE_IF_MAIN ); - diff --git a/maintenance/deleteOrphanedRevisions.php b/maintenance/deleteOrphanedRevisions.php index dcbf739991cd..f0da9a82142b 100644 --- a/maintenance/deleteOrphanedRevisions.php +++ b/maintenance/deleteOrphanedRevisions.php @@ -91,4 +91,3 @@ class DeleteOrphanedRevisions extends Maintenance { $maintClass = "DeleteOrphanedRevisions"; require_once( RUN_MAINTENANCE_IF_MAIN ); - diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php index c6768bdf18cd..f470aedb5c64 100644 --- a/maintenance/doMaintenance.php +++ b/maintenance/doMaintenance.php @@ -118,4 +118,3 @@ try { echo( $mwe->getText() ); exit( 1 ); } - diff --git a/maintenance/dumpLinks.php b/maintenance/dumpLinks.php index 153fdd79ef13..08aae2952f99 100644 --- a/maintenance/dumpLinks.php +++ b/maintenance/dumpLinks.php @@ -76,4 +76,3 @@ class DumpLinks extends Maintenance { $maintClass = "DumpLinks"; require_once( RUN_MAINTENANCE_IF_MAIN ); - diff --git a/maintenance/dumpTextPass.php b/maintenance/dumpTextPass.php index 72d7d97cbb89..2e0d03b1f024 100644 --- a/maintenance/dumpTextPass.php +++ b/maintenance/dumpTextPass.php @@ -64,5 +64,3 @@ Options: ENDS ); } - - diff --git a/maintenance/edit.php b/maintenance/edit.php index ad4c12fd1971..93fc3e79fbfa 100644 --- a/maintenance/edit.php +++ b/maintenance/edit.php @@ -93,4 +93,3 @@ class EditCLI extends Maintenance { $maintClass = "EditCLI"; require_once( RUN_MAINTENANCE_IF_MAIN ); - diff --git a/maintenance/eval.php b/maintenance/eval.php index 69cf548417f2..95f46ffaa8f7 100644 --- a/maintenance/eval.php +++ b/maintenance/eval.php @@ -80,5 +80,3 @@ while ( ( $line = Maintenance::readconsole() ) !== false ) { } print "\n"; - - diff --git a/maintenance/formatInstallDoc.php b/maintenance/formatInstallDoc.php index 600ca9768e7b..691ed80c881c 100644 --- a/maintenance/formatInstallDoc.php +++ b/maintenance/formatInstallDoc.php @@ -76,5 +76,3 @@ class MaintenanceFormatInstallDoc extends Maintenance { $maintClass = 'MaintenanceFormatInstallDoc'; require_once( RUN_MAINTENANCE_IF_MAIN ); - - diff --git a/maintenance/fuzz-tester.php b/maintenance/fuzz-tester.php index b72430a7aa51..445a3fb97a34 100644 --- a/maintenance/fuzz-tester.php +++ b/maintenance/fuzz-tester.php @@ -2709,5 +2709,3 @@ for ( $count = 0; true; $count++ ) { break; } } - - diff --git a/maintenance/mergeMessageFileList.php b/maintenance/mergeMessageFileList.php index cea64333c2b6..01ba157c4db7 100644 --- a/maintenance/mergeMessageFileList.php +++ b/maintenance/mergeMessageFileList.php @@ -120,4 +120,3 @@ if ( isset( $mmfl['output'] ) ) { } else { echo $s; } - diff --git a/maintenance/populateLogUsertext.php b/maintenance/populateLogUsertext.php index 059b6fe25c72..fa9d512f6b78 100644 --- a/maintenance/populateLogUsertext.php +++ b/maintenance/populateLogUsertext.php @@ -83,4 +83,3 @@ class PopulateLogUsertext extends LoggedUpdateMaintenance { $maintClass = "PopulateLogUsertext"; require_once( RUN_MAINTENANCE_IF_MAIN ); - diff --git a/maintenance/preprocessDump.php b/maintenance/preprocessDump.php index 87fc99745433..bb3d68b0d2c6 100644 --- a/maintenance/preprocessDump.php +++ b/maintenance/preprocessDump.php @@ -95,4 +95,3 @@ class PreprocessDump extends DumpIterator { $maintClass = "PreprocessDump"; require_once( RUN_MAINTENANCE_IF_MAIN ); - diff --git a/maintenance/reassignEdits.php b/maintenance/reassignEdits.php index a91abf93d334..2d79f363ce17 100644 --- a/maintenance/reassignEdits.php +++ b/maintenance/reassignEdits.php @@ -180,4 +180,3 @@ class ReassignEdits extends Maintenance { $maintClass = "ReassignEdits"; require_once( RUN_MAINTENANCE_IF_MAIN ); - diff --git a/maintenance/showStats.php b/maintenance/showStats.php index 982c7cbb47b9..657c056325e4 100644 --- a/maintenance/showStats.php +++ b/maintenance/showStats.php @@ -71,4 +71,3 @@ class ShowStats extends Maintenance { $maintClass = "ShowStats"; require_once( RUN_MAINTENANCE_IF_MAIN ); - diff --git a/maintenance/storage/fixBug20757.php b/maintenance/storage/fixBug20757.php index d394558fd53b..30cbcf1aefe2 100644 --- a/maintenance/storage/fixBug20757.php +++ b/maintenance/storage/fixBug20757.php @@ -349,4 +349,3 @@ class FixBug20757 extends Maintenance { $maintClass = 'FixBug20757'; require_once( RUN_MAINTENANCE_IF_MAIN ); - diff --git a/maintenance/storage/moveToExternal.php b/maintenance/storage/moveToExternal.php index e4a2a453ec59..1049e0cc33c5 100644 --- a/maintenance/storage/moveToExternal.php +++ b/maintenance/storage/moveToExternal.php @@ -124,5 +124,3 @@ function moveToExternal( $cluster, $maxID, $minID = 1 ) { } } } - - diff --git a/maintenance/storage/recompressTracked.php b/maintenance/storage/recompressTracked.php index fe62ddf34097..5e5cc8fa7bc0 100644 --- a/maintenance/storage/recompressTracked.php +++ b/maintenance/storage/recompressTracked.php @@ -809,4 +809,3 @@ class CgzCopyTransaction { } } } - diff --git a/maintenance/storage/resolveStubs.php b/maintenance/storage/resolveStubs.php index 0f5cd2b4f00f..414eab81c76b 100644 --- a/maintenance/storage/resolveStubs.php +++ b/maintenance/storage/resolveStubs.php @@ -110,4 +110,3 @@ function resolveStub( $id, $stubText, $flags ) { ), $fname ); } - diff --git a/maintenance/storage/storageTypeStats.php b/maintenance/storage/storageTypeStats.php index 1afecc4eb867..3187c3180f01 100644 --- a/maintenance/storage/storageTypeStats.php +++ b/maintenance/storage/storageTypeStats.php @@ -113,4 +113,3 @@ SQL; $maintClass = 'StorageTypeStats'; require_once( RUN_MAINTENANCE_IF_MAIN ); - diff --git a/maintenance/storage/testCompression.php b/maintenance/storage/testCompression.php index 9487bbf96de0..e13e1b10a9d3 100644 --- a/maintenance/storage/testCompression.php +++ b/maintenance/storage/testCompression.php @@ -99,4 +99,3 @@ foreach ( $keys as $id => $key ) { } $t += microtime( true ); printf( "Decompression time: %5.2f ms\n", $t * 1000 ); - diff --git a/maintenance/term/MWTerm.php b/maintenance/term/MWTerm.php index 1cb97f971c40..c52f07ccdfa2 100644 --- a/maintenance/term/MWTerm.php +++ b/maintenance/term/MWTerm.php @@ -70,4 +70,3 @@ class DummyTermColorer { return ''; } } - diff --git a/maintenance/userOptions.php b/maintenance/userOptions.php index 2181e44dddb1..1e1f24b55990 100644 --- a/maintenance/userOptions.php +++ b/maintenance/userOptions.php @@ -33,4 +33,3 @@ $uo = new userOptions( $options, $args ); $uo->run(); print "Done.\n"; - diff --git a/serialized/serialize.php b/serialized/serialize.php index 0be614a0f99d..09aec79e9dfc 100644 --- a/serialized/serialize.php +++ b/serialized/serialize.php @@ -93,4 +93,3 @@ function unixLineEndings( $var ) { } return $var; } - diff --git a/tests/TestsAutoLoader.php b/tests/TestsAutoLoader.php index 30b9f94ac0ef..264ba695c694 100644 --- a/tests/TestsAutoLoader.php +++ b/tests/TestsAutoLoader.php @@ -101,4 +101,3 @@ $wgAutoloadClasses += array( 'SeleniumTestSuite' => "$testDir/selenium/SeleniumTestSuite.php", 'SeleniumConfig' => "$testDir/selenium/SeleniumConfig.php", ); - |