replace E_USER_ERROR triggers with RuntimeExceptions

The use of trigger_error with a E_USER_ERROR is deprecated in PHP 8.4

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

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)

show more ...

remove string argument in assert - DiffEngine

add tests to DifferenceEngine and optimize each removal in it

remove deprecated each calls in libraries

I supplemented the existing comments on the methods in which there was not enough information to the standard phpDoc.

make merge conflict labels completely customizable

Added 3way merge from PEAR Text_Diff3

This adds 3way merge functionality to our DifferenceEngine stack. The
code was taken from the PEAR Text_Diff3 package and adapted to work with
our implementatio

Added 3way merge from PEAR Text_Diff3

This adds 3way merge functionality to our DifferenceEngine stack. The
code was taken from the PEAR Text_Diff3 package and adapted to work with
our implementation.

For the curious:
Here's a short Origin tree of the different versions of the Diff code to
make clear how our implementation is related to the PEAR package.

-- original code Geoffrey T. Dairiki
`-- Adaption for the Horde project
|-- Adaption for phpwiki
| `-- Adaption for MediaWiki
| `-- Adaption for DokuWiki
`-- Creation of PEAR Text_Diff

show more ...

Many PHPDocs, some unused and dyn declared vars

many PHPDocs
some unused variables
some dynamically declared variables declared

Fix CodeSniffer violations

Change indentation to ensure code confirms to CodeSniffer rules.

Added comment to DiffFormatter _escape() method

Clarify use of _escape() method in base class.

add comment to Unified Diff Formatter making it clear the output is unsafe for use in HTML as is

replace remaining hardcoded 'colspan' values with ->colspan

Merge remote-tracking branch 'whoopdedo/diffmarkup' into FS#2720

ensure diff formatters escape their output

Remove the prefix from inline diffs.

The line prefix was not actually indicating what it should indicate.
In particular, anything in a "changed" block would show a "!" even
if the entire line was ad

Remove the prefix from inline diffs.

The line prefix was not actually indicating what it should indicate.
In particular, anything in a "changed" block would show a "!" even
if the entire line was added or deleted. Better to print nothing than
something that's wrong.

show more ...

Fix width of indicator column.

Move inline diff headers into a vertical column.

xml compatibility fixes (mainly entities to unicode conversions)

Merge branch 'master' into htmlmail

* master: (382 commits)
Romanian language update
Marathi language update
Arabic Language Update
when there's not enough space for images, make sure they s

Merge branch 'master' into htmlmail

* master: (382 commits)
Romanian language update
Marathi language update
Arabic Language Update
when there's not enough space for images, make sure they stay proportional (might be FS#2480)
added minimal RTL print styles (part of FS#2185)
moved plugins' rtl.css to their style.css counterpart (part of FS#2185)
removed all browser-specific gradients as the recently (in 42ff6730) introduced svg makes them unnecessary
removed comments from accidentally commented lines in tpl_includeFile()
removed obsolete template file
added tpl_includeFile() to core
Make getTitle method in remote interface public
Changed an error code in XML-RPC interface. This error hasn't anything to do with the rest of the -32600 errors.
BG: language update
Korean language update
fixed performance issues with gradient in Firefox (which also added gradient support for IE9) (FS#2447)
deleted very old (and unused) images
added accidentally removed '<?php' back in (was in 57fc5edd)
wrapped X-UA-Compatible meta tag with conditional comments
added explanation to todo in _forms.css
removed problematic 'overflow: hidden' from lists again ('unfixes' FS#1950)
...

Conflicts:
inc/auth.php
inc/load.php

show more ...

coding style updates

use inlinestyles for diffs in HTML mails

removed incorrect nbsps in diff view (FS#2223)

Using only __construct now

Done with DifferenceEngine.php