@@ -589,6 +589,9 @@ discard block |
||
| 589 | 589 | return $operationResultList; |
| 590 | 590 | } |
| 591 | 591 | |
| 592 | + /** |
|
| 593 | + * @param resource $stream |
|
| 594 | + */ |
|
| 592 | 595 | protected function readIndexFromStream($stream): Index |
| 593 | 596 | { |
| 594 | 597 | if (!is_resource($stream)) |
@@ -623,6 +626,9 @@ discard block |
||
| 623 | 626 | fclose($stream); |
| 624 | 627 | } |
| 625 | 628 | |
| 629 | + /** |
|
| 630 | + * @param resource $stream |
|
| 631 | + */ |
|
| 626 | 632 | protected function readSynchronizationListFromStream($stream): SynchronizationList |
| 627 | 633 | { |
| 628 | 634 | if (!is_resource($stream)) |
@@ -457,7 +457,7 @@ |
||
| 457 | 457 | public function dump(string $targetPath, int $revision = null, SynchronizationProgressListenerInterface $progressListener = null): OperationResultList |
| 458 | 458 | { |
| 459 | 459 | $originalLocalPath = $this->localPath; |
| 460 | - $this->localPath = rtrim($this->expandTildePath($targetPath), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR; |
|
| 460 | + $this->localPath = rtrim($this->expandTildePath($targetPath), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR; |
|
| 461 | 461 | |
| 462 | 462 | try |
| 463 | 463 | { |
@@ -89,9 +89,7 @@ |
||
| 89 | 89 | // compare remote object to object state at last sync |
| 90 | 90 | // we explicitly want to use equality instead of identity |
| 91 | 91 | $remoteObjectModified = !($remoteObject == $lastLocalObject); |
| 92 | - } |
|
| 93 | - |
|
| 94 | - else |
|
| 92 | + } else |
|
| 95 | 93 | { |
| 96 | 94 | // object already didn't exist locally at the last sync |
| 97 | 95 | $localObjectModified = false; |
@@ -68,9 +68,7 @@ discard block |
||
| 68 | 68 | $directoryMtimes[$mergedIndexObject->getRelativePath()] = $mergedIndexObject->getMtime(); |
| 69 | 69 | } |
| 70 | 70 | } |
| 71 | - } |
|
| 72 | - |
|
| 73 | - elseif ($mergedIndexObject->isFile()) |
|
| 71 | + } elseif ($mergedIndexObject->isFile()) |
|
| 74 | 72 | { |
| 75 | 73 | // local file did not exist, hasn't been a file before or is outdated |
| 76 | 74 | $doDownloadFile = $localObject === null || !$localObject->isFile() || $localObject->getMtime() < $mergedIndexObject->getMtime(); |
@@ -98,9 +96,7 @@ discard block |
||
| 98 | 96 | |
| 99 | 97 | $operationList->addOperation(new UploadOperation($mergedIndexObject->getRelativePath(), $mergedIndexObject->getBlobId(), $uploadStreamFilters)); |
| 100 | 98 | } |
| 101 | - } |
|
| 102 | - |
|
| 103 | - elseif ($mergedIndexObject->isLink()) |
|
| 99 | + } elseif ($mergedIndexObject->isLink()) |
|
| 104 | 100 | { |
| 105 | 101 | if ($localObject !== null && $localObject->getLinkTarget() !== $mergedIndexObject->getLinkTarget()) |
| 106 | 102 | { |
@@ -109,9 +105,7 @@ discard block |
||
| 109 | 105 | |
| 110 | 106 | $modifiedPaths[] = $mergedIndexObject->getRelativePath(); |
| 111 | 107 | } |
| 112 | - } |
|
| 113 | - |
|
| 114 | - else |
|
| 108 | + } else |
|
| 115 | 109 | { |
| 116 | 110 | // unknown/invalid object type |
| 117 | 111 | throw new Exception(); |
@@ -107,8 +107,7 @@ discard block |
||
| 107 | 107 | } |
| 108 | 108 | |
| 109 | 109 | $table->render(); |
| 110 | - } |
|
| 111 | - else |
|
| 110 | + } else |
|
| 112 | 111 | { |
| 113 | 112 | $output->writeln('No synchronizations so far.'); |
| 114 | 113 | } |
@@ -124,8 +123,7 @@ discard block |
||
| 124 | 123 | if ($count = count($operationList)) |
| 125 | 124 | { |
| 126 | 125 | $output->writeln(sprintf('<bold>There are %d outstanding operations.</bold>', $count)); |
| 127 | - } |
|
| 128 | - else |
|
| 126 | + } else |
|
| 129 | 127 | { |
| 130 | 128 | $output->writeln('<info>Everything is up to date!</info>'); |
| 131 | 129 | } |
@@ -16,7 +16,7 @@ |
||
| 16 | 16 | |
| 17 | 17 | public function __construct() |
| 18 | 18 | { |
| 19 | - $this->factoryMap['dummy'] = function () |
|
| 19 | + $this->factoryMap['dummy'] = function() |
|
| 20 | 20 | { |
| 21 | 21 | return new DummyStorageDriver(); |
| 22 | 22 | }; |