Add exception if the current metadata of a version is null

Author: codedmonkey

src/Doctrine/Entity/Version.php

@@ -113,8 +113,18 @@ public function getPackage(): Package
         return $this->package;
     }
 
-    public function getCurrentMetadata(): ?Metadata
+    public function hasCurrentMetadata(): bool
     {
+        return null !== $this->currentMetadata;
+    }
+
+    public function getCurrentMetadata(): Metadata
+    {
+        if (null === $this->currentMetadata) {
+            // Packages are only allowed to have no current metadata during import
+            throw new \RuntimeException(sprintf('No current metadata found for package: %s %s', $this->package->getName(), $this->name));
+        }
+
         return $this->currentMetadata;
     }
 

src/Package/PackageMetadataResolver.php

@@ -216,7 +216,7 @@ private function updateVersion(Version $version, CompletePackageInterface $data,
     {
         $metadata = $this->createMetadata($version, $data, $driver);
 
-        if ($this->hasMetadataChanged($version->getCurrentMetadata(), $metadata)) {
+        if (!$version->hasCurrentMetadata() || $this->hasMetadataChanged($version->getCurrentMetadata(), $metadata)) {
             $version->setCurrentMetadata($metadata);
 
             $this->entityManager->persist($metadata);
@@ -351,15 +351,11 @@ private function sanitize(?string $string): ?string
         return $string;
     }
 
-    private function hasMetadataChanged(?Metadata $currentMetadata, Metadata $metadata): bool
+    private function hasMetadataChanged(Metadata $currentMetadata, Metadata $metadata): bool
     {
-        $currentData = $currentMetadata?->toComposerArray();
+        $currentData = $currentMetadata->toComposerArray();
         $data = $metadata->toComposerArray();
 
-        if (null === $currentData) {
-            return true;
-        }
-
         // Fields that shouldn't trigger a new revision
         $excludeFields = ['abandoned', 'default-branch'];