storeman-io / storeman

src/Index/IndexObject.php

Braces +1 added lines, -2 removed lines

@@ -233,8 +233,7 @@
                 "size: {$this->size}",
                 "blobId: {$blobId}",
             ]);
-        }
-        elseif ($this->isLink())
+        } elseif ($this->isLink())
         {
             $parts = array_merge($parts, [
                 "target: {$this->linkTarget}",

src/IndexMerger/StandardIndexMerger.php

Braces +3 added lines, -6 removed lines

@@ -75,12 +75,10 @@ 
             if ($localObjectModified && $remoteObjectModified)
             {
                 $mergedIndex->addObject($this->resolveConflict($conflictHandler, $remoteObject, $localObject, $lastLocalObject));
-            }
-            elseif ($localObjectModified && $localObject !== null)
+            } elseif ($localObjectModified && $localObject !== null)
             {
                 $mergedIndex->addObject($localObject);
-            }
-            elseif ($remoteObjectModified && $remoteObject !== null)
+            } elseif ($remoteObjectModified && $remoteObject !== null)
             {
                 $mergedIndex->addObject($remoteObject);
             }
@@ -137,8 +135,7 @@ 
         if ($lastLocalObject)
         {
             return !$lastLocalObject->equals($remoteObject, IndexObject::CMP_IGNORE_BLOBID | IndexObject::CMP_IGNORE_INODE);
-        }
-        else
+        } else
         {
             return $remoteObject !== null;
         }