Skip to content

Commit 412f6af

Browse files
committed
refactor: use createFromConfig() method
1 parent cea901f commit 412f6af

2 files changed

Lines changed: 18 additions & 18 deletions

File tree

src/Classes/Controllers/IndexController.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ public function invokeIndex()
213213
return $accessRedirect;
214214
}
215215

216-
$moduleLoader = ModuleLoader::create(Config::getDependenyMode());
216+
$moduleLoader = ModuleLoader::createFromConfig();
217217
$modules = $moduleLoader->loadAllVersionsWithLatestRemote();
218218
$modules = $this->moduleFilter->filterNewestOrInstalledVersion($modules);
219219

@@ -260,10 +260,10 @@ public function invokeModuleInfo()
260260
$version = $queryParams['version'] ?? '';
261261

262262
if ($version) {
263-
$moduleLoader = ModuleLoader::create(Config::getDependenyMode());
263+
$moduleLoader = ModuleLoader::createFromConfig();
264264
$module = $moduleLoader->loadByArchiveNameAndVersion($archiveName, $version);
265265
} else {
266-
$moduleLoader = ModuleLoader::create(Config::getDependenyMode());
266+
$moduleLoader = ModuleLoader::createFromConfig();
267267
$modules = $moduleLoader->loadAllVersionsByArchiveNameWithLatestRemote($archiveName);
268268
$module = $this->moduleFilter->getLatestVersion($modules);
269269
}
@@ -316,7 +316,7 @@ public function invokeLazyModuleInfo()
316316
$version = $queryParams['version'] ?? '';
317317
$data = $queryParams['data'] ?? '';
318318

319-
$moduleLoader = ModuleLoader::create(Config::getDependenyMode());
319+
$moduleLoader = ModuleLoader::createFromConfig();
320320
$module = $moduleLoader->loadByArchiveNameAndVersion($archiveName, $version);
321321

322322
if (!$module) {
@@ -384,7 +384,7 @@ public function invokeInstall()
384384
$archiveName = $queryParams['archiveName'] ?? '';
385385
$version = $queryParams['version'] ?? '';
386386

387-
$moduleLoader = LocalModuleLoader::create(Config::getDependenyMode());
387+
$moduleLoader = LocalModuleLoader::createFromConfig();
388388
$module = $moduleLoader->loadByArchiveNameAndVersion($archiveName, $version);
389389

390390
if (!$module) {
@@ -419,7 +419,7 @@ private function invokeRevertChanges()
419419
$archiveName = $queryParams['archiveName'] ?? '';
420420
$version = $queryParams['version'] ?? '';
421421

422-
$moduleLoader = LocalModuleLoader::create(Config::getDependenyMode());
422+
$moduleLoader = LocalModuleLoader::createFromConfig();
423423
$module = $moduleLoader->loadByArchiveNameAndVersion($archiveName, $version);
424424

425425
if (!$module) {
@@ -454,7 +454,7 @@ public function invokeUninstall()
454454
$archiveName = $queryParams['archiveName'] ?? '';
455455
$version = $queryParams['version'] ?? '';
456456

457-
$moduleLoader = LocalModuleLoader::create(Config::getDependenyMode());
457+
$moduleLoader = LocalModuleLoader::createFromConfig();
458458
$module = $moduleLoader->loadByArchiveNameAndVersion($archiveName, $version);
459459

460460
if (!$module) {
@@ -489,7 +489,7 @@ public function invokeUpdate()
489489
$archiveName = $queryParams['archiveName'] ?? '';
490490
$version = $queryParams['version'] ?? '';
491491

492-
$moduleLoader = LocalModuleLoader::create(Config::getDependenyMode());
492+
$moduleLoader = LocalModuleLoader::createFromConfig();
493493
$module = $moduleLoader->loadByArchiveNameAndVersion($archiveName, $version);
494494

495495
if (!$module) {
@@ -576,7 +576,7 @@ public function invokeLoadAndInstall()
576576
return $this->redirect('/');
577577
}
578578

579-
$moduleLoader = LocalModuleLoader::create(Config::getDependenyMode());
579+
$moduleLoader = LocalModuleLoader::createFromConfig();
580580
$module = $moduleLoader->loadByArchiveNameAndVersion($archiveName, $version);
581581

582582
if (!$module) {
@@ -611,7 +611,7 @@ public function invokeUnloadLocalModule()
611611
$archiveName = $queryParams['archiveName'] ?? '';
612612
$version = $queryParams['version'] ?? '';
613613

614-
$moduleLoader = LocalModuleLoader::create(Config::getDependenyMode());
614+
$moduleLoader = LocalModuleLoader::createFromConfig();
615615
$module = $moduleLoader->loadByArchiveNameAndVersion($archiveName, $version);
616616

617617
if (!$module) {
@@ -731,15 +731,15 @@ public function invokeSettings()
731731

732732
public function calcModuleUpdateCount()
733733
{
734-
$moduleLoader = LocalModuleLoader::create(Config::getDependenyMode());
734+
$moduleLoader = LocalModuleLoader::createFromConfig();
735735
$modules = $moduleLoader->loadAllVersions();
736736
$modules = $this->moduleFilter->filterInstalled($modules);
737737
return count($this->moduleFilter->filterUpdatable($modules));
738738
}
739739

740740
public function calcModuleChangeCount()
741741
{
742-
$moduleLoader = LocalModuleLoader::create(Config::getDependenyMode());
742+
$moduleLoader = LocalModuleLoader::createFromConfig();
743743
$modules = $moduleLoader->loadAllVersions();
744744
return count($this->moduleFilter->filterRepairable($modules));
745745
}

src/Classes/Module.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ public function isLoaded(): bool
468468
return true;
469469
}
470470

471-
$localModuleLoader = LocalModuleLoader::create(Config::getDependenyMode());
471+
$localModuleLoader = LocalModuleLoader::createFromConfig();
472472
$localModule = $localModuleLoader->loadByArchiveNameAndVersion(
473473
$this->getArchiveName(),
474474
$this->getVersion()
@@ -581,7 +581,7 @@ public function getInstalledVersion(): ?Module
581581
*/
582582
public function getNewestVersion(): Module
583583
{
584-
$moduleLoader = ModuleLoader::create(Config::getDependenyMode());
584+
$moduleLoader = ModuleLoader::createFromConfig();
585585
$modules = $moduleLoader->loadAllVersionsByArchiveNameWithLatestRemote($this->getArchiveName());
586586
$moduleFilter = ModuleFilter::createFromConfig();
587587
if ($module = $moduleFilter->getLatestVersion($modules)) {
@@ -597,7 +597,7 @@ public function getNewestVersion(): Module
597597
*/
598598
public function getVersions(): array
599599
{
600-
$moduleLoader = ModuleLoader::create(Config::getDependenyMode());
600+
$moduleLoader = ModuleLoader::createFromConfig();
601601
$modules = $moduleLoader->loadAllVersionsByArchiveName($this->getArchiveName());
602602
$modules = ModuleSorter::sortByVersion($modules);
603603
return $modules;
@@ -610,7 +610,7 @@ public function getVersions(): array
610610
*/
611611
public function getLocalVersions(): array
612612
{
613-
$localModuleLoader = LocalModuleLoader::create(Config::getDependenyMode());
613+
$localModuleLoader = LocalModuleLoader::createFromConfig();
614614
$modules = $localModuleLoader->loadAllVersionsByArchiveName($this->getArchiveName());
615615
$modules = ModuleSorter::sortByVersion($modules);
616616
return $modules;
@@ -623,11 +623,11 @@ public function getLocalVersions(): array
623623
*/
624624
public function getUsedBy(): array
625625
{
626-
$localModuleLoader = LocalModuleLoader::create(Config::getDependenyMode());
626+
$localModuleLoader = LocalModuleLoader::createFromConfig();
627627
$installedModules = $localModuleLoader->loadAllInstalledVersions();
628628

629629
// TODO: DI besser machen
630-
$dependencyManager = DependencyManager::create(Config::getDependenyMode());
630+
$dependencyManager = DependencyManager::createFromConfig();
631631
$usedByEntrys = $dependencyManager->getUsedByEntrys($this, $installedModules);
632632

633633
$usedByModules = [];

0 commit comments

Comments
 (0)