mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-08 15:57:01 +02:00
Code Issues Releases Wiki Activity

Optimizations to $modules loader

Browse Source
This commit is contained in:
Ryan Cramer
2024-05-31 14:35:46 -04:00
parent f6a1ea781b
commit 48f85faced
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
wire/core/Modules.php
View File

@@ -236,6 +236,9 @@ class Modules extends WireArray {
*/ */
public function __construct($path) { public function __construct($path) {
parent::__construct(); parent::__construct();
$this->nameProperty = 'className';
$this->usesNumericKeys = false;
$this->indexedByName = true;
$this->addPath($path); // paths[0] is always core modules path $this->addPath($path); // paths[0] is always core modules path
} }
@@ -978,7 +981,7 @@ class Modules extends WireArray {
$currentVersion = $class === 'PHP' ? PHP_VERSION : $this->wire()->config->version; $currentVersion = $class === 'PHP' ? PHP_VERSION : $this->wire()->config->version;
} }
} else { } else {
$installed = parent::get($class) !== null; $installed = isset($this->data[$class]);
if($installed && $requiredVersion !== null) { if($installed && $requiredVersion !== null) {
$info = $this->info->getModuleInfo($class); $info = $this->info->getModuleInfo($class);
$currentVersion = $info['version']; $currentVersion = $info['version'];
@@ -1366,26 +1369,26 @@ class Modules extends WireArray {
if(strpos($module, '.') !== false) { if(strpos($module, '.') !== false) {
$module = basename(basename($module, '.php'), '.module'); $module = basename(basename($module, '.php'), '.module');
} }
if(array_key_exists($module, $this->moduleIDs)) { if(isset($this->data[$module])) {
$className = $module;
} else if(array_key_exists($module, $this->moduleIDs)) {
$className = $module; $className = $module;
} else if(array_key_exists($module, $this->installableFiles)) { } else if(array_key_exists($module, $this->installableFiles)) {
$className = $module; $className = $module;
} }
} }
if($className) { if(!$className) return false;
if($withNamespace) {
if($namespace) { if($withNamespace) {
$className = "$namespace\\$className"; if($namespace) {
} else { $className = "$namespace\\$className";
$className = $this->info->getModuleNamespace($className) . $className; } else {
} $className = $this->info->getModuleNamespace($className) . $className;
} }
return $className; }
} return $className;
return false;
} }
/** /**

2
wire/core/ModulesLoader.php
View File

@@ -412,7 +412,7 @@ class ModulesLoader extends ModulesClass {
$requires = array(); $requires = array();
$name = $moduleName; $name = $moduleName;
$moduleName = $this->loadModule($path, $pathname, $requires, $installed); $moduleName = $this->loadModule($path, $pathname, $requires, $installed);
if(!$config->paths->get($name)) $modulesFiles->setConfigPaths($name, dirname($basePath . $pathname)); if(!$config->paths->__isset($name)) $modulesFiles->setConfigPaths($name, dirname($basePath . $pathname));
if(!$moduleName) continue; if(!$moduleName) continue;
if(count($requires)) { if(count($requires)) {