storeman-io / storeman

src/IndexMerger/StandardIndexMerger.php

Doc Comments +12 added lines

@@ -100,6 +100,10 @@ 
         return $mergedIndex;
     }
 
+    /**
+     * @param IndexObject|null $localObject
+     * @param IndexObject|null $lastLocalObject
+     */
     protected function isLocalObjectModified(?IndexObject $localObject, ?IndexObject $lastLocalObject, int $options): bool
     {
         if (!$lastLocalObject)
@@ -132,6 +136,10 @@ 
         return $localObjectModified;
     }
 
+    /**
+     * @param IndexObject|null $remoteObject
+     * @param IndexObject|null $lastLocalObject
+     */
     protected function isRemoteObjectModified(?IndexObject $remoteObject, ?IndexObject $lastLocalObject): bool
     {
         if ($lastLocalObject)
@@ -144,6 +152,10 @@ 
         }
     }
 
+    /**
+     * @param IndexObject|null $localObject
+     * @param IndexObject|null $lastLocalObject
+     */
     protected function resolveConflict(ConflictHandlerInterface $conflictHandler, IndexObject $remoteObject, ?IndexObject $localObject, ?IndexObject $lastLocalObject): IndexObject
     {
         $this->logger->notice("Resolving conflict at {$remoteObject->getRelativePath()}...");

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;
         }

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/LockAdapter/StorageBasedLockAdapter.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 
         $started = time();
 
-        while(true)
+        while (true)
         {
             $this->logger->debug("Checking lock existence for '{$name}'...");