Completed
Push — master ( a8a6e5...b4d61a )
by Arne
04:19
created
src/AbstractFactory.php 1 patch
Braces   +6 added lines, -12 removed lines patch added patch discarded remove patch
@@ -53,16 +53,13 @@  discard block
 block discarded – undo
53 53
         if (is_string($factory))
54 54
         {
55 55
             $instance = new $factory(...$params);
56
-        }
57
-        elseif ($factory instanceof \Closure)
56
+        } elseif ($factory instanceof \Closure)
58 57
         {
59 58
             $instance = $factory(...$params);
60
-        }
61
-        elseif (is_object($factory))
59
+        } elseif (is_object($factory))
62 60
         {
63 61
             $instance = $factory;
64
-        }
65
-        else
62
+        } else
66 63
         {
67 64
             throw new \LogicException();
68 65
         }
@@ -101,12 +98,10 @@  discard block
 block discarded – undo
101 98
             {
102 99
                 throw new \RuntimeException(sprintf('Trying to register factory named "%s" to "%s" as class name "%s" which does not exist.', $name, static::class, $factory));
103 100
             }
104
-        }
105
-        elseif ($factory instanceof \Closure)
101
+        } elseif ($factory instanceof \Closure)
106 102
         {
107 103
             // cannot really validate
108
-        }
109
-        elseif (is_object($factory))
104
+        } elseif (is_object($factory))
110 105
         {
111 106
             if ($type = static::requiresInstanceOf())
112 107
             {
@@ -115,8 +110,7 @@  discard block
 block discarded – undo
115 110
                     throw new \RuntimeException(sprintf('Trying to register service instance named "%s" to "%s" as which is not an instance of "%s".', $name, static::class, $type));
116 111
                 }
117 112
             }
118
-        }
119
-        else
113
+        } else
120 114
         {
121 115
             throw new \InvalidArgumentException(sprintf('Invalid factory of type "%s" named "%s" given to "%s".', gettype($factory), $name, static::class));
122 116
         }
Please login to merge, or discard this patch.
src/PathUtils.php 1 patch
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -46,8 +46,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
         }
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
@@ -73,7 +73,7 @@
 block discarded – undo
73 73
 
74 74
             $configuration->addVault($vaultConfig);
75 75
         }
76
-        while($this->consoleStyle->choice('Add another vault?', ['y', 'n'], 'n') === 'y');
76
+        while ($this->consoleStyle->choice('Add another vault?', ['y', 'n'], 'n') === 'y');
77 77
 
78 78
 
79 79
         $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/Configuration.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -200,8 +200,7 @@
 block discarded – undo
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);
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/ConfigurationFileReader.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,8 +39,7 @@
 block discarded – undo
39 39
         {
40 40
             $configuration = new Configuration();
41 41
             $configuration->exchangeArray($array);
42
-        }
43
-        catch (\InvalidArgumentException $exception)
42
+        } catch (\InvalidArgumentException $exception)
44 43
         {
45 44
             throw new ConfigurationException('', 0, $exception);
46 45
         }
Please login to merge, or discard this patch.