maksimru / composite-primary-keys

src/Eloquent/Relationships/CompositeBelongsTo.php

Spacing +8 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
             $ownerKeys = $this->getOwnerKeys();
             $foreignKeys = $this->getForeignKeys();
 
-            if(count($ownerKeys)!=count($foreignKeys))
+            if (count($ownerKeys) != count($foreignKeys))
                 throw new WrongRelationConfigurationException();
 
             foreach ($ownerKeys as $keyIndex => $key)
@@ -50,21 +50,21 @@ 
         // We'll grab the primary key name of the related models since it could be set to
         // a non-standard name and not "id". We will then construct the constraint for
         // our eagerly loading query so it returns the proper models from execution.
-        (new CompositeKeyScope(array_map(function($keyName){
+        (new CompositeKeyScope(array_map(function($keyName) {
             return  $this->related->getTable().'.'.$keyName;
-        }, $ownerKeys), $this->getEagerModelKeys($models), false, method_exists($this->related,'getBinaryColumns') ? $this->related->getBinaryColumns() : []))->apply($this->query);
+        }, $ownerKeys), $this->getEagerModelKeys($models), false, method_exists($this->related, 'getBinaryColumns') ? $this->related->getBinaryColumns() : []))->apply($this->query);
     }
 
     public function getOwnerKeys()
     {
-        if(method_exists($this->parent, 'hasCompositeIndex') && $this->parent->hasCompositeIndex() && !is_array($this->ownerKey) && strpos($this->ownerKey,$this->magicKeyDelimiter) !== false)
+        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)
+        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;
     }
@@ -95,7 +95,7 @@ 
             $keys[] = $compositeKey;
         }
 
-        if(count($foreignKeys) == 1) {
+        if (count($foreignKeys) == 1) {
             // If there are no keys that were not null we will just return an array with null
             // so this query wont fail plus returns zero results, which should be what the
             // developer expects to happen in this situation. Otherwise we'll sort them.
@@ -131,7 +131,7 @@ 
         $dictionary = [];
 
         foreach ($results as $result) {
-            $dictionary[implode($this->magicKeyDelimiter,array_map(function($owner) use ($result) {
+            $dictionary[implode($this->magicKeyDelimiter, array_map(function($owner) use ($result) {
                 return $result->getAttribute($owner);
             }, $ownerKeys))] = $result;
         }
@@ -140,7 +140,7 @@ 
         // and match back onto their children using these keys of the dictionary and
         // the primary key of the children to map them onto the correct instances.
         foreach ($models as $model) {
-            $foreignKey = implode($this->magicKeyDelimiter,array_map(function($foreign) use ($model) {
+            $foreignKey = implode($this->magicKeyDelimiter, array_map(function($foreign) use ($model) {
                 return $model->{$foreign};
             }, $foreignKeys));
             if (isset($dictionary[$foreignKey])) {

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;
     }
 
     /**