Change config key versionFilter to versionsGreaterThan

doctrine · Apr 23, 2024 · 212462d · 212462d
1 parent 03f945f
commit 212462d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/config/data/projects.yml b/config/data/projects.yml
@@ -21,7 +21,7 @@ parameters:
         - repositoryName: data-fixtures
         -
             repositoryName: dbal
-            versionFilter: "/^[3-9]\\.[0-9]+/"
+            versionsGreaterThan: "2.99.0"
 
         - repositoryName: doctrine1
         - repositoryName: event-manager

diff --git a/lib/Hydrators/ProjectHydrator.php b/lib/Hydrators/ProjectHydrator.php
@@ -9,7 +9,7 @@
 use Doctrine\Website\Model\ProjectStats;
 use Doctrine\Website\Model\ProjectVersion;
 
-use function preg_match;
+use function version_compare;
 
 /**
  * @property bool $active
@@ -70,7 +70,8 @@ protected function doHydrate(array $data): void
                 ? $version
                 : new ProjectVersion($version);
 
-            if (isset($data['versionFilter']) && preg_match($data['versionFilter'], $projectVersion->getName()) !== 1) {
+            $tagVersion = $projectVersion->getLatestTag()?->getName();
+            if (isset($data['versionsGreaterThan']) && $tagVersion !== null && version_compare($data['versionsGreaterThan'], $tagVersion, '>')) {
                 continue;
             }
 

diff --git a/tests/Hydrators/ProjectHydratorTest.php b/tests/Hydrators/ProjectHydratorTest.php
@@ -165,21 +165,18 @@ public function testHydrateWithFilter(): void
             'name' => 'name',
             'slug' => 'slug',
             'repositoryName' => 'repositoryName',
-            'versionFilter' => '/^2\.0/',
+            'versionsGreaterThan' => '1.99.0',
             'versions' => [
-                ['name' => '1.0.0'],
-                new ProjectVersion(['name' => '2.0.0']),
+                ['name' => '1.0.0', 'tags' => [['name' => '1.0.0', 'date' => '2024-10-10']]],
+                new ProjectVersion(['name' => '2.0.0', 'tags' => [['name' => '2.0.0', 'date' => '2024-10-10']]]),
             ],
         ];
 
-        $expected = [
-            new ProjectVersion(['name' => '2.0.0']),
-        ];
-
         $project = new Project();
 
         $hydrator->hydrate($project, $propertyValues);
 
-        self::assertEquals($expected, $project->getVersions());
+        self::assertCount(1, $project->getVersions());
+        self::assertEquals('2.0.0', $project->getVersions()[0]->getLatestTag()?->getName());
     }
 }