storeman-io / storeman

src/IndexMerger/StandardIndexMerger.php

Braces +4 added lines, -10 removed lines

@@ -25,27 +25,21 @@
                 if ($localObjectModified)
                 {
                     $mergedIndex->addObject($localObject);
-                }
-                elseif ($remoteIndex === null)
+                } elseif ($remoteIndex === null)
                 {
                     $mergedIndex->addObject($localObject);
                 }
-            }
-            else
+            } else
             {
                 $remoteObjectModified = $lastLocalIndex ? ($remoteObject->getMtime() > $lastLocalIndex->getCreated()->getTimestamp()) : false;
 
                 if (!$localObjectModified)
                 {
                     $mergedIndex->addObject($remoteObject);
-                }
-
-                elseif (!$remoteObjectModified)
+                } elseif (!$remoteObjectModified)
                 {
                     $mergedIndex->addObject($localObject);
-                }
-
-                else
+                } else
                 {
                     throw new \RuntimeException("Collision at path {$localObject->getRelativePath()}");
                 }