fix(symfony): fetch api-platform/symfony version debug bar (#6722)

fixes #6709
api-platform · Oct 16, 2024 · e7fb04f · e7fb04f
1 parent d34cd7b
commit e7fb04f
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 4 deletions.
diff --git a/src/Symfony/Bundle/DataCollector/RequestDataCollector.php b/src/Symfony/Bundle/DataCollector/RequestDataCollector.php
@@ -16,6 +16,7 @@
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
 use ApiPlatform\State\Util\RequestAttributesExtractor;
+use Composer\InstalledVersions;
 use PackageVersions\Versions;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -67,16 +68,38 @@ private function setFilters(ApiResource $resourceMetadata, int $index, array &$f
  }
  }
 
+ // TODO: 4.1 remove Versions as its deprecated
  public function getVersion(): ?string
  {
+ if (class_exists(InstalledVersions::class)) {
+ return InstalledVersions::getPrettyVersion('api-platform/symfony') ?? InstalledVersions::getPrettyVersion('api-platform/core');
+ }
+
  if (!class_exists(Versions::class)) {
  return null;
  }
 
- $version = Versions::getVersion('api-platform/core');
- preg_match('/^v(.*?)@/', (string) $version, $output);
+ try {
+ $version = strtok(Versions::getVersion('api-platform/symfony'), '@');
+ } catch (\OutOfBoundsException) {
+ $version = false;
+ }
+
+ if (false === $version) {
+ try {
+ $version = strtok(Versions::getVersion('api-platform/core'), '@');
+ } catch (\OutOfBoundsException) {
+ $version = false;
+ }
+ }
+
+ if (false === $version) {
+ return null;
+ }
+
+ preg_match('/^v(.*?)$/', $version, $output);
 
- return $output[1] ?? strtok($version, '@');
+ return $output[1] ?? $version;
  }
 
  /**

diff --git a/tests/Symfony/Bundle/DataCollector/RequestDataCollectorTest.php b/tests/Symfony/Bundle/DataCollector/RequestDataCollectorTest.php
@@ -20,6 +20,7 @@
 use ApiPlatform\Metadata\Resource\ResourceMetadataCollection;
 use ApiPlatform\Symfony\Bundle\DataCollector\RequestDataCollector;
 use ApiPlatform\Tests\Fixtures\DummyEntity;
+use Composer\InstalledVersions;
 use PackageVersions\Versions;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -163,7 +164,11 @@ public function testVersionCollection(): void
  $this->response
  );
 
- $this->assertSame(null !== $dataCollector->getVersion(), class_exists(Versions::class));
+ if (class_exists(InstalledVersions::class)) {
+ $this->assertTrue(null !== $dataCollector->getVersion());
+ } else {
+ $this->assertSame(null !== $dataCollector->getVersion(), class_exists(Versions::class));
+ }
  }
 
  public function testWithPreviousData(): void