mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-16 14:46:28 +02:00
Code Issues Releases Wiki Activity

[ticket/16955] Correct docblocks in diff engine

Browse Source 
PHPBB3-16955
This commit is contained in:
Marc Alexander
2022-12-26 13:54:42 +01:00
parent 160510dab3
commit ea07e4946f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/includes/diff/diff.php
View File

@ -46,8 +46,8 @@ class diff
/** /**
* Computes diffs between sequences of strings. * Computes diffs between sequences of strings.
* *
* @param array &$from_content An array of strings. Typically these are lines from a file. * @param array|string &$from_content An array of strings. Typically these are lines from a file.
* @param array &$to_content An array of strings. * @param array|string &$to_content An array of strings.
* @param bool $preserve_cr If true, \r is replaced by a new line in the diff output * @param bool $preserve_cr If true, \r is replaced by a new line in the diff output
*/ */
function __construct(&$from_content, &$to_content, $preserve_cr = true) function __construct(&$from_content, &$to_content, $preserve_cr = true)
@ -498,9 +498,9 @@ class diff3 extends diff
/** /**
* Computes diff between 3 sequences of strings. * Computes diff between 3 sequences of strings.
* *
* @param array &$orig The original lines to use. * @param array|string &$orig The original lines to use.
* @param array &$final1 The first version to compare to. * @param array|string &$final1 The first version to compare to.
* @param array &$final2 The second version to compare to. * @param array|string &$final2 The second version to compare to.
* @param bool $preserve_cr If true, \r\n and bare \r are replaced by a new line * @param bool $preserve_cr If true, \r\n and bare \r are replaced by a new line
* in the diff output * in the diff output
*/ */