Completed
Push — master ( 1d14da...d37c28 )
by Arne
02:16
created
src/Storeman.php 1 patch
Doc Comments   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
     }
155 155
 
156 156
     /**
157
-     * @param Vault[] $vaults
157
+     * @param \Traversable $vaults
158 158
      * @param string $lockName
159 159
      */
160 160
     protected function acquireLocks(\Traversable $vaults, string $lockName)
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
     }
170 170
 
171 171
     /**
172
-     * @param Vault[] $vaults
172
+     * @param \Traversable $vaults
173 173
      * @param string $lockName
174 174
      */
175 175
     protected function releaseLocks(\Traversable $vaults, string $lockName)
@@ -183,6 +183,10 @@  discard block
 block discarded – undo
183 183
         }
184 184
     }
185 185
 
186
+    /**
187
+     * @param null|integer $revision
188
+     * @param null|string $vaultTitle
189
+     */
186 190
     protected function getVaultForDownload(?int $revision, ?string $vaultTitle): ?Vault
187 191
     {
188 192
         $revision = $revision ?: $this->getLastRevision();
Please login to merge, or discard this patch.
src/OperationListBuilder/OperationListBuilderInterface.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,6 @@
 block discarded – undo
17 17
      *
18 18
      * @param Index $mergedIndex
19 19
      * @param Index $localIndex
20
-     * @param Index|null $remoteIndex
21 20
      * @return OperationList
22 21
      */
23 22
     public function buildOperationList(Index $mergedIndex, Index $localIndex): OperationList;
Please login to merge, or discard this patch.
src/IndexMerger/StandardIndexMerger.php 1 patch
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -275,6 +275,10 @@
 block discarded – undo
275 275
         return $remoteObject->getBlobId() !== $lastLocalObject->getBlobId();
276 276
     }
277 277
 
278
+    /**
279
+     * @param IndexObject $localObject
280
+     * @param IndexObject $lastLocalObject
281
+     */
278 282
     protected function resolveConflict(ConflictHandlerInterface $conflictHandler, IndexObject $remoteObject, ?IndexObject $localObject, ?IndexObject $lastLocalObject): IndexObject
279 283
     {
280 284
         $this->logger->notice("Resolving conflict at {$remoteObject->getRelativePath()}...");
Please login to merge, or discard this patch.