diff options
author | Thiemo Mättig <thiemo.maettig@wikimedia.de> | 2014-03-03 18:08:05 +0100 |
---|---|---|
committer | Thiemo Mättig <thiemo.maettig@wikimedia.de> | 2014-03-06 11:17:41 +0100 |
commit | 68064001299557613aee3c7bddc57251e4ceed3f (patch) | |
tree | 9fd14c289c10a32647e990b4631bb7fc8515772a /includes/diff/UnifiedDiffFormatter.php | |
parent | 25bfbf4756bc0cf63bbbb2986aed54c09017140d (diff) | |
download | mediawikicore-68064001299557613aee3c7bddc57251e4ceed3f.tar.gz mediawikicore-68064001299557613aee3c7bddc57251e4ceed3f.zip |
Added and updated Doxygen comments in content handler and diff namespaces
Reasons for touching this are:
* "@param type $var" were mixed in a lot of places. Both works but the
MediaWiki coding conventions suggest that specific order.
* Things like String and Bool aren't objects and shouldn't be uppercase.
* Tried to fill missing types in "@param $var".
* Tried to fill missing descriptions in "@return type" when I could.
* Removed duplicate descriptions if a @see is sufficend.
* Removed useless descriptions ("isUsefull returns true if usefull").
* Removed useless @return void.
* Replaces mixed[] with array (does have the exact same meaning).
* Tried to find better replacements for "varargs", phpDocumentor
suggest $var,...
* Order should be @since, @param, @throws, @return, @see. This is the
order Doxygen renders this.
There is always more to do but I think this is already much better
than before. Please feel free to put more change sets on top of mine
or request more changes by adding comments.
Change-Id: I05262ce06caabf79f68772302524ac91bbead1c6
Diffstat (limited to 'includes/diff/UnifiedDiffFormatter.php')
-rw-r--r-- | includes/diff/UnifiedDiffFormatter.php | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/includes/diff/UnifiedDiffFormatter.php b/includes/diff/UnifiedDiffFormatter.php index 0a86ccc0ab1d..32a76055ee4a 100644 --- a/includes/diff/UnifiedDiffFormatter.php +++ b/includes/diff/UnifiedDiffFormatter.php @@ -29,6 +29,7 @@ * @ingroup DifferenceEngine */ class UnifiedDiffFormatter extends DiffFormatter { + /** @var int */ protected $leadingContextLines = 2; @@ -36,22 +37,22 @@ class UnifiedDiffFormatter extends DiffFormatter { protected $trailingContextLines = 2; /** - * @param $lines + * @param string[] $lines */ protected function added( $lines ) { $this->lines( $lines, '+' ); } /** - * @param $lines + * @param string[] $lines */ protected function deleted( $lines ) { $this->lines( $lines, '-' ); } /** - * @param $orig - * @param $closing + * @param string[] $orig + * @param string[] $closing */ protected function changed( $orig, $closing ) { $this->deleted( $orig ); @@ -59,13 +60,15 @@ class UnifiedDiffFormatter extends DiffFormatter { } /** - * @param $xbeg - * @param $xlen - * @param $ybeg - * @param $ylen + * @param int $xbeg + * @param int $xlen + * @param int $ybeg + * @param int $ylen + * * @return string */ protected function blockHeader( $xbeg, $xlen, $ybeg, $ylen ) { return "@@ -$xbeg,$xlen +$ybeg,$ylen @@"; } + } |