Merge "Fix return type hints in media related classes"

diff --combined includes/media/SvgHandler.php
index 639132c,e12f596..98c22a3
--- 1/includes/media/SvgHandler.php
--- 2/includes/media/SvgHandler.php
+++ b/includes/media/SvgHandler.php
@@@ -381,7 -381,7 +381,7 @@@ class SvgHandler extends ImageHandler 
         * @param File|FSFile $file
         * @param string $path Unused
         * @param bool|array $metadata
-        * @return array
+        * @return array|false
         */
        function getImageSize( $file, $path, $metadata = false ) {
                if ( $metadata === false && $file instanceof File ) {
@@@ -438,10 -438,8 +438,10 @@@
         */
        public function getMetadata( $file, $filename ) {
                $metadata = [ 'version' => self::SVG_METADATA_VERSION ];
 +
                try {
 -                      $metadata += SVGMetadataExtractor::getMetadata( $filename );
 +                      $svgReader = new SVGReader( $filename );
 +                      $metadata += $svgReader->getMetadata();
                } catch ( Exception $e ) { // @todo SVG specific exceptions
                        // File not found, broken, etc.
                        $metadata['error'] = [