Completed
Pull Request — master (#140)
by
unknown
02:55
created
src/Cli/Executable/Tar.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -260,7 +260,7 @@
 block discarded – undo
260 260
 
261 261
         $tar->addOptionIfNotEmpty('--force-local', $this->local, false);
262 262
         $tar->addOptionIfNotEmpty('--use-compress-program', $this->compressProgram);
263
-        $tar->addOption('-' . (empty($this->compressProgram) ? $this->compression : '') . $create);
263
+        $tar->addOption('-'.(empty($this->compressProgram) ? $this->compression : '').$create);
264 264
 
265 265
         if ($this->isThrottled()) {
266 266
             $pv = new Cmd('pv');
Please login to merge, or discard this patch.
src/Util/Cli.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
         'mongodump' => [],
44 44
         'mysqldump' => [
45 45
             '/usr/local/mysql/bin', // Mac OS X
46
-            '/usr/mysql/bin',       // Linux
46
+            '/usr/mysql/bin', // Linux
47 47
         ],
48 48
         'tar'       => [],
49 49
     ];
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
      */
121 121
     public static function detectCmdLocationInPath(string $cmd, string $path) : string
122 122
     {
123
-        $command = $path . DIRECTORY_SEPARATOR . $cmd;
123
+        $command = $path.DIRECTORY_SEPARATOR.$cmd;
124 124
         $bin     = self::isExecutable($command);
125 125
         if (empty($bin)) {
126 126
             throw new RuntimeException(sprintf('wrong path specified for \'%s\': %s', $cmd, $path));
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
     public static function detectCmdLocationInPaths($cmd, array $paths) : string
157 157
     {
158 158
         foreach ($paths as $path) {
159
-            $command = $path . DIRECTORY_SEPARATOR . $cmd;
159
+            $command = $path.DIRECTORY_SEPARATOR.$cmd;
160 160
             $bin     = self::isExecutable($command);
161 161
             if (!empty($bin)) {
162 162
                 return $bin;
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
262 262
             return $path;
263 263
         }
264 264
 
265
-        $file = $base . DIRECTORY_SEPARATOR . $path;
265
+        $file = $base.DIRECTORY_SEPARATOR.$path;
266 266
 
267 267
         if ($useIncludePath && !file_exists($file)) {
268 268
             $includePathFile = stream_resolve_include_path($path);
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
295 295
 
296 296
         $styledLines = [];
297 297
         foreach ($lines as $line) {
298
-            $styledLines[] = strlen($line) ? $style . str_pad($line, $padding) . "\x1b[0m" : '';
298
+            $styledLines[] = strlen($line) ? $style.str_pad($line, $padding)."\x1b[0m" : '';
299 299
         }
300 300
 
301 301
         return implode(PHP_EOL, $styledLines);
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
      */
311 311
     public static function formatWithAsterisk(string $buffer, int $length = 75) : string
312 312
     {
313
-        return $buffer . str_repeat('*', $length - strlen($buffer)) . PHP_EOL;
313
+        return $buffer.str_repeat('*', $length - strlen($buffer)).PHP_EOL;
314 314
     }
315 315
 
316 316
     /**
@@ -334,10 +334,10 @@  discard block
 block discarded – undo
334 334
             if ('.' === $file || '..' === $file) {
335 335
                 continue;
336 336
             }
337
-            if (is_dir($dir . '/' . $file)) {
338
-                self::removeDir($dir . '/' . $file);
337
+            if (is_dir($dir.'/'.$file)) {
338
+                self::removeDir($dir.'/'.$file);
339 339
             } else {
340
-                unlink($dir . '/' . $file);
340
+                unlink($dir.'/'.$file);
341 341
             }
342 342
         }
343 343
         rmdir($dir);
Please login to merge, or discard this patch.
src/Configuration/Bootstrapper.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
         if (!empty($filename)) {
42 42
             $pathToFile = stream_resolve_include_path($filename);
43 43
             if (!$pathToFile || !is_readable($pathToFile)) {
44
-                throw new Exception(sprintf('Cannot open bootstrap file "%s".' . PHP_EOL, $filename));
44
+                throw new Exception(sprintf('Cannot open bootstrap file "%s".'.PHP_EOL, $filename));
45 45
             }
46 46
             require $pathToFile;
47 47
         }
Please login to merge, or discard this patch.
src/Configuration/Loader/Factory.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@
 block discarded – undo
44 44
         $bs    = $bootstrapper ?? new Bootstrapper();
45 45
         $ext   = pathinfo($filename, PATHINFO_EXTENSION);
46 46
         $type  = isset(self::$extToLoaderMap[$ext]) ? self::$extToLoaderMap[$ext] : self::DEFAULT_LOADER;
47
-        $class = '\\phpbu\\App\\Configuration\\Loader\\' . $type;
47
+        $class = '\\phpbu\\App\\Configuration\\Loader\\'.$type;
48 48
 
49 49
         return new $class($filename, $bs);
50 50
     }
Please login to merge, or discard this patch.
src/Runner/Backup.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
             }
55 55
             // make sure the backup should be executed and is not excluded via the --limit option
56 56
             if (!$configuration->isBackupActive($backup->getName())) {
57
-                $this->result->debug('skipping backup: ' . $backup->getName() . PHP_EOL);
57
+                $this->result->debug('skipping backup: '.$backup->getName().PHP_EOL);
58 58
                 continue;
59 59
             }
60 60
             // setup target and collector, reset failure state
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
                 $this->executeCleanup($backup, $target, $collector);
100 100
 
101 101
             } catch (\Exception $e) {
102
-                $this->result->debug('exception: ' . $e->getMessage());
102
+                $this->result->debug('exception: '.$e->getMessage());
103 103
                 $this->result->addError($e);
104 104
                 $this->result->backupFailed($backup);
105 105
                 if ($backup->stopOnFailure()) {
Please login to merge, or discard this patch.
src/Runner/Simulate.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
         foreach ($configuration->getBackups() as $backup) {
40 40
             // make sure the backup should be executed and is not excluded via the --limit option
41 41
             if (!$configuration->isBackupActive($backup->getName())) {
42
-                $this->result->debug('skipping backup: ' . $backup->getName() . PHP_EOL);
42
+                $this->result->debug('skipping backup: '.$backup->getName().PHP_EOL);
43 43
                 continue;
44 44
             }
45 45
             // setup target and collector
Please login to merge, or discard this patch.
src/Backup/Compressor/Abstraction.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -64,14 +64,14 @@
 block discarded – undo
64 64
     public function compress(Target $target, Result $result) : string
65 65
     {
66 66
         if (!$this->isPathValid($this->path)) {
67
-            throw new Exception('path to compress should be valid: ' . $this->path);
67
+            throw new Exception('path to compress should be valid: '.$this->path);
68 68
         }
69 69
 
70 70
         $res = $this->execute($target);
71 71
         $result->debug($res->getCmd());
72 72
 
73 73
         if (!$res->isSuccessful()) {
74
-            throw new Exception('Failed to \'compress\' file: ' . $this->path);
74
+            throw new Exception('Failed to \'compress\' file: '.$this->path);
75 75
         }
76 76
 
77 77
         return $this->getArchiveFile($target);
Please login to merge, or discard this patch.
src/Cmd.php 1 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.
src/Backup/Sync/SoftLayer.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
         // check for mandatory options
75 75
         foreach (['user', 'secret', 'container', 'host', 'path'] as $option) {
76 76
             if (!Arr::isSetAndNotEmptyString($config, $option)) {
77
-                throw new Exception('SoftLayer ' . $option . ' is mandatory');
77
+                throw new Exception('SoftLayer '.$option.' is mandatory');
78 78
             }
79 79
         }
80 80
 
@@ -98,19 +98,19 @@  discard block
 block discarded – undo
98 98
     public function sync(Target $target, Result $result)
99 99
     {
100 100
         $sourcePath = $target->getPathname();
101
-        $targetPath = $this->path . $target->getFilename();
101
+        $targetPath = $this->path.$target->getFilename();
102 102
 
103 103
         $options       = ['adapter' => ObjectStorage_Http_Client::SOCKET, 'timeout' => 20];
104 104
         $objectStorage = new ObjectStorage($this->host, $this->user, $this->secret, $options);
105 105
 
106
-        $result->debug('softlayer source: ' . $sourcePath);
107
-        $result->debug('softlayer target: ' . $targetPath);
106
+        $result->debug('softlayer source: '.$sourcePath);
107
+        $result->debug('softlayer target: '.$targetPath);
108 108
 
109 109
         try {
110 110
             /** @var \ObjectStorage_Container $container */
111
-            $container = $objectStorage->with($this->container . $targetPath)
111
+            $container = $objectStorage->with($this->container.$targetPath)
112 112
                                        ->setLocalFile($sourcePath)
113
-                                       ->setMeta('description', 'PHPBU Backup: ' . date('r', time()))
113
+                                       ->setMeta('description', 'PHPBU Backup: '.date('r', time()))
114 114
                                        ->setHeader('Content-Type', $target->getMimeType());
115 115
             $container->create();
116 116
         } catch (\Exception $e) {
@@ -129,12 +129,12 @@  discard block
 block discarded – undo
129 129
     public function simulate(Target $target, Result $result)
130 130
     {
131 131
         $result->debug(
132
-            'sync backup to SoftLayer' . PHP_EOL
133
-            . '  host:      ' . $this->host . PHP_EOL
134
-            . '  user:      ' . $this->user . PHP_EOL
135
-            . '  secret:     ********' . PHP_EOL
136
-            . '  container: ' . $this->container . PHP_EOL
137
-            . '  location:  ' . $this->path
132
+            'sync backup to SoftLayer'.PHP_EOL
133
+            . '  host:      '.$this->host.PHP_EOL
134
+            . '  user:      '.$this->user.PHP_EOL
135
+            . '  secret:     ********'.PHP_EOL
136
+            . '  container: '.$this->container.PHP_EOL
137
+            . '  location:  '.$this->path
138 138
         );
139 139
     }
140 140
 
Please login to merge, or discard this patch.