Update ObjectFactory and ConvertibleTimestamp

* wikimedia/object-factory -> 2.0.0
* wikimedia/timestamp -> 3.0.0
* wikimedia/xmp-reader -> 0.6.3

Needed for I5c0cc3a8. mediawiki/vendor equivalent is Iea05dc43.

Bug: T224729
Bug: T144482
Depends-On: Iea05dc439688871c574c639e617765ae88a75ff7
Change-Id: I6705a8d46f53ef807edab10f8f0cb0eba6b560dc

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index 431db3d..f3526d4 100644 (file)
--- 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 a91008a..59873ef 100644 (file)
--- 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 83554d2..3610054 100644 (file)
--- 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'] );
        }
 
        /**