storeman-io / storeman

src/IndexMerger/StandardIndexMerger.php

Braces +3 added lines, -6 removed lines

@@ -76,12 +76,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);
             }
@@ -146,8 +144,7 @@ 
         if ($lastLocalObject)
         {
             return !$lastLocalObject->equals($remoteObject, static::CMP_OPTIONS);
-        }
-        else
+        } else
         {
             return $remoteObject !== null;
         }

src/OperationListBuilder/StandardOperationListBuilder.php

Braces +3 added lines, -9 removed lines

@@ -60,9 +60,7 @@ 
                         $directoryMtimes[$mergedIndexObject->getRelativePath()] = $mergedIndexObject->getMtime();
                     }
                 }
-            }
-
-            elseif ($mergedIndexObject->isFile())
+            } elseif ($mergedIndexObject->isFile())
             {
                 // local file did not exist, hasn't been a file before or has outdated content
                 $doDownloadFile = $localObject === null || !$localObject->isFile() || $mergedIndexObject->getBlobId() !== $localObject->getBlobId();
@@ -75,9 +73,7 @@ 
 
                     $modifiedPaths[] = $mergedIndexObject->getRelativePath();
                 }
-            }
-
-            elseif ($mergedIndexObject->isLink())
+            } elseif ($mergedIndexObject->isLink())
             {
                 if ($localObject !== null && $localObject->getLinkTarget() !== $mergedIndexObject->getLinkTarget())
                 {
@@ -86,9 +82,7 @@ 
 
                     $modifiedPaths[] = $mergedIndexObject->getRelativePath();
                 }
-            }
-
-            else
+            } else
             {
                 // unknown/invalid object type
                 throw new Exception();

src/Cli/Command/ShowIndexCommand.php

Braces +4 added lines, -8 removed lines

@@ -34,16 +34,13 @@ 
 
                 return 0;
             }
-        }
-        elseif ($revision === 'local')
+        } elseif ($revision === 'local')
         {
             $index = $storeman->getLocalIndex();
-        }
-        elseif (ctype_digit($revision))
+        } elseif (ctype_digit($revision))
         {
             $revision = intval($revision);
-        }
-        else
+        } else
         {
             $this->consoleStyle->error("Argument 'revision' invalid.");
 
@@ -72,8 +69,7 @@ 
             /** @var DisplayIndexHelper $displayIndexHelper */
             $displayIndexHelper = $this->getHelper('displayIndex');
             $displayIndexHelper->displayIndex($index, $output);
-        }
-        else
+        } else
         {
             $this->consoleStyle->writeln("(Empty index)");
         }