Use compacted constraint without stability flag

contao · Jul 29, 2024 · 884e365 · 884e365
1 parent ec76ce4
commit 884e365
Showing 1 changed file with 5 additions and 13 deletions.
diff --git a/indexer/src/Package/Factory.php b/indexer/src/Package/Factory.php
@@ -198,17 +198,7 @@ private function buildContaoConstraint(array $versions): string|null
             }
 
             try {
-                $constraint = (new VersionParser())->parseConstraints($constraint)->getPrettyString();
-
-                foreach (explode('||', $constraint) as $c) {
-                    $c = trim($c);
-
-                    if (str_starts_with(ltrim($c, '<>=^~'), '3.')) {
-                        continue;
-                    }
-
-                    $constraints[] = $c;
-                }
+                $constraints[] = (new VersionParser())->parseConstraints($constraint);
             } catch (\Throwable) {
                 // Ignore
             }
@@ -218,9 +208,11 @@ private function buildContaoConstraint(array $versions): string|null
             return null;
         }
 
-        $constraints = array_unique($constraints);
+        $constraint = (string) Intervals::compactConstraint(MultiConstraint::create($constraints, false));
+        $constraint =  str_replace(['[', ']'], '', $constraint);
+        $constraint = preg_replace('{(\d+\.\d+\.\d+)\.\d+(-dev)?( |$)}', '$1 ', $constraint);
 
-        return implode(' || ', $constraints);
+        return trim($constraint);
     }
 
     private function buildContaoVersions(string $contaoConstraint): array