Completed
Push — master ( bf6ec7...65b5b4 )
by Arne
02:10
created
src/PharCompiler.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -106,12 +106,10 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
             }
Please login to merge, or discard this patch.
src/Cli/Command/InitCommand.php 2 patches
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -88,8 +88,7 @@
 block discarded – undo
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
         }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@
 block discarded – undo
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');
Please login to merge, or discard this patch.
src/Cli/Command/SynchronizeCommand.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -41,8 +41,7 @@
 block discarded – undo
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
             {
Please login to merge, or discard this patch.
src/ArrayUtils.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -26,13 +26,11 @@
 block discarded – undo
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
             }
Please login to merge, or discard this patch.
src/StorageAdapter/FlysystemStorageAdapter.php 1 patch
Braces   +6 added lines, -12 removed lines patch added patch discarded remove patch
@@ -27,8 +27,7 @@  discard block
 block discarded – undo
27 27
             {
28 28
                 throw new Exception(sprintf('read() failed for %s.', $relativePath));
29 29
             }
30
-        }
31
-        catch (\Exception $exception)
30
+        } catch (\Exception $exception)
32 31
         {
33 32
             throw new Exception($exception->getMessage(), 0, $exception);
34 33
         }
@@ -46,8 +45,7 @@  discard block
 block discarded – undo
46 45
             {
47 46
                 throw new Exception(sprintf('write() failed for %s.', $relativePath));
48 47
             }
49
-        }
50
-        catch (\Exception $exception)
48
+        } catch (\Exception $exception)
51 49
         {
52 50
             throw new Exception($exception->getMessage(), 0, $exception);
53 51
         }
@@ -63,8 +61,7 @@  discard block
 block discarded – undo
63 61
             {
64 62
                 throw new Exception(sprintf('writeStream() failed for %s.', $relativePath));
65 63
             }
66
-        }
67
-        catch (\Exception $exception)
64
+        } catch (\Exception $exception)
68 65
         {
69 66
             throw new Exception($exception->getMessage(), 0, $exception);
70 67
         }
@@ -75,8 +72,7 @@  discard block
 block discarded – undo
75 72
         try
76 73
         {
77 74
             return $this->filesystem->has($relativePath);
78
-        }
79
-        catch (\Exception $exception)
75
+        } catch (\Exception $exception)
80 76
         {
81 77
             throw new Exception($exception->getMessage(), 0, $exception);
82 78
         }
@@ -92,8 +88,7 @@  discard block
 block discarded – undo
92 88
             {
93 89
                 throw new Exception(sprintf('unlink() failed for %s', $relativePath));
94 90
             }
95
-        }
96
-        catch (\Exception $exception)
91
+        } catch (\Exception $exception)
97 92
         {
98 93
             throw new Exception($exception->getMessage(), 0, $exception);
99 94
         }
@@ -111,8 +106,7 @@  discard block
 block discarded – undo
111 106
             }
112 107
 
113 108
             return $stream;
114
-        }
115
-        catch (\Exception $exception)
109
+        } catch (\Exception $exception)
116 110
         {
117 111
             throw new Exception($exception->getMessage(), 0, $exception);
118 112
         }
Please login to merge, or discard this patch.
src/LockAdapter/StorageBasedLockAdapter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@
 block discarded – undo
33 33
 
34 34
         $started = time();
35 35
 
36
-        while(true)
36
+        while (true)
37 37
         {
38 38
             if (!$this->storageAdapter->exists($lockFileName))
39 39
             {
Please login to merge, or discard this patch.
src/Cli/Command/DumpCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
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
         );
Please login to merge, or discard this patch.
src/OperationListBuilder/StandardOperationListBuilder.php 1 patch
Braces   +3 added lines, -9 removed lines patch added patch discarded remove patch
@@ -58,9 +58,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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();
Please login to merge, or discard this patch.
src/Vault.php 2 patches
Spacing   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -149,8 +149,7 @@
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -216,8 +216,7 @@
 block discarded – undo
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;
Please login to merge, or discard this patch.