chore(internal): relay on autoloading when not using preloading

Signed-off-by: azjezz <azjezz@protonmail.com>
azjezz · Nov 13, 2021 · 1e815fc · 1e815fc
1 parent 26dbdb9
commit 1e815fc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -27,6 +27,9 @@
         "php-standard-library/psalm-plugin": "^1.1.1"
     },
     "autoload": {
+        "psr-4": {
+            "Psl\\": "src/Psl"
+        },
         "files": [
             "src/bootstrap.php"
         ]

diff --git a/composer.lock b/composer.lock
diff --git a/src/Psl/Internal/Loader.php b/src/Psl/Internal/Loader.php
@@ -694,11 +694,10 @@ private function __construct()
 
     public static function bootstrap(): void
     {
-        if (!function_exists(self::FUNCTIONS[0])) {
-            self::preload();
-        } elseif (!defined(self::CONSTANTS[0])) {
-            self::loadConstants();
-        }
+        self::loadConstants();
+        self::autoload(static function (): void {
+            self::loadFunctions();
+        });
     }
 
     public static function preload(): void