From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 21 Jun 2019 06:06:56 +0000 (+0000)
Subject: Merge "Update ObjectFactory and ConvertibleTimestamp"
X-Git-Tag: 1.34.0-rc.0~1315
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=97db167a0ae539d7bb9c9d4ca51b2aaaf78f1853;hp=88ecf8d0958ebf11b80a89fc3e176016082a54bc

Merge "Update ObjectFactory and ConvertibleTimestamp"
---

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index 67aa371b3e..21e909c061 100644
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -78,6 +78,9 @@ For notes on 1.33.x and older releases, see HISTORY.
 * Updated wikimedia/at-ease from 1.2.0 to 2.0.0.
 * Updated wikimedia/remex-html from 2.0.1 to 2.0.3.
 * Updated monolog/monolog from 1.22.1 to 1.24.0 (dev-only).
+* Updated wikimedia/object-factory from 1.0.0 to 2.0.0.
+* Updated wikimedia/timestamp from 2.2.0 to 3.0.0.
+* Updated wikimedia/xmp-reader from 0.6.2 to 0.6.3.
 * …
 
 ==== Removed external libraries ====
diff --git a/composer.json b/composer.json
index a91008a372..59873ef843 100644
--- a/composer.json
+++ b/composer.json
@@ -43,7 +43,7 @@
 		"wikimedia/html-formatter": "1.0.2",
 		"wikimedia/ip-set": "2.0.1",
 		"wikimedia/less.php": "1.8.0",
-		"wikimedia/object-factory": "1.0.0",
+		"wikimedia/object-factory": "2.0.0",
 		"wikimedia/password-blacklist": "0.1.4",
 		"wikimedia/php-session-serializer": "1.0.7",
 		"wikimedia/purtle": "1.0.7",
@@ -52,10 +52,10 @@
 		"wikimedia/running-stat": "1.2.1",
 		"wikimedia/scoped-callback": "3.0.0",
 		"wikimedia/utfnormal": "2.0.0",
-		"wikimedia/timestamp": "2.2.0",
+		"wikimedia/timestamp": "3.0.0",
 		"wikimedia/wait-condition-loop": "1.0.1",
 		"wikimedia/wrappedstring": "3.0.1",
-		"wikimedia/xmp-reader": "0.6.2",
+		"wikimedia/xmp-reader": "0.6.3",
 		"zordius/lightncandy": "0.23"
 	},
 	"require-dev": {
diff --git a/tests/phpunit/includes/media/BitmapMetadataHandlerTest.php b/tests/phpunit/includes/media/BitmapMetadataHandlerTest.php
index 83554d28e1..3610054039 100644
--- a/tests/phpunit/includes/media/BitmapMetadataHandlerTest.php
+++ b/tests/phpunit/includes/media/BitmapMetadataHandlerTest.php
@@ -77,21 +77,18 @@ class BitmapMetadataHandlerTest extends MediaWikiTestCase {
 		$meta = BitmapMetadataHandler::Jpeg( $this->filePath .
 			'iptc-timetest.jpg' );
 
+		// raw date is 2020:07:13 14:04:05+11:32
 		$this->assertEquals( '2020:07:14 01:36:05', $meta['DateTimeDigitized'] );
+		// raw date is 1997:03:02 03:01:02-03:00
 		$this->assertEquals( '1997:03:02 00:01:02', $meta['DateTimeOriginal'] );
-	}
 
-	/**
-	 * File has an invalid time (+ one valid but really weird time)
-	 * that shouldn't be included
-	 * @covers BitmapMetadataHandler::Jpeg
-	 */
-	public function testIPTCDatesInvalid() {
 		$meta = BitmapMetadataHandler::Jpeg( $this->filePath .
-			'iptc-timetest-invalid.jpg' );
+											 'iptc-timetest-invalid.jpg' );
 
+		// raw date is 1845:03:02 03:01:02-03:00
 		$this->assertEquals( '1845:03:02 00:01:02', $meta['DateTimeOriginal'] );
-		$this->assertFalse( isset( $meta['DateTimeDigitized'] ) );
+		// raw date is 1942:07:13 25:05:02+00:00
+		$this->assertSame( '1942:07:14 01:05:02', $meta['DateTimeDigitized'] );
 	}
 
 	/**