Fixed VersionParser being unable to parse its own MultiConstraint format

composer · Jun 8, 2023 · 7110172 · 7110172
1 parent fa1ec24
commit 7110172
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/VersionParser.php b/src/VersionParser.php
@@ -261,7 +261,7 @@ public function parseConstraints($constraints)
         $orGroups = array();
 
         foreach ($orConstraints as $orConstraint) {
-            $andConstraints = preg_split('{(?<!^|as|[=>< ,]) *(?<!-)[, ](?!-) *(?!,|as|$)}', $orConstraint);
+            $andConstraints = preg_split('{(?<!^|as|[=>< ,]) *(?<!-)[, ](?!-) *(?!,|as|$)}', trim($orConstraint, '[]'));
             if (false === $andConstraints) {
                 throw new \RuntimeException('Failed to preg_split string: '.$orConstraint);
             }

diff --git a/tests/VersionParserTest.php b/tests/VersionParserTest.php
@@ -597,6 +597,7 @@ public function testParseConstraintsMulti($constraint)
         $multi = new MultiConstraint(array($first, $second));
 
         $this->assertSame((string) $multi, (string) $parser->parseConstraints($constraint));
+        $this->assertSame((string) $multi, (string) $parser->parseConstraints((string) $multi));
     }
 
     /**