Completed
Push — master ( c79300...9eb332 )
by Arne
02:48
created
src/IndexMerger/StandardIndexMerger.php 1 patch
Doc Comments   +12 added lines patch added patch discarded remove patch
@@ -100,6 +100,10 @@  discard block
 block discarded – undo
100 100
         return $mergedIndex;
101 101
     }
102 102
 
103
+    /**
104
+     * @param IndexObject|null $localObject
105
+     * @param IndexObject|null $lastLocalObject
106
+     */
103 107
     protected function isLocalObjectModified(?IndexObject $localObject, ?IndexObject $lastLocalObject, int $options): bool
104 108
     {
105 109
         if (!$lastLocalObject)
@@ -132,6 +136,10 @@  discard block
 block discarded – undo
132 136
         return $localObjectModified;
133 137
     }
134 138
 
139
+    /**
140
+     * @param IndexObject|null $remoteObject
141
+     * @param IndexObject|null $lastLocalObject
142
+     */
135 143
     protected function isRemoteObjectModified(?IndexObject $remoteObject, ?IndexObject $lastLocalObject): bool
136 144
     {
137 145
         if ($lastLocalObject)
@@ -144,6 +152,10 @@  discard block
 block discarded – undo
144 152
         }
145 153
     }
146 154
 
155
+    /**
156
+     * @param IndexObject|null $localObject
157
+     * @param IndexObject|null $lastLocalObject
158
+     */
147 159
     protected function resolveConflict(ConflictHandlerInterface $conflictHandler, IndexObject $remoteObject, ?IndexObject $localObject, ?IndexObject $lastLocalObject): IndexObject
148 160
     {
149 161
         $this->logger->notice("Resolving conflict at {$remoteObject->getRelativePath()}...");
Please login to merge, or discard this patch.