Skip to content

Commit 8bf9045

Browse files
codedmonkeycodedmonkey
committed
Update Version entity with metadata entities integration
1 parent f45a148 commit 8bf9045

8 files changed

Lines changed: 135 additions & 79 deletions

File tree

‎migrations/Version20260120114538.php‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,13 @@ public function up(Schema $schema): void
1818
{
1919
$this->createMetadataTables();
2020
$this->fillMetadataTables();
21+
$this->updateVersionTable();
2122
}
2223

2324
public function down(Schema $schema): void
2425
{
2526
$this->dropMetadataTables();
27+
$this->revertVersionTableUpdate();
2628
}
2729

2830
private function createMetadataTables(): void
@@ -281,6 +283,29 @@ private function fillMetadataTables(): void
281283
}
282284
}
283285

286+
private function updateVersionTable(): void
287+
{
288+
$this->addSql(<<<'SQL'
289+
ALTER TABLE version ADD current_metadata_id INT DEFAULT NULL
290+
SQL);
291+
$this->addSql(<<<'SQL'
292+
ALTER TABLE
293+
version
294+
ADD
295+
CONSTRAINT FK_BF1CD3C3624A4280 FOREIGN KEY (current_metadata_id) REFERENCES metadata (id)
296+
SQL);
297+
$this->addSql(<<<'SQL'
298+
CREATE UNIQUE INDEX UNIQ_BF1CD3C3624A4280 ON version (current_metadata_id)
299+
SQL);
300+
301+
$this->addSql(<<<'SQL'
302+
UPDATE version
303+
SET current_metadata_id = metadata.id
304+
FROM metadata
305+
WHERE metadata.version_id = version.id
306+
SQL);
307+
}
308+
284309
private function dropMetadataTables(): void
285310
{
286311
$this->addSql(<<<'SQL'
@@ -338,4 +363,17 @@ private function dropMetadataTables(): void
338363
DROP TABLE metadata_suggest_link
339364
SQL);
340365
}
366+
367+
private function revertVersionTableUpdate(): void
368+
{
369+
$this->addSql(<<<'SQL'
370+
ALTER TABLE version DROP CONSTRAINT FK_BF1CD3C3624A4280
371+
SQL);
372+
$this->addSql(<<<'SQL'
373+
DROP INDEX UNIQ_BF1CD3C3624A4280
374+
SQL);
375+
$this->addSql(<<<'SQL'
376+
ALTER TABLE version DROP current_metadata_id
377+
SQL);
378+
}
341379
}

‎src/Doctrine/Entity/Metadata.php‎

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

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

‎src/Doctrine/Entity/Package.php‎

Lines changed: 17 additions & 17 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->getNormalizedVersionName())] = $version;
280280
}
281281
}
282282

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

421421
foreach ($this->getSortedVersions() as $version) {
422-
if ('stable' !== VersionParser::parseStability($version->getNormalizedVersion())) {
422+
if ('stable' !== VersionParser::parseStability($version->getNormalizedVersionName())) {
423423
continue;
424424
}
425425

426-
[$majorVersion, $minorVersion] = explode('.', $version->getNormalizedVersion());
426+
[$majorVersion, $minorVersion] = explode('.', $version->getNormalizedVersionName());
427427

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

431431
$activePrereleaseVersions[$prereleaseVersion] ??= $version;
432-
if (version_compare($version->getNormalizedVersion(), $activePrereleaseVersions[$prereleaseVersion]->getNormalizedVersion(), '>')) {
432+
if (version_compare($version->getNormalizedVersionName(), $activePrereleaseVersions[$prereleaseVersion]->getNormalizedVersionName(), '>')) {
433433
$activePrereleaseVersions[$prereleaseVersion] = $version;
434434
}
435435

436436
continue;
437437
}
438438

439439
$activeVersions[$majorVersion] ??= $version;
440-
if (version_compare($version->getNormalizedVersion(), $activeVersions[$majorVersion]->getNormalizedVersion(), '>')) {
440+
if (version_compare($version->getNormalizedVersionName(), $activeVersions[$majorVersion]->getNormalizedVersionName(), '>')) {
441441
$activeVersions[$majorVersion] = $version;
442442
}
443443
}
@@ -447,34 +447,34 @@ public function getActiveVersions(): array
447447

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

454-
[$majorVersion, $minorVersion] = explode('.', $version->getNormalizedVersion());
454+
[$majorVersion, $minorVersion] = explode('.', $version->getNormalizedVersionName());
455455

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

458458
if ('0' === $majorVersion) {
459-
if (isset($activePrereleaseVersions[$developmentVersion]) && !version_compare($version->getNormalizedVersion(), $activePrereleaseVersions[$developmentVersion]->getNormalizedVersion(), '>')) {
459+
if (isset($activePrereleaseVersions[$developmentVersion]) && !version_compare($version->getNormalizedVersionName(), $activePrereleaseVersions[$developmentVersion]->getNormalizedVersionName(), '>')) {
460460
continue;
461461
}
462462

463463
$activePrereleaseDevelopmentVersions[$developmentVersion] ??= $version;
464-
if (version_compare($version->getNormalizedVersion(), $activePrereleaseDevelopmentVersions[$developmentVersion]->getNormalizedVersion(), '>')) {
464+
if (version_compare($version->getNormalizedVersionName(), $activePrereleaseDevelopmentVersions[$developmentVersion]->getNormalizedVersionName(), '>')) {
465465
$activePrereleaseDevelopmentVersions[$developmentVersion] = $version;
466466
}
467467

468468
continue;
469469
}
470470

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

475475
$activeDevelopmentVersions[$developmentVersion] ??= $version;
476-
if (version_compare($version->getNormalizedVersion(), $activeDevelopmentVersions[$developmentVersion]->getNormalizedVersion(), '>')) {
477-
$activeDevelopmentVersions[$version->getNormalizedVersion()] = $version;
476+
if (version_compare($version->getNormalizedVersionName(), $activeDevelopmentVersions[$developmentVersion]->getNormalizedVersionName(), '>')) {
477+
$activeDevelopmentVersions[$version->getNormalizedVersionName()] = $version;
478478
}
479479
}
480480

@@ -514,7 +514,7 @@ public function getHistoricalVersions(): array
514514
public function getDevVersions(): array
515515
{
516516
return array_filter($this->getSortedVersions(), static function (Version $version) {
517-
if (str_ends_with($version->getNormalizedVersion(), '.9999999-dev')) {
517+
if (str_ends_with($version->getNormalizedVersionName(), '.9999999-dev')) {
518518
return true;
519519
}
520520

@@ -531,13 +531,13 @@ public function getDevVersions(): array
531531
*/
532532
public function getDevBranchVersions(): array
533533
{
534-
return array_filter($this->getSortedVersions(), static fn (Version $version) => str_starts_with($version->getNormalizedVersion(), 'dev-'));
534+
return array_filter($this->getSortedVersions(), static fn (Version $version) => str_starts_with($version->getNormalizedVersionName(), 'dev-'));
535535
}
536536

537537
public static function sortVersions(Version $a, Version $b): int
538538
{
539-
$aVersion = $a->getNormalizedVersion();
540-
$bVersion = $b->getNormalizedVersion();
539+
$aVersion = $a->getNormalizedVersionName();
540+
$bVersion = $b->getNormalizedVersionName();
541541

542542
// use branch alias for sorting if one is provided
543543
if (isset($a->getExtra()['branch-alias'][$aVersion])) {
@@ -562,7 +562,7 @@ public static function sortVersions(Version $a, Version $b): int
562562
if ($aVersion === $bVersion) {
563563
// make sure sort is stable
564564
if ($a->getReleasedAt() === $b->getReleasedAt()) {
565-
return $a->getNormalizedVersion() <=> $b->getNormalizedVersion();
565+
return $a->getNormalizedVersionName() <=> $b->getNormalizedVersionName();
566566
}
567567

568568
return $b->getReleasedAt() > $a->getReleasedAt() ? 1 : -1;

0 commit comments

Comments
 (0)