From 732308ce6d1157355090f3b6864fd6ac04a8567f Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 22 Dec 2018 22:04:47 +0000
Subject: [PATCH] Hopefully this fixes the tests again

---
 src/Core/Installer.php           | 14 +++++++-------
 tests/src/Core/InstallerTest.php | 11 +++++++++++
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index 912406a29..74d6114f1 100644
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -405,13 +405,6 @@ class Installer
 		);
 		$returnVal = $returnVal ? $status : false;
 
-		$status = $this->checkFunction('json_encode',
-			L10n::t('JSON PHP module'),
-			L10n::t('Error: JSON PHP module required but not installed.'),
-			true
-		);
-		$returnVal = $returnVal ? $status : false;
-
 		$status = $this->checkFunction('imagecreatefromjpeg',
 			L10n::t('GD graphics PHP module'),
 			L10n::t('Error: GD graphics PHP module with JPEG support required but not installed.'),
@@ -447,6 +440,13 @@ class Installer
 		);
 		$returnVal = $returnVal ? $status : false;
 
+		$status = $this->checkFunction('json_encode',
+			L10n::t('JSON PHP module'),
+			L10n::t('Error: JSON PHP module required but not installed.'),
+			true
+		);
+		$returnVal = $returnVal ? $status : false;
+
 		return $returnVal;
 	}
 
diff --git a/tests/src/Core/InstallerTest.php b/tests/src/Core/InstallerTest.php
index 32a80a77e..d860321d4 100644
--- a/tests/src/Core/InstallerTest.php
+++ b/tests/src/Core/InstallerTest.php
@@ -177,6 +177,17 @@ class InstallerTest extends MockedTest
 			true,
 			$install->getChecks());
 
+		$this->mockFunctionL10TCalls();
+		$this->setFunctions(['json_encode' => false]);
+		$install = new Installer();
+		$this->assertFalse($install->checkFunctions());
+		$this->assertCheckExist(9,
+			'JSON PHP module',
+			'Error: JSON PHP module required but not installed.',
+			false,
+			true,
+			$install->getChecks());
+
 		$this->mockFunctionL10TCalls();
 		$this->setFunctions([
 			'curl_init' => true,