Merge branch '3.x' into develop

octobercms · Sep 7, 2023 · 8ed5765 · 8ed5765
2 parents c495714 + f49276d
commit 8ed5765
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/src/Database/Relations/DeferOneOrMany.php b/src/Database/Relations/DeferOneOrMany.php
@@ -67,7 +67,7 @@ public function withDeferred($sessionKey = null)
             }
 
             // Bind (Add)
-            $query = $query->orWhereIn($this->getWithDeferredQualifiedKeyName(), function ($query) use ($sessionKey) {
+            $query = $query->orWhereIn($this->related->getQualifiedKeyName(), function ($query) use ($sessionKey) {
                 $query
                     ->select('slave_id')
                     ->from('deferred_bindings')
@@ -79,7 +79,7 @@ public function withDeferred($sessionKey = null)
         });
 
         // Unbind (Remove)
-        $newQuery->whereNotIn($this->getWithDeferredQualifiedKeyName(), function ($query) use ($sessionKey) {
+        $newQuery->whereNotIn($this->related->getQualifiedKeyName(), function ($query) use ($sessionKey) {
             $query
                 ->select('slave_id')
                 ->from('deferred_bindings')

diff --git a/src/Database/Traits/Validation.php b/src/Database/Traits/Validation.php
@@ -163,8 +163,7 @@ protected function getRelationValidationValue($relationName)
             !$this->relationLoaded($relationName) &&
             $this->hasDeferred($this->sessionKey, $relationName)
         ) {
-            $fetchMethod = $this->isRelationTypeSingular($relationName) ? 'first' : 'get';
-            $data = $this->$relationName()->withDeferred($this->sessionKey)->$fetchMethod();
+            $data = $this->$relationName()->withDeferred($this->sessionKey)->get();
         }
         else {
             $data = $this->$relationName;
@@ -194,12 +193,7 @@ protected function getRelationValidationValue($relationName)
             return $value;
         };
 
-        // Process singular
-        if ($this->isRelationTypeSingular($relationName)) {
-            return $processValidationValue($data);
-        }
-
-        // Process multi
+        // Cast to primitive type
         if ($data instanceof \Illuminate\Support\Collection) {
             $data = $data->all();
         }
@@ -208,6 +202,12 @@ protected function getRelationValidationValue($relationName)
             return null;
         }
 
+        // Process singular (last item)
+        if ($this->isRelationTypeSingular($relationName)) {
+            return $processValidationValue($data[array_key_last($data)]);
+        }
+
+        // Process multi
         $result = [];
 
         foreach ($data as $key => $value) {

diff --git a/src/Parse/Syntax/SyntaxModelTrait.php b/src/Parse/Syntax/SyntaxModelTrait.php
@@ -41,7 +41,7 @@ public function defineSyntaxRelations()
     }
 
     /**
-     * Prepare the syntax field data for saving.
+     * getFormSyntaxData prepares the syntax field data for saving.
      */
     public function getFormSyntaxData()
     {
@@ -57,9 +57,7 @@ public function getFormSyntaxData()
                 continue;
             }
 
-            /*
-             * File upload
-             */
+            // File upload
             if ($params['type'] === 'fileupload' && $this->hasRelation($field)) {
                 if ($this->sessionKey) {
                     if ($image = $this->$field()->withDeferred($this->sessionKey)->first()) {
@@ -79,7 +77,7 @@ public function getFormSyntaxData()
     }
 
     /**
-     * Helper to get the perfect sized image.
+     * getThumbForImage helper to get the perfect sized image.
      */
     protected function getThumbForImage($image, $params = [])
     {