From ea07e4946f16e01753ae42ba7dbc36a512c0abfb Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 26 Dec 2022 13:54:42 +0100 Subject: [PATCH] [ticket/16955] Correct docblocks in diff engine PHPBB3-16955 --- phpBB/includes/diff/diff.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/phpBB/includes/diff/diff.php b/phpBB/includes/diff/diff.php index d5d0e3e3f0..bed16285a1 100644 --- a/phpBB/includes/diff/diff.php +++ b/phpBB/includes/diff/diff.php @@ -46,8 +46,8 @@ class diff /** * Computes diffs between sequences of strings. * - * @param array &$from_content An array of strings. Typically these are lines from a file. - * @param array &$to_content An array of strings. + * @param array|string &$from_content An array of strings. Typically these are lines from a file. + * @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 */ function __construct(&$from_content, &$to_content, $preserve_cr = true) @@ -498,9 +498,9 @@ class diff3 extends diff /** * Computes diff between 3 sequences of strings. * - * @param array &$orig The original lines to use. - * @param array &$final1 The first version to compare to. - * @param array &$final2 The second version to compare to. + * @param array|string &$orig The original lines to use. + * @param array|string &$final1 The first 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 * in the diff output */