Denny Vrandecic has submitted this change and it was merged.
Change subject: Remove some deprecated methods
......................................................................
Remove some deprecated methods
Change-Id: If918a7ed1346dbf2924dbc7106adbc19376abe59
---
M Diff.php
M RELEASE-NOTES
M includes/diffop/diff/ListDiff.php
M includes/diffop/diff/MapDiff.php
4 files changed, 8 insertions(+), 63 deletions(-)
Approvals:
Denny Vrandecic: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Diff.php b/Diff.php
index 8ef7b23..a3a846a 100644
--- a/Diff.php
+++ b/Diff.php
@@ -28,7 +28,7 @@
* @ingroup Test
*/
-define( 'Diff_VERSION', '0.6' );
+define( 'Diff_VERSION', '0.7 alpha' );
// @codeCoverageIgnoreStart
call_user_func( function() {
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 7975a00..a9b39a3 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -4,6 +4,13 @@
Latest version of the release notes:
https://gerrit.wikimedia.org/r/gitweb?p=mediawiki/extensions/Diff.git;a=blob;f=RELEASE-NOTES
+=== Version 0.7 ===
+(dev)
+
+; Removals
+
+* Removed static methods from ListDiff and MapDiff (all deprecated since 0.4)
+
=== Version 0.6 ===
2013-05-08
diff --git a/includes/diffop/diff/ListDiff.php
b/includes/diffop/diff/ListDiff.php
index 859ac96..6b5d8d3 100644
--- a/includes/diffop/diff/ListDiff.php
+++ b/includes/diffop/diff/ListDiff.php
@@ -38,22 +38,6 @@
}
/**
- * Creates a new ListDiff given two arrays.
- *
- * @since 0.1
- * @deprecated since 0.4, use ListDiffer::doDiff instead
- *
- * @param array $firstList
- * @param array $secondList
- *
- * @return ListDiff
- */
- public static function newFromArrays( array $firstList, array
$secondList ) {
- $differ = new ListDiffer();
- return new static( $differ->doDiff( $firstList, $secondList ) );
- }
-
- /**
* @see DiffOp::getType
*
* @since 0.1
diff --git a/includes/diffop/diff/MapDiff.php b/includes/diffop/diff/MapDiff.php
index 2a30d81..5098e13 100644
--- a/includes/diffop/diff/MapDiff.php
+++ b/includes/diffop/diff/MapDiff.php
@@ -26,52 +26,6 @@
}
/**
- * Creates and returns an empty MapDiff.
- *
- * @since 0.1
- * @deprecated since 0.4, just use the constructor
- *
- * @return MapDiff
- */
- public static function newEmpty() {
- return new self( array() );
- }
-
- /**
- * Creates a new MapDiff given two arrays.
- *
- * @since 0.1
- * @deprecated since 0.4, use MapDiffer::doDiff instead
- *
- * @param array $oldValues
- * @param array $newValues
- * @param boolean $recursively
- *
- * @return MapDiff
- */
- public static function newFromArrays( array $oldValues, array
$newValues, $recursively = false ) {
- $differ = new MapDiffer( $recursively );
- return new static( $differ->doDiff( $oldValues, $newValues ) );
- }
-
- /**
- * Computes the diff between two associate arrays.
- *
- * @since 0.1
- * @deprecated since 0.4, use MapDiffer::doDiff instead
- *
- * @param array $oldValues The first array
- * @param array $newValues The second array
- * @param boolean $recursively If elements that are arrays should also
be diffed.
- *
- * @return DiffOp[]
- */
- public static function doDiff( array $oldValues, array $newValues,
$recursively = false ) {
- $differ = new MapDiffer( $recursively );
- return $differ->doDiff( $oldValues, $newValues );
- }
-
- /**
* @see DiffOp::getType
*
* @since 0.1
--
To view, visit https://gerrit.wikimedia.org/r/63677
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If918a7ed1346dbf2924dbc7106adbc19376abe59
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Diff
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <jeroended...@gmail.com>
Gerrit-Reviewer: Anja Jentzsch <a...@anjeve.de>
Gerrit-Reviewer: Ataherivand <abraham.taheriv...@wikimedia.de>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: Daniel Werner <daniel.wer...@wikimedia.de>
Gerrit-Reviewer: Denny Vrandecic <denny.vrande...@wikimedia.de>
Gerrit-Reviewer: Henning Snater <henning.sna...@wikimedia.de>
Gerrit-Reviewer: Jens Ohlig <jens.oh...@wikimedia.de>
Gerrit-Reviewer: Jeroen De Dauw <jeroended...@gmail.com>
Gerrit-Reviewer: John Erling Blad <jeb...@gmail.com>
Gerrit-Reviewer: Lydia Pintscher <lydia.pintsc...@wikimedia.de>
Gerrit-Reviewer: Markus Kroetzsch <mar...@semantic-mediawiki.org>
Gerrit-Reviewer: Nikola Smolenski <smole...@eunet.rs>
Gerrit-Reviewer: Silke Meyer <silke.me...@wikimedia.de>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
