Fix matching of existing package metadata

Signed-off-by: Tim Goudriaan <tim@codedmonkey.com>

Author: codedmonkey

src/Doctrine/Entity/Metadata.php

@@ -596,7 +596,7 @@ public function getBrowsableRepositoryUrl(): ?string
         return null;
     }
 
-    public function toComposerArray(): array
+    public function toComposerArray(bool $includePackageMetadata = true): array
     {
         // Set default fields
         $data = [
@@ -629,6 +629,7 @@ public function toComposerArray(): array
             foreach ($linkCollection as $link) {
                 $data[$linkType][$link->getLinkedPackageName()] = $link->getLinkedVersionConstraint();
             }
+            ksort($data[$linkType]);
         }
 
         // Set optional fields
@@ -662,7 +663,10 @@ public function toComposerArray(): array
             $data['bin'] = $this->binaries;
         }
 
-        // Set administrative fields
+        if (!$includePackageMetadata) {
+            return $data;
+        }
+
         if ($this->getVersion()->isDefaultBranch()) {
             $data['default-branch'] = true;
         }

src/Package/PackageMetadataResolver.php

@@ -253,7 +253,7 @@ private function updateVersion(Version $version, CompletePackageInterface $data,
     {
         $metadata = $this->createMetadata($version, $data, $driver);
 
-        if ($this->hasMetadataChanged($version->getCurrentMetadata(), $metadata)) {
+        if ($this->hasMetadataChanged($metadata)) {
             $version->setCurrentMetadata($metadata);
 
             $this->entityManager->persist($metadata);
@@ -396,27 +396,17 @@ private function sanitize(?string $string): ?string
         return $string;
     }
 
-    private function hasMetadataChanged(?Metadata $currentMetadata, Metadata $metadata): bool
+    private function hasMetadataChanged(Metadata $resolvedMetadata): bool
     {
-        $currentData = $currentMetadata?->toComposerArray();
-        $data = $metadata->toComposerArray();
-
-        if (null === $currentData) {
+        // Check if the package version has existing metadata first
+        if (null === $currentMetadata = $resolvedMetadata->getVersion()->getCurrentMetadata()) {
             return true;
         }
 
-        // Fields that shouldn't trigger a new revision
-        $excludeFields = ['abandoned', 'default-branch'];
-
-        foreach ($excludeFields as $field) {
-            unset($currentData[$field], $data[$field]);
-        }
-
-        // Normalize both arrays for comparison
-        ksort($currentData);
-        ksort($data);
+        $currentData = $currentMetadata->toComposerArray(includePackageMetadata: false);
+        $resolvedData = $resolvedMetadata->toComposerArray(includePackageMetadata: false);
 
-        return $currentData !== $data;
+        return $currentData !== $resolvedData;
     }
 
     private function getReadmeContents(Metadata $metadata, VcsDriverInterface $driver): ?string