@@ -29,8 +29,7 @@ discard block |
||
| 29 | 29 | { |
| 30 | 30 | throw new Exception(sprintf('read() failed for %s.', $relativePath)); |
| 31 | 31 | } |
| 32 | - } |
|
| 33 | - catch (FlysystemException $exception) |
|
| 32 | + } catch (FlysystemException $exception) |
|
| 34 | 33 | { |
| 35 | 34 | throw new Exception($exception->getMessage(), 0, $exception); |
| 36 | 35 | } |
@@ -48,8 +47,7 @@ discard block |
||
| 48 | 47 | { |
| 49 | 48 | throw new Exception(sprintf('write() failed for %s.', $relativePath)); |
| 50 | 49 | } |
| 51 | - } |
|
| 52 | - catch (FlysystemException $exception) |
|
| 50 | + } catch (FlysystemException $exception) |
|
| 53 | 51 | { |
| 54 | 52 | throw new Exception($exception->getMessage(), 0, $exception); |
| 55 | 53 | } |
@@ -65,8 +63,7 @@ discard block |
||
| 65 | 63 | { |
| 66 | 64 | throw new Exception(sprintf('writeStream() failed for %s.', $relativePath)); |
| 67 | 65 | } |
| 68 | - } |
|
| 69 | - catch (FlysystemException $exception) |
|
| 66 | + } catch (FlysystemException $exception) |
|
| 70 | 67 | { |
| 71 | 68 | throw new Exception($exception->getMessage(), 0, $exception); |
| 72 | 69 | } |
@@ -77,8 +74,7 @@ discard block |
||
| 77 | 74 | try |
| 78 | 75 | { |
| 79 | 76 | return $this->filesystem->has($relativePath); |
| 80 | - } |
|
| 81 | - catch (FlysystemException $exception) |
|
| 77 | + } catch (FlysystemException $exception) |
|
| 82 | 78 | { |
| 83 | 79 | throw new Exception($exception->getMessage(), 0, $exception); |
| 84 | 80 | } |
@@ -94,8 +90,7 @@ discard block |
||
| 94 | 90 | { |
| 95 | 91 | throw new Exception(sprintf('unlink() failed for %s', $relativePath)); |
| 96 | 92 | } |
| 97 | - } |
|
| 98 | - catch (FlysystemException $exception) |
|
| 93 | + } catch (FlysystemException $exception) |
|
| 99 | 94 | { |
| 100 | 95 | throw new Exception($exception->getMessage(), 0, $exception); |
| 101 | 96 | } |
@@ -113,8 +108,7 @@ discard block |
||
| 113 | 108 | } |
| 114 | 109 | |
| 115 | 110 | return $stream; |
| 116 | - } |
|
| 117 | - catch (FlysystemException $exception) |
|
| 111 | + } catch (FlysystemException $exception) |
|
| 118 | 112 | { |
| 119 | 113 | throw new Exception($exception->getMessage(), 0, $exception); |
| 120 | 114 | } |
@@ -29,8 +29,7 @@ |
||
| 29 | 29 | fclose($localStream); |
| 30 | 30 | |
| 31 | 31 | return true; |
| 32 | - } |
|
| 33 | - catch (Exception $exception) |
|
| 32 | + } catch (Exception $exception) |
|
| 34 | 33 | { |
| 35 | 34 | return false; |
| 36 | 35 | } |
@@ -38,8 +38,7 @@ |
||
| 38 | 38 | if ($parent === null) |
| 39 | 39 | { |
| 40 | 40 | throw new Exception(); |
| 41 | - } |
|
| 42 | - elseif (!$parent->isDirectory()) |
|
| 41 | + } elseif (!$parent->isDirectory()) |
|
| 43 | 42 | { |
| 44 | 43 | throw new Exception(); |
| 45 | 44 | } |
@@ -46,8 +46,7 @@ |
||
| 46 | 46 | if ($input->getOption('config')) |
| 47 | 47 | { |
| 48 | 48 | $this->config = $reader->getConfiguration($input->getOption('config')); |
| 49 | - } |
|
| 50 | - elseif (is_file('archivr.json')) |
|
| 49 | + } elseif (is_file('archivr.json')) |
|
| 51 | 50 | { |
| 52 | 51 | $this->config = $reader->getConfiguration('archivr.json'); |
| 53 | 52 | } |
@@ -299,8 +299,7 @@ discard block |
||
| 299 | 299 | { |
| 300 | 300 | $newRevision = $newRevision ?: ($lastSynchronization->getRevision() + 1); |
| 301 | 301 | $remoteIndex = $this->doLoadRemoteIndex($lastSynchronization->getRevision(), $synchronizationList); |
| 302 | - } |
|
| 303 | - else |
|
| 302 | + } else |
|
| 304 | 303 | { |
| 305 | 304 | $newRevision = $newRevision ?: 1; |
| 306 | 305 | $remoteIndex = null; |
@@ -432,12 +431,10 @@ discard block |
||
| 432 | 431 | try |
| 433 | 432 | { |
| 434 | 433 | return $this->doRestore($revision, $progressListener, true); |
| 435 | - } |
|
| 436 | - catch (\Exception $exception) |
|
| 434 | + } catch (\Exception $exception) |
|
| 437 | 435 | { |
| 438 | 436 | throw $exception; |
| 439 | - } |
|
| 440 | - finally |
|
| 437 | + } finally |
|
| 441 | 438 | { |
| 442 | 439 | $this->localPath = $originalLocalPath; |
| 443 | 440 | } |
@@ -602,9 +599,7 @@ discard block |
||
| 602 | 599 | $directoryMtimes[$absoluteLocalPath] = $mergedIndexObject->getMtime(); |
| 603 | 600 | } |
| 604 | 601 | } |
| 605 | - } |
|
| 606 | - |
|
| 607 | - elseif ($mergedIndexObject->isFile()) |
|
| 602 | + } elseif ($mergedIndexObject->isFile()) |
|
| 608 | 603 | { |
| 609 | 604 | // local file did not exist, hasn't been a file before or is outdated |
| 610 | 605 | $doDownloadFile = $localObject === null || !$localObject->isFile() || $localObject->getMtime() < $mergedIndexObject->getMtime(); |
@@ -635,9 +630,7 @@ discard block |
||
| 635 | 630 | |
| 636 | 631 | $operationCollection->addOperation(new UploadOperation($absoluteLocalPath, $mergedIndexObject->getBlobId(), $this->vaultConnection, $uploadStreamFilters)); |
| 637 | 632 | } |
| 638 | - } |
|
| 639 | - |
|
| 640 | - elseif ($mergedIndexObject->isLink()) |
|
| 633 | + } elseif ($mergedIndexObject->isLink()) |
|
| 641 | 634 | { |
| 642 | 635 | $absoluteLinkTarget = dirname($absoluteLocalPath) . DIRECTORY_SEPARATOR . $mergedIndexObject->getLinkTarget(); |
| 643 | 636 | |
@@ -646,9 +639,7 @@ discard block |
||
| 646 | 639 | $operationCollection->addOperation(new UnlinkOperation($absoluteLocalPath)); |
| 647 | 640 | $operationCollection->addOperation(new SymlinkOperation($absoluteLocalPath, $absoluteLinkTarget, $mergedIndexObject->getMode())); |
| 648 | 641 | } |
| 649 | - } |
|
| 650 | - |
|
| 651 | - else |
|
| 642 | + } else |
|
| 652 | 643 | { |
| 653 | 644 | // unknown/invalid object type |
| 654 | 645 | 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($operationCollection)) |
| 125 | 124 | { |
| 126 | 125 | $output->writeln(sprintf('<bold>There are %d outstanding operations.</bold>', count($operationCollection))); |
| 127 | - } |
|
| 128 | - else |
|
| 126 | + } else |
|
| 129 | 127 | { |
| 130 | 128 | $output->writeln('<info>Everything is up to date!</info>'); |
| 131 | 129 | } |
@@ -106,12 +106,10 @@ discard block |
||
| 106 | 106 | if (is_string($token)) |
| 107 | 107 | { |
| 108 | 108 | $output .= $token; |
| 109 | - } |
|
| 110 | - elseif (in_array($token[0], [T_COMMENT, T_DOC_COMMENT])) |
|
| 109 | + } elseif (in_array($token[0], [T_COMMENT, T_DOC_COMMENT])) |
|
| 111 | 110 | { |
| 112 | 111 | $output .= str_repeat("\n", substr_count($token[1], "\n")); |
| 113 | - } |
|
| 114 | - elseif (T_WHITESPACE === $token[0]) |
|
| 112 | + } elseif (T_WHITESPACE === $token[0]) |
|
| 115 | 113 | { |
| 116 | 114 | // reduce wide spaces |
| 117 | 115 | $whitespace = preg_replace('{[ \t]+}', ' ', $token[1]); |
@@ -123,8 +121,7 @@ discard block |
||
| 123 | 121 | $whitespace = preg_replace('{\n +}', "\n", $whitespace); |
| 124 | 122 | |
| 125 | 123 | $output .= $whitespace; |
| 126 | - } |
|
| 127 | - else |
|
| 124 | + } else |
|
| 128 | 125 | { |
| 129 | 126 | $output .= $token[1]; |
| 130 | 127 | } |
@@ -173,17 +173,14 @@ |
||
| 173 | 173 | { |
| 174 | 174 | $object->type = static::TYPE_FILE; |
| 175 | 175 | $object->size = (int)$stat['size']; |
| 176 | - } |
|
| 177 | - elseif (is_dir($absolutePath)) |
|
| 176 | + } elseif (is_dir($absolutePath)) |
|
| 178 | 177 | { |
| 179 | 178 | $object->type = static::TYPE_DIR; |
| 180 | - } |
|
| 181 | - elseif (is_link($absolutePath)) |
|
| 179 | + } elseif (is_link($absolutePath)) |
|
| 182 | 180 | { |
| 183 | 181 | $object->type = static::TYPE_LINK; |
| 184 | 182 | $object->linkTarget = str_replace($basePath, '', readlink($absolutePath)); |
| 185 | - } |
|
| 186 | - else |
|
| 183 | + } else |
|
| 187 | 184 | { |
| 188 | 185 | throw new \LogicException(); |
| 189 | 186 | } |
@@ -110,9 +110,7 @@ |
||
| 110 | 110 | |
| 111 | 111 | // compare remote object to object state at last sync |
| 112 | 112 | $remoteObjectModified = !$remoteObject->equals($lastLocalObject); |
| 113 | - } |
|
| 114 | - |
|
| 115 | - else |
|
| 113 | + } else |
|
| 116 | 114 | { |
| 117 | 115 | // object already didn't exist locally at the last sync |
| 118 | 116 | $localObjectModified = false; |