media: code style improvements

- Avoid unnecesary else branching
- Static vs non-static fixes
- string, int and float casting instead of strval,
  intval, floatval (faster and more readable)
- Strict comparisons (but not for all '' and 0 as might have
  implicit falsey behavior)
- Few spelling mistakes
- Remove TimestampException handling, caught by parent function

Change-Id: I08725c8e391965529a2766dfaf5d8f6cf8a86db8

1 files changed, 4 insertions, 8 deletions

diff --git a/includes/media/PNGHandler.php b/includes/media/PNGHandler.php
index 4ebe1842a447..131b447a2d4b 100644
--- a/includes/media/PNGHandler.php
+++ b/includes/media/PNGHandler.php
@@ -96,11 +96,7 @@ class PNGHandler extends BitmapHandler {
 	 */
 	public function isAnimatedImage( $image ) {
 		$metadata = $image->getMetadataArray();
-		if ( isset( $metadata['frameCount'] ) && $metadata['frameCount'] > 1 ) {
-			return true;
-		}
-
-		return false;
+		return isset( $metadata['frameCount'] ) && $metadata['frameCount'] > 1;
 	}
 
 	/**
@@ -130,7 +126,7 @@ class PNGHandler extends BitmapHandler {
 		}
 
 		if ( !isset( $data['metadata']['_MW_PNG_VERSION'] )
-			|| $data['metadata']['_MW_PNG_VERSION'] != PNGMetadataExtractor::VERSION
+			|| $data['metadata']['_MW_PNG_VERSION'] !== PNGMetadataExtractor::VERSION
 		) {
 			wfDebug( __METHOD__ . " old but compatible png metadata" );
 
@@ -187,9 +183,9 @@ class PNGHandler extends BitmapHandler {
 
 		if ( !$metadata || !isset( $metadata['duration'] ) || !$metadata['duration'] ) {
 			return 0.0;
-		} else {
-			return (float)$metadata['duration'];
 		}
+
+		return (float)$metadata['duration'];
 	}
 
 	// PNGs should be easy to support, but it will need some sharpening applied