Merge branch '3.x' into develop

octobercms · Jan 11, 2025 · 17a4110 · 17a4110
2 parents b26af0f + c7c9a76
commit 17a4110
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 14 deletions.
diff --git a/src/Database/Concerns/HasReplication.php b/src/Database/Concerns/HasReplication.php
@@ -49,4 +49,22 @@ public function newReplicationInstance($attributes)
 
         return $instance;
     }
+
+    /**
+     * isRelationReplicable determines whether the specified relation should be replicated
+     */
+    public function isRelationReplicable(string $name): bool
+    {
+        $relationType = $this->getRelationType($name);
+        if ($relationType === 'morphTo') {
+            return false;
+        }
+
+        $definition = $this->getRelationDefinition($name);
+        if (!array_key_exists('replicate', $definition)) {
+            return true;
+        }
+
+        return (bool) $definition['replicate'];
+    }
 }
diff --git a/src/Database/Relations/AttachOne.php b/src/Database/Relations/AttachOne.php
@@ -40,7 +40,7 @@ public function __construct(Builder $query, Model $parent, $type, $id, $isPublic
     public function setSimpleValue($value)
     {
         if (is_array($value)) {
-            $value = reset($value);
+            $value = current($value);
         }
 
         // Nulling the relationship

diff --git a/src/Database/Relations/HasOne.php b/src/Database/Relations/HasOne.php
@@ -34,7 +34,7 @@ public function __construct(Builder $query, Model $parent, $foreignKey, $localKe
     public function setSimpleValue($value)
     {
         if (is_array($value)) {
-            return;
+            $value = current($value);
         }
 
         // Nulling the relationship

diff --git a/src/Database/Relations/MorphOne.php b/src/Database/Relations/MorphOne.php
@@ -34,7 +34,7 @@ public function __construct(Builder $query, Model $parent, $type, $id, $localKey
     public function setSimpleValue($value)
     {
         if (is_array($value)) {
-            return;
+            $value = current($value);
         }
 
         // Nulling the relationship

diff --git a/src/Database/Replicator.php b/src/Database/Replicator.php
@@ -141,11 +141,6 @@ protected function replicateRelationInternal($relationObject, $models)
      */
     protected function isRelationReplicable(string $name): bool
     {
-        $relationType = $this->model->getRelationType($name);
-        if ($relationType === 'morphTo') {
-            return false;
-        }
-
         // Relation is shared via propagation
         if (
             !$this->isDuplicating &&
@@ -155,12 +150,7 @@ protected function isRelationReplicable(string $name): bool
             return false;
         }
 
-        $definition = $this->model->getRelationDefinition($name);
-        if (!array_key_exists('replicate', $definition)) {
-            return true;
-        }
-
-        return (bool) $definition['replicate'];
+        return $this->model->isRelationReplicable($name);
     }
 
     /**