@@ -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 | ); |
@@ -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 | } |
@@ -45,7 +45,7 @@ |
||
| 45 | 45 | |
| 46 | 46 | $this->consoleStyle->warning("Invalid choice"); |
| 47 | 47 | } |
| 48 | - while(true); |
|
| 48 | + while (true); |
|
| 49 | 49 | |
| 50 | 50 | return $return; |
| 51 | 51 | } |
@@ -46,8 +46,7 @@ discard block |
||
| 46 | 46 | if ('..' === $part) |
| 47 | 47 | { |
| 48 | 48 | array_pop($absolutePathParts); |
| 49 | - } |
|
| 50 | - else |
|
| 49 | + } else |
|
| 51 | 50 | { |
| 52 | 51 | $absolutePathParts[] = $part; |
| 53 | 52 | } |
@@ -58,8 +57,7 @@ discard block |
||
| 58 | 57 | if (substr($path, 0, 1) === '/') |
| 59 | 58 | { |
| 60 | 59 | return '/' . $return; |
| 61 | - } |
|
| 62 | - else |
|
| 60 | + } else |
|
| 63 | 61 | { |
| 64 | 62 | return getcwd() . '/' . $return; |
| 65 | 63 | } |