Skip to content

Commit a3a3169

Browse files
codedmonkeycodedmonkey
committed
Update Version entity with metadata entities integration
Signed-off-by: Tim Goudriaan <tim@codedmonkey.com>
1 parent 6e0fec9 commit a3a3169

File tree

15 files changed

+248
-114
lines changed

15 files changed

+248
-114
lines changed

‎migrations/Version20260120114538.php‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,15 @@ public function up(Schema $schema): void
1818
{
1919
$this->createMetadataTables();
2020
$this->fillMetadataTables();
21+
$this->addCurrentMetadataColumnToVersionTable();
22+
$this->updateVersionTableColumns();
2123
}
2224

2325
public function down(Schema $schema): void
2426
{
27+
$this->revertVersionTableColumns();
2528
$this->fillVersionTables();
29+
$this->dropCurrentMetadataColumnFromVersionTable();
2630
$this->dropMetadataTables();
2731
}
2832

@@ -292,6 +296,93 @@ private function fillMetadataTables(): void
292296
}
293297
}
294298

299+
private function addCurrentMetadataColumnToVersionTable(): void
300+
{
301+
$this->addSql(<<<'SQL'
302+
ALTER TABLE version ADD current_metadata_id INT DEFAULT NULL
303+
SQL);
304+
$this->addSql(<<<'SQL'
305+
ALTER TABLE
306+
version
307+
ADD
308+
CONSTRAINT FK_BF1CD3C3624A4280 FOREIGN KEY (current_metadata_id) REFERENCES metadata (id)
309+
SQL);
310+
$this->addSql(<<<'SQL'
311+
CREATE UNIQUE INDEX UNIQ_BF1CD3C3624A4280 ON version (current_metadata_id)
312+
SQL);
313+
314+
$this->addSql(<<<'SQL'
315+
UPDATE version
316+
SET current_metadata_id = metadata.id
317+
FROM metadata
318+
WHERE metadata.version_id = version.id
319+
SQL);
320+
}
321+
322+
private function updateVersionTableColumns(): void
323+
{
324+
$this->addSql(<<<'SQL'
325+
DROP INDEX pkg_ver_idx
326+
SQL);
327+
$this->addSql(<<<'SQL'
328+
ALTER TABLE version RENAME COLUMN name TO package_name
329+
SQL);
330+
$this->addSql(<<<'SQL'
331+
ALTER TABLE version RENAME COLUMN version TO name
332+
SQL);
333+
$this->addSql(<<<'SQL'
334+
ALTER TABLE version RENAME COLUMN normalized_version TO normalized_name
335+
SQL);
336+
$this->addSql(<<<'SQL'
337+
CREATE UNIQUE INDEX package_version_idx ON version (package_id, normalized_name)
338+
SQL);
339+
340+
$this->addSql(<<<'SQL'
341+
ALTER TABLE version DROP CONSTRAINT fk_bf1cd3c3f44cabff
342+
SQL);
343+
$this->addSql(<<<'SQL'
344+
ALTER TABLE version ALTER package_id SET NOT NULL
345+
SQL);
346+
$this->addSql(<<<'SQL'
347+
ALTER TABLE
348+
version
349+
ADD
350+
CONSTRAINT FK_BF1CD3C3F44CABFF FOREIGN KEY (package_id) REFERENCES package (id) ON DELETE CASCADE NOT DEFERRABLE
351+
SQL);
352+
}
353+
354+
private function revertVersionTableColumns(): void
355+
{
356+
$this->addSql(<<<'SQL'
357+
DROP INDEX package_version_idx
358+
SQL);
359+
$this->addSql(<<<'SQL'
360+
ALTER TABLE version RENAME COLUMN name TO version
361+
SQL);
362+
$this->addSql(<<<'SQL'
363+
ALTER TABLE version RENAME COLUMN normalized_name TO normalized_version
364+
SQL);
365+
$this->addSql(<<<'SQL'
366+
ALTER TABLE version RENAME COLUMN package_name TO name
367+
SQL);
368+
$this->addSql(<<<'SQL'
369+
CREATE UNIQUE INDEX pkg_ver_idx ON version (package_id, normalized_version)
370+
SQL);
371+
372+
$this->addSql(<<<'SQL'
373+
ALTER TABLE version DROP CONSTRAINT FK_BF1CD3C3F44CABFF
374+
SQL);
375+
$this->addSql(<<<'SQL'
376+
ALTER TABLE version ALTER package_id DROP NOT NULL
377+
SQL);
378+
$this->addSql(<<<'SQL'
379+
ALTER TABLE
380+
version
381+
ADD
382+
CONSTRAINT fk_bf1cd3c3f44cabff FOREIGN KEY (package_id) REFERENCES package (id) NOT DEFERRABLE INITIALLY IMMEDIATE
383+
SQL);
384+
}
385+
295386
private function fillVersionTables(): void
296387
{
297388
$this->addSql(<<<'SQL'
@@ -350,6 +441,19 @@ private function fillVersionTables(): void
350441
}
351442
}
352443

444+
private function dropCurrentMetadataColumnFromVersionTable(): void
445+
{
446+
$this->addSql(<<<'SQL'
447+
ALTER TABLE version DROP CONSTRAINT FK_BF1CD3C3624A4280
448+
SQL);
449+
$this->addSql(<<<'SQL'
450+
DROP INDEX UNIQ_BF1CD3C3624A4280
451+
SQL);
452+
$this->addSql(<<<'SQL'
453+
ALTER TABLE version DROP current_metadata_id
454+
SQL);
455+
}
456+
353457
private function dropMetadataTables(): void
354458
{
355459
$this->addSql(<<<'SQL'

‎src/Controller/ApiController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public function packageDistribution(Request $request, string $reference, string
128128
throw $this->createNotFoundException();
129129
}
130130

131-
if (null === $version = $this->versionRepository->findOneByNormalizedVersion($package, $versionName)) {
131+
if (null === $version = $this->versionRepository->findOneByNormalizedVersionName($package, $versionName)) {
132132
throw $this->createNotFoundException();
133133
}
134134

‎src/Doctrine/Entity/Metadata.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class Metadata extends TrackedEntity implements \Stringable
8888
#[ORM\Column(nullable: true)]
8989
private ?\DateTimeImmutable $releasedAt = null;
9090

91-
#[ORM\ManyToOne(targetEntity: Version::class)]
91+
#[ORM\ManyToOne(targetEntity: Version::class, inversedBy: 'metadata')]
9292
#[ORM\JoinColumn(nullable: false, onDelete: 'CASCADE')]
9393
private Version $version;
9494

‎src/Doctrine/Entity/Package.php‎

Lines changed: 43 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ public function getVersion(string $normalizedVersion): ?Version
276276
if (!isset($this->cachedVersions)) {
277277
$this->cachedVersions = [];
278278
foreach ($this->getVersions() as $version) {
279-
$this->cachedVersions[strtolower($version->getNormalizedVersion())] = $version;
279+
$this->cachedVersions[strtolower($version->getNormalizedName())] = $version;
280280
}
281281
}
282282

@@ -420,25 +420,25 @@ public function getActiveVersions(): array
420420
$activePrereleaseVersions = [];
421421

422422
foreach ($this->getSortedVersions() as $version) {
423-
if ('stable' !== VersionParser::parseStability($version->getNormalizedVersion())) {
423+
if ('stable' !== VersionParser::parseStability($version->getNormalizedName())) {
424424
continue;
425425
}
426426

427-
[$majorVersion, $minorVersion] = explode('.', $version->getNormalizedVersion());
427+
[$majorVersion, $minorVersion] = explode('.', $version->getNormalizedName());
428428

429429
if ('0' === $majorVersion) {
430430
$prereleaseVersion = "$majorVersion.$minorVersion";
431431

432432
$activePrereleaseVersions[$prereleaseVersion] ??= $version;
433-
if (version_compare($version->getNormalizedVersion(), $activePrereleaseVersions[$prereleaseVersion]->getNormalizedVersion(), '>')) {
433+
if (version_compare($version->getNormalizedName(), $activePrereleaseVersions[$prereleaseVersion]->getNormalizedName(), '>')) {
434434
$activePrereleaseVersions[$prereleaseVersion] = $version;
435435
}
436436

437437
continue;
438438
}
439439

440440
$activeVersions[$majorVersion] ??= $version;
441-
if (version_compare($version->getNormalizedVersion(), $activeVersions[$majorVersion]->getNormalizedVersion(), '>')) {
441+
if (version_compare($version->getNormalizedName(), $activeVersions[$majorVersion]->getNormalizedName(), '>')) {
442442
$activeVersions[$majorVersion] = $version;
443443
}
444444
}
@@ -448,34 +448,34 @@ public function getActiveVersions(): array
448448

449449
// Find newer unstable releases of active versions
450450
foreach ($this->getSortedVersions() as $version) {
451-
if (in_array(VersionParser::parseStability($version->getNormalizedVersion()), ['stable', 'dev'], true)) {
451+
if (in_array(VersionParser::parseStability($version->getNormalizedName()), ['stable', 'dev'], true)) {
452452
continue;
453453
}
454454

455-
[$majorVersion, $minorVersion] = explode('.', $version->getNormalizedVersion());
455+
[$majorVersion, $minorVersion] = explode('.', $version->getNormalizedName());
456456

457457
$developmentVersion = "$majorVersion.$minorVersion";
458458

459459
if ('0' === $majorVersion) {
460-
if (isset($activePrereleaseVersions[$developmentVersion]) && !version_compare($version->getNormalizedVersion(), $activePrereleaseVersions[$developmentVersion]->getNormalizedVersion(), '>')) {
460+
if (isset($activePrereleaseVersions[$developmentVersion]) && !version_compare($version->getNormalizedName(), $activePrereleaseVersions[$developmentVersion]->getNormalizedName(), '>')) {
461461
continue;
462462
}
463463

464464
$activePrereleaseDevelopmentVersions[$developmentVersion] ??= $version;
465-
if (version_compare($version->getNormalizedVersion(), $activePrereleaseDevelopmentVersions[$developmentVersion]->getNormalizedVersion(), '>')) {
465+
if (version_compare($version->getNormalizedName(), $activePrereleaseDevelopmentVersions[$developmentVersion]->getNormalizedName(), '>')) {
466466
$activePrereleaseDevelopmentVersions[$developmentVersion] = $version;
467467
}
468468

469469
continue;
470470
}
471471

472-
if (isset($activeVersions[$majorVersion]) && !version_compare($version->getNormalizedVersion(), $activeVersions[$majorVersion]->getNormalizedVersion(), '>')) {
472+
if (isset($activeVersions[$majorVersion]) && !version_compare($version->getNormalizedName(), $activeVersions[$majorVersion]->getNormalizedName(), '>')) {
473473
continue;
474474
}
475475

476476
$activeDevelopmentVersions[$developmentVersion] ??= $version;
477-
if (version_compare($version->getNormalizedVersion(), $activeDevelopmentVersions[$developmentVersion]->getNormalizedVersion(), '>')) {
478-
$activeDevelopmentVersions[$version->getNormalizedVersion()] = $version;
477+
if (version_compare($version->getNormalizedName(), $activeDevelopmentVersions[$developmentVersion]->getNormalizedName(), '>')) {
478+
$activeDevelopmentVersions[$version->getNormalizedName()] = $version;
479479
}
480480
}
481481

@@ -515,13 +515,15 @@ public function getHistoricalVersions(): array
515515
public function getDevVersions(): array
516516
{
517517
return array_filter($this->getSortedVersions(), static function (Version $version) {
518-
if (str_ends_with($version->getNormalizedVersion(), '.9999999-dev')) {
518+
if (str_ends_with($version->getNormalizedName(), '.9999999-dev')) {
519519
return true;
520520
}
521521

522+
$metadata = $version->getCurrentMetadata();
523+
522524
static $parser = new VersionParser();
523525

524-
return $version->hasVersionAlias() && str_ends_with((string) $parser->normalize($version->getVersionAlias()), '.9999999-dev');
526+
return $metadata->hasVersionAlias() && str_ends_with((string) $parser->normalize($metadata->getVersionAlias()), '.9999999-dev');
525527
});
526528
}
527529

@@ -532,44 +534,49 @@ public function getDevVersions(): array
532534
*/
533535
public function getDevBranchVersions(): array
534536
{
535-
return array_filter($this->getSortedVersions(), static fn (Version $version) => str_starts_with($version->getNormalizedVersion(), 'dev-'));
537+
return array_filter($this->getSortedVersions(), static fn (Version $version) => str_starts_with($version->getNormalizedName(), 'dev-'));
536538
}
537539

540+
/**
541+
* Sort versions from newest to oldest.
542+
*/
538543
public static function sortVersions(Version $a, Version $b): int
539544
{
540-
$aVersion = $a->getNormalizedVersion();
541-
$bVersion = $b->getNormalizedVersion();
545+
$aName = $a->getNormalizedName();
546+
$bName = $b->getNormalizedName();
542547

543-
// use branch alias for sorting if one is provided
544-
if (isset($a->getExtra()['branch-alias'][$aVersion])) {
545-
$aVersion = Preg::replace('{(.x)?-dev$}', '.9999999-dev', $a->getExtra()['branch-alias'][$aVersion]);
548+
// Use the branch alias for sorting if one is provided
549+
if (null !== $aBranchAlias = $a->getCurrentMetadata()->getExtra()['branch-alias'][$aName] ?? null) {
550+
$aName = Preg::replace('{(.x)?-dev$}', '.9999999-dev', $aBranchAlias);
546551
}
547-
if (isset($b->getExtra()['branch-alias'][$bVersion])) {
548-
$bVersion = Preg::replace('{(.x)?-dev$}', '.9999999-dev', $b->getExtra()['branch-alias'][$bVersion]);
552+
if (null !== $bBranchAlias = $b->getCurrentMetadata()->getExtra()['branch-alias'][$bName] ?? null) {
553+
$bName = Preg::replace('{(.x)?-dev$}', '.9999999-dev', $bBranchAlias);
549554
}
550555

551-
$aVersion = Preg::replace('{^dev-.*}', '0.0.0-alpha', $aVersion);
552-
$bVersion = Preg::replace('{^dev-.*}', '0.0.0-alpha', $bVersion);
556+
$aName = Preg::replace('{^dev-.*}', '0.0.0-alpha', $aName);
557+
$bName = Preg::replace('{^dev-.*}', '0.0.0-alpha', $bName);
553558

554-
// sort default branch first if it is non numeric
555-
if ('0.0.0-alpha' === $aVersion && $a->isDefaultBranch()) {
559+
// Sort the default branch first if it is non-numeric
560+
if ('0.0.0-alpha' === $aName && $a->isDefaultBranch()) {
556561
return -1;
557562
}
558-
if ('0.0.0-alpha' === $bVersion && $b->isDefaultBranch()) {
563+
if ('0.0.0-alpha' === $bName && $b->isDefaultBranch()) {
559564
return 1;
560565
}
561566

562-
// equal versions are sorted by date
563-
if ($aVersion === $bVersion) {
564-
// make sure sort is stable
565-
if ($a->getReleasedAt() === $b->getReleasedAt()) {
566-
return $a->getNormalizedVersion() <=> $b->getNormalizedVersion();
567-
}
567+
if ($aName !== $bName) {
568+
return version_compare($bName, $aName);
569+
}
570+
571+
// Equal versions are sorted by release date
572+
$aReleasedAt = $a->getCurrentMetadata()->getReleasedAt();
573+
$bReleasedAt = $b->getCurrentMetadata()->getReleasedAt();
568574

569-
return $b->getReleasedAt() > $a->getReleasedAt() ? 1 : -1;
575+
if (0 !== $sort = $bReleasedAt <=> $aReleasedAt) {
576+
return $sort;
570577
}
571578

572-
// the rest is sorted by version
573-
return version_compare($bVersion, $aVersion);
579+
// Add a stable fallback sort
580+
return $b->getId() <=> $a->getId();
574581
}
575582
}

0 commit comments

Comments
 (0)