maksimru / composite-primary-keys

src/Eloquent/Relationships/CompositeBelongsTo.php

Spacing +4 added lines, -4 removed lines

@@ -46,7 +46,7 @@ 
     public function getResults()
     {
         $foreignKey = !is_array($this->foreignKey) ? [$this->foreignKey] : $this->foreignKey;
-        foreach($foreignKey as $foreignKeyVal) {
+        foreach ($foreignKey as $foreignKeyVal) {
             if (is_null($this->child->{$foreignKeyVal})) {
                 return $this->getDefaultFor($this->parent);
             }
@@ -69,7 +69,7 @@ 
         // 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);
     }
@@ -150,7 +150,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;
         }
@@ -159,7 +159,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])) {

src/Http/Traits/NormalizedKeysParser.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
         $rawKeys = $this->getRawKey();
 
         //do not normalize single key because we couldn't detect its type
-        if(count($rawKeys) > 1) {
+        if (count($rawKeys) > 1) {
             foreach ($rawKeys as $key => $value) {
                 if (in_array($key, $this->getBinaryColumns()) && !$this->hexBinaryColumns()) {
                     $rawKeys[$key] = strtoupper(bin2hex($value));

src/Http/Traits/HasCompositePrimaryKey.php

Spacing +4 added lines, -4 removed lines

@@ -139,8 +139,8 @@ 
             (new CompositeKeyScope($keys, $ids, $inverse, $this->getBinaryColumns()))->apply($query);
         } else {
             //remap hex ID to binary ID even if index is not composite
-            if($this->shouldProcessBinaryAttribute($keys[0]))
-                $ids = array_map(function($hex){
+            if ($this->shouldProcessBinaryAttribute($keys[0]))
+                $ids = array_map(function($hex) {
                     return hex2bin($hex);
                 }, $ids);
             if ($inverse) {
@@ -169,7 +169,7 @@ 
 
         return $this->newQueryWithoutScopes()->applyIds(
             array_map(
-                function ($normalizedKey) {
+                function($normalizedKey) {
                     return $this->parseNormalizedKey($normalizedKey);
                 },
                 $ids
@@ -274,7 +274,7 @@ 
         }
     }
     
-    private function shouldProcessBinaryAttribute($key){
+    private function shouldProcessBinaryAttribute($key) {
         return $this->hexBinaryColumns() && in_array($key, $this->getBinaryColumns());
     }
 

Braces +3 added lines, -2 removed lines

@@ -139,9 +139,10 @@
             (new CompositeKeyScope($keys, $ids, $inverse, $this->getBinaryColumns()))->apply($query);
         } else {
             //remap hex ID to binary ID even if index is not composite
-            if($this->shouldProcessBinaryAttribute($keys[0]))
-                $ids = array_map(function($hex){
+            if($this->shouldProcessBinaryAttribute($keys[0])) {
+                            $ids = array_map(function($hex){
                     return hex2bin($hex);
+            }
                 }, $ids);
             if ($inverse) {
                 $query->whereNotIn($this->qualifyColumn($keys[0]), $ids);

src/Scopes/CompositeKeyScope.php

Spacing +3 added lines, -3 removed lines

@@ -40,13 +40,13 @@ 
      */
     public function apply($query)
     {
-        $query->where(function ($query) {
+        $query->where(function($query) {
             foreach ($this->ids as $compositeKey) {
                 // try to parse normalized key
                 if (!is_array($compositeKey)) {
                     $compositeKey = $this->parseNormalizedKey($compositeKey);
                 } else {
-                    if(method_exists($query->getModel(), 'hexBinaryColumns') && $query->getModel()->hexBinaryColumns()) {
+                    if (method_exists($query->getModel(), 'hexBinaryColumns') && $query->getModel()->hexBinaryColumns()) {
                         foreach ($compositeKey as $key => $value) {
                             $compositeKey[$key] = in_array($key, $this->getBinaryColumns()) ? $this->recoverBinaryKey(
                                 $key,
@@ -56,7 +56,7 @@ 
                     }
                 }
 
-                $queryWriter = function ($query) use ($compositeKey) {
+                $queryWriter = function($query) use ($compositeKey) {
                     /*
                      * @var \Illuminate\Database\Query\Builder $query
                      */

tests/CompositeKeyBaseUnit.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
 
         if (env('DEBUG_QUERY_LOG', true)) {
             DB::listen(
-                function (QueryExecuted $queryExecuted) {
+                function(QueryExecuted $queryExecuted) {
                     var_dump($queryExecuted->sql);
                     var_dump($queryExecuted->bindings);
                 }
@@ -58,7 +58,7 @@ 
     protected function loadMigrationsFrom($paths): void
     {
         $paths = (is_array($paths)) ? $paths : [$paths];
-        $this->app->afterResolving('migrator', function ($migrator) use ($paths) {
+        $this->app->afterResolving('migrator', function($migrator) use ($paths) {
             foreach ((array) $paths as $path) {
                 $migrator->path($path);
             }

tests/Stubs/TestRole.php

Spacing +2 added lines, -2 removed lines

@@ -17,11 +17,11 @@
         'name',
     ];
 
-    public function users(){
+    public function users() {
         return $this->hasMany(TestBinaryUser::class, 'role_id', 'role_id');
     }
 
-    public function hex_users(){
+    public function hex_users() {
         return $this->hasMany(TestBinaryUserHex::class, 'role_id', 'role_id');
     }
 

tests/Stubs/TestBinaryRole.php

Spacing +2 added lines, -2 removed lines

@@ -24,11 +24,11 @@
         'name',
     ];
 
-    public function users(){
+    public function users() {
         return $this->hasMany(TestBinaryUser::class, 'binary_role_id', 'role_id');
     }
 
-    public function hex_users(){
+    public function hex_users() {
         return $this->hasMany(TestBinaryUserHex::class, 'binary_role_id', 'role_id');
     }
 

tests/SingleKeyBinaryModelTest.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
      */
     public function validateEagerRelations(TestBinaryRole $model)
     {
-        $model->loadMissing(['users','hex_users']);
+        $model->loadMissing(['users', 'hex_users']);
         $this->assertNotNull($model->toArray()['users']);
         $this->assertNotNull($model->toArray()['hex_users']);
         $this->assertNotNull($model->users);

tests/SingleKeyBinaryModelHexTest.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
      */
     public function validateEagerRelations(TestBinaryRoleHex $model)
     {
-        $model->loadMissing(['users','hex_users']);
+        $model->loadMissing(['users', 'hex_users']);
         $this->assertNotNull($model->toArray()['users']);
         $this->assertNotNull($model->toArray()['hex_users']);
         $this->assertNotNull($model->users);