| @@ -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 | } | 
| @@ -88,8 +88,7 @@ | ||
| 88 | 88 | $configurationFileWriter->writeConfigurationFile($configuration, $configFilePath, $skipDefaults); | 
| 89 | 89 | |
| 90 | 90 |              $output->writeln("<info>Successfully written config file to {$configFilePath}</info>"); | 
| 91 | - } | |
| 92 | - else | |
| 91 | + } else | |
| 93 | 92 |          { | 
| 94 | 93 |              $output->writeln("<comment>Aborted</comment>"); | 
| 95 | 94 | } | 
| @@ -68,7 +68,7 @@ | ||
| 68 | 68 | } | 
| 69 | 69 | } | 
| 70 | 70 | } | 
| 71 | -        while($this->consoleStyle->choice('Add another vault?', ['y', 'n'], 'n') === 'y'); | |
| 71 | +        while ($this->consoleStyle->choice('Add another vault?', ['y', 'n'], 'n') === 'y'); | |
| 72 | 72 | |
| 73 | 73 | |
| 74 | 74 |          $skipDefaults = !$input->getOption('writeDefaults'); | 
| @@ -41,8 +41,7 @@ | ||
| 41 | 41 |              { | 
| 42 | 42 |                  $vaultConfiguration->setConflictHandler('preferLocal'); | 
| 43 | 43 | } | 
| 44 | - } | |
| 45 | - elseif ($preferRemote) | |
| 44 | + } elseif ($preferRemote) | |
| 46 | 45 |          { | 
| 47 | 46 | foreach ($configuration->getVaults() as $vaultConfiguration) | 
| 48 | 47 |              { | 
| @@ -26,13 +26,11 @@ | ||
| 26 | 26 |                      { | 
| 27 | 27 | $return[$key] = $recursiveDiff; | 
| 28 | 28 | } | 
| 29 | - } | |
| 30 | - elseif ($value !== $array2[$key]) | |
| 29 | + } elseif ($value !== $array2[$key]) | |
| 31 | 30 |                  { | 
| 32 | 31 | $return[$key] = $value; | 
| 33 | 32 | } | 
| 34 | - } | |
| 35 | - else | |
| 33 | + } else | |
| 36 | 34 |              { | 
| 37 | 35 | $return[$key] = $value; | 
| 38 | 36 | } | 
| @@ -26,7 +26,7 @@ | ||
| 26 | 26 |      { | 
| 27 | 27 | $storeman->dump( | 
| 28 | 28 |              $input->getArgument('path'), | 
| 29 | -            $input->getOption(  'revision') ? (int)$input->getOption('revision') : null, | |
| 29 | +            $input->getOption('revision') ? (int)$input->getOption('revision') : null, | |
| 30 | 30 |              $input->getOption('vault'), | 
| 31 | 31 | new SynchronizationProgressListener($output) | 
| 32 | 32 | ); | 
| @@ -58,9 +58,7 @@ discard block | ||
| 58 | 58 | $directoryMtimes[$mergedIndexObject->getRelativePath()] = $mergedIndexObject->getMtime(); | 
| 59 | 59 | } | 
| 60 | 60 | } | 
| 61 | - } | |
| 62 | - | |
| 63 | - elseif ($mergedIndexObject->isFile()) | |
| 61 | + } elseif ($mergedIndexObject->isFile()) | |
| 64 | 62 |              { | 
| 65 | 63 | // local file did not exist, hasn't been a file before or is outdated | 
| 66 | 64 | $doDownloadFile = $localObject === null || !$localObject->isFile() || $localObject->getMtime() < $mergedIndexObject->getMtime(); | 
| @@ -76,9 +74,7 @@ discard block | ||
| 76 | 74 | |
| 77 | 75 | $modifiedPaths[] = $mergedIndexObject->getRelativePath(); | 
| 78 | 76 | } | 
| 79 | - } | |
| 80 | - | |
| 81 | - elseif ($mergedIndexObject->isLink()) | |
| 77 | + } elseif ($mergedIndexObject->isLink()) | |
| 82 | 78 |              { | 
| 83 | 79 | if ($localObject !== null && $localObject->getLinkTarget() !== $mergedIndexObject->getLinkTarget()) | 
| 84 | 80 |                  { | 
| @@ -87,9 +83,7 @@ discard block | ||
| 87 | 83 | |
| 88 | 84 | $modifiedPaths[] = $mergedIndexObject->getRelativePath(); | 
| 89 | 85 | } | 
| 90 | - } | |
| 91 | - | |
| 92 | - else | |
| 86 | + } else | |
| 93 | 87 |              { | 
| 94 | 88 | // unknown/invalid object type | 
| 95 | 89 | throw new Exception(); | 
| @@ -149,8 +149,7 @@ | ||
| 149 | 149 | public function loadRemoteIndex(int $revision = null): ?Index | 
| 150 | 150 |      { | 
| 151 | 151 | $synchronization = $revision ? | 
| 152 | - $this->getVaultLayout()->getSynchronization($revision) : | |
| 153 | - $this->getVaultLayout()->getLastSynchronization(); | |
| 152 | + $this->getVaultLayout()->getSynchronization($revision) : $this->getVaultLayout()->getLastSynchronization(); | |
| 154 | 153 | |
| 155 | 154 | return $synchronization ? $synchronization->getIndex() : null; | 
| 156 | 155 | } | 
| @@ -216,8 +216,7 @@ | ||
| 216 | 216 |          { | 
| 217 | 217 | $newRevision = $newRevision ?: ($lastSynchronization->getRevision() + 1); | 
| 218 | 218 | $remoteIndex = $lastSynchronization->getIndex(); | 
| 219 | - } | |
| 220 | - else | |
| 219 | + } else | |
| 221 | 220 |          { | 
| 222 | 221 | $newRevision = $newRevision ?: 1; | 
| 223 | 222 | $remoteIndex = null; | 
| @@ -20,8 +20,7 @@ | ||
| 20 | 20 | if (is_file($absolutePath) || is_link($absolutePath)) | 
| 21 | 21 |          { | 
| 22 | 22 | return unlink($localBasePath . $this->relativePath); | 
| 23 | - } | |
| 24 | - elseif (is_dir($absolutePath)) | |
| 23 | + } elseif (is_dir($absolutePath)) | |
| 25 | 24 |          { | 
| 26 | 25 | return rmdir($absolutePath); | 
| 27 | 26 | } | 
| @@ -108,8 +108,7 @@ | ||
| 108 | 108 | } | 
| 109 | 109 | |
| 110 | 110 | $table->render(); | 
| 111 | - } | |
| 112 | - else | |
| 111 | + } else | |
| 113 | 112 |          { | 
| 114 | 113 |              $output->writeln('No synchronizations so far.'); | 
| 115 | 114 | } |