From 6ac3a7bfe48e72b687c5727cd60f88b9724da4ac Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Mon, 1 Aug 2022 16:46:38 +0900
Subject: [PATCH] fix: move PHP version check to index.php/spark

If we use new syntax in new PHP version when dropping older PHP version support,
syntax error occurs before the PHP version check.
---
 public/index.php       | 12 ++++++++++++
 spark                  | 12 ++++++++++++
 system/CodeIgniter.php | 13 +------------
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/public/index.php b/public/index.php
index 51f4be81e731..96e7f45ff4ac 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,5 +1,17 @@
 <?php
 
+// Check PHP version.
+$minPhpVersion = '7.4'; // If you update this, don't forget to update `spark`.
+if (version_compare(PHP_VERSION, $minPhpVersion, '<')) {
+    $message = sprintf(
+        'Your PHP version must be %s or higher to run CodeIgniter. Current version: %s',
+        $minPhpVersion,
+        PHP_VERSION
+    );
+
+    exit($message);
+}
+
 // Path to the front controller (this file)
 define('FCPATH', __DIR__ . DIRECTORY_SEPARATOR);
 
diff --git a/spark b/spark
index 225422aace74..49a00aa8a699 100755
--- a/spark
+++ b/spark
@@ -26,6 +26,18 @@ if (strpos(PHP_SAPI, 'cgi') === 0) {
     exit("The cli tool is not supported when running php-cgi. It needs php-cli to function!\n\n");
 }
 
+// Check PHP version.
+$minPhpVersion = '7.4'; // If you update this, don't forget to update `public/index.php`.
+if (version_compare(PHP_VERSION, $minPhpVersion, '<')) {
+    $message = sprintf(
+        'Your PHP version must be %s or higher to run CodeIgniter. Current version: %s',
+        $minPhpVersion,
+        PHP_VERSION
+    );
+
+    exit($message);
+}
+
 // We want errors to be shown when using it from the CLI.
 error_reporting(-1);
 ini_set('display_errors', '1');
diff --git a/system/CodeIgniter.php b/system/CodeIgniter.php
index 6a68262da1d1..116c63465ec8 100644
--- a/system/CodeIgniter.php
+++ b/system/CodeIgniter.php
@@ -49,8 +49,6 @@ class CodeIgniter
      */
     public const CI_VERSION = '4.2.1';
 
-    private const MIN_PHP_VERSION = '7.4';
-
     /**
      * App startup time.
      *
@@ -158,16 +156,6 @@ class CodeIgniter
      */
     public function __construct(App $config)
     {
-        if (version_compare(PHP_VERSION, self::MIN_PHP_VERSION, '<')) {
-            // @codeCoverageIgnoreStart
-            $message = extension_loaded('intl')
-                ? lang('Core.invalidPhpVersion', [self::MIN_PHP_VERSION, PHP_VERSION])
-                : sprintf('Your PHP version must be %s or higher to run CodeIgniter. Current version: %s', self::MIN_PHP_VERSION, PHP_VERSION);
-
-            exit($message);
-            // @codeCoverageIgnoreEnd
-        }
-
         $this->startTime = microtime(true);
         $this->config    = $config;
     }
@@ -962,6 +950,7 @@ protected function display404errors(PageNotFoundException $e)
             ob_end_flush(); // @codeCoverageIgnore
         }
 
+        // Throws new PageNotFoundException and remove exception message on production.
         throw PageNotFoundException::forPageNotFound(
             (ENVIRONMENT !== 'production' || ! $this->isWeb()) ? $e->getMessage() : null
         );