revised the code.

MrPunyapal · Apr 3, 2023 · 334a9e3 · 334a9e3
1 parent ebbddd8
commit 334a9e3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/src/Relations/BelongsToManyKeys.php b/src/Relations/BelongsToManyKeys.php
@@ -104,15 +104,12 @@ public function initRelation(array $models, $relation)
     public function match(array $models, Collection $results, $relation)
     {
         $dictionary = $this->buildDictionary($results);
-        
+
         foreach ($models as $model) {
             foreach ($this->localKeys as $localKey) {
                 $key = $model->getAttribute($localKey);
-                if (
-                    isset($dictionary[$key])
-                ) {
+                if (isset($dictionary[$key]))
                     $model->setRelation($this->relations[$localKey], $dictionary[$key]);
-                }
             }
             $model->unsetRelation($relation);
         }

diff --git a/src/Relations/HasManyKeys.php b/src/Relations/HasManyKeys.php
@@ -71,17 +71,6 @@ public function addConstraints(): void
         }
     }
 
-    /**
-     * Get the key value of the parent's local key.
-     * Info: From HasOneOrMany class.
-     *
-     * @return mixed
-     */
-    public function getParentKey()
-    {
-        return $this->parent->getAttribute($this->localKey);
-    }
-
     /**
      * Set the constraints for an eager load of the relation.
      * Note: Used to load relations of multiple models at once.
@@ -158,6 +147,17 @@ protected function buildDictionary(Collection $models): array
         return $dictionary;
     }
 
+    /**
+     * Get the key value of the parent's local key.
+     * Info: From HasOneOrMany class.
+     *
+     * @return mixed
+     */
+    public function getParentKey()
+    {
+        return $this->parent->getAttribute($this->localKey);
+    }
+
     /**
      * Get the results of the relationship.
      *