Merge "Fix a PHP 5.5 TODO"

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

diff --git a/includes/media/XCF.php b/includes/media/XCF.php
index e957cb2..f8fa252 100644 (file)
--- a/includes/media/XCF.php
+++ b/includes/media/XCF.php
@@ -3,7 +3,7 @@
  * Handler for the Gimp's native file format (XCF)
  *
  * Overview:
- *   http://en.wikipedia.org/wiki/XCF_(file_format)
+ *   https://en.wikipedia.org/wiki/XCF_(file_format)
  * Specification in Gnome repository:
  *   http://svn.gnome.org/viewvc/gimp/trunk/devel-docs/xcf.txt?view=markup
  *
@@ -37,7 +37,7 @@ class XCFHandler extends BitmapHandler {
         * @param File $file
         * @return bool
         */
-       function mustRender( $file ) {
+       public function mustRender( $file ) {
                return true;
        }
 
@@ -50,7 +50,7 @@ class XCFHandler extends BitmapHandler {
         * @return array
         */
        function getThumbType( $ext, $mime, $params = null ) {
-               return array( 'png', 'image/png' );
+               return [ 'png', 'image/png' ];
        }
 
        /**
@@ -68,7 +68,7 @@ class XCFHandler extends BitmapHandler {
 
                # Forge a return array containing metadata information just like getimagesize()
                # See PHP documentation at: http://www.php.net/getimagesize
-               $metadata = array();
+               $metadata = [];
                $metadata[0] = $header['width'];
                $metadata[1] = $header['height'];
                $metadata[2] = null; # IMAGETYPE constant, none exist for XCF.
@@ -106,21 +106,23 @@ class XCFHandler extends BitmapHandler {
                $binaryHeader = fread( $f, 26 );
                fclose( $f );
 
-               # Master image structure:
-               #
-               # byte[9] "gimp xcf "  File type magic
-               # byte[4] version      XCF version
-               #                        "file" - version 0
-               #                        "v001" - version 1
-               #                        "v002" - version 2
-               # byte    0            Zero-terminator for version tag
-               # uint32  width        With of canvas
-               # uint32  height       Height of canvas
-               # uint32  base_type    Color mode of the image; one of
-               #                         0: RGB color
-               #                         1: Grayscale
-               #                         2: Indexed color
-               #        (enum GimpImageBaseType in libgimpbase/gimpbaseenums.h)
+               /**
+                * Master image structure:
+                *
+                * byte[9] "gimp xcf "  File type magic
+                * byte[4] version      XCF version
+                *                        "file" - version 0
+                *                        "v001" - version 1
+                *                        "v002" - version 2
+                * byte    0            Zero-terminator for version tag
+                * uint32  width        With of canvas
+                * uint32  height       Height of canvas
+                * uint32  base_type    Color mode of the image; one of
+                *                         0: RGB color
+                *                         1: Grayscale
+                *                         2: Indexed color
+                *        (enum GimpImageBaseType in libgimpbase/gimpbaseenums.h)
+                */
                try {
                        $header = wfUnpack(
                                "A9magic" . # A: space padded
@@ -160,7 +162,7 @@ class XCFHandler extends BitmapHandler {
         */
        public function getMetadata( $file, $filename ) {
                $header = self::getXCFMetadata( $filename );
-               $metadata = array();
+               $metadata = [];
                if ( $header ) {
                        // Try to be consistent with the names used by PNG files.
                        // Unclear from base media type if it has an alpha layer,