Refactor compatibility check to a new function

Author: iMattPro

includes/qi.php

@@ -866,4 +866,39 @@ public static function phpbb_version_compare($version1, $version2, $operator = n
 		}
 		return version_compare($version1, $version2, $operator);
 	}
+
+	/**
+	 * Check phpBB compatibility with the PHP environment
+	 *
+	 * phpBB 3.1.x is not compat with PHP >= 7 (700000)
+	 * phpBB 3.2.0-3.2.1 is not compat with PHP >= 7.2 (702000)
+	 * phpBB 3.2.x is not compat with PHP >= 7.3 (703000)
+	 * phpBB 3.3.x is not compat with PHP < 7.1.3 (70103)
+	 * phpBB 4.0.x is not compat with PHP < 7.3 (703000)
+	 *
+	 * @param string $phpbb_version Check a given phpBB version. If none given, will check QI's loaded phpBB.
+	 *
+	 * @return bool
+	 */
+	public static function php_phpbb_incompatible($phpbb_version = '')
+	{
+		if ($phpbb_version)
+		{
+			return
+				(PHP_VERSION_ID >= 70000 && self::phpbb_version_compare($phpbb_version, '3.2', '<')) ||
+				(PHP_VERSION_ID >= 70200 && self::phpbb_version_compare($phpbb_version, '3.2.2', '<')) ||
+				(PHP_VERSION_ID >= 70300 && self::phpbb_version_compare($phpbb_version, '3.3', '<')) ||
+				(PHP_VERSION_ID < 70103 && self::phpbb_version_compare($phpbb_version, '3.3', '>=')) ||
+				(PHP_VERSION_ID < 70300 && self::phpbb_version_compare($phpbb_version, '4.0', '>='))
+			;
+		}
+
+		return
+			(PHP_VERSION_ID >= 70000 && !defined('PHPBB_32')) ||
+			(PHP_VERSION_ID >= 70200 && self::phpbb_version_compare(PHPBB_VERSION, '3.2.2', '<')) ||
+			(PHP_VERSION_ID >= 70300 && !defined('PHPBB_33')) ||
+			(PHP_VERSION_ID < 70103 && defined('PHPBB_33')) ||
+			(PHP_VERSION_ID < 70300 && defined('PHPBB_40'))
+		;
+	}
 }

includes/settings.php

@@ -166,21 +166,11 @@ public function validate()
 			$validation_errors[] = ['BOARDS_DIR_MISSING', $this->get_boards_dir()];
 		}
 
-		// Validate alt environment boards
+		// Validate alt environment board's compatibility with current PHP environment
 		if ($this->settings['alt_env'])
 		{
 			$phpbb_version = get_phpbb_version($this->qi_path . 'sources/phpBB3_alt/' . $this->settings['alt_env']);
-			// phpBB 3.1.x is not compat with PHP >= 7 (700000)
-			// phpBB 3.2.0-3.2.1 is not compat with PHP >= 7.2 (702000)
-			// phpBB 3.2.x is not compat with PHP >= 7.3 (703000)
-			// phpBB 3.3.x is not compat with PHP < 7.1.3 (70103)
-			// phpBB 4.0.x is not compat with PHP < 7.3 (703000)
-			if ((PHP_VERSION_ID >= 70000 && qi::phpbb_version_compare($phpbb_version, '3.2', '<')) ||
-				(PHP_VERSION_ID >= 70200 && qi::phpbb_version_compare($phpbb_version, '3.2.2', '<')) ||
-				(PHP_VERSION_ID >= 70300 && qi::phpbb_version_compare($phpbb_version, '3.3', '<')) ||
-				(PHP_VERSION_ID < 70103 && qi::phpbb_version_compare($phpbb_version, '3.3', '>=')) ||
-				(PHP_VERSION_ID < 70300 && qi::phpbb_version_compare($phpbb_version, '4.0', '>='))
-			)
+			if (qi::php_phpbb_incompatible($phpbb_version))
 			{
 				$validation_errors[] = ['PHP_INCOMPATIBLE', $phpbb_version, PHP_VERSION];
 			}

modules/qi_create.php

@@ -22,17 +22,8 @@ public function run()
 		// postgres uses remove_comments function which is defined in functions_admin
 		include($phpbb_root_path . 'includes/functions_admin.' . $phpEx);
 
-		// phpBB 3.1.x is not compat with PHP 7 (700000)
-		// phpBB 3.2.0-3.2.1 is not compat with PHP 7.2 (702000)
-		// phpBB 3.2.x is not compat with PHP 7.3 (703000)
-		// phpBB 3.3.x is not compat with PHP < 7.1.3 (70103)
-		// phpBB 4.0.x is not compat with PHP < 7.3 (703000)
-		if ((PHP_VERSION_ID >= 70000 && !defined('PHPBB_32')) ||
-			(PHP_VERSION_ID >= 70200 && qi::phpbb_version_compare(PHPBB_VERSION, '3.2.2', '<')) ||
-			(PHP_VERSION_ID >= 70300 && !defined('PHPBB_33')) ||
-			(PHP_VERSION_ID < 70103 && defined('PHPBB_33')) ||
-			(PHP_VERSION_ID < 70300 && defined('PHPBB_40'))
-		)
+		// Validate board's compatibility with current PHP environment
+		if (qi::php_phpbb_incompatible())
 		{
 			trigger_error(qi::lang('PHP_INCOMPATIBLE', PHPBB_VERSION, PHP_VERSION));
 		}