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

codeigniter4 · Oct 12, 2023 · 1a6d2a9 · 1a6d2a9
2 parents 8ad55e3 + 52dbf70
commit 1a6d2a9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/phpstan.neon.dist b/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\
diff --git a/system/Config/Factories.php b/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.