From 22d1426241ed3c34ff49ad972fb8510a0ea50675 Mon Sep 17 00:00:00 2001
From: Derick Alangi <alangiderick@gmail.com>
Date: Fri, 22 Mar 2019 23:36:11 +0100
Subject: [PATCH] registration: Fix if or elseif constructs with return
 statements

Change-Id: I7abd09d8959daddaa161bd92a1b1b23a4abbab32
---
 .../registration/ExtensionJsonValidator.php   | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/includes/registration/ExtensionJsonValidator.php b/includes/registration/ExtensionJsonValidator.php
index 9d6c1a5b33..ba5df52854 100644
--- a/includes/registration/ExtensionJsonValidator.php
+++ b/includes/registration/ExtensionJsonValidator.php
@@ -60,12 +60,16 @@ class ExtensionJsonValidator {
 				'The JsonSchema library cannot be found, please install it through composer.'
 			);
 			return false;
-		} elseif ( !class_exists( SpdxLicenses::class ) ) {
+		}
+
+		if ( !class_exists( SpdxLicenses::class ) ) {
 			call_user_func( $this->missingDepCallback,
 				'The spdx-licenses library cannot be found, please install it through composer.'
 			);
 			return false;
-		} elseif ( !class_exists( JsonParser::class ) ) {
+		}
+
+		if ( !class_exists( JsonParser::class ) ) {
 			call_user_func( $this->missingDepCallback,
 				'The JSON lint library cannot be found, please install it through composer.'
 			);
@@ -104,7 +108,9 @@ class ExtensionJsonValidator {
 			throw new ExtensionJsonValidationError(
 				"$path is using a non-supported schema version"
 			);
-		} elseif ( $version > ExtensionRegistry::MANIFEST_VERSION ) {
+		}
+
+		if ( $version > ExtensionRegistry::MANIFEST_VERSION ) {
 			throw new ExtensionJsonValidationError(
 				"$path is using a non-supported schema version"
 			);
@@ -140,15 +146,15 @@ class ExtensionJsonValidator {
 		if ( $validator->isValid() && !$extraErrors ) {
 			// All good.
 			return true;
-		} else {
-			$out = "$path did not pass validation.\n";
-			foreach ( $validator->getErrors() as $error ) {
-				$out .= "[{$error['property']}] {$error['message']}\n";
-			}
-			if ( $extraErrors ) {
-				$out .= implode( "\n", $extraErrors ) . "\n";
-			}
-			throw new ExtensionJsonValidationError( $out );
 		}
+
+		$out = "$path did not pass validation.\n";
+		foreach ( $validator->getErrors() as $error ) {
+			$out .= "[{$error['property']}] {$error['message']}\n";
+		}
+		if ( $extraErrors ) {
+			$out .= implode( "\n", $extraErrors ) . "\n";
+		}
+		throw new ExtensionJsonValidationError( $out );
 	}
 }
-- 
2.20.1