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