Added support for new ~ dependency modifier.

Author: BluePsyduck

composer.json

@@ -15,7 +15,7 @@
     "php": "^7.4 | ^8.0",
     "ext-json": "*",
     "ext-pdo": "*",
-    "bluepsyduck/factorio-mod-portal-client": "^1.3",
+    "bluepsyduck/factorio-mod-portal-client": "^1.4",
     "bluepsyduck/laminas-autowire-factory": "^1.0",
     "bluepsyduck/mapper-manager": "^1.2",
     "doctrine/orm": "^2.6",

src/Service/ValidationService.php

@@ -86,6 +86,7 @@ private function validateRelease(Release $release, array $allReleases): array
             $dependentRelease = $allReleases[$dependency->getMod()] ?? null;
             switch ($dependency->getType()) {
                 case DependencyType::MANDATORY:
+                case DependencyType::MANDATORY_CIRCULAR:
                     if (
                         $dependentRelease === null
                         || !$dependency->isMatchedByVersion($dependentRelease->getVersion())

test/src/Service/ValidationServiceTest.php

@@ -75,21 +75,36 @@ public function testValidate(): void
         $validatedValidMod->name = 'validMod';
         $validatedValidMod->version = '3.4.5';
 
-        $missingDependencyMod = new Mod();
-        $missingDependencyRelease = new Release();
-        $missingDependencyRelease->setVersion(new Version('4.5.6'));
-        $missingDependencyRelease->getInfoJson()->setDependencies([
+        $missingDependency1Mod = new Mod();
+        $missingDependency1Release = new Release();
+        $missingDependency1Release->setVersion(new Version('4.5.6'));
+        $missingDependency1Release->getInfoJson()->setDependencies([
             new Dependency('notExistingMod'),
             new Dependency('dummyMod > 2.0'),
         ]);
-        $validatedMissingDependencyMod = new ValidatedMod();
-        $validatedMissingDependencyMod->name = 'missingDependencyMod';
-        $validatedMissingDependencyMod->version = '4.5.6';
-        $validatedMissingDependencyMod->problems = [
+        $validatedMissingDependency1Mod = new ValidatedMod();
+        $validatedMissingDependency1Mod->name = 'missingDependency1Mod';
+        $validatedMissingDependency1Mod->version = '4.5.6';
+        $validatedMissingDependency1Mod->problems = [
             $createProblem(ValidationProblemType::MISSING_DEPENDENCY, 'notExistingMod'),
             $createProblem(ValidationProblemType::MISSING_DEPENDENCY, 'dummyMod > 2.0.0'),
         ];
 
+        $missingDependency2Mod = new Mod();
+        $missingDependency2Release = new Release();
+        $missingDependency2Release->setVersion(new Version('4.5.6'));
+        $missingDependency2Release->getInfoJson()->setDependencies([
+            new Dependency('notExistingMod'),
+            new Dependency('~ dummyMod > 2.0'),
+        ]);
+        $validatedMissingDependency2Mod = new ValidatedMod();
+        $validatedMissingDependency2Mod->name = 'missingDependency2Mod';
+        $validatedMissingDependency2Mod->version = '4.5.6';
+        $validatedMissingDependency2Mod->problems = [
+            $createProblem(ValidationProblemType::MISSING_DEPENDENCY, 'notExistingMod'),
+            $createProblem(ValidationProblemType::MISSING_DEPENDENCY, '~ dummyMod > 2.0.0'),
+        ];
+
         $conflictedMod = new Mod();
         $conflictedRelease = new Release();
         $conflictedRelease->setVersion(new Version('5.6.7'));
@@ -113,7 +128,8 @@ public function testValidate(): void
             'missingMod',
             'missingReleaseMod',
             'validMod',
-            'missingDependencyMod',
+            'missingDependency1Mod',
+            'missingDependency2Mod',
             'conflictedMod',
         ];
         $mods = [
@@ -122,14 +138,16 @@ public function testValidate(): void
             'dummyMod2' => $dummyMod2,
             'missingReleaseMod' => $missingReleaseMod,
             'validMod' => $validMod,
-            'missingDependencyMod' => $missingDependencyMod,
+            'missingDependency1Mod' => $missingDependency1Mod,
+            'missingDependency2Mod' => $missingDependency2Mod,
             'conflictedMod' => $conflictedMod,
         ];
         $releases = [
             'dummyMod1' => $dummyRelease1,
             'dummyMod2' => $dummyRelease2,
             'validMod' => $validRelease,
-            'missingDependencyMod' => $missingDependencyRelease,
+            'missingDependency1Mod' => $missingDependency1Release,
+            'missingDependency2Mod' => $missingDependency2Release,
             'conflictedMod' => $conflictedRelease,
         ];
         $expectedResult = [
@@ -139,7 +157,8 @@ public function testValidate(): void
             'missingMod' => $validatedMissingMod,
             'missingReleaseMod' => $validatedMissingReleaseMod,
             'validMod' => $validatedValidMod,
-            'missingDependencyMod' => $validatedMissingDependencyMod,
+            'missingDependency1Mod' => $validatedMissingDependency1Mod,
+            'missingDependency2Mod' => $validatedMissingDependency2Mod,
             'conflictedMod' => $validatedConflictedMod,
         ];