Create Dependent and Suggester entities

Author: codedmonkey

src/Doctrine/Entity/Dependent.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace CodedMonkey\Dirigent\Doctrine\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+#[ORM\Entity]
+class Dependent
+{
+    #[ORM\Id, ORM\ManyToOne(targetEntity: Package::class), ORM\JoinColumn(nullable: false)]
+    private ?Package $package = null;
+
+    #[ORM\Id, ORM\Column(length: 191)]
+    private string $dependentPackageName;
+
+    #[ORM\Id, ORM\Column]
+    private bool $devDependency;
+
+    public function getPackage(): ?Package
+    {
+        return $this->package;
+    }
+
+    public function setPackage(Package $package): static
+    {
+        $this->package = $package;
+
+        return $this;
+    }
+
+    public function getDependentPackageName(): string
+    {
+        return $this->dependentPackageName;
+    }
+
+    public function setDependentPackageName(string $packageName): static
+    {
+        $this->dependentPackageName = $packageName;
+
+        return $this;
+    }
+
+    public function isDevDependency(): bool
+    {
+        return $this->devDependency;
+    }
+
+    public function setDevDependency(bool $devDependency): static
+    {
+        $this->devDependency = $devDependency;
+
+        return $this;
+    }
+}

src/Doctrine/Entity/PackageLink.php

@@ -13,58 +13,58 @@ abstract class PackageLink
     #[ORM\GeneratedValue]
     private ?int $id = null;
 
-    #[ORM\Column(length: 191)]
-    private string $packageName;
-
-    #[ORM\Column(type: Types::TEXT)]
-    private string $packageVersion;
-
     /**
      * Base property holding the version - this must remain protected since it
      * is redefined with an attribute in the child class.
      */
     protected Version $version;
 
+    #[ORM\Column(length: 191)]
+    private string $linkedPackageName;
+
+    #[ORM\Column(type: Types::TEXT)]
+    private string $linkedPackageVersion;
+
     public function getId(): ?int
     {
         return $this->id;
     }
 
-    public function getPackageName(): string
+    public function getVersion(): Version
     {
-        return $this->packageName;
+        return $this->version;
     }
 
-    public function setPackageName(string $packageName): void
+    public function setVersion(Version $version): void
     {
-        $this->packageName = $packageName;
+        $this->version = $version;
     }
 
-    public function getPackageVersion(): string
+    public function getLinkedPackageName(): string
     {
-        return $this->packageVersion;
+        return $this->linkedPackageName;
     }
 
-    public function setPackageVersion(string $packageVersion): void
+    public function setLinkedPackageName(string $packageName): void
     {
-        $this->packageVersion = $packageVersion;
+        $this->linkedPackageName = $packageName;
     }
 
-    public function getVersion(): ?Version
+    public function getLinkedPackageVersion(): string
     {
-        return $this->version;
+        return $this->linkedPackageVersion;
     }
 
-    public function setVersion(Version $version): void
+    public function setLinkedPackageVersion(string $packageVersion): void
     {
-        $this->version = $version;
+        $this->linkedPackageVersion = $packageVersion;
     }
 
     /**
      * @return non-empty-array<string, string>
      */
     public function toArray(): array
     {
-        return [$this->getPackageName() => $this->getPackageVersion()];
+        return [$this->getLinkedPackageName() => $this->getLinkedPackageVersion()];
     }
 }

src/Doctrine/Entity/Suggester.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace CodedMonkey\Dirigent\Doctrine\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+#[ORM\Entity]
+class Suggester
+{
+    #[ORM\Id, ORM\ManyToOne(targetEntity: Package::class), ORM\JoinColumn(nullable: false)]
+    private ?Package $package = null;
+
+    #[ORM\Id, ORM\Column(length: 191)]
+    private string $suggestedPackageName;
+
+    public function getPackage(): ?Package
+    {
+        return $this->package;
+    }
+
+    public function setPackage(Package $package): static
+    {
+        $this->package = $package;
+
+        return $this;
+    }
+
+    public function getSuggestedPackageName(): string
+    {
+        return $this->suggestedPackageName;
+    }
+
+    public function setSuggestedPackageName(string $packageName): static
+    {
+        $this->suggestedPackageName = $packageName;
+
+        return $this;
+    }
+}

src/Package/PackageMetadataResolver.php

@@ -318,7 +318,7 @@ private function updateVersion(Package $package, Version $version, CompletePacka
         if ($suggests = $data->getSuggests()) {
             foreach ($version->getSuggest() as $link) {
                 // clear links that have changed/disappeared (for updates)
-                if (!isset($suggests[$link->getPackageName()]) || $suggests[$link->getPackageName()] !== $link->getPackageVersion()) {
+                if (!isset($suggests[$link->getPackageName()]) || $suggests[$link->getPackageName()] !== $link->getLinkedPackageVersion()) {
                     $version->getSuggest()->removeElement($link);
                     $em->remove($link);
                 } else {
@@ -330,7 +330,7 @@ private function updateVersion(Package $package, Version $version, CompletePacka
             foreach ($suggests as $linkPackageName => $linkPackageVersion) {
                 $link = new SuggestLink();
                 $link->setPackageName($linkPackageName);
-                $link->setPackageVersion($linkPackageVersion);
+                $link->setLinkedPackageVersion($linkPackageVersion);
                 $version->addSuggestLink($link);
                 $link->setVersion($version);
                 $em->persist($link);