Umherirrender has uploaded a new change for review. https://gerrit.wikimedia.org/r/54517
Change subject: Remove spaces in function signature ...................................................................... Remove spaces in function signature Change-Id: I45aea7a7af88cd913b2f485913620a8af0ab2fed --- M includes/AjaxResponse.php M includes/Cookie.php M includes/api/ApiBase.php M includes/api/ApiFormatBase.php M includes/api/ApiQueryImageInfo.php M includes/db/DatabaseMssql.php M includes/db/DatabaseMysql.php M includes/db/DatabaseOracle.php M includes/db/DatabasePostgres.php M includes/diff/DairikiDiff.php M includes/installer/WebInstallerPage.php M includes/media/BitmapMetadataHandler.php M includes/media/Exif.php M includes/media/IPTC.php M includes/media/Jpeg.php M includes/media/JpegMetadataExtractor.php M includes/media/MediaHandler.php M includes/media/XMP.php M includes/media/XMPInfo.php M includes/media/XMPValidate.php M includes/parser/ParserOutput.php M includes/specials/SpecialRandompage.php M includes/specials/SpecialUncategorizedcategories.php M includes/upload/UploadStash.php M languages/classes/LanguageAz.php M languages/classes/LanguageKaa.php M languages/classes/LanguageKk.php M languages/classes/LanguageTr.php M tests/phpunit/MediaWikiTestCase.php M tests/phpunit/includes/LinksUpdateTest.php M tests/phpunit/includes/RevisionStorageTest.php M tests/phpunit/includes/WikiPageTest.php M tests/phpunit/includes/jobqueue/JobQueueTest.php M tests/phpunit/includes/media/PNGMetadataExtractorTest.php 34 files changed, 60 insertions(+), 60 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/17/54517/1 diff --git a/includes/AjaxResponse.php b/includes/AjaxResponse.php index 138f808..d553652 100644 --- a/includes/AjaxResponse.php +++ b/includes/AjaxResponse.php @@ -210,7 +210,7 @@ * @param $timestamp string * @return bool Returns true if the response code was set to 304 Not Modified. */ - function checkLastModified ( $timestamp ) { + function checkLastModified( $timestamp ) { global $wgCachePages, $wgCacheEpoch, $wgUser; $fname = 'AjaxResponse::checkLastModified'; diff --git a/includes/Cookie.php b/includes/Cookie.php index 27a8507..1b22c0e 100644 --- a/includes/Cookie.php +++ b/includes/Cookie.php @@ -197,7 +197,7 @@ * Set a cookie in the cookie jar. Make sure only one cookie per-name exists. * @see Cookie::set() */ - public function setCookie ( $name, $value, $attr ) { + public function setCookie( $name, $value, $attr ) { /* cookies: case insensitive, so this should work. * We'll still send the cookies back in the same case we got them, though. */ @@ -235,7 +235,7 @@ * @param string $domain cookie's domain * @return null */ - public function parseCookieResponseHeader ( $cookie, $domain ) { + public function parseCookieResponseHeader( $cookie, $domain ) { $len = strlen( 'Set-Cookie:' ); if ( substr_compare( 'Set-Cookie:', $cookie, 0, $len, true ) === 0 ) { diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php index 9351a8d..d2d50ae 100644 --- a/includes/api/ApiBase.php +++ b/includes/api/ApiBase.php @@ -822,7 +822,7 @@ * If not set will magically default to either watchdefault or watchcreations * @return bool */ - protected function getWatchlistValue ( $watchlist, $titleObj, $userOption = null ) { + protected function getWatchlistValue( $watchlist, $titleObj, $userOption = null ) { $userWatching = $this->getUser()->isWatched( $titleObj ); diff --git a/includes/api/ApiFormatBase.php b/includes/api/ApiFormatBase.php index d8aa163..e8e6acf 100644 --- a/includes/api/ApiFormatBase.php +++ b/includes/api/ApiFormatBase.php @@ -85,7 +85,7 @@ * * @param bool $b Whether or not ampersands should be escaped. */ - public function setUnescapeAmps ( $b ) { + public function setUnescapeAmps( $b ) { $this->mUnescapeAmps = $b; } diff --git a/includes/api/ApiQueryImageInfo.php b/includes/api/ApiQueryImageInfo.php index 95c2745..556f147 100644 --- a/includes/api/ApiQueryImageInfo.php +++ b/includes/api/ApiQueryImageInfo.php @@ -228,7 +228,7 @@ * @param string $otherParams of otherParams (iiurlparam). * @return Array of parameters for transform. */ - protected function mergeThumbParams ( $image, $thumbParams, $otherParams ) { + protected function mergeThumbParams( $image, $thumbParams, $otherParams ) { if ( !$otherParams ) { return $thumbParams; } diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php index 6c45ffa..575f629 100644 --- a/includes/db/DatabaseMssql.php +++ b/includes/db/DatabaseMssql.php @@ -661,7 +661,7 @@ return $version; } - function tableExists ( $table, $fname = __METHOD__, $schema = false ) { + function tableExists( $table, $fname = __METHOD__, $schema = false ) { $res = sqlsrv_query( $this->mConn, "SELECT * FROM information_schema.tables WHERE table_type='BASE TABLE' AND table_name = '$table'" ); if ( $res === false ) { @@ -952,7 +952,7 @@ */ class MssqlField implements Field { private $name, $tablename, $default, $max_length, $nullable, $type; - function __construct ( $info ) { + function __construct( $info ) { $this->name = $info['COLUMN_NAME']; $this->tablename = $info['TABLE_NAME']; $this->default = $info['COLUMN_DEFAULT']; diff --git a/includes/db/DatabaseMysql.php b/includes/db/DatabaseMysql.php index 27aae18..0f7eb9e 100644 --- a/includes/db/DatabaseMysql.php +++ b/includes/db/DatabaseMysql.php @@ -965,7 +965,7 @@ private $name, $tablename, $default, $max_length, $nullable, $is_pk, $is_unique, $is_multiple, $is_key, $type; - function __construct ( $info ) { + function __construct( $info ) { $this->name = $info->name; $this->tablename = $info->table; $this->default = $info->def; diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php index 75b3550..7db032f 100644 --- a/includes/db/DatabaseOracle.php +++ b/includes/db/DatabaseOracle.php @@ -493,7 +493,7 @@ return $retVal; } - private function fieldBindStatement ( $table, $col, &$val, $includeCol = false ) { + private function fieldBindStatement( $table, $col, &$val, $includeCol = false ) { $col_info = $this->fieldInfoMulti( $table, $col ); $col_type = $col_info != false ? $col_info->type() : 'CONSTANT'; @@ -1121,7 +1121,7 @@ } } - private function wrapConditionsForWhere ( $table, $conds, $parentCol = null ) { + private function wrapConditionsForWhere( $table, $conds, $parentCol = null ) { $conds2 = array(); foreach ( $conds as $col => $val ) { if ( is_array( $val ) ) { diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php index f32d775..c6ac11a 100644 --- a/includes/db/DatabasePostgres.php +++ b/includes/db/DatabasePostgres.php @@ -218,7 +218,7 @@ protected $id; protected $didbegin; - public function __construct ( $dbw, $id ) { + public function __construct( $dbw, $id ) { $this->dbw = $dbw; $this->id = $id; $this->didbegin = false; @@ -450,7 +450,7 @@ return $this->mLastResult; } - protected function dumpError () { + protected function dumpError() { $diags = array( PGSQL_DIAG_SEVERITY, PGSQL_DIAG_SQLSTATE, PGSQL_DIAG_MESSAGE_PRIMARY, @@ -647,7 +647,7 @@ * @since 1.19 * @return Array */ - function indexAttributes ( $index, $schema = false ) { + function indexAttributes( $index, $schema = false ) { if ( $schema === false ) $schema = $this->getCoreSchema(); /* diff --git a/includes/diff/DairikiDiff.php b/includes/diff/DairikiDiff.php index 94ffc06..1a26d0c 100644 --- a/includes/diff/DairikiDiff.php +++ b/includes/diff/DairikiDiff.php @@ -183,7 +183,7 @@ * @param $to_lines * @return array */ - function diff ( $from_lines, $to_lines ) { + function diff( $from_lines, $to_lines ) { wfProfileIn( __METHOD__ ); // Diff and store locally @@ -241,7 +241,7 @@ * @param $from_lines * @param $to_lines */ - function diff_local ( $from_lines, $to_lines ) { + function diff_local( $from_lines, $to_lines ) { global $wgExternalDiffEngine; wfProfileIn( __METHOD__ ); @@ -469,7 +469,7 @@ * @param $yoff * @param $ylim */ - function _compareseq ( $xoff, $xlim, $yoff, $ylim ) { + function _compareseq( $xoff, $xlim, $yoff, $ylim ) { // Slide down the bottom initial diagonal. while ( $xoff < $xlim && $yoff < $ylim && $this->xv[$xoff] == $this->yv[$yoff] ) { @@ -1204,7 +1204,7 @@ * @param $words * @param $tag string */ - function addWords ( $words, $tag = '' ) { + function addWords( $words, $tag = '' ) { if ( $tag != $this->_tag ) { $this->_flushGroup( $tag ); } @@ -1244,7 +1244,7 @@ * @param $orig_lines * @param $closing_lines */ - function __construct ( $orig_lines, $closing_lines ) { + function __construct( $orig_lines, $closing_lines ) { wfProfileIn( __METHOD__ ); list( $orig_words, $orig_stripped ) = $this->_split( $orig_lines ); diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php index f352cf1..93092e3 100644 --- a/includes/installer/WebInstallerPage.php +++ b/includes/installer/WebInstallerPage.php @@ -1261,7 +1261,7 @@ abstract protected function getFileName(); - public function execute() { + public function execute() { $text = $this->getFileContents(); $text = InstallDocFormatter::format( $text ); $this->parent->output->addWikiText( $text ); diff --git a/includes/media/BitmapMetadataHandler.php b/includes/media/BitmapMetadataHandler.php index 345e786..3876c52 100644 --- a/includes/media/BitmapMetadataHandler.php +++ b/includes/media/BitmapMetadataHandler.php @@ -54,7 +54,7 @@ * * @param string $app13 String containing app13 block from jpeg file */ - private function doApp13 ( $app13 ) { + private function doApp13( $app13 ) { try { $this->iptcType = JpegMetadataExtractor::doPSIR( $app13 ); } catch ( MWException $e ) { @@ -79,7 +79,7 @@ * @param $filename string * @param $byteOrder string */ - function getExif ( $filename, $byteOrder ) { + function getExif( $filename, $byteOrder ) { global $wgShowEXIF; if ( file_exists( $filename ) && $wgShowEXIF ) { $exif = new Exif( $filename, $byteOrder ); @@ -95,7 +95,7 @@ * @param array $metaArray array of metadata values * @param string $type type. defaults to other. if two things have the same type they're merged */ - function addMetadata ( $metaArray, $type = 'other' ) { + function addMetadata( $metaArray, $type = 'other' ) { if ( isset( $this->metadata[$type] ) ) { /* merge with old data */ $metaArray = $metaArray + $this->metadata[$type]; @@ -113,7 +113,7 @@ * * @return Array metadata array */ - function getMetadataArray () { + function getMetadataArray() { // this seems a bit ugly... This is all so its merged in right order // based on the MWG recomendation. $temp = Array(); @@ -147,7 +147,7 @@ * @return array metadata result array. * @throws MWException on invalid file. */ - static function Jpeg ( $filename ) { + static function Jpeg( $filename ) { $showXMP = function_exists( 'xml_parser_create_ns' ); $meta = new self(); @@ -189,7 +189,7 @@ * @param string $filename full path to file * @return Array Array for storage in img_metadata. */ - public static function PNG ( $filename ) { + public static function PNG( $filename ) { $showXMP = function_exists( 'xml_parser_create_ns' ); $meta = new self(); @@ -218,7 +218,7 @@ * @param string $filename full path to file * @return Array metadata array */ - public static function GIF ( $filename ) { + public static function GIF( $filename ) { $meta = new self(); $baseArray = GIFMetadataExtractor::getMetadata( $filename ); @@ -259,7 +259,7 @@ * @throws MWException * @return Array The metadata. */ - public static function Tiff ( $filename ) { + public static function Tiff( $filename ) { if ( file_exists( $filename ) ) { $byteOrder = self::getTiffByteOrder( $filename ); if ( !$byteOrder ) { diff --git a/includes/media/Exif.php b/includes/media/Exif.php index 5664d59..52d3195 100644 --- a/includes/media/Exif.php +++ b/includes/media/Exif.php @@ -439,7 +439,7 @@ * This has not been tested on any shift-JIS strings. * @param string $prop prop name. */ - private function charCodeString ( $prop ) { + private function charCodeString( $prop ) { if ( isset( $this->mFilteredExifData[$prop] ) ) { if ( strlen( $this->mFilteredExifData[$prop] ) <= 8 ) { @@ -500,7 +500,7 @@ * the type of UNDEFINED field * @param string $prop name of property */ - private function exifPropToOrd ( $prop ) { + private function exifPropToOrd( $prop ) { if ( isset( $this->mFilteredExifData[$prop] ) ) { $this->mFilteredExifData[$prop] = ord( $this->mFilteredExifData[$prop] ); } @@ -510,7 +510,7 @@ * for example 10 degress 20`40`` S -> -10.34444 * @param string $prop a gps coordinate exif tag name (like GPSLongitude) */ - private function exifGPStoNumber ( $prop ) { + private function exifGPStoNumber( $prop ) { $loc =& $this->mFilteredExifData[$prop]; $dir =& $this->mFilteredExifData[$prop . 'Ref']; $res = false; diff --git a/includes/media/IPTC.php b/includes/media/IPTC.php index 4191cde..a1b3fd8 100644 --- a/includes/media/IPTC.php +++ b/includes/media/IPTC.php @@ -423,7 +423,7 @@ * * @return string|array */ - private static function convIPTC ( $data, $charset ) { + private static function convIPTC( $data, $charset ) { if ( is_array( $data ) ) { foreach ( $data as &$val ) { $val = self::convIPTCHelper( $val, $charset ); @@ -441,7 +441,7 @@ * * @return string */ - private static function convIPTCHelper ( $data, $charset ) { + private static function convIPTCHelper( $data, $charset ) { if ( $charset ) { wfSuppressWarnings(); $data = iconv( $charset, "UTF-8//IGNORE", $data ); diff --git a/includes/media/Jpeg.php b/includes/media/Jpeg.php index 8b5d651..3551943 100644 --- a/includes/media/Jpeg.php +++ b/includes/media/Jpeg.php @@ -32,7 +32,7 @@ */ class JpegHandler extends ExifBitmapHandler { - function getMetadata ( $image, $filename ) { + function getMetadata( $image, $filename ) { try { $meta = BitmapMetadataHandler::Jpeg( $filename ); if ( !is_array( $meta ) ) { diff --git a/includes/media/JpegMetadataExtractor.php b/includes/media/JpegMetadataExtractor.php index 6ff07ed..121652f 100644 --- a/includes/media/JpegMetadataExtractor.php +++ b/includes/media/JpegMetadataExtractor.php @@ -47,7 +47,7 @@ * @return Array of interesting segments. * @throws MWException if given invalid file. */ - static function segmentSplitter ( $filename ) { + static function segmentSplitter( $filename ) { $showXMP = function_exists( 'xml_parser_create_ns' ); $segmentCount = 0; @@ -195,7 +195,7 @@ * @throws MWException (It gets caught next level up though) * @return String if the iptc hash is good or not. */ - public static function doPSIR ( $app13 ) { + public static function doPSIR( $app13 ) { if ( !$app13 ) { throw new MWException( "No App13 segment given" ); } diff --git a/includes/media/MediaHandler.php b/includes/media/MediaHandler.php index 9a3f645..b36bfa9 100644 --- a/includes/media/MediaHandler.php +++ b/includes/media/MediaHandler.php @@ -133,7 +133,7 @@ * * @return string version string */ - static function getMetadataVersion () { + static function getMetadataVersion() { $version = Array( '2' ); // core metadata version wfRunHooks( 'GetMetadataVersion', Array( &$version ) ); return implode( ';', $version); diff --git a/includes/media/XMP.php b/includes/media/XMP.php index 62738a0..d9cca3f 100644 --- a/includes/media/XMP.php +++ b/includes/media/XMP.php @@ -414,7 +414,7 @@ * * @param string $elm Namespace of element followed by a space and then tag name of element. */ - private function endElementModeIgnore ( $elm ) { + private function endElementModeIgnore( $elm ) { if ( $this->curItem[0] === $elm ) { array_shift( $this->curItem ); array_shift( $this->mode ); @@ -436,7 +436,7 @@ * * @param string $elm namespace, space, and tag name. */ - private function endElementModeSimple ( $elm ) { + private function endElementModeSimple( $elm ) { if ( $this->charContent !== false ) { if ( $this->processingArray ) { // if we're processing an array, use the original element diff --git a/includes/media/XMPInfo.php b/includes/media/XMPInfo.php index 102547f..3b64fd3 100644 --- a/includes/media/XMPInfo.php +++ b/includes/media/XMPInfo.php @@ -31,7 +31,7 @@ /** get the items array * @return Array XMP item configuration array. */ - public static function getItems () { + public static function getItems() { if( !self::$ranHooks ) { // This is for if someone makes a custom metadata extension. // For example, a medical wiki might want to decode DICOM xmp properties. diff --git a/includes/media/XMPValidate.php b/includes/media/XMPValidate.php index f98f0b5..b7b35dc 100644 --- a/includes/media/XMPValidate.php +++ b/includes/media/XMPValidate.php @@ -335,7 +335,7 @@ * or DDD,MM.mmk form * @param $standalone Boolean if its a simple prop (should always be true) */ - public static function validateGPS ( $info, &$val, $standalone ) { + public static function validateGPS( $info, &$val, $standalone ) { if ( !$standalone ) { return; } diff --git a/includes/parser/ParserOutput.php b/includes/parser/ParserOutput.php index db649f1..3af3b7a 100644 --- a/includes/parser/ParserOutput.php +++ b/includes/parser/ParserOutput.php @@ -143,10 +143,10 @@ function setNewSection( $value ) { $this->mNewSection = (bool)$value; } - function hideNewSection ( $value ) { + function hideNewSection( $value ) { $this->mHideNewSection = (bool)$value; } - function getHideNewSection () { + function getHideNewSection() { return (bool)$this->mHideNewSection; } function getNewSection() { diff --git a/includes/specials/SpecialRandompage.php b/includes/specials/SpecialRandompage.php index b59f834..ba5a4ac 100644 --- a/includes/specials/SpecialRandompage.php +++ b/includes/specials/SpecialRandompage.php @@ -41,7 +41,7 @@ return $this->namespaces; } - public function setNamespace ( $ns ) { + public function setNamespace( $ns ) { if( !$ns || $ns < NS_MAIN ) { $ns = NS_MAIN; } diff --git a/includes/specials/SpecialUncategorizedcategories.php b/includes/specials/SpecialUncategorizedcategories.php index 54b20dd..ebc32cf 100644 --- a/includes/specials/SpecialUncategorizedcategories.php +++ b/includes/specials/SpecialUncategorizedcategories.php @@ -38,7 +38,7 @@ * @param $result The query result * @return string The category link */ - function formatResult ( $skin, $result ) { + function formatResult( $skin, $result ) { $title = Title::makeTitle( NS_CATEGORY, $result->title ); $text = $title->getText(); diff --git a/includes/upload/UploadStash.php b/includes/upload/UploadStash.php index cfa3879..326d91d 100644 --- a/includes/upload/UploadStash.php +++ b/includes/upload/UploadStash.php @@ -158,7 +158,7 @@ * @param string $key key under which file information is stored * @return Array */ - public function getMetadata ( $key ) { + public function getMetadata( $key ) { $this->getFile( $key ); return $this->fileMetadata[$key]; } @@ -169,7 +169,7 @@ * @param string $key key under which file information is stored * @return Array */ - public function getFileProps ( $key ) { + public function getFileProps( $key ) { $this->getFile( $key ); return $this->fileProps[$key]; } diff --git a/languages/classes/LanguageAz.php b/languages/classes/LanguageAz.php index 0956dc4..48f70e8 100644 --- a/languages/classes/LanguageAz.php +++ b/languages/classes/LanguageAz.php @@ -32,7 +32,7 @@ * @param $string string * @return mixed|string */ - function ucfirst ( $string ) { + function ucfirst( $string ) { if ( $string[0] == 'i' ) { return 'İ' . substr( $string, 1 ); } else { diff --git a/languages/classes/LanguageKaa.php b/languages/classes/LanguageKaa.php index a397bc0..0318fb1 100644 --- a/languages/classes/LanguageKaa.php +++ b/languages/classes/LanguageKaa.php @@ -54,7 +54,7 @@ * * @return string */ - function ucfirst ( $string ) { + function ucfirst( $string ) { if ( substr( $string, 0, 1 ) === 'i' ) { return 'İ' . substr( $string, 1 ); } else { @@ -69,7 +69,7 @@ * * @return mixed|string */ - function lcfirst ( $string ) { + function lcfirst( $string ) { if ( substr( $string, 0, 1 ) === 'I' ) { return 'ı' . substr( $string, 1 ); } else { diff --git a/languages/classes/LanguageKk.php b/languages/classes/LanguageKk.php index 6dd6959..f6bbae7 100644 --- a/languages/classes/LanguageKk.php +++ b/languages/classes/LanguageKk.php @@ -435,7 +435,7 @@ * * @return string */ - function ucfirst ( $string ) { + function ucfirst( $string ) { $variant = $this->getPreferredVariant(); if ( ( $variant == 'kk-latn' || $variant == 'kk-tr' ) && $string[0] == 'i' ) { $string = 'İ' . substr( $string, 1 ); @@ -452,7 +452,7 @@ * * @return string */ - function lcfirst ( $string ) { + function lcfirst( $string ) { $variant = $this->getPreferredVariant(); if ( ( $variant == 'kk-latn' || $variant == 'kk-tr' ) && $string[0] == 'I' ) { $string = 'ı' . substr( $string, 1 ); diff --git a/languages/classes/LanguageTr.php b/languages/classes/LanguageTr.php index 6a01566..887f05c 100644 --- a/languages/classes/LanguageTr.php +++ b/languages/classes/LanguageTr.php @@ -38,7 +38,7 @@ * @param $string string * @return string */ - function ucfirst ( $string ) { + function ucfirst( $string ) { if ( strlen( $string ) && $string[0] == 'i' ) { return 'İ' . substr( $string, 1 ); } else { @@ -50,7 +50,7 @@ * @param $string string * @return mixed|string */ - function lcfirst ( $string ) { + function lcfirst( $string ) { if ( strlen( $string ) && $string[0] == 'I' ) { return 'ı' . substr( $string, 1 ); } else { diff --git a/tests/phpunit/MediaWikiTestCase.php b/tests/phpunit/MediaWikiTestCase.php index 7e6e0ab..7d95b07 100644 --- a/tests/phpunit/MediaWikiTestCase.php +++ b/tests/phpunit/MediaWikiTestCase.php @@ -64,7 +64,7 @@ 'oracle' ); - function __construct( $name = null, array $data = array(), $dataName = '' ) { + function __construct( $name = null, array $data = array(), $dataName = '' ) { parent::__construct( $name, $data, $dataName ); $this->backupGlobals = false; diff --git a/tests/phpunit/includes/LinksUpdateTest.php b/tests/phpunit/includes/LinksUpdateTest.php index a79b3a2..c83f7da 100644 --- a/tests/phpunit/includes/LinksUpdateTest.php +++ b/tests/phpunit/includes/LinksUpdateTest.php @@ -7,7 +7,7 @@ */ class LinksUpdateTest extends MediaWikiTestCase { - function __construct( $name = null, array $data = array(), $dataName = '' ) { + function __construct( $name = null, array $data = array(), $dataName = '' ) { parent::__construct( $name, $data, $dataName ); $this->tablesUsed = array_merge( $this->tablesUsed, diff --git a/tests/phpunit/includes/RevisionStorageTest.php b/tests/phpunit/includes/RevisionStorageTest.php index e8d8db0..3b8e5cf 100644 --- a/tests/phpunit/includes/RevisionStorageTest.php +++ b/tests/phpunit/includes/RevisionStorageTest.php @@ -17,7 +17,7 @@ */ var $the_page; - function __construct( $name = null, array $data = array(), $dataName = '' ) { + function __construct( $name = null, array $data = array(), $dataName = '' ) { parent::__construct( $name, $data, $dataName ); $this->tablesUsed = array_merge( $this->tablesUsed, diff --git a/tests/phpunit/includes/WikiPageTest.php b/tests/phpunit/includes/WikiPageTest.php index 2501be3..4bb6daa 100644 --- a/tests/phpunit/includes/WikiPageTest.php +++ b/tests/phpunit/includes/WikiPageTest.php @@ -10,7 +10,7 @@ var $pages_to_delete; - function __construct( $name = null, array $data = array(), $dataName = '' ) { + function __construct( $name = null, array $data = array(), $dataName = '' ) { parent::__construct( $name, $data, $dataName ); $this->tablesUsed = array_merge( diff --git a/tests/phpunit/includes/jobqueue/JobQueueTest.php b/tests/phpunit/includes/jobqueue/JobQueueTest.php index 453cec3..ad4c8df 100644 --- a/tests/phpunit/includes/jobqueue/JobQueueTest.php +++ b/tests/phpunit/includes/jobqueue/JobQueueTest.php @@ -10,7 +10,7 @@ protected $queueRand, $queueRandTTL, $queueFifo, $queueFifoTTL; protected $old = array(); - function __construct( $name = null, array $data = array(), $dataName = '' ) { + function __construct( $name = null, array $data = array(), $dataName = '' ) { parent::__construct( $name, $data, $dataName ); $this->tablesUsed[] = 'job'; diff --git a/tests/phpunit/includes/media/PNGMetadataExtractorTest.php b/tests/phpunit/includes/media/PNGMetadataExtractorTest.php index 1e91201..3bbce2b 100644 --- a/tests/phpunit/includes/media/PNGMetadataExtractorTest.php +++ b/tests/phpunit/includes/media/PNGMetadataExtractorTest.php @@ -66,7 +66,7 @@ * actual resolution of the image is (aka in dots per meter). */ /* - function testPngPhysTag () { + function testPngPhysTag() { $meta = PNGMetadataExtractor::getMetadata( $this->filePath . 'Png-native-test.png' ); -- To view, visit https://gerrit.wikimedia.org/r/54517 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I45aea7a7af88cd913b2f485913620a8af0ab2fed Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender <umherirrender_de...@web.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits