storeman-io / storeman

src/OperationListBuilder/OperationListBuilderInterface.php

Doc Comments -1 removed lines

@@ -17,7 +17,6 @@
      *
      * @param Index $mergedIndex
      * @param Index $localIndex
-     * @param Index|null $remoteIndex
      * @return OperationList
      */
     public function buildOperationList(Index $mergedIndex, Index $localIndex): OperationList;

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/Comparison/IndexObjectComparison.php

Braces +2 added lines, -4 removed lines

@@ -35,12 +35,10 @@
         if ($indexObjectA instanceof IndexObject)
         {
             $this->relativePath = $indexObjectA->getRelativePath();
-        }
-        elseif ($indexObjectB instanceof IndexObject)
+        } elseif ($indexObjectB instanceof IndexObject)
         {
             $this->relativePath = $indexObjectB->getRelativePath();
-        }
-        else
+        } else
         {
             throw new \LogicException();
         }

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}'...");
 

src/Cli/Command/DiffCommand.php

Braces +3 added lines, -7 removed lines

@@ -57,12 +57,10 @@ 
             $this->consoleStyle->error("Invalid argument compareTo given.");
 
             return 1;
-        }
-        elseif ($compareTo === null)
+        } elseif ($compareTo === null)
         {
             $compareToIndex = $storeman->getLocalIndex();
-        }
-        else
+        } else
         {
             $vault = $vaults->getPrioritizedVault($vaults->getVaultsHavingRevision($compareTo));
 
@@ -101,9 +99,7 @@ 
             $table->render();
 
             $output->write("\n");
-        }
-
-        else
+        } else
         {
             $output->writeln("No differences found.");
         }

src/Cli/Command/ShowIndexCommand.php

Braces +3 added lines, -6 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.");