Merge pull request #4549 from paulbalandan/ci-missing-ext

Author: MGatner

system/CodeIgniter.php

@@ -143,8 +143,6 @@ class CodeIgniter
 	 */
 	protected $useSafeOutput = false;
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Constructor.
 	 *
@@ -154,15 +152,13 @@ public function __construct(App $config)
 	{
 		if (version_compare(PHP_VERSION, self::MIN_PHP_VERSION, '<'))
 		{
-			die(lang('Core.invalidPhpVersion', [self::MIN_PHP_VERSION, PHP_VERSION]));
+			exit(lang('Core.invalidPhpVersion', [self::MIN_PHP_VERSION, PHP_VERSION]));
 		}
 
 		$this->startTime = microtime(true);
 		$this->config    = $config;
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Handles some basic app and environment setup.
 	 */
@@ -178,9 +174,7 @@ public function initialize()
 		// Run this check for manual installations
 		if (! is_file(COMPOSER_PATH))
 		{
-			// @codeCoverageIgnoreStart
-			$this->resolvePlatformExtensions();
-			// @codeCoverageIgnoreEnd
+			$this->resolvePlatformExtensions(); // @codeCoverageIgnore
 		}
 
 		// Set default locale on the server
@@ -193,20 +187,17 @@ public function initialize()
 
 		if (! CI_DEBUG)
 		{
-			// @codeCoverageIgnoreStart
-			Kint::$enabled_mode = false;
-			// @codeCoverageIgnoreEnd
+			Kint::$enabled_mode = false; // @codeCoverageIgnore
 		}
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Checks system for missing required PHP extensions.
 	 *
-	 * @return void
 	 * @throws FrameworkException
 	 *
+	 * @return void
+	 *
 	 * @codeCoverageIgnore
 	 */
 	protected function resolvePlatformExtensions()
@@ -229,14 +220,12 @@ protected function resolvePlatformExtensions()
 			}
 		}
 
-		if ($missingExtensions)
+		if ($missingExtensions !== [])
 		{
 			throw FrameworkException::forMissingExtension(implode(', ', $missingExtensions));
 		}
 	}
 
-	//--------------------------------------------------------------------
-
 	/**
 	 * Initializes Kint
 	 */

system/Exceptions/FrameworkException.php

@@ -40,7 +40,21 @@ public static function forCopyError(string $path)
 
 	public static function forMissingExtension(string $extension)
 	{
-		return new static(lang('Core.missingExtension', [$extension]));
+		if (strpos($extension, 'intl') !== false)
+		{
+			// @codeCoverageIgnoreStart
+			$message = sprintf(
+				'The framework needs the following extension(s) installed and loaded: %s.',
+				$extension
+			);
+			// @codeCoverageIgnoreEnd
+		}
+		else
+		{
+			$message = lang('Core.missingExtension', [$extension]);
+		}
+
+		return new static($message);
 	}
 
 	public static function forNoHandlers(string $class)