Merge remote-tracking branch 'upstream/develop' into 4.6

codeigniter4 · Apr 21, 2024 · b82cfc7 · b82cfc7
2 parents c2da959 + 971b0da
commit b82cfc7
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 18 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -36,6 +36,7 @@
         __DIR__ . '/.php-cs-fixer.no-header.php',
         __DIR__ . '/.php-cs-fixer.tests.php',
         __DIR__ . '/.php-cs-fixer.user-guide.php',
+        __DIR__ . '/preload.php',
         __DIR__ . '/rector.php',
         __DIR__ . '/spark',
     ]);

diff --git a/preload.php b/preload.php
@@ -29,19 +29,6 @@
 // Path to the front controller
 define('FCPATH', __DIR__ . DIRECTORY_SEPARATOR . 'public' . DIRECTORY_SEPARATOR);
 
-/**
- * See https://www.php.net/manual/en/function.str-contains.php#126277
- */
-if (! function_exists('str_contains')) {
-    /**
-     * Polyfill of str_contains()
-     */
-    function str_contains(string $haystack, string $needle): bool
-    {
-        return empty($needle) || strpos($haystack, $needle) !== false;
-    }
-}
-
 class preload
 {
     /**
@@ -51,6 +38,7 @@ class preload
         [
             'include' => __DIR__ . '/vendor/codeigniter4/framework/system', // Change this path if using manual installation
             'exclude' => [
+                '/system/bootstrap.php',
                 // Not needed if you don't use them.
                 '/system/Database/OCI8/',
                 '/system/Database/Postgre/',
@@ -77,16 +65,18 @@ public function __construct()
         $this->loadAutoloader();
     }
 
-    private function loadAutoloader()
+    private function loadAutoloader(): void
     {
         $paths = new Config\Paths();
-        require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'bootstrap.php';
+        require rtrim($paths->systemDirectory, '\\/ ') . DIRECTORY_SEPARATOR . 'Boot.php';
+
+        CodeIgniter\Boot::preload($paths);
     }
 
     /**
      * Load PHP files.
      */
-    public function load()
+    public function load(): void
     {
         foreach ($this->paths as $path) {
             $directory = new RecursiveDirectoryIterator($path['include']);

diff --git a/system/Boot.php b/system/Boot.php
@@ -122,6 +122,19 @@ public static function bootTest(Paths $paths): void
         static::autoloadHelpers();
     }
 
+    /**
+     * Used by `preload.php`
+     */
+    public static function preload(Paths $paths): void
+    {
+        static::definePathConstants($paths);
+        static::loadConstants();
+        static::defineEnvironment();
+        static::loadEnvironmentBootstrap($paths, false);
+
+        static::loadAutoloader();
+    }
+
     /**
      * Load environment settings from .env files into $_SERVER and $_ENV
      */

diff --git a/system/Security/CheckPhpIni.php b/system/Security/CheckPhpIni.php
@@ -141,9 +141,10 @@ public static function checkIni(): array
         $ini    = ini_get_all();
 
         foreach ($items as $key => $values) {
+            $hasKeyInIni  = array_key_exists($key, $ini);
             $output[$key] = [
-                'global'      => $ini[$key]['global_value'],
-                'current'     => $ini[$key]['local_value'],
+                'global'      => $hasKeyInIni ? $ini[$key]['global_value'] : 'disabled',
+                'current'     => $hasKeyInIni ? $ini[$key]['local_value'] : 'disabled',
                 'recommended' => $values['recommended'] ?? '',
                 'remark'      => $values['remark'] ?? '',
             ];