From: umherirrender <umherirrender_de.wp@web.de>
Date: Mon, 23 Jun 2014 18:18:47 +0000 (+0200)
Subject: Remove deprecated class FormatExif
X-Git-Tag: 1.31.0-rc.0~15099
X-Git-Url: http://git.cyclocoop.org/%24dirpuce/puce%24spip_lang_rtl.gif?a=commitdiff_plain;h=2df720d88b8c2826912e6455a74b6c3ee28bdec9;p=lhc%2Fweb%2Fwiklou.git

Remove deprecated class FormatExif

Deprecated and warnings since 1.18

Change-Id: I2461383bb2d3c5fc00ffb5f45bc8e931ed9acb58
---

diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index 83c2459f63..a62a560e4d 100644
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -250,6 +250,7 @@ changes to languages because of Bugzilla reports.
 ==== Removed classes ====
 * IPBlockForm - Use SpecialBlock directly
 * WatchlistEditor - Use SpecialEditWatchlist directly
+* FormatExif - Use FormatMetadata directly
 
 == Compatibility ==
 
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 1417db06a8..67f9a1c098 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -738,7 +738,6 @@ $wgAutoloadLocalClasses = array(
 	'DjVuImage' => 'includes/media/DjVuImage.php',
 	'Exif' => 'includes/media/Exif.php',
 	'ExifBitmapHandler' => 'includes/media/ExifBitmap.php',
-	'FormatExif' => 'includes/media/FormatMetadata.php',
 	'FormatMetadata' => 'includes/media/FormatMetadata.php',
 	'GIFHandler' => 'includes/media/GIF.php',
 	'GIFMetadataExtractor' => 'includes/media/GIFMetadataExtractor.php',
diff --git a/includes/media/FormatMetadata.php b/includes/media/FormatMetadata.php
index fca1c6d430..f7aa56710b 100644
--- a/includes/media/FormatMetadata.php
+++ b/includes/media/FormatMetadata.php
@@ -1871,29 +1871,3 @@ class FormatMetadata extends ContextSource {
 		return $priorityLanguages;
 	}
 }
-
-/** For compatability with old FormatExif class
- * which some extensions use.
- *
- * @deprecated since 1.18
- *
- */
-class FormatExif {
-	/** @var array */
-	private $meta;
-
-	/**
-	 * @param array $meta
-	 */
-	function __construct( $meta ) {
-		wfDeprecated( __METHOD__, '1.18' );
-		$this->meta = $meta;
-	}
-
-	/**
-	 * @return array
-	 */
-	function getFormattedData() {
-		return FormatMetadata::getFormattedData( $this->meta );
-	}
-}
diff --git a/includes/media/XMP.php b/includes/media/XMP.php
index 55d531962d..a74b701257 100644
--- a/includes/media/XMP.php
+++ b/includes/media/XMP.php
@@ -23,7 +23,7 @@
 
 /**
  * Class for reading xmp data containing properties relevant to
- * images, and spitting out an array that FormatExif accepts.
+ * images, and spitting out an array that FormatMetadata accepts.
  *
  * Note, this is not meant to recognize every possible thing you can
  * encode in XMP. It should recognize all the properties we want.