Merge "Avoid 'message' in log context in AuthManager"

[lhc/web/wiklou.git] / includes / media / PNG.php

diff --git a/includes/media/PNG.php b/includes/media/PNG.php
index e297fe1..294abb3 100644 (file)
--- a/includes/media/PNG.php
+++ b/includes/media/PNG.php
@@ -30,7 +30,7 @@ class PNGHandler extends BitmapHandler {
        const BROKEN_FILE = '0';
 
        /**
-        * @param File $image
+        * @param File|FSFile $image
         * @param string $filename
         * @return string
         */
@@ -71,11 +71,11 @@ class PNGHandler extends BitmapHandler {
                $meta = $image->getMetadata();
 
                if ( !$meta ) {
-                       return array();
+                       return [];
                }
                $meta = unserialize( $meta );
                if ( !isset( $meta['metadata'] ) ) {
-                       return array();
+                       return [];
                }
                unset( $meta['metadata']['_MW_PNG_VERSION'] );
 
@@ -155,7 +155,7 @@ class PNGHandler extends BitmapHandler {
                        return $original;
                }
 
-               $info = array();
+               $info = [];
                $info[] = $original;
 
                if ( $metadata['loopCount'] == 0 ) {
@@ -180,7 +180,7 @@ class PNGHandler extends BitmapHandler {
         *
         * Shown in the &query=imageinfo&iiprop=size api query.
         *
-        * @param $file File
+        * @param File $file
         * @return float The duration of the file.
         */
        public function getLength( $file ) {