Phantom42 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/405554 )
Change subject: Fix multiple PHP class declarations in one file in includes/diff
......................................................................
Fix multiple PHP class declarations in one file in includes/diff
All files containing more than one PHP class were splitted into
multiple files. Autoloader references were updated to match new
class locations.
Bug: T177809
Change-Id: I7ed010d09c7a58f4ac7c48a424cdacede9d46352
---
M autoload.php
D includes/diff/DairikiDiff.php
A includes/diff/Diff.php
M includes/diff/DiffEngine.php
A includes/diff/DiffOp.php
A includes/diff/DiffOpAdd.php
A includes/diff/DiffOpChange.php
A includes/diff/DiffOpCopy.php
A includes/diff/DiffOpDelete.php
A includes/diff/HWLDFWordAccumulator.php
A includes/diff/RangeDifference.php
11 files changed, 559 insertions(+), 379 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/54/405554/1
diff --git a/autoload.php b/autoload.php
index 9e557e1..e20dcea 100644
--- a/autoload.php
+++ b/autoload.php
@@ -379,15 +379,15 @@
'DerivativeRequest' => __DIR__ . '/includes/DerivativeRequest.php',
'DerivativeResourceLoaderContext' => __DIR__ .
'/includes/resourceloader/DerivativeResourceLoaderContext.php',
'DescribeFileOp' => __DIR__ .
'/includes/libs/filebackend/fileop/DescribeFileOp.php',
- 'Diff' => __DIR__ . '/includes/diff/DairikiDiff.php',
+ 'Diff' => __DIR__ . '/includes/diff/Diff.php',
'DiffEngine' => __DIR__ . '/includes/diff/DiffEngine.php',
'DiffFormatter' => __DIR__ . '/includes/diff/DiffFormatter.php',
'DiffHistoryBlob' => __DIR__ . '/includes/HistoryBlob.php',
- 'DiffOp' => __DIR__ . '/includes/diff/DairikiDiff.php',
- 'DiffOpAdd' => __DIR__ . '/includes/diff/DairikiDiff.php',
- 'DiffOpChange' => __DIR__ . '/includes/diff/DairikiDiff.php',
- 'DiffOpCopy' => __DIR__ . '/includes/diff/DairikiDiff.php',
- 'DiffOpDelete' => __DIR__ . '/includes/diff/DairikiDiff.php',
+ 'DiffOp' => __DIR__ . '/includes/diff/DiffOp.php',
+ 'DiffOpAdd' => __DIR__ . '/includes/diff/DiffOpAdd.php',
+ 'DiffOpChange' => __DIR__ . '/includes/diff/DiffOpChange.php',
+ 'DiffOpCopy' => __DIR__ . '/includes/diff/DiffOpCopy.php',
+ 'DiffOpDelete' => __DIR__ . '/includes/diff/DiffOpDelete.php',
'DifferenceEngine' => __DIR__ . '/includes/diff/DifferenceEngine.php',
'Digit2Html' => __DIR__ . '/maintenance/language/digit2html.php',
'DjVuHandler' => __DIR__ . '/includes/media/DjVu.php',
@@ -592,7 +592,7 @@
'HTMLUserTextField' => __DIR__ .
'/includes/htmlform/fields/HTMLUserTextField.php',
'HTMLUsersMultiselectField' => __DIR__ .
'/includes/htmlform/fields/HTMLUsersMultiselectField.php',
'HTTPFileStreamer' => __DIR__ .
'/includes/libs/filebackend/HTTPFileStreamer.php',
- 'HWLDFWordAccumulator' => __DIR__ . '/includes/diff/DairikiDiff.php',
+ 'HWLDFWordAccumulator' => __DIR__ .
'/includes/diff/HWLDFWordAccumulator.php',
'HashBagOStuff' => __DIR__ .
'/includes/libs/objectcache/HashBagOStuff.php',
'HashConfig' => __DIR__ . '/includes/config/HashConfig.php',
'HashRing' => __DIR__ . '/includes/libs/HashRing.php',
@@ -1209,7 +1209,7 @@
'RSSFeed' => __DIR__ . '/includes/Feed.php',
'RandomPage' => __DIR__ . '/includes/specials/SpecialRandompage.php',
'RangeChronologicalPager' => __DIR__ .
'/includes/pager/RangeChronologicalPager.php',
- 'RangeDifference' => __DIR__ . '/includes/diff/DiffEngine.php',
+ 'RangeDifference' => __DIR__ . '/includes/diff/RangeDifference.php',
'RawAction' => __DIR__ . '/includes/actions/RawAction.php',
'RawMessage' => __DIR__ . '/includes/RawMessage.php',
'ReadOnlyError' => __DIR__ . '/includes/exception/ReadOnlyError.php',
diff --git a/includes/diff/DairikiDiff.php b/includes/diff/DairikiDiff.php
deleted file mode 100644
index d76af31..0000000
--- a/includes/diff/DairikiDiff.php
+++ /dev/null
@@ -1,334 +0,0 @@
-<?php
-/**
- * A PHP diff engine for phpwiki. (Taken from phpwiki-1.3.3)
- *
- * Copyright © 2000, 2001 Geoffrey T. Dairiki <[email protected]>
- * You may copy this code freely under the conditions of the GPL.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup DifferenceEngine
- * @defgroup DifferenceEngine DifferenceEngine
- */
-
-/**
- * The base class for all other DiffOp classes.
- *
- * The classes that extend DiffOp are: DiffOpCopy, DiffOpDelete, DiffOpAdd and
- * DiffOpChange. FakeDiffOp also extends DiffOp, but it is not located in this
file.
- *
- * @private
- * @ingroup DifferenceEngine
- */
-abstract class DiffOp {
-
- /**
- * @var string
- */
- public $type;
-
- /**
- * @var string[]
- */
- public $orig;
-
- /**
- * @var string[]
- */
- public $closing;
-
- /**
- * @return string
- */
- public function getType() {
- return $this->type;
- }
-
- /**
- * @return string[]
- */
- public function getOrig() {
- return $this->orig;
- }
-
- /**
- * @param int $i
- * @return string[]|string|null
- */
- public function getClosing( $i = null ) {
- if ( $i === null ) {
- return $this->closing;
- }
- if ( array_key_exists( $i, $this->closing ) ) {
- return $this->closing[$i];
- }
- return null;
- }
-
- abstract public function reverse();
-
- /**
- * @return int
- */
- public function norig() {
- return $this->orig ? count( $this->orig ) : 0;
- }
-
- /**
- * @return int
- */
- public function nclosing() {
- return $this->closing ? count( $this->closing ) : 0;
- }
-}
-
-/**
- * Extends DiffOp. Used to mark strings that have been
- * copied from one string array to the other.
- *
- * @private
- * @ingroup DifferenceEngine
- */
-class DiffOpCopy extends DiffOp {
- public $type = 'copy';
-
- public function __construct( $orig, $closing = false ) {
- if ( !is_array( $closing ) ) {
- $closing = $orig;
- }
- $this->orig = $orig;
- $this->closing = $closing;
- }
-
- /**
- * @return DiffOpCopy
- */
- public function reverse() {
- return new DiffOpCopy( $this->closing, $this->orig );
- }
-}
-
-/**
- * Extends DiffOp. Used to mark strings that have been
- * deleted from the first string array.
- *
- * @private
- * @ingroup DifferenceEngine
- */
-class DiffOpDelete extends DiffOp {
- public $type = 'delete';
-
- public function __construct( $lines ) {
- $this->orig = $lines;
- $this->closing = false;
- }
-
- /**
- * @return DiffOpAdd
- */
- public function reverse() {
- return new DiffOpAdd( $this->orig );
- }
-}
-
-/**
- * Extends DiffOp. Used to mark strings that have been
- * added from the first string array.
- *
- * @private
- * @ingroup DifferenceEngine
- */
-class DiffOpAdd extends DiffOp {
- public $type = 'add';
-
- public function __construct( $lines ) {
- $this->closing = $lines;
- $this->orig = false;
- }
-
- /**
- * @return DiffOpDelete
- */
- public function reverse() {
- return new DiffOpDelete( $this->closing );
- }
-}
-
-/**
- * Extends DiffOp. Used to mark strings that have been
- * changed from the first string array (both added and subtracted).
- *
- * @private
- * @ingroup DifferenceEngine
- */
-class DiffOpChange extends DiffOp {
- public $type = 'change';
-
- public function __construct( $orig, $closing ) {
- $this->orig = $orig;
- $this->closing = $closing;
- }
-
- /**
- * @return DiffOpChange
- */
- public function reverse() {
- return new DiffOpChange( $this->closing, $this->orig );
- }
-}
-
-/**
- * Class representing a 'diff' between two sequences of strings.
- * @todo document
- * @private
- * @ingroup DifferenceEngine
- */
-class Diff {
-
- /**
- * @var DiffOp[]
- */
- public $edits;
-
- /**
- * @var int If this diff complexity is exceeded, a ComplexityException
is thrown
- * 0 means no limit.
- */
- protected $bailoutComplexity = 0;
-
- /**
- * Computes diff between sequences of strings.
- *
- * @param string[] $from_lines An array of strings.
- * Typically these are lines from a file.
- * @param string[] $to_lines An array of strings.
- * @throws \MediaWiki\Diff\ComplexityException
- */
- public function __construct( $from_lines, $to_lines ) {
- $eng = new DiffEngine;
- $eng->setBailoutComplexity( $this->bailoutComplexity );
- $this->edits = $eng->diff( $from_lines, $to_lines );
- }
-
- /**
- * @return DiffOp[]
- */
- public function getEdits() {
- return $this->edits;
- }
-
- /**
- * Compute reversed Diff.
- *
- * SYNOPSIS:
- *
- * $diff = new Diff($lines1, $lines2);
- * $rev = $diff->reverse();
- *
- * @return Object A Diff object representing the inverse of the
- * original diff.
- */
- public function reverse() {
- $rev = $this;
- $rev->edits = [];
- /** @var DiffOp $edit */
- foreach ( $this->edits as $edit ) {
- $rev->edits[] = $edit->reverse();
- }
-
- return $rev;
- }
-
- /**
- * Check for empty diff.
- *
- * @return bool True if two sequences were identical.
- */
- public function isEmpty() {
- foreach ( $this->edits as $edit ) {
- if ( $edit->type != 'copy' ) {
- return false;
- }
- }
-
- return true;
- }
-
- /**
- * Compute the length of the Longest Common Subsequence (LCS).
- *
- * This is mostly for diagnostic purposed.
- *
- * @return int The length of the LCS.
- */
- public function lcs() {
- $lcs = 0;
- foreach ( $this->edits as $edit ) {
- if ( $edit->type == 'copy' ) {
- $lcs += count( $edit->orig );
- }
- }
-
- return $lcs;
- }
-
- /**
- * Get the original set of lines.
- *
- * This reconstructs the $from_lines parameter passed to the
- * constructor.
- *
- * @return string[] The original sequence of strings.
- */
- public function orig() {
- $lines = [];
-
- foreach ( $this->edits as $edit ) {
- if ( $edit->orig ) {
- array_splice( $lines, count( $lines ), 0,
$edit->orig );
- }
- }
-
- return $lines;
- }
-
- /**
- * Get the closing set of lines.
- *
- * This reconstructs the $to_lines parameter passed to the
- * constructor.
- *
- * @return string[] The sequence of strings.
- */
- public function closing() {
- $lines = [];
-
- foreach ( $this->edits as $edit ) {
- if ( $edit->closing ) {
- array_splice( $lines, count( $lines ), 0,
$edit->closing );
- }
- }
-
- return $lines;
- }
-}
-
-/**
- * @deprecated Alias for WordAccumulator, to be soon removed
- */
-class HWLDFWordAccumulator extends MediaWiki\Diff\WordAccumulator {
-}
diff --git a/includes/diff/Diff.php b/includes/diff/Diff.php
new file mode 100644
index 0000000..901495b
--- /dev/null
+++ b/includes/diff/Diff.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * Part of PHP diff engine for phpwiki. (Taken from phpwiki-1.3.3)
+ *
+ * Copyright © 2000, 2001 Geoffrey T. Dairiki <[email protected]>
+ * You may copy this code freely under the conditions of the GPL.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup DifferenceEngine
+ * @defgroup DifferenceEngine DifferenceEngine
+ */
+
+/**
+ * Class representing a 'diff' between two sequences of strings.
+ * @todo document
+ * @private
+ * @ingroup DifferenceEngine
+ */
+class Diff {
+
+ /**
+ * @var DiffOp[]
+ */
+ public $edits;
+
+ /**
+ * @var int If this diff complexity is exceeded, a ComplexityException
is thrown
+ * 0 means no limit.
+ */
+ protected $bailoutComplexity = 0;
+
+ /**
+ * Computes diff between sequences of strings.
+ *
+ * @param string[] $from_lines An array of strings.
+ * Typically these are lines from a file.
+ * @param string[] $to_lines An array of strings.
+ * @throws \MediaWiki\Diff\ComplexityException
+ */
+ public function __construct( $from_lines, $to_lines ) {
+ $eng = new DiffEngine;
+ $eng->setBailoutComplexity( $this->bailoutComplexity );
+ $this->edits = $eng->diff( $from_lines, $to_lines );
+ }
+
+ /**
+ * @return DiffOp[]
+ */
+ public function getEdits() {
+ return $this->edits;
+ }
+
+ /**
+ * Compute reversed Diff.
+ *
+ * SYNOPSIS:
+ *
+ * $diff = new Diff($lines1, $lines2);
+ * $rev = $diff->reverse();
+ *
+ * @return Object A Diff object representing the inverse of the
+ * original diff.
+ */
+ public function reverse() {
+ $rev = $this;
+ $rev->edits = [];
+ /** @var DiffOp $edit */
+ foreach ( $this->edits as $edit ) {
+ $rev->edits[] = $edit->reverse();
+ }
+
+ return $rev;
+ }
+
+ /**
+ * Check for empty diff.
+ *
+ * @return bool True if two sequences were identical.
+ */
+ public function isEmpty() {
+ foreach ( $this->edits as $edit ) {
+ if ( $edit->type != 'copy' ) {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ /**
+ * Compute the length of the Longest Common Subsequence (LCS).
+ *
+ * This is mostly for diagnostic purposed.
+ *
+ * @return int The length of the LCS.
+ */
+ public function lcs() {
+ $lcs = 0;
+ foreach ( $this->edits as $edit ) {
+ if ( $edit->type == 'copy' ) {
+ $lcs += count( $edit->orig );
+ }
+ }
+
+ return $lcs;
+ }
+
+ /**
+ * Get the original set of lines.
+ *
+ * This reconstructs the $from_lines parameter passed to the
+ * constructor.
+ *
+ * @return string[] The original sequence of strings.
+ */
+ public function orig() {
+ $lines = [];
+
+ foreach ( $this->edits as $edit ) {
+ if ( $edit->orig ) {
+ array_splice( $lines, count( $lines ), 0,
$edit->orig );
+ }
+ }
+
+ return $lines;
+ }
+
+ /**
+ * Get the closing set of lines.
+ *
+ * This reconstructs the $to_lines parameter passed to the
+ * constructor.
+ *
+ * @return string[] The sequence of strings.
+ */
+ public function closing() {
+ $lines = [];
+
+ foreach ( $this->edits as $edit ) {
+ if ( $edit->closing ) {
+ array_splice( $lines, count( $lines ), 0,
$edit->closing );
+ }
+ }
+
+ return $lines;
+ }
+}
diff --git a/includes/diff/DiffEngine.php b/includes/diff/DiffEngine.php
index 53378e5..5e919d2 100644
--- a/includes/diff/DiffEngine.php
+++ b/includes/diff/DiffEngine.php
@@ -802,40 +802,3 @@
}
}
-
-/**
- * Alternative representation of a set of changes, by the index
- * ranges that are changed.
- *
- * @ingroup DifferenceEngine
- */
-class RangeDifference {
-
- /** @var int */
- public $leftstart;
-
- /** @var int */
- public $leftend;
-
- /** @var int */
- public $leftlength;
-
- /** @var int */
- public $rightstart;
-
- /** @var int */
- public $rightend;
-
- /** @var int */
- public $rightlength;
-
- function __construct( $leftstart, $leftend, $rightstart, $rightend ) {
- $this->leftstart = $leftstart;
- $this->leftend = $leftend;
- $this->leftlength = $leftend - $leftstart;
- $this->rightstart = $rightstart;
- $this->rightend = $rightend;
- $this->rightlength = $rightend - $rightstart;
- }
-
-}
diff --git a/includes/diff/DiffOp.php b/includes/diff/DiffOp.php
new file mode 100644
index 0000000..51a1f62d
--- /dev/null
+++ b/includes/diff/DiffOp.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Part of PHP diff engine for phpwiki. (Taken from phpwiki-1.3.3)
+ *
+ * Copyright © 2000, 2001 Geoffrey T. Dairiki <[email protected]>
+ * You may copy this code freely under the conditions of the GPL.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup DifferenceEngine
+ * @defgroup DifferenceEngine DifferenceEngine
+ */
+
+/**
+ * The base class for all other DiffOp classes.
+ *
+ * The classes that extend DiffOp are: DiffOpCopy, DiffOpDelete, DiffOpAdd and
+ * DiffOpChange. FakeDiffOp also extends DiffOp, but it is not located in this
file.
+ *
+ * @private
+ * @ingroup DifferenceEngine
+ */
+abstract class DiffOp {
+
+ /**
+ * @var string
+ */
+ public $type;
+
+ /**
+ * @var string[]
+ */
+ public $orig;
+
+ /**
+ * @var string[]
+ */
+ public $closing;
+
+ /**
+ * @return string
+ */
+ public function getType() {
+ return $this->type;
+ }
+
+ /**
+ * @return string[]
+ */
+ public function getOrig() {
+ return $this->orig;
+ }
+
+ /**
+ * @param int $i
+ * @return string[]|string|null
+ */
+ public function getClosing( $i = null ) {
+ if ( $i === null ) {
+ return $this->closing;
+ }
+ if ( array_key_exists( $i, $this->closing ) ) {
+ return $this->closing[$i];
+ }
+ return null;
+ }
+
+ abstract public function reverse();
+
+ /**
+ * @return int
+ */
+ public function norig() {
+ return $this->orig ? count( $this->orig ) : 0;
+ }
+
+ /**
+ * @return int
+ */
+ public function nclosing() {
+ return $this->closing ? count( $this->closing ) : 0;
+ }
+}
diff --git a/includes/diff/DiffOpAdd.php b/includes/diff/DiffOpAdd.php
new file mode 100644
index 0000000..5601fc6
--- /dev/null
+++ b/includes/diff/DiffOpAdd.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Part of PHP diff engine for phpwiki. (Taken from phpwiki-1.3.3)
+ *
+ * Copyright © 2000, 2001 Geoffrey T. Dairiki <[email protected]>
+ * You may copy this code freely under the conditions of the GPL.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup DifferenceEngine
+ * @defgroup DifferenceEngine DifferenceEngine
+ */
+
+/**
+ * Extends DiffOp. Used to mark strings that have been
+ * added from the first string array.
+ *
+ * @private
+ * @ingroup DifferenceEngine
+ */
+class DiffOpAdd extends DiffOp {
+ public $type = 'add';
+
+ public function __construct( $lines ) {
+ $this->closing = $lines;
+ $this->orig = false;
+ }
+
+ /**
+ * @return DiffOpDelete
+ */
+ public function reverse() {
+ return new DiffOpDelete( $this->closing );
+ }
+}
diff --git a/includes/diff/DiffOpChange.php b/includes/diff/DiffOpChange.php
new file mode 100644
index 0000000..1889a56
--- /dev/null
+++ b/includes/diff/DiffOpChange.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Part of PHP diff engine for phpwiki. (Taken from phpwiki-1.3.3)
+ *
+ * Copyright © 2000, 2001 Geoffrey T. Dairiki <[email protected]>
+ * You may copy this code freely under the conditions of the GPL.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup DifferenceEngine
+ * @defgroup DifferenceEngine DifferenceEngine
+ */
+
+/**
+ * Extends DiffOp. Used to mark strings that have been
+ * changed from the first string array (both added and subtracted).
+ *
+ * @private
+ * @ingroup DifferenceEngine
+ */
+class DiffOpChange extends DiffOp {
+ public $type = 'change';
+
+ public function __construct( $orig, $closing ) {
+ $this->orig = $orig;
+ $this->closing = $closing;
+ }
+
+ /**
+ * @return DiffOpChange
+ */
+ public function reverse() {
+ return new DiffOpChange( $this->closing, $this->orig );
+ }
+}
diff --git a/includes/diff/DiffOpCopy.php b/includes/diff/DiffOpCopy.php
new file mode 100644
index 0000000..ca1fed1
--- /dev/null
+++ b/includes/diff/DiffOpCopy.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Part of PHP diff engine for phpwiki. (Taken from phpwiki-1.3.3)
+ *
+ * Copyright © 2000, 2001 Geoffrey T. Dairiki <[email protected]>
+ * You may copy this code freely under the conditions of the GPL.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup DifferenceEngine
+ * @defgroup DifferenceEngine DifferenceEngine
+ */
+
+/**
+ * Extends DiffOp. Used to mark strings that have been
+ * copied from one string array to the other.
+ *
+ * @private
+ * @ingroup DifferenceEngine
+ */
+class DiffOpCopy extends DiffOp {
+ public $type = 'copy';
+
+ public function __construct( $orig, $closing = false ) {
+ if ( !is_array( $closing ) ) {
+ $closing = $orig;
+ }
+ $this->orig = $orig;
+ $this->closing = $closing;
+ }
+
+ /**
+ * @return DiffOpCopy
+ */
+ public function reverse() {
+ return new DiffOpCopy( $this->closing, $this->orig );
+ }
+}
diff --git a/includes/diff/DiffOpDelete.php b/includes/diff/DiffOpDelete.php
new file mode 100644
index 0000000..7e2e8ad
--- /dev/null
+++ b/includes/diff/DiffOpDelete.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Part of PHP diff engine for phpwiki. (Taken from phpwiki-1.3.3)
+ *
+ * Copyright © 2000, 2001 Geoffrey T. Dairiki <[email protected]>
+ * You may copy this code freely under the conditions of the GPL.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup DifferenceEngine
+ * @defgroup DifferenceEngine DifferenceEngine
+ */
+
+/**
+ * Extends DiffOp. Used to mark strings that have been
+ * deleted from the first string array.
+ *
+ * @private
+ * @ingroup DifferenceEngine
+ */
+class DiffOpDelete extends DiffOp {
+ public $type = 'delete';
+
+ public function __construct( $lines ) {
+ $this->orig = $lines;
+ $this->closing = false;
+ }
+
+ /**
+ * @return DiffOpAdd
+ */
+ public function reverse() {
+ return new DiffOpAdd( $this->orig );
+ }
+}
diff --git a/includes/diff/HWLDFWordAccumulator.php
b/includes/diff/HWLDFWordAccumulator.php
new file mode 100644
index 0000000..15a4d0e
--- /dev/null
+++ b/includes/diff/HWLDFWordAccumulator.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Part of PHP diff engine for phpwiki. (Taken from phpwiki-1.3.3)
+ *
+ * Copyright © 2000, 2001 Geoffrey T. Dairiki <[email protected]>
+ * You may copy this code freely under the conditions of the GPL.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup DifferenceEngine
+ * @defgroup DifferenceEngine DifferenceEngine
+ */
+
+/**
+ * @deprecated Alias for WordAccumulator, to be soon removed
+ */
+class HWLDFWordAccumulator extends MediaWiki\Diff\WordAccumulator {
+}
diff --git a/includes/diff/RangeDifference.php
b/includes/diff/RangeDifference.php
new file mode 100644
index 0000000..635b92a
--- /dev/null
+++ b/includes/diff/RangeDifference.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Alternative representation of a set of changes
+ *
+ * Copyright © 2008 Guy Van den Broeck <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup DifferenceEngine
+ */
+
+/**
+ * Alternative representation of a set of changes, by the index
+ * ranges that are changed.
+ *
+ * @ingroup DifferenceEngine
+ */
+class RangeDifference {
+
+ /** @var int */
+ public $leftstart;
+
+ /** @var int */
+ public $leftend;
+
+ /** @var int */
+ public $leftlength;
+
+ /** @var int */
+ public $rightstart;
+
+ /** @var int */
+ public $rightend;
+
+ /** @var int */
+ public $rightlength;
+
+ function __construct( $leftstart, $leftend, $rightstart, $rightend ) {
+ $this->leftstart = $leftstart;
+ $this->leftend = $leftend;
+ $this->leftlength = $leftend - $leftstart;
+ $this->rightstart = $rightstart;
+ $this->rightend = $rightend;
+ $this->rightlength = $rightend - $rightstart;
+ }
+
+}
--
To view, visit https://gerrit.wikimedia.org/r/405554
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ed010d09c7a58f4ac7c48a424cdacede9d46352
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Phantom42 <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
