| Index: trunk/phase3/maintenance/Maintenance.php |
| — | — | @@ -456,6 +456,9 @@ |
| 457 | 457 | } |
| 458 | 458 | } |
| 459 | 459 | |
| | 460 | + /** |
| | 461 | + * @var $child Maintenance |
| | 462 | + */ |
| 460 | 463 | $child = new $maintClass(); |
| 461 | 464 | $child->loadParamsAndArgs( $this->mSelf, $this->mOptions, $this->mArgs ); |
| 462 | 465 | if ( !is_null( $this->mDb ) ) { |
| Index: trunk/phase3/includes/MWFunction.php |
| — | — | @@ -20,6 +20,11 @@ |
| 21 | 21 | |
| 22 | 22 | class MWFunction { |
| 23 | 23 | |
| | 24 | + /** |
| | 25 | + * @param $callback |
| | 26 | + * @return array |
| | 27 | + * @throws MWException |
| | 28 | + */ |
| 24 | 29 | protected static function cleanCallback( $callback ) { |
| 25 | 30 | if( is_string( $callback ) ) { |
| 26 | 31 | if ( strpos( $callback, '::' ) !== false ) { |
| — | — | @@ -39,6 +44,10 @@ |
| 40 | 45 | return $callback; |
| 41 | 46 | } |
| 42 | 47 | |
| | 48 | + /** |
| | 49 | + * @param $callback |
| | 50 | + * @return mixed |
| | 51 | + */ |
| 43 | 52 | public static function call( $callback ) { |
| 44 | 53 | $callback = self::cleanCallback( $callback ); |
| 45 | 54 | |
| — | — | @@ -47,11 +56,21 @@ |
| 48 | 57 | return call_user_func_array( 'call_user_func', $args ); |
| 49 | 58 | } |
| 50 | 59 | |
| | 60 | + /** |
| | 61 | + * @param $callback |
| | 62 | + * @param $argsarams |
| | 63 | + * @return mixed |
| | 64 | + */ |
| 51 | 65 | public static function callArray( $callback, $argsarams ) { |
| 52 | 66 | $callback = self::cleanCallback( $callback ); |
| 53 | 67 | return call_user_func_array( $callback, $argsarams ); |
| 54 | 68 | } |
| 55 | 69 | |
| | 70 | + /** |
| | 71 | + * @param $class |
| | 72 | + * @param $args array |
| | 73 | + * @return object |
| | 74 | + */ |
| 56 | 75 | public static function newObj( $class, $args = array() ) { |
| 57 | 76 | if( !count( $args ) ) { |
| 58 | 77 | return new $class; |
| Index: trunk/phase3/includes/db/Database.php |
| — | — | @@ -3192,6 +3192,8 @@ |
| 3193 | 3193 | /** |
| 3194 | 3194 | * Get schema variables. If none have been set via setSchemaVars(), then |
| 3195 | 3195 | * use some defaults from the current object. |
| | 3196 | + * |
| | 3197 | + * @return array |
| 3196 | 3198 | */ |
| 3197 | 3199 | protected function getSchemaVars() { |
| 3198 | 3200 | if ( $this->mSchemaVars ) { |
| Index: trunk/phase3/includes/api/ApiQueryCategoryMembers.php |
| — | — | @@ -153,7 +153,7 @@ |
| 154 | 154 | $endsortkey = $params['endsortkeyprefix'] !== null ? |
| 155 | 155 | Collation::singleton()->getSortkey( $params['endsortkeyprefix'] ) : |
| 156 | 156 | $params['endsortkey']; |
| 157 | | - |
| | 157 | + |
| 158 | 158 | // The below produces ORDER BY cl_sortkey, cl_from, possibly with DESC added to each of them |
| 159 | 159 | $this->addWhereRange( 'cl_sortkey', |
| 160 | 160 | $dir, |
| Index: trunk/phase3/includes/mime.types |
| — | — | @@ -59,7 +59,7 @@ |
| 60 | 60 | application/xslt+xml xslt |
| 61 | 61 | application/xml xml xsl xsd |
| 62 | 62 | application/xml-dtd dtd |
| 63 | | -application/zip zip jar xpi sxc stc sxd std sxi sti sxm stm sxw stw |
| | 63 | +application/zip zip jar xpi sxc stc sxd std sxi sti sxm stm sxw stw |
| 64 | 64 | application/x-rar rar |
| 65 | 65 | audio/basic au snd |
| 66 | 66 | audio/midi mid midi kar |
| Index: trunk/phase3/includes/MagicWord.php |
| — | — | @@ -748,7 +748,7 @@ |
| 749 | 749 | * Returns array(magic word ID, parameter value) |
| 750 | 750 | * If there is no parameter value, that element will be false. |
| 751 | 751 | * |
| 752 | | - * @param $m arrray |
| | 752 | + * @param $m array |
| 753 | 753 | * |
| 754 | 754 | * @return array |
| 755 | 755 | */ |
| Index: trunk/phase3/includes/specials/SpecialWantedpages.php |
| — | — | @@ -39,10 +39,10 @@ |
| 40 | 40 | $parts = explode( '/', $par, 2 ); |
| 41 | 41 | $this->limit = (int)$parts[0]; |
| 42 | 42 | // @todo FIXME: nlinks is ignored |
| 43 | | - $nlinks = isset( $parts[1] ) && $parts[1] === 'nlinks'; |
| | 43 | + //$nlinks = isset( $parts[1] ) && $parts[1] === 'nlinks'; |
| 44 | 44 | $this->offset = 0; |
| 45 | 45 | } else { |
| 46 | | - $nlinks = true; |
| | 46 | + //$nlinks = true; |
| 47 | 47 | } |
| 48 | 48 | $this->setListoutput( $inc ); |
| 49 | 49 | $this->shownavigation = !$inc; |
| Index: trunk/tools/make-release/make-release |
| — | — | @@ -244,7 +244,7 @@ |
| 245 | 245 | # Sign |
| 246 | 246 | uploadFiles = [] |
| 247 | 247 | for fileName in outFiles: |
| 248 | | - proc = subprocess.Popen(['gpg', '--detach-sign', dir+'/'+fileName]) |
| | 248 | + proc = subprocess.Popen(['gpg', '--detach-sign', dir +' /' + fileName]) |
| 249 | 249 | if proc.wait() != 0: |
| 250 | 250 | print "gpg failed, exiting" |
| 251 | 251 | sys.exit(1) |