Completed
Pull Request — master (#140)
by
unknown
02:55
created
src/Backup/Source/Arangodump.php 2 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -161,13 +161,13 @@
 block discarded – undo
161 161
     {
162 162
         $executable = new Executable\Arangodump($this->pathToArangodump);
163 163
         $executable->useEndpoint($this->endpoint)
164
-                   ->credentials($this->username, $this->password)
165
-                   ->dumpDatabase($this->database)
166
-                   ->dumpCollections($this->collections)
167
-                   ->disableAuthentication($this->disableAuthentication)
168
-                   ->includeSystemCollections($this->includeSystemCollections)
169
-                   ->dumpData($this->dumpData)
170
-                   ->dumpTo($this->getDumpDir($target));
164
+                    ->credentials($this->username, $this->password)
165
+                    ->dumpDatabase($this->database)
166
+                    ->dumpCollections($this->collections)
167
+                    ->disableAuthentication($this->disableAuthentication)
168
+                    ->includeSystemCollections($this->includeSystemCollections)
169
+                    ->dumpData($this->dumpData)
170
+                    ->dumpTo($this->getDumpDir($target));
171 171
         return $executable;
172 172
     }
173 173
 
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
         $result->debug($arangodump->getCmdPrintable());
145 145
 
146 146
         if (!$arangodump->isSuccessful()) {
147
-            throw new Exception('arangodump failed: ' . $arangodump->getStdErr());
147
+            throw new Exception('arangodump failed: '.$arangodump->getStdErr());
148 148
         }
149 149
 
150 150
         return $this->createStatus($target);
@@ -190,6 +190,6 @@  discard block
 block discarded – undo
190 190
      */
191 191
     public function getDumpDir(Target $target) : string
192 192
     {
193
-        return $target->getPath() . '/dump';
193
+        return $target->getPath().'/dump';
194 194
     }
195 195
 }
Please login to merge, or discard this patch.
src/Backup/Compressor/Directory.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -72,10 +72,10 @@
 block discarded – undo
72 72
         $executable = new Tar($this->pathToCommand);
73 73
         $executable->archiveDirectory($this->path);
74 74
         $executable->archiveTo($this->getArchiveFile($target))
75
-                   ->useCompression(
76
-                       $target->shouldBeCompressed() ? $target->getCompression()->getCommand() : ''
77
-                   )
78
-                   ->removeSourceDirectory(true);
75
+                    ->useCompression(
76
+                        $target->shouldBeCompressed() ? $target->getCompression()->getCommand() : ''
77
+                    )
78
+                    ->removeSourceDirectory(true);
79 79
         return $executable;
80 80
     }
81 81
 
Please login to merge, or discard this patch.
src/Backup/Sync/Rsync.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
         $result->debug($rsync->getCmd());
60 60
 
61 61
         if (!$rsync->isSuccessful()) {
62
-            throw new Exception('rsync failed: ' . $rsync->getStdErr());
62
+            throw new Exception('rsync failed: '.$rsync->getStdErr());
63 63
         }
64 64
     }
65 65
 
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
     public function simulate(Target $target, Result $result)
73 73
     {
74 74
         $result->debug(
75
-            'sync backup with rsync' . PHP_EOL
75
+            'sync backup with rsync'.PHP_EOL
76 76
             . $this->getExecutable($target)->getCommandPrintable()
77 77
         );
78 78
     }
Please login to merge, or discard this patch.
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -95,14 +95,14 @@
 block discarded – undo
95 95
             );
96 96
         } else {
97 97
             $executable->fromPath($this->getRsyncLocation($target))
98
-                       ->usePassword($this->password)
99
-                       ->usePasswordFile($this->passwordFile)
100
-                       ->toHost($this->host)
101
-                       ->toPath($this->path)
102
-                       ->toUser($this->user)
103
-                       ->compressed(!$target->shouldBeCompressed())
104
-                       ->removeDeleted($this->delete)
105
-                       ->exclude($this->excludes);
98
+                        ->usePassword($this->password)
99
+                        ->usePasswordFile($this->passwordFile)
100
+                        ->toHost($this->host)
101
+                        ->toPath($this->path)
102
+                        ->toUser($this->user)
103
+                        ->compressed(!$target->shouldBeCompressed())
104
+                        ->removeDeleted($this->delete)
105
+                        ->exclude($this->excludes);
106 106
         }
107 107
         return $executable;
108 108
     }
Please login to merge, or discard this patch.
src/Backup/Target.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
                 $this->pathElementsChanging[] = $d;
180 180
                 $foundChangingElement         = true;
181 181
             } else {
182
-                $this->pathNotChanging .= DIRECTORY_SEPARATOR . $d;
182
+                $this->pathNotChanging .= DIRECTORY_SEPARATOR.$d;
183 183
             }
184 184
         }
185 185
     }
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
      */
272 272
     public function getFilename(bool $plain = false) : string
273 273
     {
274
-        return $this->filename . $this->getFilenameSuffix($plain);
274
+        return $this->filename.$this->getFilenameSuffix($plain);
275 275
     }
276 276
 
277 277
     /**
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
      */
293 293
     public function getFilenameRaw($plain = false) : string
294 294
     {
295
-        return $this->filenameRaw . $this->getFilenameSuffix($plain);
295
+        return $this->filenameRaw.$this->getFilenameSuffix($plain);
296 296
     }
297 297
 
298 298
     /**
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
303 303
      */
304 304
     public function getFilenameSuffix($plain = false) : string
305 305
     {
306
-        return $this->getSuffixToAppend() . ($plain ? '' : $this->getCompressionSuffix() . $this->getCrypterSuffix());
306
+        return $this->getSuffixToAppend().($plain ? '' : $this->getCompressionSuffix().$this->getCrypterSuffix());
307 307
     }
308 308
 
309 309
     /**
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
313 313
      */
314 314
     public function getSuffixToAppend() : string
315 315
     {
316
-        return count($this->fileSuffixes) ? '.' . implode('.', $this->fileSuffixes) : '';
316
+        return count($this->fileSuffixes) ? '.'.implode('.', $this->fileSuffixes) : '';
317 317
     }
318 318
 
319 319
     /**
@@ -323,7 +323,7 @@  discard block
 block discarded – undo
323 323
      */
324 324
     public function getCompressionSuffix() : string
325 325
     {
326
-        return $this->shouldBeCompressed() ? '.' . $this->compression->getSuffix() : '';
326
+        return $this->shouldBeCompressed() ? '.'.$this->compression->getSuffix() : '';
327 327
     }
328 328
 
329 329
     /**
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
      */
334 334
     public function getCrypterSuffix() : string
335 335
     {
336
-        return $this->shouldBeEncrypted() ? '.' . $this->crypter->getSuffix() : '';
336
+        return $this->shouldBeEncrypted() ? '.'.$this->crypter->getSuffix() : '';
337 337
     }
338 338
 
339 339
     /**
@@ -406,7 +406,7 @@  discard block
 block discarded – undo
406 406
      */
407 407
     public function getPathname(bool $plain = false) : string
408 408
     {
409
-        return $this->path . DIRECTORY_SEPARATOR . $this->getFilename($plain);
409
+        return $this->path.DIRECTORY_SEPARATOR.$this->getFilename($plain);
410 410
     }
411 411
 
412 412
     /**
Please login to merge, or discard this patch.
src/Configuration/Finder.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -64,11 +64,11 @@
 block discarded – undo
64 64
     protected function findConfigurationInDir(string $path) : string
65 65
     {
66 66
         foreach ($this->defaultConfigNames as $file) {
67
-            $configurationFile = $path . DIRECTORY_SEPARATOR . $file;
67
+            $configurationFile = $path.DIRECTORY_SEPARATOR.$file;
68 68
             if (file_exists($configurationFile)) {
69 69
                 return realpath($configurationFile);
70 70
             }
71 71
         }
72
-        throw new Exception('Can\'t find configuration in directory \'' . $path . '\'.');
72
+        throw new Exception('Can\'t find configuration in directory \''.$path.'\'.');
73 73
     }
74 74
 }
Please login to merge, or discard this patch.
src/Cmd.php 2 patches
Upper-Lower-Casing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -368,7 +368,7 @@
 block discarded – undo
368 368
   -v, --verbose          Output more verbose information.
369 369
   -V, --version          Output version information and exit.
370 370
 
371
-EOT;
371
+eot;
372 372
         if ($this->isPhar) {
373 373
             echo '  --version-check        Check whether phpbu is up to date.' . PHP_EOL;
374 374
             echo '  --self-update          Upgrade phpbu to the latest version.' . PHP_EOL;
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
                 $ret = self::EXIT_EXCEPTION;
99 99
             }
100 100
         } catch (\Exception $e) {
101
-            echo $e->getMessage() . PHP_EOL;
101
+            echo $e->getMessage().PHP_EOL;
102 102
             $ret = self::EXIT_EXCEPTION;
103 103
         }
104 104
 
@@ -219,7 +219,7 @@  discard block
 block discarded – undo
219 219
         foreach ($settingsToOverride as $arg) {
220 220
             $value = Arr::getValue($this->arguments, $arg);
221 221
             if (!empty($value)) {
222
-                $setter = 'set' . ucfirst($arg);
222
+                $setter = 'set'.ucfirst($arg);
223 223
                 $configuration->{$setter}($value);
224 224
             }
225 225
         }
@@ -235,21 +235,21 @@  discard block
 block discarded – undo
235 235
         // check if upgrade is necessary
236 236
         $latestVersion = $this->getLatestVersion();
237 237
         if (!$this->isPharOutdated($latestVersion)) {
238
-            echo 'You already have the latest version of phpbu installed.' . PHP_EOL;
238
+            echo 'You already have the latest version of phpbu installed.'.PHP_EOL;
239 239
             exit(self::EXIT_SUCCESS);
240 240
         }
241 241
 
242 242
         $remoteFilename = 'http://phar.phpbu.de/phpbu.phar';
243 243
         $localFilename  = realpath($_SERVER['argv'][0]);
244
-        $tempFilename   = basename($localFilename, '.phar') . '-temp.phar';
244
+        $tempFilename   = basename($localFilename, '.phar').'-temp.phar';
245 245
 
246
-        echo 'Updating the phpbu PHAR to version ' . $latestVersion . ' ... ';
246
+        echo 'Updating the phpbu PHAR to version '.$latestVersion.' ... ';
247 247
 
248 248
         $old  = error_reporting(0);
249 249
         $phar = file_get_contents($remoteFilename);
250 250
         error_reporting($old);
251 251
         if (!$phar) {
252
-            echo ' failed' . PHP_EOL . 'Could not reach phpbu update site' . PHP_EOL;
252
+            echo ' failed'.PHP_EOL.'Could not reach phpbu update site'.PHP_EOL;
253 253
             exit(self::EXIT_EXCEPTION);
254 254
         }
255 255
         file_put_contents($tempFilename, $phar);
@@ -265,11 +265,11 @@  discard block
 block discarded – undo
265 265
         } catch (Exception $e) {
266 266
             // cleanup crappy phar
267 267
             unlink($tempFilename);
268
-            echo 'failed' . PHP_EOL . $e->getMessage() . PHP_EOL;
268
+            echo 'failed'.PHP_EOL.$e->getMessage().PHP_EOL;
269 269
             exit(self::EXIT_EXCEPTION);
270 270
         }
271 271
 
272
-        echo 'done' . PHP_EOL;
272
+        echo 'done'.PHP_EOL;
273 273
     }
274 274
 
275 275
     /**
@@ -281,10 +281,10 @@  discard block
 block discarded – undo
281 281
 
282 282
         $latestVersion = $this->getLatestVersion();
283 283
         if ($this->isPharOutdated($latestVersion)) {
284
-            print 'You are not using the latest version of phpbu.' . PHP_EOL
285
-                . 'Use "phpbu --self-update" to install phpbu ' . $latestVersion . PHP_EOL;
284
+            print 'You are not using the latest version of phpbu.'.PHP_EOL
285
+                . 'Use "phpbu --self-update" to install phpbu '.$latestVersion.PHP_EOL;
286 286
         } else {
287
-            print 'You are using the latest version of phpbu.' . PHP_EOL;
287
+            print 'You are using the latest version of phpbu.'.PHP_EOL;
288 288
         }
289 289
     }
290 290
 
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
         $version = file_get_contents('https://phar.phpbu.de/latest-version-of/phpbu');
301 301
         error_reporting($old);
302 302
         if (!$version) {
303
-            echo 'Network-Error: Could not check latest version.' . PHP_EOL;
303
+            echo 'Network-Error: Could not check latest version.'.PHP_EOL;
304 304
             exit(self::EXIT_EXCEPTION);
305 305
         }
306 306
         return $version;
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
326 326
             return;
327 327
         }
328 328
 
329
-        echo Version::getVersionString() . PHP_EOL . PHP_EOL;
329
+        echo Version::getVersionString().PHP_EOL.PHP_EOL;
330 330
         $this->isVersionStringPrinted = true;
331 331
     }
332 332
 
@@ -351,8 +351,8 @@  discard block
 block discarded – undo
351 351
 
352 352
 EOT;
353 353
         if ($this->isPhar) {
354
-            echo '  --version-check        Check whether phpbu is up to date.' . PHP_EOL;
355
-            echo '  --self-update          Upgrade phpbu to the latest version.' . PHP_EOL;
354
+            echo '  --version-check        Check whether phpbu is up to date.'.PHP_EOL;
355
+            echo '  --self-update          Upgrade phpbu to the latest version.'.PHP_EOL;
356 356
         }
357 357
     }
358 358
 
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
366 366
     {
367 367
         $help = $hint ? ', use "phpbu -h" for help' : '';
368 368
         $this->printVersionString();
369
-        echo $message . $help . PHP_EOL;
369
+        echo $message.$help.PHP_EOL;
370 370
         exit(self::EXIT_EXCEPTION);
371 371
     }
372 372
 
Please login to merge, or discard this patch.
build/phar-manifest.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
         "softlayer/objectstorage",
31 31
         "vlucas/phpdotenv"
32 32
     ])) {
33
-      continue;
33
+        continue;
34 34
     }
35 35
     echo $package->name . ': ' . $package->version;
36 36
     if (!preg_match('/^[v= ]*(([0-9]+)(\\.([0-9]+)(\\.([0-9]+)(-([0-9]+))?(-?([a-zA-Z-+][a-zA-Z0-9\\.\\-:]*)?)?)?)?)$/', $package->version)) {
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -9,16 +9,16 @@  discard block
 block discarded – undo
9 9
 } else {
10 10
     $branch = @exec('git rev-parse --abbrev-ref HEAD');
11 11
     $hash   = @exec('git log -1 --format="%H"');
12
-    echo $branch . '@' . $hash;
12
+    echo $branch.'@'.$hash;
13 13
 }
14 14
 echo PHP_EOL;
15 15
 
16
-$lock = json_decode(file_get_contents(__DIR__ . '/../composer.lock'));
16
+$lock = json_decode(file_get_contents(__DIR__.'/../composer.lock'));
17 17
 
18 18
 foreach ($lock->packages as $package) {
19
-    echo $package->name . ': ' . $package->version;
19
+    echo $package->name.': '.$package->version;
20 20
     if (!preg_match('/^[v= ]*(([0-9]+)(\\.([0-9]+)(\\.([0-9]+)(-([0-9]+))?(-?([a-zA-Z-+][a-zA-Z0-9\\.\\-:]*)?)?)?)?)$/', $package->version)) {
21
-        echo '@' . $package->source->reference;
21
+        echo '@'.$package->source->reference;
22 22
     }
23 23
     echo PHP_EOL;
24 24
 }
@@ -32,9 +32,9 @@  discard block
 block discarded – undo
32 32
     ])) {
33 33
       continue;
34 34
     }
35
-    echo $package->name . ': ' . $package->version;
35
+    echo $package->name.': '.$package->version;
36 36
     if (!preg_match('/^[v= ]*(([0-9]+)(\\.([0-9]+)(\\.([0-9]+)(-([0-9]+))?(-?([a-zA-Z-+][a-zA-Z0-9\\.\\-:]*)?)?)?)?)$/', $package->version)) {
37
-        echo '@' . $package->source->reference;
37
+        echo '@'.$package->source->reference;
38 38
     }
39 39
     echo PHP_EOL;
40 40
 }
Please login to merge, or discard this patch.
src/Cli/Executable/Rsync.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -244,9 +244,9 @@  discard block
 block discarded – undo
244 244
      */
245 245
     protected function createCommandLine() : CommandLine
246 246
     {
247
-        $password = !empty($this->password) ? 'RSYNC_PASSWORD=' . escapeshellarg($this->password) . ' ' : '';
247
+        $password = !empty($this->password) ? 'RSYNC_PASSWORD='.escapeshellarg($this->password).' ' : '';
248 248
         $process  = new CommandLine();
249
-        $cmd      = new Cmd($password . $this->binary);
249
+        $cmd      = new Cmd($password.$this->binary);
250 250
         $process->addCommand($cmd);
251 251
 
252 252
         if (!empty($this->args)) {
@@ -256,7 +256,7 @@  discard block
 block discarded – undo
256 256
             $this->validateLocations();
257 257
 
258 258
             // use archive mode, verbose and compress if not already done
259
-            $options = '-av' . ($this->compressed ? 'z' : '');
259
+            $options = '-av'.($this->compressed ? 'z' : '');
260 260
             $cmd->addOption($options);
261 261
             $this->configureExcludes($cmd, $this->excludes);
262 262
             $cmd->addOptionIfNotEmpty('--delete', $this->delete, false);
Please login to merge, or discard this patch.
src/Backup/Sync/AmazonS3.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
     {
127 127
         foreach (['key', 'secret', 'bucket', 'region', 'path'] as $option) {
128 128
             if (!Arr::isSetAndNotEmptyString($config, $option)) {
129
-                throw new Exception('AWS S3 ' . $option . ' is mandatory');
129
+                throw new Exception('AWS S3 '.$option.' is mandatory');
130 130
             }
131 131
         }
132 132
     }
@@ -150,11 +150,11 @@  discard block
 block discarded – undo
150 150
     public function simulate(Target $target, Result $result)
151 151
     {
152 152
         $result->debug(
153
-            'sync backup to Amazon S3' . PHP_EOL
154
-            . '  region:   ' . $this->region . PHP_EOL
155
-            . '  key:      ' . $this->key . PHP_EOL
156
-            . '  secret:    ********' . PHP_EOL
157
-            . '  location: ' . $this->bucket
153
+            'sync backup to Amazon S3'.PHP_EOL
154
+            . '  region:   '.$this->region.PHP_EOL
155
+            . '  key:      '.$this->key.PHP_EOL
156
+            . '  secret:    ********'.PHP_EOL
157
+            . '  location: '.$this->bucket
158 158
         );
159 159
     }
160 160
 
Please login to merge, or discard this patch.