storeman-io / storeman

src/IndexMerger/StandardIndexMerger.php

Doc Comments +4 added lines

@@ -275,6 +275,10 @@
         return $remoteObject->getBlobId() !== $lastLocalObject->getBlobId();
     }
 
+    /**
+     * @param IndexObject $localObject
+     * @param IndexObject $lastLocalObject
+     */
     protected function resolveConflict(ConflictHandlerInterface $conflictHandler, IndexObject $remoteObject, ?IndexObject $localObject, ?IndexObject $lastLocalObject): IndexObject
     {
         $this->logger->notice("Resolving conflict at {$remoteObject->getRelativePath()}...");

Braces +8 added lines, -16 removed lines

@@ -100,38 +100,32 @@ 
         {
             // locally and remotely deleted
             return null;
-        }
-        elseif ($lastLocalObject === null)
+        } elseif ($lastLocalObject === null)
         {
             if ($remoteObject === null)
             {
                 // locally created
                 return clone $localObject;
-            }
-            elseif ($localObject === null)
+            } elseif ($localObject === null)
             {
                 // remotely created
                 return clone $remoteObject;
-            }
-            elseif ($remoteObject !== null && $localObject !== null)
+            } elseif ($remoteObject !== null && $localObject !== null)
             {
                 // remotely and locally created
                 return $this->resolveConflict($conflictHandler, $remoteObject, $localObject, $lastLocalObject);
             }
-        }
-        elseif ($remoteObject === null)
+        } elseif ($remoteObject === null)
         {
             // remotely deleted and locally changed
             return $this->resolveConflict($conflictHandler, $remoteObject, $localObject, $lastLocalObject);
-        }
-        elseif ($localObject === null)
+        } elseif ($localObject === null)
         {
             if ($remoteObject->equals($lastLocalObject))
             {
                 // locally deleted
                 return null;
-            }
-            else
+            } else
             {
                 // remotely changed and locally deleted
                 return $this->resolveConflict($conflictHandler, $remoteObject, $localObject, $lastLocalObject);
@@ -183,8 +177,7 @@ 
             if ($modifiedRemote || !$modifiedLocal)
             {
                 $attributes[$attribute] = $remoteObject[$attribute];
-            }
-            else
+            } else
             {
                 $attributes[$attribute] = $localObject[$attribute];
             }
@@ -210,8 +203,7 @@ 
                 $attributes['size'] = $remoteObject->getSize();
                 $attributes['blobId'] = $remoteObject->getBlobId();
                 $attributes['hashes'] = clone $remoteObject->getHashes();
-            }
-            else
+            } else
             {
                 $attributes['size'] = $localObject->getSize();
                 $attributes['inode'] = $localObject->getInode();

src/OperationListBuilder/StandardOperationListBuilder.php

Braces +3 added lines, -9 removed lines

@@ -63,9 +63,7 @@ 
                         $toSetMtime[$mergedIndexObject->getRelativePath()] = $mergedIndexObject;
                     }
                 }
-            }
-
-            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();
@@ -78,9 +76,7 @@ 
 
                     $modifiedPaths[] = $mergedIndexObject->getRelativePath();
                 }
-            }
-
-            elseif ($mergedIndexObject->isLink())
+            } elseif ($mergedIndexObject->isLink())
             {
                 if ($localObject !== null && $localObject->getLinkTarget() !== $mergedIndexObject->getLinkTarget())
                 {
@@ -89,9 +85,7 @@ 
 
                     $modifiedPaths[] = $mergedIndexObject->getRelativePath();
                 }
-            }
-
-            else
+            } else
             {
                 // unknown/invalid object type
                 throw new Exception();

src/Index/IndexObject.php

Braces +1 added lines, -2 removed lines

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