Make hard-coded versions from lang files dynamic

Author: iMattPro

ext.php

@@ -53,11 +53,11 @@ protected function phpbb_requirement($phpBB_version = PHPBB_VERSION)
 	{
 		if (phpbb_version_compare($phpBB_version, self::MIN_PHPBB_ALLOWED, '<'))
 		{
-			$this->errors[] = 'PHPBB_VERSION_MIN_ERROR';
+			$this->errors[] = ['PHPBB_VERSION_MIN_ERROR', self::MIN_PHPBB_ALLOWED];
 		}
 		else if (phpbb_version_compare($phpBB_version, self::MAX_PHPBB_ALLOWED, '>='))
 		{
-			$this->errors[] = 'PHPBB_VERSION_MAX_ERROR';
+			$this->errors[] = ['PHPBB_VERSION_MAX_ERROR', self::MAX_PHPBB_ALLOWED];
 		}
 	}
 
@@ -71,7 +71,7 @@ protected function php_requirement($php_version = PHP_VERSION_ID)
 	{
 		if ($php_version < self::MIN_PHP_ALLOWED)
 		{
-			$this->errors[] = 'PHP_VERSION_ERROR';
+			$this->errors[] = ['PHP_VERSION_ERROR', sprintf('%d.%d.%d', self::MIN_PHP_ALLOWED / 10000, (self::MIN_PHP_ALLOWED / 100) % 100, self::MIN_PHP_ALLOWED % 100)];
 		}
 	}
 
@@ -101,7 +101,9 @@ protected function enable_failed()
 		{
 			$language = $this->container->get('language');
 			$language->add_lang('common', 'phpbb/skeleton');
-			return array_map([$language, 'lang'], $this->errors);
+			return array_map(static function($error) use ($language) {
+				return is_array($error) ? call_user_func_array([$language, 'lang'], $error) : $language->lang($error);
+			}, $this->errors);
 		}
 
 		return false;

language/en/common.php

@@ -163,7 +163,7 @@
 	'SKELETON_INVALID_PHPBB_MAX_VERSION'=> 'The maximum phpBB version requirement is invalid.',
 
 	'NO_ZIPARCHIVE_ERROR'	=> 'The ZipArchive class is required, but was not found in your PHP configuration.',
-	'PHP_VERSION_ERROR'		=> 'PHP 5.6 or newer is required to use this extension.',
-	'PHPBB_VERSION_MIN_ERROR'	=> 'phpBB 3.2.3 or newer is required to use this extension.',
-	'PHPBB_VERSION_MAX_ERROR'	=> 'phpBB 4 is not supported with this version of the extension. Please check for a newer version of this extension.'
+	'PHP_VERSION_ERROR'		=> 'PHP %1$s or newer is required to install this version of the Skeleton Extension.',
+	'PHPBB_VERSION_MIN_ERROR'	=> 'phpBB %1$s or newer is required to install this version of the Skeleton Extension.',
+	'PHPBB_VERSION_MAX_ERROR'	=> 'phpBB %1$s and above is not supported by this version of the Skeleton Extension. Please check for a newer version of this extension.'
 ]);

tests/ext_test.php

@@ -138,7 +138,9 @@ protected function getExtErrors($ext): array
 	{
 		$prop = (new \ReflectionClass($ext))->getProperty('errors');
 		$prop->setAccessible(true);
-		return $prop->getValue($ext);
+		return array_map(static function ($e) {
+			return is_array($e) ? $e[0] : $e;
+		}, $prop->getValue($ext));
 	}
 
 	protected function setExtErrors($ext, array $errors): void