Modular architecture (#2)

Author: devlob

src/CheckVersionVulnerability.php

@@ -2,19 +2,29 @@
 
 declare(strict_types=1);
 
-namespace Patchstack\VersionCompare;
+namespace Patchstack\VersionCompare\Comparators;
 
-final class NormalizeVersionPair
+use Patchstack\VersionCompare\Contracts\VersionComparator;
+
+/**
+ * Compares versions by treating each dot-separated segment as a decimal number.
+ *
+ * PHP's version_compare treats "3.5" < "3.41" (string comparison: "5" < "41").
+ * This comparator right-pads segments so "3.5" becomes "3.50", making 3.50 > 3.41.
+ */
+final class DecimalComparator implements VersionComparator
 {
+    public function compare(string $version1, string $version2, string $operator): bool
+    {
+        [$version1, $version2] = $this->padSegments($version1, $version2);
+
+        return version_compare($version1, $version2, $operator);
+    }
+
     /**
-     * Normalize two version strings by right-padding numeric segments to equal length.
-     *
-     * This ensures decimal-style versioning compares correctly:
-     * e.g., "3.5" vs "3.41" becomes "3.50" vs "3.41".
-     *
      * @return array{string, string}
      */
-    public function execute(string $version1, string $version2): array
+    private function padSegments(string $version1, string $version2): array
     {
         $segments1 = explode('.', $version1);
         $segments2 = explode('.', $version2);

src/NormalizeVersionPair.php src/Comparators/DecimalComparator.phpsrc/NormalizeVersionPair.php renamed to src/Comparators/DecimalComparator.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Patchstack\VersionCompare\Comparators;
+
+use Patchstack\VersionCompare\Contracts\VersionComparator;
+
+final class StandardComparator implements VersionComparator
+{
+    public function compare(string $version1, string $version2, string $operator): bool
+    {
+        return version_compare($version1, $version2, $operator);
+    }
+}

src/Comparators/StandardComparator.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Patchstack\VersionCompare\Contracts;
+
+interface VersionComparator
+{
+    public function compare(string $version1, string $version2, string $operator): bool;
+}

src/CompareVersions.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Patchstack\VersionCompare\Contracts;
+
+interface VersionNormalizer
+{
+    /**
+     * Clean a version string for comparison (strip prefixes, lowercase, trim).
+     */
+    public function normalize(string $version): string;
+
+    /**
+     * Check if two versions can be meaningfully compared.
+     *
+     * For example, Drupal versions with different major prefixes (8.x vs 9.x)
+     * are never vulnerable to each other. Called with raw (pre-normalized) strings.
+     */
+    public function areCompatible(string $version1, string $version2): bool;
+}

src/Contracts/VersionComparator.php

@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Patchstack\VersionCompare\Normalizers;
+
+use Patchstack\VersionCompare\Contracts\VersionNormalizer;
+
+final class DrupalNormalizer implements VersionNormalizer
+{
+    public function normalize(string $version): string
+    {
+        $version = strtolower(trim($version));
+
+        if (str_starts_with($version, 'v')) {
+            $version = substr($version, 1);
+        }
+
+        return preg_replace('/([0-9]*\.x)-/m', '', $version);
+    }
+
+    /**
+     * Drupal versions with different major prefixes (8.x vs 9.x) are incompatible.
+     */
+    public function areCompatible(string $version1, string $version2): bool
+    {
+        if (stripos($version1, 'x') === false || stripos($version2, 'x') === false) {
+            return true;
+        }
+
+        preg_match_all('/([0-9]*\.x)-/m', $version1, $matches1);
+        preg_match_all('/([0-9]*\.x)-/m', $version2, $matches2);
+
+        if (count($matches1[0]) > 0 && count($matches2[0]) > 0 && $matches1[1][0] !== $matches2[1][0]) {
+            return false;
+        }
+
+        return true;
+    }
+}

src/Contracts/VersionNormalizer.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Patchstack\VersionCompare\Normalizers;
+
+use Patchstack\VersionCompare\Contracts\VersionNormalizer;
+
+final class GenericNormalizer implements VersionNormalizer
+{
+    public function normalize(string $version): string
+    {
+        $version = strtolower(trim($version));
+
+        if (str_starts_with($version, 'v')) {
+            $version = substr($version, 1);
+        }
+
+        return $version;
+    }
+
+    public function areCompatible(string $version1, string $version2): bool
+    {
+        return true;
+    }
+}