From 4aa997ac2605e0c1283100473d050923cdeba3c0 Mon Sep 17 00:00:00 2001
From: Ambroise Maupate <ambroise@rezo-zero.com>
Date: Fri, 12 Jul 2024 20:19:21 +0200
Subject: [PATCH] fix: Fixed RequestDataCollector

---
 lib/RoadizCoreBundle/config/services.yaml       |  1 +
 .../src/DataCollector/RequestDataCollector.php  | 17 +++++------------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/lib/RoadizCoreBundle/config/services.yaml b/lib/RoadizCoreBundle/config/services.yaml
index 9fc1910f..24324643 100644
--- a/lib/RoadizCoreBundle/config/services.yaml
+++ b/lib/RoadizCoreBundle/config/services.yaml
@@ -61,6 +61,7 @@ services:
             - '../src/Traits/'
             - '../src/Kernel.php'
             - '../src/Tests/'
+            - '../src/DataCollector/'
             - '../src/Event/'
 
     RZ\Roadiz\CoreBundle\EntityHandler\:
diff --git a/lib/RoadizCoreBundle/src/DataCollector/RequestDataCollector.php b/lib/RoadizCoreBundle/src/DataCollector/RequestDataCollector.php
index 27f5bc2e..38ed74f9 100644
--- a/lib/RoadizCoreBundle/src/DataCollector/RequestDataCollector.php
+++ b/lib/RoadizCoreBundle/src/DataCollector/RequestDataCollector.php
@@ -4,7 +4,6 @@
 
 namespace RZ\Roadiz\CoreBundle\DataCollector;
 
-use PackageVersions\Versions;
 use Symfony\Bundle\FrameworkBundle\DataCollector\AbstractDataCollector;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -22,20 +21,14 @@ public function __construct(
      */
     public function collect(Request $request, Response $response, \Throwable $exception = null): void
     {
-        $this->data = [];
+        $this->data = [
+            'version' => implode(' - ', array_filter([$this->cmsVersionPrefix, $this->cmsVersion])),
+        ];
     }
 
-    public function getVersion(): ?string
+    public function getVersion(): string
     {
-        $fallback = implode(' - ', array_filter([$this->cmsVersionPrefix, $this->cmsVersion]));
-        if (!class_exists(Versions::class)) {
-            return $fallback;
-        }
-
-        $version = Versions::getVersion('roadiz/core-bundle');
-        preg_match('/^v(.*?)@/', $version, $output);
-
-        return $output[1] ?? strtok($version, '@') ?: $fallback;
+        return $this->data['version'];
     }
 
     public static function getTemplate(): ?string