| Index: trunk/phase3/maintenance/importDump.php |
| — | — | @@ -83,9 +83,9 @@ |
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | if( $this->hasArg() ) { |
| 87 | | - $result = $this->importFromFile( $this->getArg() ); |
| | 87 | + $this->importFromFile( $this->getArg() ); |
| 88 | 88 | } else { |
| 89 | | - $result = $this->importFromStdin(); |
| | 89 | + $this->importFromStdin(); |
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | $this->output( "Done!\n" ); |
| Index: trunk/phase3/maintenance/compareParsers.php |
| — | — | @@ -32,7 +32,6 @@ |
| 33 | 33 | class CompareParsers extends DumpIterator { |
| 34 | 34 | |
| 35 | 35 | private $count = 0; |
| 36 | | - private $startTime; |
| 37 | 36 | |
| 38 | 37 | public function __construct() { |
| 39 | 38 | parent::__construct(); |
| Index: trunk/phase3/includes/diff/DifferenceEngine.php |
| — | — | @@ -57,10 +57,9 @@ |
| 58 | 58 | /** |
| 59 | 59 | * Constructor |
| 60 | 60 | * @param $titleObj Title object that the diff is associated with |
| 61 | | - * @param $old Integer: old ID we want to show and diff with. |
| 62 | | - * @param $new String: either 'prev' or 'next'. |
| 63 | | - * @todo FIXME: $rcid ??? |
| 64 | | - * @param $rcid Integer: ??? FIXME (default 0) |
| | 61 | + * @param $old Integer old ID we want to show and diff with. |
| | 62 | + * @param $new String either 'prev' or 'next'. |
| | 63 | + * @param $rcid Integer ??? FIXME (default 0) |
| 65 | 64 | * @param $refreshCache boolean If set, refreshes the diff cache |
| 66 | 65 | * @param $unhide boolean If set, allow viewing deleted revs |
| 67 | 66 | */ |
| — | — | @@ -100,22 +99,37 @@ |
| 101 | 100 | $this->unhide = $unhide; |
| 102 | 101 | } |
| 103 | 102 | |
| | 103 | + /** |
| | 104 | + * @param $value bool |
| | 105 | + */ |
| 104 | 106 | function setReducedLineNumbers( $value = true ) { |
| 105 | 107 | $this->mReducedLineNumbers = $value; |
| 106 | 108 | } |
| 107 | 109 | |
| | 110 | + /** |
| | 111 | + * @return Title |
| | 112 | + */ |
| 108 | 113 | function getTitle() { |
| 109 | 114 | return $this->mTitle; |
| 110 | 115 | } |
| 111 | 116 | |
| | 117 | + /** |
| | 118 | + * @return bool |
| | 119 | + */ |
| 112 | 120 | function wasCacheHit() { |
| 113 | 121 | return $this->mCacheHit; |
| 114 | 122 | } |
| 115 | 123 | |
| | 124 | + /** |
| | 125 | + * @return int |
| | 126 | + */ |
| 116 | 127 | function getOldid() { |
| 117 | 128 | return $this->mOldid; |
| 118 | 129 | } |
| 119 | 130 | |
| | 131 | + /** |
| | 132 | + * @return Bool|int |
| | 133 | + */ |
| 120 | 134 | function getNewid() { |
| 121 | 135 | return $this->mNewid; |
| 122 | 136 | } |
| — | — | @@ -626,6 +640,8 @@ |
| 627 | 641 | /** |
| 628 | 642 | * Get the diff text, send it to $wgOut |
| 629 | 643 | * Returns false if the diff could not be generated, otherwise returns true |
| | 644 | + * |
| | 645 | + * @return bool |
| 630 | 646 | */ |
| 631 | 647 | function showDiff( $otitle, $ntitle, $notice = '' ) { |
| 632 | 648 | global $wgOut; |
| — | — | @@ -915,6 +931,8 @@ |
| 916 | 932 | |
| 917 | 933 | /** |
| 918 | 934 | * Add the header to a diff body |
| | 935 | + * |
| | 936 | + * @return string |
| 919 | 937 | */ |
| 920 | 938 | static function addHeader( $diff, $otitle, $ntitle, $multi = '', $notice = '' ) { |
| 921 | 939 | $header = "<table class='diff'>"; |
| — | — | @@ -965,6 +983,8 @@ |
| 966 | 984 | * If oldid is false, leave the corresponding revision object set |
| 967 | 985 | * to false. This is impossible via ordinary user input, and is provided for |
| 968 | 986 | * API convenience. |
| | 987 | + * |
| | 988 | + * @return bool |
| 969 | 989 | */ |
| 970 | 990 | function loadRevisionData() { |
| 971 | 991 | global $wgLang, $wgUser; |
| — | — | @@ -979,8 +999,9 @@ |
| 980 | 1000 | $this->mNewRev = $this->mNewid |
| 981 | 1001 | ? Revision::newFromId( $this->mNewid ) |
| 982 | 1002 | : Revision::newFromTitle( $this->mTitle ); |
| 983 | | - if ( !$this->mNewRev instanceof Revision ) |
| | 1003 | + if ( !$this->mNewRev instanceof Revision ) { |
| 984 | 1004 | return false; |
| | 1005 | + } |
| 985 | 1006 | |
| 986 | 1007 | // Update the new revision ID in case it was 0 (makes life easier doing UI stuff) |
| 987 | 1008 | $this->mNewid = $this->mNewRev->getId(); |
| — | — | @@ -1094,6 +1115,8 @@ |
| 1095 | 1116 | |
| 1096 | 1117 | /** |
| 1097 | 1118 | * Load the text of the revisions, as well as revision data. |
| | 1119 | + * |
| | 1120 | + * @return bool |
| 1098 | 1121 | */ |
| 1099 | 1122 | function loadText() { |
| 1100 | 1123 | if ( $this->mTextLoaded == 2 ) { |
| — | — | @@ -1123,6 +1146,8 @@ |
| 1124 | 1147 | |
| 1125 | 1148 | /** |
| 1126 | 1149 | * Load the text of the new revision, not the old one |
| | 1150 | + * |
| | 1151 | + * @return bool |
| 1127 | 1152 | */ |
| 1128 | 1153 | function loadNewText() { |
| 1129 | 1154 | if ( $this->mTextLoaded >= 1 ) { |