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

Author: kenjis

phpstan.neon.dist

@@ -38,3 +38,8 @@ parameters:
 		booleansInConditions: true
 		disallowedConstructs: true
 		matchingInheritedMethodNames: true
+	ignoreErrors:
+		- '#^Call to function config with Config\\.+\:\:class is discouraged\.$#'
+	codeigniter:
+		additionalConfigNamespaces:
+			- CodeIgniter\Config\

system/Config/Factories.php

@@ -377,7 +377,7 @@ public static function getOptions(string $component): array
             // Handle Config as a special case to prevent logic loops
             ? self::$configOptions
             // Load values from the best Factory configuration (will include Registrars)
-            : config(Factory::class)->{$component} ?? [];
+            : config('Factory')->{$component} ?? [];
 
         // The setOptions() reset the component. So getOptions() may reset
         // the component.