maksimru / composite-primary-keys

tests/CompositeToCompositeRelationTest.php

Braces +1 added lines, -2 removed lines

@@ -55,8 +55,7 @@
 
         try {
             $user->wrongConfiguredReferrer()->first();
-        }
-        catch (\Exception $exception) {
+        } catch (\Exception $exception) {
             $this->assertInstanceOf(WrongRelationConfigurationException::class, $exception);
         }
     }

src/Eloquent/Relationships/CompositeBelongsTo.php

Braces +14 added lines, -10 removed lines

@@ -29,11 +29,13 @@ 
             $ownerKeys = $this->getOwnerKeys();
             $foreignKeys = $this->getForeignKeys();
 
-            if(count($ownerKeys)!=count($foreignKeys))
-                throw new WrongRelationConfigurationException();
+            if(count($ownerKeys)!=count($foreignKeys)) {
+                            throw new WrongRelationConfigurationException();
+            }
 
-            foreach ($ownerKeys as $keyIndex => $key)
-                $this->query->where($table.'.'.$key, '=', $this->child->{$foreignKeys[$keyIndex]});
+            foreach ($ownerKeys as $keyIndex => $key) {
+                            $this->query->where($table.'.'.$key, '=', $this->child->{$foreignKeys[$keyIndex]});
+            }
         }
     }
 
@@ -57,15 +59,17 @@ 
 
     public function getOwnerKeys()
     {
-        if(method_exists($this->parent, 'hasCompositeIndex') && $this->parent->hasCompositeIndex() && !is_array($this->ownerKey) && strpos($this->ownerKey,$this->magicKeyDelimiter) !== false)
-            $this->ownerKey = explode($this->magicKeyDelimiter, $this->ownerKey);
+        if(method_exists($this->parent, 'hasCompositeIndex') && $this->parent->hasCompositeIndex() && !is_array($this->ownerKey) && strpos($this->ownerKey,$this->magicKeyDelimiter) !== false) {
+                    $this->ownerKey = explode($this->magicKeyDelimiter, $this->ownerKey);
+        }
         return !is_array($this->ownerKey) ? [$this->ownerKey] : $this->ownerKey;
     }
 
     public function getForeignKeys()
     {
-        if(method_exists($this->related, 'hasCompositeIndex') && $this->related->hasCompositeIndex() && !is_array($this->foreignKey) && strpos($this->foreignKey,$this->magicKeyDelimiter) !== false)
-            $this->foreignKey = explode($this->magicKeyDelimiter, $this->foreignKey);
+        if(method_exists($this->related, 'hasCompositeIndex') && $this->related->hasCompositeIndex() && !is_array($this->foreignKey) && strpos($this->foreignKey,$this->magicKeyDelimiter) !== false) {
+                    $this->foreignKey = explode($this->magicKeyDelimiter, $this->foreignKey);
+        }
         return !is_array($this->foreignKey) ? [$this->foreignKey] : $this->foreignKey;
     }
 
@@ -106,9 +110,9 @@ 
             sort($keys);
 
             return array_values(array_unique($keys));
+        } else {
+                    return $keys;
         }
-        else
-            return $keys;
     }
 
     /**