Merge "Protected function UploadBase->validateName changed to public"

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

diff --git a/includes/media/SVGMetadataExtractor.php b/includes/media/SVGMetadataExtractor.php
index e4235a7..f21d6b0 100644 (file)
--- a/includes/media/SVGMetadataExtractor.php
+++ b/includes/media/SVGMetadataExtractor.php
@@ -51,7 +51,7 @@ class SVGReader {
         * Constructor
         *
         * Creates an SVGReader drawing from the source provided
-        * @param $source String: URI from which to read
+        * @param string $source URI from which to read
         * @throws MWException|Exception
         */
        function __construct( $source ) {
@@ -175,11 +175,11 @@ class SVGReader {
        /**
         * Read a textelement from an element
         *
-        * @param String $name of the element that we are reading from
-        * @param String $metafield that we will fill with the result
+        * @param string $name of the element that we are reading from
+        * @param string $metafield that we will fill with the result
         */
        private function readField( $name, $metafield=null ) {
-               $this->debug ( "Read field $metafield" );
+               $this->debug( "Read field $metafield" );
                if( !$metafield || $this->reader->nodeType != XmlReader::ELEMENT ) {
                        return;
                }
@@ -197,11 +197,11 @@ class SVGReader {
        /**
         * Read an XML snippet from an element
         *
-        * @param String $metafield that we will fill with the result
+        * @param string $metafield that we will fill with the result
         * @throws MWException
         */
        private function readXml( $metafield=null ) {
-               $this->debug ( "Read top level metadata" );
+               $this->debug( "Read top level metadata" );
                if( !$metafield || $this->reader->nodeType != XmlReader::ELEMENT ) {
                        return;
                }
@@ -217,10 +217,10 @@ class SVGReader {
        /**
         * Filter all children, looking for animate elements
         *
-        * @param String $name of the element that we are reading from
+        * @param string $name of the element that we are reading from
         */
        private function animateFilter( $name ) {
-               $this->debug ( "animate filter for tag $name" );
+               $this->debug( "animate filter for tag $name" );
                if( $this->reader->nodeType != XmlReader::ELEMENT ) {
                        return;
                }
@@ -278,7 +278,7 @@ class SVGReader {
         *
         * The parser has to be in the start element of "<svg>"
         */
-       private function handleSVGAttribs( ) {
+       private function handleSVGAttribs() {
                $defaultWidth = self::DEFAULT_WIDTH;
                $defaultHeight = self::DEFAULT_HEIGHT;
                $aspect = 1.0;
@@ -325,7 +325,7 @@ class SVGReader {
         * Return a rounded pixel equivalent for a labeled CSS/SVG length.
         * http://www.w3.org/TR/SVG11/coords.html#UnitIdentifiers
         *
-        * @param $length String: CSS/SVG length.
+        * @param string $length CSS/SVG length.
         * @param $viewportSize: Float optional scale for percentage units...
         * @return float: length in pixels
         */