X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fmedia%2FBitmapMetadataHandler.php;h=7999bbbf8614b6740a2896969d93d57662587fb0;hb=975cd8710036865784a97aaffe2c0a3f69c8580c;hp=c8d37bbb5d36bbc151464514e9b3e1241f58830a;hpb=08611d0aef02e031a7e6f556d42786c76d8b3a60;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/media/BitmapMetadataHandler.php b/includes/media/BitmapMetadataHandler.php
index c8d37bbb5d..7999bbbf86 100644
--- a/includes/media/BitmapMetadataHandler.php
+++ b/includes/media/BitmapMetadataHandler.php
@@ -21,6 +21,8 @@
  * @ingroup Media
  */
 
+use MediaWiki\Logger\LoggerFactory;
+
 /**
  * Class to deal with reconciling and extracting metadata from bitmap images.
  * This is meant to comply with http://www.metadataworkinggroup.org/pdf/mwg_guidance.pdf
@@ -33,19 +35,19 @@
  */
 class BitmapMetadataHandler {
 	/** @var array */
-	private $metadata = array();
+	private $metadata = [];
 
 	/** @var array Metadata priority */
-	private $metaPriority = array(
-		20 => array( 'other' ),
-		40 => array( 'native' ),
-		60 => array( 'iptc-good-hash', 'iptc-no-hash' ),
-		70 => array( 'xmp-deprecated' ),
-		80 => array( 'xmp-general' ),
-		90 => array( 'xmp-exif' ),
-		100 => array( 'iptc-bad-hash' ),
-		120 => array( 'exif' ),
-	);
+	private $metaPriority = [
+		20 => [ 'other' ],
+		40 => [ 'native' ],
+		60 => [ 'iptc-good-hash', 'iptc-no-hash' ],
+		70 => [ 'xmp-deprecated' ],
+		80 => [ 'xmp-general' ],
+		90 => [ 'xmp-exif' ],
+		100 => [ 'iptc-bad-hash' ],
+		120 => [ 'exif' ],
+	];
 
 	/** @var string */
 	private $iptcType = 'iptc-no-hash';
@@ -121,7 +123,7 @@ class BitmapMetadataHandler {
 	function getMetadataArray() {
 		// this seems a bit ugly... This is all so its merged in right order
 		// based on the MWG recomendation.
-		$temp = array();
+		$temp = [];
 		krsort( $this->metaPriority );
 		foreach ( $this->metaPriority as $pri ) {
 			foreach ( $pri as $type ) {
@@ -159,7 +161,7 @@ class BitmapMetadataHandler {
 
 		$seg = JpegMetadataExtractor::segmentSplitter( $filename );
 		if ( isset( $seg['COM'] ) && isset( $seg['COM'][0] ) ) {
-			$meta->addMetadata( array( 'JPEGFileComment' => $seg['COM'] ), 'native' );
+			$meta->addMetadata( [ 'JPEGFileComment' => $seg['COM'] ], 'native' );
 		}
 		if ( isset( $seg['PSIR'] ) && count( $seg['PSIR'] ) > 0 ) {
 			foreach ( $seg['PSIR'] as $curPSIRValue ) {
@@ -167,7 +169,7 @@ class BitmapMetadataHandler {
 			}
 		}
 		if ( isset( $seg['XMP'] ) && $showXMP ) {
-			$xmp = new XMPReader();
+			$xmp = new XMPReader( LoggerFactory::getInstance( 'XMP' ) );
 			$xmp->parse( $seg['XMP'] );
 			foreach ( $seg['XMP_ext'] as $xmpExt ) {
 				/* Support for extended xmp in jpeg files
@@ -203,7 +205,7 @@ class BitmapMetadataHandler {
 		if ( isset( $array['text']['xmp']['x-default'] )
 			&& $array['text']['xmp']['x-default'] !== '' && $showXMP
 		) {
-			$xmp = new XMPReader();
+			$xmp = new XMPReader( LoggerFactory::getInstance( 'XMP' ) );
 			$xmp->parse( $array['text']['xmp']['x-default'] );
 			$xmpRes = $xmp->getResults();
 			foreach ( $xmpRes as $type => $xmpSection ) {
@@ -233,11 +235,11 @@ class BitmapMetadataHandler {
 		$baseArray = GIFMetadataExtractor::getMetadata( $filename );
 
 		if ( count( $baseArray['comment'] ) > 0 ) {
-			$meta->addMetadata( array( 'GIFFileComment' => $baseArray['comment'] ), 'native' );
+			$meta->addMetadata( [ 'GIFFileComment' => $baseArray['comment'] ], 'native' );
 		}
 
 		if ( $baseArray['xmp'] !== '' && XMPReader::isSupported() ) {
-			$xmp = new XMPReader();
+			$xmp = new XMPReader( LoggerFactory::getInstance( 'XMP' ) );
 			$xmp->parse( $baseArray['xmp'] );
 			$xmpRes = $xmp->getResults();
 			foreach ( $xmpRes as $type => $xmpSection ) {