Completed
Push — master ( 7d5317...877556 )
by Arne
02:32
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   +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.