fixed import of old game exports

mkalkbrenner · mkalkbrenner · commit 1305bc44e589 · 2025-05-13T17:14:13.000+02:00
diff --git a/composer.lock b/composer.lock
diff --git a/composer.patches.json b/composer.patches.json
@@ -1,4 +1,8 @@
 {
   "patches": {
+    "drupal/hal": {
+      "2904423 - Translated field denormalization creates duplicate values": "https://www.drupal.org/files/issues/2023-04-05/2904423-90.patch",
+      "3517446 - Cached relation IDs are broken": "https://www.drupal.org/files/issues/2025-04-04/3517446.patch"
+    }
   }
 }
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -1524,7 +1524,7 @@
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/default_content_deploy.git",
-                "reference": "f4f8a6fccee4f9619f21d89972078e702865f58d"
+                "reference": "d52cf833263a24d10cfff2d0e34bdcd3d9ace8b9"
             },
             "require": {
                 "drupal/core": "^10.3 || ^11.0",
@@ -1546,8 +1546,8 @@
                     "dev-2.2.x": "2.2.x-dev"
                 },
                 "drupal": {
-                    "version": "2.2.0-beta1+3-dev",
-                    "datestamp": "1745834090",
+                    "version": "2.2.0-beta2+2-dev",
+                    "datestamp": "1747149066",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "Dev releases are not covered by Drupal security advisories."
@@ -1618,6 +1618,10 @@
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
                     }
+                },
+                "patches_applied": {
+                    "2904423 - Translated field denormalization creates duplicate values": "https://www.drupal.org/files/issues/2023-04-05/2904423-90.patch",
+                    "3517446 - Cached relation IDs are broken": "https://www.drupal.org/files/issues/2025-04-04/3517446.patch"
                 }
             },
             "installation-source": "dist",
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => 'ppuc/web',
         'pretty_version' => 'dev-main',
         'version' => 'dev-main',
-        'reference' => '6c3dd4f39ab1b04a4e47a3ae876d48ae45b1ad44',
+        'reference' => 'c4b79d418d0b5e28049fddb758884e2dab6a79b2',
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -346,7 +346,7 @@
         'drupal/default_content_deploy' => array(
             'pretty_version' => 'dev-2.2.x',
             'version' => 'dev-2.2.x',
-            'reference' => 'f4f8a6fccee4f9619f21d89972078e702865f58d',
+            'reference' => 'd52cf833263a24d10cfff2d0e34bdcd3d9ace8b9',
             'type' => 'drupal-module',
             'install_path' => __DIR__ . '/../../web/modules/contrib/default_content_deploy',
             'aliases' => array(
@@ -579,7 +579,7 @@
         'ppuc/web' => array(
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-            'reference' => '6c3dd4f39ab1b04a4e47a3ae876d48ae45b1ad44',
+            'reference' => 'c4b79d418d0b5e28049fddb758884e2dab6a79b2',
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
diff --git a/web/modules/contrib/default_content_deploy/src/Importer.php b/web/modules/contrib/default_content_deploy/src/Importer.php
@@ -760,9 +760,11 @@ public function decodeFile(object $file): void {
     // Get parsed data.
     $parsed_data = file_get_contents($file->uri);
     // Backward compatibility for exports before 2.2.x.
-    $parsed_data = preg_replace('@"href": "http[^"]+/rest\\\\/type\\\\/([^"]+)"@', '"href": "$1"', $parsed_data);
-    $parsed_data = preg_replace('@"http[^"]+/rest\\\\/(relation[^"]+)"@', '"$1"', $parsed_data);
-
+    if (preg_match('@"href": "(http[^"]+)/rest\\\\/type\\\\/[^"]+"@', $parsed_data, $matches)) {
+      $parsed_data = preg_replace('@"href": "http[^"]+/rest\\\\/type\\\\/([^"?]+).*?"@', '"href": "$1"', $parsed_data);
+      $parsed_data = preg_replace('@"http[^"]+/rest\\\\/(relation[^"?]+).*?"@', '"$1"', $parsed_data);
+      $parsed_data = preg_replace('@"href": "' . preg_quote($matches[1], '@') . '([^"?]+).*?"@', '"href": "_dcd$1"', $parsed_data);
+    }
     // Decode.
     try {
       $decode = $this->serializer->decode($parsed_data, 'hal_json');
@@ -777,7 +779,7 @@ public function decodeFile(object $file): void {
   }
 
   /**
-   * Here we can edit data`s value before importing.
+   * Here we can edit data's value before importing.
    *
    * @param object $file
    *   The file object.
diff --git a/web/modules/contrib/default_content_deploy/src/Normalizer/ConfigurableContentEntityNormalizer.php b/web/modules/contrib/default_content_deploy/src/Normalizer/ConfigurableContentEntityNormalizer.php
@@ -168,6 +168,15 @@ public function denormalize($data, $class, $format = NULL, array $context = []):
       unset($data['_dcd_metadata']);
     }
 
+    if (isset($data['_embedded']) && !$this->metadataService->isCorrectionRequired($data['uuid'][0]['value'])) {
+      foreach (array_keys($data['_embedded']) as $relation) {
+        $field_ids = $this->linkManager->getRelationInternalIds($relation, $context);
+        if (empty($field_ids)) {
+          $this->metadataService->setCorrectionRequired($data['uuid'][0]['value'], TRUE);
+        }
+      }
+    }
+
     return parent::denormalize($data, $class, $format, $context);
   }
 
diff --git a/web/modules/contrib/hal/PATCHES.txt b/web/modules/contrib/hal/PATCHES.txt
@@ -0,0 +1,11 @@
+This file was automatically generated by Composer Patches (https://github.com/cweagans/composer-patches)
+Patches applied to this directory:
+
+2904423 - Translated field denormalization creates duplicate values
+Source: https://www.drupal.org/files/issues/2023-04-05/2904423-90.patch
+
+
+3517446 - Cached relation IDs are broken
+Source: https://www.drupal.org/files/issues/2025-04-04/3517446.patch
+
+
diff --git a/web/modules/contrib/hal/src/LinkManager/LinkManager.php b/web/modules/contrib/hal/src/LinkManager/LinkManager.php
@@ -55,8 +55,8 @@ public function getRelationUri($entity_type, $bundle, $field_name, $context = []
   /**
    * {@inheritdoc}
    */
-  public function getRelationInternalIds($relation_uri) {
-    return $this->relationLinkManager->getRelationInternalIds($relation_uri);
+  public function getRelationInternalIds($relation_uri, $context = []) {
+    return $this->relationLinkManager->getRelationInternalIds($relation_uri, $context);
   }
 
   /**
diff --git a/web/modules/contrib/hal/src/LinkManager/RelationLinkManagerInterface.php b/web/modules/contrib/hal/src/LinkManager/RelationLinkManagerInterface.php
@@ -30,10 +30,12 @@ public function getRelationUri($entity_type, $bundle, $field_name, $context = []
    *
    * @param string $relation_uri
    *   Relation URI (or IANA link relation type) to transform into internal IDs.
+   * @param array $context
+   *   (optional) Optional serializer/normalizer context.
    *
    * @return array
    *   Array with keys 'entity_type_id', 'bundle' and 'field_name'.
    */
-  public function getRelationInternalIds($relation_uri);
+  public function getRelationInternalIds($relation_uri, $context = []);
 
 }
diff --git a/web/modules/contrib/hal/src/Normalizer/ContentEntityNormalizer.php b/web/modules/contrib/hal/src/Normalizer/ContentEntityNormalizer.php
@@ -155,8 +155,6 @@ public function denormalize($data, $class, $format = NULL, array $context = []):
           break;
         }
       }
-      // Remove the default langcode so it does not get iterated over below.
-      unset($data[$default_langcode_key]);
     }
 
     if ($entity_type->hasKey('bundle')) {
@@ -179,7 +177,7 @@ public function denormalize($data, $class, $format = NULL, array $context = []):
 
     // Flatten the embedded values.
     foreach ($embedded as $relation => $field) {
-      $field_ids = $this->linkManager->getRelationInternalIds($relation);
+      $field_ids = $this->linkManager->getRelationInternalIds($relation, $context);
       if (!empty($field_ids)) {
         $field_name = $field_ids['field_name'];
         $data[$field_name] = $field;
diff --git a/web/modules/contrib/hal/src/Normalizer/FieldItemNormalizer.php b/web/modules/contrib/hal/src/Normalizer/FieldItemNormalizer.php
@@ -2,7 +2,9 @@
 
 namespace Drupal\hal\Normalizer;
 
+use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Field\FieldItemInterface;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Core\TypedData\TypedDataInternalPropertiesHelper;
 use Drupal\serialization\Normalizer\FieldableEntityNormalizerTrait;
 use Drupal\serialization\Normalizer\SerializedColumnNormalizerTrait;
@@ -129,9 +131,43 @@ protected function createTranslatedInstance(FieldItemInterface $item, $langcode)
 
     // Instead, create a new item for the entity in the requested language.
     $entity = $item->getEntity();
-    $entity_translation = $entity->hasTranslation($langcode) ? $entity->getTranslation($langcode) : $entity->addTranslation($langcode);
+    // Get the translated entity, or create it if it does not exist.
+    $entity_translation = $entity->hasTranslation($langcode) ? $entity->getTranslation($langcode) : $this->createTranslatedEntity($entity, $langcode);
     $field_name = $item->getFieldDefinition()->getName();
-    return $entity_translation->get($field_name)->appendItem();
+    $field = $entity_translation->get($field_name);
+    $cardinality = $item->getFieldDefinition()->getFieldStorageDefinition()->getCardinality();
+    if ($cardinality === FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED || count($field) < $cardinality) {
+      return $field->appendItem();
+    }
+    return $field->first();
+  }
+
+  /**
+   * Create an empty entity translation to fill with field data.
+   *
+   * @param \Drupal\Core\Entity\FieldableEntityInterface $entity
+   *   The untranslated entity.
+   * @param string $langcode
+   *   The langcode.
+   *
+   * @return \Drupal\Core\Entity\FieldableEntityInterface
+   *   The translated entity.
+   *
+   * @throws \Drupal\Core\TypedData\Exception\ReadOnlyException
+   */
+  protected function createTranslatedEntity(FieldableEntityInterface $entity, $langcode) {
+    // Create a new translation.
+    /** @var \Drupal\Core\TypedData\TranslatableInterface $entity */
+    /** @var \Drupal\Core\Entity\FieldableEntityInterface $entity_translation */
+    $entity_translation = $entity->addTranslation($langcode);
+
+    // Remove all default values, except for the langcode.
+    $translated_fields = $entity_translation->getTranslatableFields(FALSE);
+    unset($translated_fields['langcode']);
+    foreach ($translated_fields as $field) {
+      $field->setValue([]);
+    }
+    return $entity_translation;
   }
 
   /**
diff --git a/web/modules/contrib/hal/tests/src/Kernel/TranslationNormalizeTest.php b/web/modules/contrib/hal/tests/src/Kernel/TranslationNormalizeTest.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Drupal\Tests\hal\Kernel;
+
+use Drupal\entity_test\Entity\EntityTestMulChanged;
+
+/**
+ * Test normalizing and denormalizing an entity with a translation.
+ *
+ * @group hal
+ */
+class TranslationNormalizeTest extends NormalizerTestBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $entityClass = 'Drupal\entity_test\Entity\EntityTestMulChanged';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp(): void {
+    parent::setUp();
+    $this->installEntitySchema('entity_test_mul_changed');
+  }
+
+  /**
+   * Tests normalizing and denormalizing an entity.
+   */
+  public function testTranslationNormalize() {
+    $target_entity = EntityTestMulChanged::create((['langcode' => 'en', 'field_test_entity_reference' => NULL]));
+    $target_entity->save();
+
+    $target_entity->addTranslation('de', $target_entity->toArray());
+
+    $this->assertEquals(1, count($target_entity->changed));
+    $this->assertEquals(1, count($target_entity->getTranslation('en')->changed));
+    $this->assertEquals(1, count($target_entity->getTranslation('de')->changed));
+
+    $data = $this->serializer->normalize($target_entity, 'hal_json');
+    $denormalized_entity = $this->serializer->denormalize($data, $this->entityClass, 'hal_json');
+
+    $this->assertEquals(1, count($denormalized_entity->changed));
+    $this->assertEquals(1, count($target_entity->getTranslation('en')->changed));
+    $this->assertEquals(1, count($denormalized_entity->getTranslation('de')->changed));
+  }
+
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"patches": {`
	`3`	`+ "drupal/hal": {`
	`4`	`+ "2904423 - Translated field denormalization creates duplicate values": "https://www.drupal.org/files/issues/2023-04-05/2904423-90.patch",`
	`5`	`+ "3517446 - Cached relation IDs are broken": "https://www.drupal.org/files/issues/2025-04-04/3517446.patch"`
	`6`	`+ }`
`3`	`7`	`}`
`4`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -168,6 +168,15 @@ public function denormalize($data, $class, $format = NULL, array $context = []):`
`168`	`168`	`unset($data['_dcd_metadata']);`
`169`	`169`	`}`
`170`	`170`
	`171`	`+ if (isset($data['_embedded']) && !$this->metadataService->isCorrectionRequired($data['uuid'][0]['value'])) {`
	`172`	`+ foreach (array_keys($data['_embedded']) as $relation) {`
	`173`	`+ $field_ids = $this->linkManager->getRelationInternalIds($relation, $context);`
	`174`	`+ if (empty($field_ids)) {`
	`175`	`+ $this->metadataService->setCorrectionRequired($data['uuid'][0]['value'], TRUE);`
	`176`	`+ }`
	`177`	`+ }`
	`178`	`+ }`
	`179`	`+`
`171`	`180`	`return parent::denormalize($data, $class, $format, $context);`
`172`	`181`	`}`
`173`	`182`
Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,12 @@ public function getRelationUri($entity_type, $bundle, $field_name, $context = []`
`30`	`30`	`*`
`31`	`31`	`* @param string $relation_uri`
`32`	`32`	`* Relation URI (or IANA link relation type) to transform into internal IDs.`
	`33`	`+ * @param array $context`
	`34`	`+ * (optional) Optional serializer/normalizer context.`
`33`	`35`	`*`
`34`	`36`	`* @return array`
`35`	`37`	`* Array with keys 'entity_type_id', 'bundle' and 'field_name'.`
`36`	`38`	`*/`
`37`		`- public function getRelationInternalIds($relation_uri);`
	`39`	`+ public function getRelationInternalIds($relation_uri, $context = []);`
`38`	`40`
`39`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -155,8 +155,6 @@ public function denormalize($data, $class, $format = NULL, array $context = []):`
`155`	`155`	`break;`
`156`	`156`	`}`
`157`	`157`	`}`
`158`		`- // Remove the default langcode so it does not get iterated over below.`
`159`		`- unset($data[$default_langcode_key]);`
`160`	`158`	`}`
`161`	`159`
`162`	`160`	`if ($entity_type->hasKey('bundle')) {`
`@@ -179,7 +177,7 @@ public function denormalize($data, $class, $format = NULL, array $context = []):`
`179`	`177`
`180`	`178`	`// Flatten the embedded values.`
`181`	`179`	`foreach ($embedded as $relation => $field) {`
`182`		`- $field_ids = $this->linkManager->getRelationInternalIds($relation);`
	`180`	`+ $field_ids = $this->linkManager->getRelationInternalIds($relation, $context);`
`183`	`181`	`if (!empty($field_ids)) {`
`184`	`182`	`$field_name = $field_ids['field_name'];`
`185`	`183`	`$data[$field_name] = $field;`