@@ -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 | } |
@@ -73,7 +73,7 @@ |
||
| 73 | 73 | |
| 74 | 74 | $configuration->addVault($vaultConfig); |
| 75 | 75 | } |
| 76 | - while($this->outputStyle->choice('Add another vault?', ['y', 'n'], 'n') === 'y'); |
|
| 76 | + while ($this->outputStyle->choice('Add another vault?', ['y', 'n'], 'n') === 'y'); |
|
| 77 | 77 | |
| 78 | 78 | |
| 79 | 79 | $skipDefaults = !$input->getOption('writeDefaults'); |
@@ -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 | } |
@@ -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 | { |
@@ -200,8 +200,7 @@ |
||
| 200 | 200 | |
| 201 | 201 | $this->addVault($vaultConfig); |
| 202 | 202 | } |
| 203 | - } |
|
| 204 | - else |
|
| 203 | + } else |
|
| 205 | 204 | { |
| 206 | 205 | // using setter to prevent skipping validation |
| 207 | 206 | call_user_func([$this, 'set' . ucfirst($key)], $value); |
@@ -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 | } |