Skip to content

feat: change code for di #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RobinTheHood merged 2 commits into from
Jun 20, 2023
Merged

feat: change code for di #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac60971
feat: change code for di
RobinTheHood Jun 20, 2023
a03691a
Merge branch 'master' into feat/change-code-for-di
RobinTheHood Jun 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Classes/Archive.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public function getVendorName(): string

public function tarArchive(): bool
{
$localModuleLoader = new LocalModuleLoader();
$localModuleLoader = LocalModuleLoader::create(Config::getDependenyMode());
$module = $localModuleLoader->loadByArchiveNameAndVersion($this->getArchiveName(), $this->getVersion());

if (!$module) {
Expand Down
35 changes: 26 additions & 9 deletions src/Classes/DependencyManager/DependencyBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,31 @@
use RobinTheHood\ModifiedModuleLoaderClient\Config;
use RobinTheHood\ModifiedModuleLoaderClient\Loader\ModuleLoader;
use RobinTheHood\ModifiedModuleLoaderClient\Module;
use RobinTheHood\ModifiedModuleLoaderClient\Semver\Comparator;
use RobinTheHood\ModifiedModuleLoaderClient\Semver\Constraint;

class DependencyBuilder
{
/** @var ModuleTreeBuilder*/
private $moduleTreeBuilder;

/** @var ModuleLoader*/
private $moduleLoader;

public static function create(int $mode): DependencyBuilder
{
$moduleTreeBuilder = ModuleTreeBuilder::create($mode);
$moduleLoader = ModuleLoader::create($mode);
$dependencyBuilder = new DependencyBuilder($moduleTreeBuilder, $moduleLoader);
return $dependencyBuilder;
}

public function __construct(ModuleTreeBuilder $moduleTreeBuilder, ModuleLoader $moduleLoader)
{
$this->moduleTreeBuilder = $moduleTreeBuilder;
$this->moduleLoader = $moduleLoader;
}

private function logFile($value, $file)
{
if (!Config::getLogging()) {
Expand All @@ -41,7 +62,7 @@ public function log($var)

public function test()
{
$moduleLoader = ModuleLoader::getModuleLoader();
$moduleLoader = ModuleLoader::create(Comparator::CARET_MODE_STRICT);
$module = $moduleLoader->loadLatestVersionByArchiveName('firstweb/multi-order');

if (!$module) {
Expand Down Expand Up @@ -74,8 +95,7 @@ public function test()

public function satisfiesContraints1(Module $module, SystemSet $systemSet): CombinationSatisfyerResult
{
$moduleTreeBuilder = new ModuleTreeBuilder();
$moduleTrees = $moduleTreeBuilder->buildListByConstraints($module);
$moduleTrees = $this->moduleTreeBuilder->buildListByConstraints($module);
$this->logFile($moduleTrees, '1-moduleTrees.json');

$flatEntryBuilder = new FlatEntryBuilder();
Expand Down Expand Up @@ -104,8 +124,7 @@ public function satisfiesContraints2(
string $constraint,
SystemSet $systemSet
): CombinationSatisfyerResult {
$moduleTreeBuilder = new ModuleTreeBuilder();
$moduleTree = $moduleTreeBuilder->buildByConstraints($archiveName, $constraint);
$moduleTree = $this->moduleTreeBuilder->buildByConstraints($archiveName, $constraint);
$this->logFile($moduleTree, '2-moduleTrees.json');

$flatEntryBuilder = new FlatEntryBuilder();
Expand Down Expand Up @@ -133,8 +152,7 @@ public function satisfies(string $archiveName, string $constraint, SystemSet $sy
$systemSet->remove($archiveName);
$constraint = $this->createConstraint($archiveName, $constraint, $systemSet);

$moduleTreeBuilder = new ModuleTreeBuilder();
$moduleTree = $moduleTreeBuilder->buildByConstraints($archiveName, $constraint);
$moduleTree = $this->moduleTreeBuilder->buildByConstraints($archiveName, $constraint);
$this->logFile($moduleTree, '3-moduleTrees.json');

$flatEntryBuilder = new FlatEntryBuilder();
Expand Down Expand Up @@ -184,8 +202,7 @@ private function createConstraint(string $archiveName, string $constraint, Syste

private function getModuleByArchiveNameAndVersion(string $archiveName, string $version): ?Module
{
$moduleLoader = ModuleLoader::getModuleLoader();
return $moduleLoader->loadByArchiveNameAndVersion($archiveName, $version);
return $this->moduleLoader->loadByArchiveNameAndVersion($archiveName, $version);
}

private function getRequiredConstraint(Module $installedModule, string $archiveName): string
Expand Down
56 changes: 41 additions & 15 deletions src/Classes/DependencyManager/DependencyManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,56 @@

namespace RobinTheHood\ModifiedModuleLoaderClient\DependencyManager;

use RobinTheHood\ModifiedModuleLoaderClient\Config;
use RobinTheHood\ModifiedModuleLoaderClient\DependencyManager\Combination;
use RobinTheHood\ModifiedModuleLoaderClient\DependencyManager\CombinationSatisfyerResult;
use RobinTheHood\ModifiedModuleLoaderClient\DependencyManager\DependencyBuilder;
use RobinTheHood\ModifiedModuleLoaderClient\DependencyManager\SystemSetFactory;
use RobinTheHood\ModifiedModuleLoaderClient\Loader\LocalModuleLoader;
use RobinTheHood\ModifiedModuleLoaderClient\Module;
use RobinTheHood\ModifiedModuleLoaderClient\Loader\ModuleLoader;
use RobinTheHood\ModifiedModuleLoaderClient\Logger\LogLevel;
use RobinTheHood\ModifiedModuleLoaderClient\Logger\StaticLogger;
use RobinTheHood\ModifiedModuleLoaderClient\Semver\Comparator;
use RobinTheHood\ModifiedModuleLoaderClient\SemverComparatorFactory;

class DependencyManager
{
/** @var dependencyBuilder */
private $dependencyBuilder;

/** @var Comparator */
protected $comparator;
private $comparator;

/** @var ModuleLoader */
private $moduleLoader;

/** @var SystemSetFactory */
private $systemSetFactory;

public static function create(int $mode): DependencyManager
{
$dependencyBuilder = DependencyBuilder::create($mode);
$comparator = Comparator::create($mode);
$moduleLoader = ModuleLoader::create($mode);
$systemSetFactory = SystemSetFactory::create($mode);
$dependencyManager = new DependencyManager($dependencyBuilder, $comparator, $moduleLoader, $systemSetFactory);
return $dependencyManager;
}

public function __construct()
public static function createFromConfig(): DependencyManager
{
$this->comparator = SemverComparatorFactory::createComparator();
return self::create(Config::getDependenyMode());
}

public function __construct(
DependencyBuilder $dependencyBuilder,
Comparator $comparator,
ModuleLoader $moduleLoader,
SystemSetFactory $systemSetFactory
) {
$this->dependencyBuilder = $dependencyBuilder;
$this->comparator = $comparator;
$this->moduleLoader = $moduleLoader;
$this->systemSetFactory = $systemSetFactory;
}

/**
Expand Down Expand Up @@ -64,12 +94,11 @@ public function getUsedByEntrys(Module $module, array $selectedModules): array
*/
public function getAllModulesFromCombination(Combination $combination): array
{
$moduleLoader = ModuleLoader::getModuleLoader();
$moduleLoader->resetCache();
$this->moduleLoader->resetCache();

$modules = [];
foreach ($combination->strip()->getAll() as $archiveName => $version) {
$module = $moduleLoader->loadByArchiveNameAndVersion($archiveName, $version);
$module = $this->moduleLoader->loadByArchiveNameAndVersion($archiveName, $version);
if (!$module) {
$message = "Can not find Module {$archiveName} in version {$version}";
StaticLogger::log(LogLevel::WARNING, $message);
Expand All @@ -88,15 +117,13 @@ public function getAllModulesFromCombination(Combination $combination): array
*/
public function canBeInstalled(Module $module, array $doNotCheck = []): CombinationSatisfyerResult
{
$systemSetFactory = new SystemSetFactory();
$systemSet = $systemSetFactory->getSystemSet();
$systemSet = $this->systemSetFactory->getSystemSet();

foreach ($doNotCheck as $name) {
$systemSet->remove($name);
}

$dependencyBuilder = new DependencyBuilder();
$combinationSatisfyerResult = $dependencyBuilder->satisfies(
$combinationSatisfyerResult = $this->dependencyBuilder->satisfies(
$module->getArchiveName(),
$module->getVersion(),
$systemSet
Expand Down Expand Up @@ -148,13 +175,12 @@ private function canBeInstalledTestChanged(Module $module, array $modules): void
*/
public function getMissingDependencies(Module $module): array
{
$moduleLoader = LocalModuleLoader::getModuleLoader();
$moduleLoader->resetCache();
$this->moduleLoader->resetCache();
$missing = [];

foreach ($module->getRequire() as $archiveName => $version) {
$found = false;
$depModules = $moduleLoader->loadAllVersionsByArchiveName($archiveName);
$depModules = $this->moduleLoader->loadAllVersionsByArchiveName($archiveName);
foreach ($depModules as $depModule) {
if (!$depModule->isInstalled()) {
continue;
Expand Down
25 changes: 22 additions & 3 deletions src/Classes/DependencyManager/ModuleTreeBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,26 @@ class ModuleTreeBuilder
/** @var array<string, Module[]> */
private $moduleCache = [];

/** @var ModuleFilter */
private $moduleFilter;

/** @var ModuleLoader */
private $moduleLoader;

public static function create(int $mode): ModuleTreeBuilder
{
$moduleFilter = ModuleFilter::create($mode);
$moduleLoader = ModuleLoader::create($mode);
$moduleTreeBuilder = new ModuleTreeBuilder($moduleFilter, $moduleLoader);
return $moduleTreeBuilder;
}

public function __construct(ModuleFilter $moduleFilter, ModuleLoader $moduleLoader)
{
$this->moduleFilter = $moduleFilter;
$this->moduleLoader = $moduleLoader;
}

/**
* @param string $archiveName
* @param string $versionConstraint
Expand All @@ -32,13 +52,12 @@ private function loadAllByArchiveNameAndConstraint(string $archiveName, string $
{
$modules = $this->moduleCache[$archiveName] ?? [];
if (!$modules) {
$moduleLoader = ModuleLoader::getModuleLoader();
$modules = $moduleLoader->loadAllVersionsByArchiveName($archiveName);
$modules = $this->moduleLoader->loadAllVersionsByArchiveName($archiveName);
$modules = ModuleSorter::sortByVersion($modules);
$this->moduleCache[$archiveName] = $modules;
}

return ModuleFilter::filterByVersionConstrain($modules, $versionConstraint);
return $this->moduleFilter->filterByVersionConstrain($modules, $versionConstraint);
}

/**
Expand Down
22 changes: 18 additions & 4 deletions src/Classes/DependencyManager/SystemSetFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,33 @@

use RobinTheHood\ModifiedModuleLoaderClient\App;
use RobinTheHood\ModifiedModuleLoaderClient\Loader\LocalModuleLoader;
use RobinTheHood\ModifiedModuleLoaderClient\ShopInfo as ModifiedModuleLoaderClientShopInfo;
use RobinTheHood\ModifiedModuleLoaderClient\ShopInfo;

class SystemSetFactory
{
/** @var LocalModuleLoader */
private $localModuleLoader;

public static function create(int $mode): SystemSetFactory
{
$localModuleLoader = LocalModuleLoader::create($mode);
$localModuleLoader = new SystemSetFactory($localModuleLoader);
return $localModuleLoader;
}

public function __construct(LocalModuleLoader $localModuleLoader)
{
$this->localModuleLoader = $localModuleLoader;
}

public function getSystemSet(): SystemSet
{
$systemSet = new SystemSet();
$systemSet->add('modified', ModifiedModuleLoaderClientShopInfo::getModifiedVersion());
$systemSet->add('modified', ShopInfo::getModifiedVersion());
$systemSet->add('php', phpversion());
$systemSet->add('mmlc', App::getMmlcVersion());

$moduleLoader = LocalModuleLoader::getModuleLoader();
$modules = $moduleLoader->loadAllInstalledVersions();
$modules = $this->localModuleLoader->loadAllInstalledVersions();
foreach ($modules as $module) {
$systemSet->add($module->getArchiveName(), $module->getVersion());
}
Expand Down
Loading