fix: Fixed RequestDataCollector

roadiz · Jul 12, 2024 · 4aa997a · 4aa997a
1 parent 1d9d203
commit 4aa997a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git 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
@@ -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