storeman-io / storeman

src/IndexMerger/StandardIndexMerger.php

Braces +3 added lines, -6 removed lines

@@ -76,12 +76,10 @@ 
             if ($localObjectModified && $remoteObjectModified)
             {
                 $mergedIndex->addObject(clone $this->resolveConflict($conflictHandler, $remoteObject, $localObject, $lastLocalObject));
-            }
-            elseif ($localObjectModified && $localObject !== null)
+            } elseif ($localObjectModified && $localObject !== null)
             {
                 $mergedIndex->addObject(clone $localObject);
-            }
-            elseif ($remoteObjectModified && $remoteObject !== null)
+            } elseif ($remoteObjectModified && $remoteObject !== null)
             {
                 $mergedIndex->addObject(clone $remoteObject);
             }
@@ -146,8 +144,7 @@ 
         if ($lastLocalObject)
         {
             return !$lastLocalObject->equals($remoteObject, static::CMP_OPTIONS);
-        }
-        else
+        } else
         {
             return $remoteObject !== null;
         }