opensourcemirror
/
dokuwiki
mirror of https://github.com/splitbrain/dokuwiki.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Add undeclared Class Properties 

Fixes Creation of dynamic property _HWLDF_WordAccumulator::$_lines /
$_line / $_group / $_tag is deprecated in ./inc/DifferenceEngine.php
on line 936

And proactively caught another bunch in _Diff3_Op class (not reported
in unit tests)
This commit is contained in:
Damien Regad 2023-04-06 18:04:23 +02:00
parent 3d52dbfaad
commit ebba5e5de9
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
inc/DifferenceEngine.php
View File

@ -929,6 +929,18 @@ define('NBSP', "\xC2\xA0"); // utf-8 non-breaking space.
class _HWLDF_WordAccumulator {
/** @var array */
protected $_lines;
/** @var string */
protected $_line;
/** @var string */
protected $_group;
/** @var string */
protected $_tag;
function __construct() {
$this->_lines = array();
$this->_line = '';
@ -1439,6 +1451,18 @@ class Diff3 extends Diff {
*/
class _Diff3_Op {
/** @var array|mixed */
protected $orig;
/** @var array|mixed */
protected $final1;
/** @var array|mixed */
protected $final2;
/** @var array|mixed|false */
protected $_merged;
function __construct($orig = false, $final1 = false, $final2 = false) {
$this->orig = $orig ? $orig : array();
$this->final1 = $final1 ? $final1 : array();