Fix version constraint parsing from package.xml

Author: shivammathur

extension-matrix/src/php-versions.sh

@@ -59,26 +59,16 @@ function compare_versions_using_composer() {
   states="$(curl -sL https://www.php.net/releases/states.php)"
   php_versions="$(echo "$states" | jq -r 'to_entries[] | .key as $major | .value | to_entries[] | .key' | sort -Vu | tr '\n' ',')"
   constraint=$(jq -r .require.php "$composer_json")
-
-  rm -rf "$directory"
-
-  php "$SCRIPT_DIR"/semver/semver.phar "$constraint" "$php_versions"
+  php "$SCRIPT_DIR"/semver/semver.phar composer.json "$constraint" "$php_versions"
 }
 
 function compare_versions_using_package_xml() {
   local directory=$1
   local package_xml=$2
-  min_version=$(grep '<min>' "$package_xml" | head -1 | sed -e 's/<[^>]*>//g' | cut -d'.' -f1,2 | xargs)
-  max_version=$(grep '<max>' "$package_xml" | head -1 | sed -e 's/<[^>]*>//g' | cut -d'.' -f1,2 | xargs)
-
+  SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
   states="$(curl -sL https://www.php.net/releases/states.php)"
-  IFS=' ' read -r -a php_versions <<< "$(echo "$states" | jq -r 'to_entries[] | .key as $major | .value | to_entries[] | .key' | sort -Vu | tr '\n' ' ')"
-
-  [[ -z "$max_version" ]] && max_version="${php_versions[-1]}"
-
-  rm -rf "$directory"
-
-  filter_versions "$min_version" "$max_version" "${php_versions[@]}"
+  php_versions="$(echo "$states" | jq -r 'to_entries[] | .key as $major | .value | to_entries[] | .key' | sort -Vu | tr '\n' ',')"
+  php "$SCRIPT_DIR"/semver/semver.phar package.xml "$package_xml" "$php_versions"
 }
 
 function get_php_versions() {
@@ -90,8 +80,10 @@ function get_php_versions() {
   package_xml=$(find "$directory" -name package.xml)
   if [ -n "$composer_json" ]; then
     compare_versions_using_composer "$directory" "$composer_json"
+    rm -rf "$directory"
   elif [ -n "$package_xml" ]; then
     compare_versions_using_package_xml "$directory" "$package_xml"
+    rm -rf "$directory"
   else
     echo "No composer.json with type php-ext or package.xml found"
     exit 1

extension-matrix/src/semver/app.php

@@ -6,14 +6,35 @@
 use Composer\Semver\VersionParser;
 
 if ($argc < 3) {
-    echo "Usage: php app.php '<constraint>' '<version1,version2,...>'\n";
+    echo "Usage: php app.php '<file>' '<constraint>' '<version1,version2,...>'\n";
     exit(1);
 }
 
-$constraint = $argv[1];
-$versions = array_filter(explode(',', preg_replace('/\s+/', '', $argv[2])));
+$file = $argv[1];
+if($file === 'composer.json') {
+    $constraint = $argv[2];
+} else if($file === 'package.xml') {
+    $package_xml = $argv[2];
+    $xml = simplexml_load_file($package_xml);
+    $xml->registerXPathNamespace("p", "http://pear.php.net/dtd/package-2.0");
+    $min = $xml->xpath("//p:php/p:min")[0] ?? null;
+    $max = $xml->xpath("//p:php/p:max")[0] ?? null;
+    $constraint = '';
+    if($min) {
+        $constraint .= '>=' . $min;
+    }
+    if($max) {
+        $constraint .= ',<=' . $max;
+    }
+    $constraint = ltrim($constraint, ',');
+} else {
+    echo "File not found";
+    exit(1);
+}
 
-if(count($versions)) {
+$versions = array_filter(explode(',', preg_replace('/\s+/', '', $argv[3])));
+
+if (count($versions)) {
     $versionParser = new VersionParser();
     $constraint = $versionParser->parseConstraints($constraint);
 
@@ -26,4 +47,7 @@
     }
 
     echo implode(',', $satisfiedVersions);
-}
+} else {
+    echo "No versions provided";
+    exit(1);
+}