diff --git a/WebVideoTranscode/WebVideoTranscodeJob.php b/WebVideoTranscode/WebVideoTranscodeJob.php
index 78ae728ec..f8915d949 100644
--- a/WebVideoTranscode/WebVideoTranscodeJob.php
+++ b/WebVideoTranscode/WebVideoTranscodeJob.php
@@ -184,9 +184,9 @@ public function run() {
 		// Check the codec see which encode method to call;
 		if ( isset( $options[ 'novideo' ] ) ) {
 			$status = $this->ffmpegEncode( $options );
-		} elseif( $options['videoCodec'] == 'theora' && $wgFFmpeg2theoraLocation !== false ) {
+		} elseif ( $options['videoCodec'] == 'theora' && $wgFFmpeg2theoraLocation !== false ) {
 			$status = $this->ffmpeg2TheoraEncode( $options );
-		} elseif( $options['videoCodec'] == 'vp8' || $options['videoCodec'] == 'vp9' ||
+		} elseif ( $options['videoCodec'] == 'vp8' || $options['videoCodec'] == 'vp9' ||
 			$options['videoCodec'] == 'h264' ||
 				( $options['videoCodec'] == 'theora' && $wgFFmpeg2theoraLocation === false )
 		) {
@@ -360,11 +360,11 @@ function ffmpegEncode( $options, $pass=0 ) {
 
 		if ( isset( $options['novideo'] ) ) {
 			$cmd .= " -vn ";
-		} elseif( $options['videoCodec'] == 'vp8' || $options['videoCodec'] == 'vp9' ) {
+		} elseif ( $options['videoCodec'] == 'vp8' || $options['videoCodec'] == 'vp9' ) {
 			$cmd .= $this->ffmpegAddWebmVideoOptions( $options, $pass );
-		} elseif( $options['videoCodec'] == 'h264' ) {
+		} elseif ( $options['videoCodec'] == 'h264' ) {
 			$cmd .= $this->ffmpegAddH264VideoOptions( $options, $pass );
-		} elseif( $options['videoCodec'] == 'theora' ) {
+		} elseif ( $options['videoCodec'] == 'theora' ) {
 			$cmd .= $this->ffmpegAddTheoraVideoOptions( $options, $pass );
 		}
 		// Add size options:
diff --git a/composer.json b/composer.json
index 262874c43..bde1d3172 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
 	"require-dev": {
 		"jakub-onderka/php-parallel-lint": "0.9.2",
-		"mediawiki/mediawiki-codesniffer": "0.6.0"
+		"mediawiki/mediawiki-codesniffer": "0.7.1"
 	},
 	"scripts": {
 		"test": [
diff --git a/handlers/TextHandler/TextHandler.php b/handlers/TextHandler/TextHandler.php
index ba61e14f7..42f631468 100644
--- a/handlers/TextHandler/TextHandler.php
+++ b/handlers/TextHandler/TextHandler.php
@@ -98,7 +98,7 @@ function getTimedTextNamespace() {
 			} else {
 				return false;
 			}
-		} elseif( $this->file->repo instanceof ForeignDBViaLBRepo ){
+		} elseif ( $this->file->repo instanceof ForeignDBViaLBRepo ){
 			global $wgTimedTextForeignNamespaces;
 			$wikiID = $this->file->getRepo()->getSlaveDB()->getWikiID();
 			if ( isset( $wgTimedTextForeignNamespaces[ $wikiID ] ) ) {
diff --git a/handlers/WebMHandler/WebMHandler.php b/handlers/WebMHandler/WebMHandler.php
index 61bcd504a..ce3004351 100644
--- a/handlers/WebMHandler/WebMHandler.php
+++ b/handlers/WebMHandler/WebMHandler.php
@@ -112,7 +112,7 @@ function getStreamTypes( $file ) {
 		// id3 gives 'V_VP8' for what we call VP8
 		if ( isset( $metadata['video'] ) && $metadata['video']['dataformat'] == 'vp8' ) {
 			$streamTypes[] =  'VP8';
-		} elseif( isset( $metadata['video'] ) &&
+		} elseif ( isset( $metadata['video'] ) &&
 			( $metadata['video']['dataformat'] === 'vp9'
 			|| $metadata['video']['dataformat'] === 'V_VP9'
 		) ) {