feat: preps for di container

src/Classes/MmlcVersionInfoLoader.php

@@ -33,15 +33,10 @@ class MmlcVersionInfoLoader
 
     public static function createLoader(): MmlcVersionInfoLoader
     {
-        $parser = new Parser();
-        $comparator = new Comparator($parser, Comparator::CARET_MODE_STRICT);
-        $sorter = new Sorter($comparator);
-        $filter = new Filter($parser, $comparator, $sorter);
-
         $mmlcVersionInfoLoader = new MmlcVersionInfoLoader(
             new ApiRequest(),
-            $parser,
-            $filter
+            Parser::create(),
+            Filter::create(Comparator::CARET_MODE_STRICT)
         );
 
         return $mmlcVersionInfoLoader;

src/Classes/ModuleFilter.php

@@ -20,6 +20,8 @@
 
 class ModuleFilter
 {
+    public static $comparator;
+
     /**
      * @param Module[] $modules
      * @return Module[]
@@ -124,7 +126,7 @@ public static function filterNewestVersion(array $modules): array
                     continue;
                 }
 
-                $comparator = SemverComparatorFactory::createComparator();
+                $comparator = self::$comparator ?? SemverComparatorFactory::createComparator();
                 if ($comparator->lessThan($module->getVersion(), $filteredModule->getVersion())) {
                     $insertOrReplace = false;
                     break;
@@ -162,7 +164,7 @@ public static function filterNewestOrInstalledVersion($modules): array
                     break;
                 }
 
-                $comparator = SemverComparatorFactory::createComparator();
+                $comparator = self::$comparator ?? SemverComparatorFactory::createComparator();
                 if ($comparator->lessThan($module->getVersion(), $filteredModule->getVersion())) {
                     $insertOrReplace = false;
                     break;
@@ -215,7 +217,7 @@ public static function filterByVersionConstrain(array $modules, string $constrai
     {
         $filteredModules = [];
         foreach ($modules as $module) {
-            $comparator = SemverComparatorFactory::createComparator();
+            $comparator = self::$comparator ?? SemverComparatorFactory::createComparator();
             if ($comparator->satisfies($module->getVersion(), $constrain)) {
                 $filteredModules[] = $module;
             }
@@ -230,7 +232,7 @@ public static function getLatestVersion(array $modules): ?Module
     {
         $selectedModule = null;
         foreach ($modules as $module) {
-            $comparator = SemverComparatorFactory::createComparator();
+            $comparator = self::$comparator ?? SemverComparatorFactory::createComparator();
             if (!$selectedModule || $comparator->greaterThan($module->getVersion(), $selectedModule->getVersion())) {
                 $selectedModule = $module;
             }

src/Classes/ModuleStatus.php

@@ -148,7 +148,8 @@ public static function isUpdatable(Module $module): bool
 
     public static function hasValidRequire(Module $module): string
     {
-        $constraintParser = new ConstraintParser(new Parser());
+        $constraintParser = ConstraintParser::create(Config::getDependenyMode());
+
         foreach ($module->getRequire() as $archiveName => $constraintString) {
             try {
                 $constraintParser->parse($constraintString);

src/Classes/SelfUpdater.php

@@ -15,12 +15,9 @@
 
 use RobinTheHood\ModifiedModuleLoaderClient\App;
 use RobinTheHood\ModifiedModuleLoaderClient\Config;
-use RobinTheHood\ModifiedModuleLoaderClient\Semver\Parser;
 use RobinTheHood\ModifiedModuleLoaderClient\Semver\Comparator;
 use RobinTheHood\ModifiedModuleLoaderClient\Helpers\FileHelper;
 use RobinTheHood\ModifiedModuleLoaderClient\Api\V1\HttpRequest;
-use RobinTheHood\ModifiedModuleLoaderClient\Semver\Filter;
-use RobinTheHood\ModifiedModuleLoaderClient\Semver\Sorter;
 use RuntimeException;
 use Throwable;
 
@@ -33,16 +30,10 @@ class SelfUpdater
     private $remoteUpdateServer;
 
     /** @var Comparator */
-    protected $comparator;
-
-    /** @var Parser */
-    protected $parser;
-
-    /** @var Filter */
-    protected $filter;
+    private $comparator;
 
     /** @var MmlcVersionInfoLoader */
-    protected $mmlcVersionInfoLoader;
+    private $mmlcVersionInfoLoader;
 
     /**
      * Während der Installtion werden Dateien und damit auch die Pfade von Klassen verschoben.
@@ -55,9 +46,7 @@ public function __construct(MmlcVersionInfoLoader $mmlcVersionInfoLoader)
         $this->appRoot = App::getRoot();
         $this->mmlcVersionInfoLoader = $mmlcVersionInfoLoader;
         $this->remoteUpdateServer = $this->getRomteUpdateServer();
-        $this->comparator = new Comparator(new Parser(), Comparator::CARET_MODE_STRICT);
-        $this->parser = new Parser();
-        $this->filter = new Filter($this->parser, $this->comparator, new Sorter($this->comparator));
+        $this->comparator = Comparator::create(Comparator::CARET_MODE_STRICT);
     }
 
     /**

src/Classes/Semver/Comparator.php

@@ -23,12 +23,33 @@ class Comparator
     /** @var Parser */
     protected $parser;
 
+    /** @var ConstraintParser */
+    protected $constraintParser;
+
+    /** @var TagComparator */
+    protected $tagComparator;
+
     /** @var int */
     private $mode = self::CARET_MODE_STRICT;
 
-    public function __construct(Parser $parser, int $mode = self::CARET_MODE_STRICT)
+    public static function create(int $mode): Comparator
     {
+        $parser = Parser::create();
+        $constraintParser = ConstraintParser::create($mode);
+        $tagComparator = TagComparator::create();
+        return new Comparator($parser, $constraintParser, $tagComparator, $mode);
+    }
+
+    public function __construct(
+        Parser $parser,
+        ConstraintParser $constraintParser,
+        TagComparator $tagComparator,
+        int $mode
+    ) {
         $this->parser = $parser;
+        $this->constraintParser = $constraintParser;
+        $this->tagComparator = $tagComparator;
+        $this->mode = $mode;
     }
 
     public function greaterThan(string $versionString1, string $versionString2): bool
@@ -71,7 +92,7 @@ public function greaterThan(string $versionString1, string $versionString2): boo
             $version1->getMajor() == $version2->getMajor() &&
             $version1->getMinor() == $version2->getMinor() &&
             $version1->getPatch() == $version2->getPatch() &&
-            (new TagComparator())->greaterThan($version1->getTag(), $version2->getTag())
+            $this->tagComparator->greaterThan($version1->getTag(), $version2->getTag())
         ) {
             return true;
         }
@@ -188,9 +209,8 @@ public function isCompatible(string $versionString1, string $versionString2): bo
 
     public function satisfies(string $versionString1, string $constrainString): bool
     {
-        $constraintParser = new ConstraintParser($this->parser);
         try {
-            $constraint = $constraintParser->parse($constrainString);
+            $constraint = $this->constraintParser->parse($constrainString);
         } catch (ParseErrorException $e) {
             return false;
         }

src/Classes/Semver/ConstraintParser.php

@@ -20,6 +20,12 @@ class ConstraintParser
     /** @var Parser $parser */
     private $parser;
 
+    public static function create(int $mode): ConstraintParser
+    {
+        $parser = Parser::create();
+        return new ConstraintParser($parser);
+    }
+
     public function __construct(Parser $parser)
     {
         $this->parser = $parser;

src/Classes/Semver/Filter.php

@@ -23,6 +23,15 @@ class Filter
 
     private $parser;
 
+    public static function create(int $mode): Filter
+    {
+        $parser = Parser::create();
+        $comparator = Comparator::create($mode);
+        $sorter = Sorter::create($mode);
+        $filter = new Filter($parser, $comparator, $sorter);
+        return $filter;
+    }
+
     public function __construct(Parser $parser, Comparator $comparator, Sorter $sorter)
     {
         $this->parser = $parser;

src/Classes/Semver/Parser.php

@@ -18,6 +18,11 @@
 
 class Parser
 {
+    public static function create(): Parser
+    {
+        return new Parser();
+    }
+
     public function parse(string $string): Version
     {
         $string = $this->deletePrefix($string);

src/Classes/Semver/Sorter.php

@@ -18,6 +18,13 @@ class Sorter
     /** @var Comparator */
     private $comparator;
 
+    public static function create(int $mode): Sorter
+    {
+        $comparator = Comparator::create($mode);
+        $sorter = new Sorter($comparator);
+        return $sorter;
+    }
+
     public function __construct(Comparator $comparator)
     {
         $this->comparator = $comparator;

src/Classes/Semver/TagComparator.php

@@ -55,6 +55,11 @@ class TagComparator
         '' => 100
     ];
 
+    public static function create(): TagComparator
+    {
+        return new TagComparator();
+    }
+
     public function equalTo(string $string1, string $string2): bool
     {
         if ($string1 === $string2) {

src/Classes/SemverComparatorFactory.php

@@ -23,7 +23,6 @@ class SemverComparatorFactory
      */
     public static function createComparator()
     {
-        $comparator = new Comparator(new Parser(), Config::getDependenyMode());
-        return $comparator;
+        return Comparator::create(Config::getDependenyMode());
     }
 }

tests/unit/DependencyManager/DependencyBuilderTest.php

@@ -17,11 +17,15 @@
 use RobinTheHood\ModifiedModuleLoaderClient\DependencyManager\CombinationSatisfyerResult;
 use RobinTheHood\ModifiedModuleLoaderClient\DependencyManager\DependencyBuilder;
 use RobinTheHood\ModifiedModuleLoaderClient\DependencyManager\SystemSet;
+use RobinTheHood\ModifiedModuleLoaderClient\ModuleFilter;
+use RobinTheHood\ModifiedModuleLoaderClient\Semver\Comparator;
 
 class DependencyBuilderTest extends TestCase
 {
     public function testSatisfies1()
     {
+        ModuleFilter::$comparator = Comparator::create(Comparator::CARET_MODE_STRICT);
+
         $dependencyBuilder = new DependencyBuilder();
         $systemSet = new SystemSet();
 
@@ -72,6 +76,8 @@ public function testSatisfies1()
 
     public function testSatisfies2()
     {
+        ModuleFilter::$comparator = Comparator::create(Comparator::CARET_MODE_STRICT);
+
         $dependencyBuilder = new DependencyBuilder();
         $systemSet = new SystemSet();
 

tests/unit/MmlcVersionInfoLoaderTest.php

@@ -20,7 +20,6 @@
 use RobinTheHood\ModifiedModuleLoaderClient\Semver\Comparator;
 use RobinTheHood\ModifiedModuleLoaderClient\Semver\Filter;
 use RobinTheHood\ModifiedModuleLoaderClient\Semver\Parser;
-use RobinTheHood\ModifiedModuleLoaderClient\Semver\Sorter;
 
 class MmlcVersionInfoLoaderTest extends TestCase
 {
@@ -73,15 +72,10 @@ public function testCanGetNextNewestUnstable()
 
     private function getMmlcVersionInfoLoader(): MmlcVersionInfoLoader
     {
-        $parser = new Parser();
-        $comparator = new Comparator($parser, Comparator::CARET_MODE_STRICT);
-        $sorter = new Sorter($comparator);
-        $filter = new Filter($parser, $comparator, $sorter);
-
         $mmlcVersionInfoLoader = new MmlcVersionInfoLoader(
             $this->getMockedApiRequest(),
-            $parser,
-            $filter
+            Parser::create(),
+            Filter::create(Comparator::CARET_MODE_STRICT)
         );
 
         return $mmlcVersionInfoLoader;

tests/unit/ModuleLoaderTest.php

@@ -15,6 +15,8 @@
 
 use PHPUnit\Framework\TestCase;
 use RobinTheHood\ModifiedModuleLoaderClient\Loader\ModuleLoader;
+use RobinTheHood\ModifiedModuleLoaderClient\ModuleFilter;
+use RobinTheHood\ModifiedModuleLoaderClient\Semver\Comparator;
 
 class ModuleLoaderTest extends TestCase
 {
@@ -52,6 +54,8 @@ public function testCanLoadAllVersionsByContraintWithLocalAuto()
 
     public function testCanLoadAllVersionsByContraint()
     {
+        ModuleFilter::$comparator = Comparator::create(Comparator::CARET_MODE_STRICT);
+
         $modules = $this->loader->loadAllByArchiveNameAndConstraint('robinthehood/modified-std-module', '1.0.0');
         $this->assertEquals(0, count($modules));
 

tests/unit/SemverTests/SemverComparatorTest.php

@@ -24,7 +24,7 @@ class SemverComparatorTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->comparator = new Comparator(new Parser(), Comparator::CARET_MODE_STRICT);
+        $this->comparator = Comparator::create(Comparator::CARET_MODE_STRICT);
     }
 
     public function testSemverCanHandleGreaterThan()

tests/unit/SemverTests/SemverFilterTest.php

@@ -26,9 +26,7 @@ class SemverFilterTest extends TestCase
 
     protected function setUp(): void
     {
-        $parser = new Parser();
-        $comparator = new Comparator($parser, Comparator::CARET_MODE_STRICT);
-        $this->filter = new Filter($parser, $comparator, new Sorter($comparator));
+        $this->filter = Filter::create(Comparator::CARET_MODE_STRICT);
     }
 
     public function testSemverGetsHighestVersionString()

tests/unit/SemverTests/SemverSorterTest.php

@@ -25,8 +25,7 @@ class SemverSorterTest extends TestCase
 
     protected function setUp(): void
     {
-        $comparator = new Comparator(new Parser(), Comparator::CARET_MODE_STRICT);
-        $this->sorter = new Sorter($comparator);
+        $this->sorter = Sorter::create(Comparator::CARET_MODE_STRICT);
     }
 
     public function testSemverCanSortVersions()