sebastianfeldmann / phpbu

src/Backup/Sync/Dropbox.php

Spacing +5 added lines, -5 removed lines

@@ -76,7 +76,7 @@ 
     public function sync(Target $target, Result $result)
     {
         $sourcePath  = $target->getPathname();
-        $dropboxPath = $this->path . $target->getFilename();
+        $dropboxPath = $this->path.$target->getFilename();
         $client      = new DropboxApi\Client($this->token, "phpbu/1.1.0");
         $pathError   = DropboxApi\Path::findErrorNonRoot($dropboxPath);
 
@@ -100,7 +100,7 @@ 
         } catch (\Exception $e) {
             throw new Exception($e->getMessage(), null, $e);
         }
-        $result->debug('upload: done  (' . $res['size'] . ')');
+        $result->debug('upload: done  ('.$res['size'].')');
     }
 
     /**
@@ -112,9 +112,9 @@ 
     public function simulate(Target $target, Result $result)
     {
         $result->debug(
-            'sync backup to dropbox' . PHP_EOL
-            . '  token:    ********' . PHP_EOL
-            . '  location: ' . $this->path
+            'sync backup to dropbox'.PHP_EOL
+            . '  token:    ********'.PHP_EOL
+            . '  location: '.$this->path
         );
     }
 }

src/Backup/Source/Mysqldump.php

Indentation +13 added lines, -13 removed lines

@@ -220,19 +220,19 @@
         if (null == $this->executable) {
             $this->executable = new Executable\Mysqldump($this->pathToMysqldump);
             $this->executable->credentials($this->user, $this->password)
-                             ->useHost($this->host)
-                             ->useQuickMode($this->quick)
-                             ->lockTables($this->lockTables)
-                             ->dumpBlobsHexadecimal($this->hexBlob)
-                             ->useCompression($this->compress)
-                             ->useExtendedInsert($this->extendedInsert)
-                             ->dumpTables($this->tables)
-                             ->dumpDatabases($this->databases)
-                             ->ignoreTables($this->ignoreTables)
-                             ->produceFilePerTable($this->filePerTable)
-                             ->dumpNoData($this->noData)
-                             ->dumpStructureOnly($this->structureOnly)
-                             ->dumpTo($this->getDumpTarget($target));
+                                ->useHost($this->host)
+                                ->useQuickMode($this->quick)
+                                ->lockTables($this->lockTables)
+                                ->dumpBlobsHexadecimal($this->hexBlob)
+                                ->useCompression($this->compress)
+                                ->useExtendedInsert($this->extendedInsert)
+                                ->dumpTables($this->tables)
+                                ->dumpDatabases($this->databases)
+                                ->ignoreTables($this->ignoreTables)
+                                ->produceFilePerTable($this->filePerTable)
+                                ->dumpNoData($this->noData)
+                                ->dumpStructureOnly($this->structureOnly)
+                                ->dumpTo($this->getDumpTarget($target));
         }
         return $this->executable;
     }

Spacing +2 added lines, -2 removed lines

@@ -203,7 +203,7 @@ 
         $result->debug($this->getExecutable($target)->getCommandLinePrintable());
 
         if (!$mysqldump->wasSuccessful()) {
-            throw new Exception('mysqldump failed:' . $mysqldump->getStdErr());
+            throw new Exception('mysqldump failed:'.$mysqldump->getStdErr());
         }
 
         return $this->createStatus($target);
@@ -258,6 +258,6 @@ 
      */
     private function getDumpTarget(Target $target)
     {
-        return $target->getPathnamePlain() . ($this->filePerTable ? '.dump' : '');
+        return $target->getPathnamePlain().($this->filePerTable ? '.dump' : '');
     }
 }

src/Backup/Source/Tar.php

Spacing +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
         $result->debug($tar->getCmd());
 
         if (!$tar->wasSuccessful()) {
-            throw new Exception('tar failed: ' . $tar->getStdErr());
+            throw new Exception('tar failed: '.$tar->getStdErr());
         }
 
         return $this->createStatus($target);

Indentation +4 added lines, -4 removed lines

@@ -141,10 +141,10 @@
 
             $this->executable = new Executable\Tar($this->pathToTar);
             $this->executable->archiveDirectory($this->path)
-                             ->useCompression($this->compression)
-                             ->ignoreFailedRead($this->ignoreFailedRead)
-                             ->removeSourceDirectory($this->removeSourceDir)
-                             ->archiveTo($this->pathToArchive);
+                                ->useCompression($this->compression)
+                                ->ignoreFailedRead($this->ignoreFailedRead)
+                                ->removeSourceDirectory($this->removeSourceDir)
+                                ->archiveTo($this->pathToArchive);
         }
         return $this->executable;
     }

src/Backup/Source/SimulatorExecutable.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
      */
     public function simulate(Target $target, Result $result)
     {
-        $result->debug('backup data:' . PHP_EOL . $this->getExecutable($target)->getCommandLinePrintable());
+        $result->debug('backup data:'.PHP_EOL.$this->getExecutable($target)->getCommandLinePrintable());
 
         return $this->createStatus($target);
     }

src/Runner.php

Spacing +3 added lines, -3 removed lines

@@ -125,7 +125,7 @@ 
                 $this->executeCleanup($backup, $target, $collector);
 
             } catch (\Exception $e) {
-                $this->result->debug('exception: ' . $e->getMessage());
+                $this->result->debug('exception: '.$e->getMessage());
                 $this->result->addError($e);
                 $this->result->backupFailed($backup);
                 if ($backup->stopOnFailure()) {
@@ -254,7 +254,7 @@ 
                     $this->result->cryptSkipped($crypt);
                 } else {
                     /* @var \phpbu\App\Runner\Crypter $runner */
-                    $runner  = $this->factory->createRunner('crypter', $this->configuration->isSimulation());
+                    $runner = $this->factory->createRunner('crypter', $this->configuration->isSimulation());
                     $runner->run($this->factory->createCrypter($crypt->type, $crypt->options), $target, $this->result);
                 }
             } catch (Backup\Crypter\Exception $e) {
@@ -276,7 +276,7 @@ 
     {
         /* @var \phpbu\App\Runner\Crypter $runner */
         /* @var \phpbu\App\Configuration\Backup\Sync $sync */
-        $runner  = $this->factory->createRunner('sync', $this->configuration->isSimulation());
+        $runner = $this->factory->createRunner('sync', $this->configuration->isSimulation());
         foreach ($backup->getSyncs() as $sync) {
             try {
                 $this->result->syncStart($sync);

src/Result/PrinterCli.php

Spacing +38 added lines, -38 removed lines

@@ -171,10 +171,10 @@ 
     {
         $configuration = $event->getConfiguration();
         $this->write(
-            Version::getVersionString() . PHP_EOL .
-            PHP_EOL .
-            'Runtime:       ' . $this->runtime->getNameWithVersion() . PHP_EOL .
-            'Configuration: ' . $configuration->getFilename() . PHP_EOL .
+            Version::getVersionString().PHP_EOL.
+            PHP_EOL.
+            'Runtime:       '.$this->runtime->getNameWithVersion().PHP_EOL.
+            'Configuration: '.$configuration->getFilename().PHP_EOL.
             PHP_EOL
         );
     }
@@ -189,7 +189,7 @@ 
         $this->numBackups++;
         if ($this->debug) {
             $backup = $event->getConfiguration();
-            $this->writeWithAsterisk('backup: [' . $backup->getSource()->type . '] ');
+            $this->writeWithAsterisk('backup: ['.$backup->getSource()->type.'] ');
         }
     }
 
@@ -201,7 +201,7 @@ 
     public function onBackupFailed(Event\Backup\Failed $event)
     {
         if ($this->debug) {
-            $this->writeWithColor('fg-white, bg-red, bold', 'failed' . PHP_EOL);
+            $this->writeWithColor('fg-white, bg-red, bold', 'failed'.PHP_EOL);
         }
     }
 
@@ -213,7 +213,7 @@ 
     public function onBackupEnd(Event\Backup\End $event)
     {
         if ($this->debug) {
-            $this->writeWithColor('fg-black, bg-green', 'ok' . PHP_EOL);
+            $this->writeWithColor('fg-black, bg-green', 'ok'.PHP_EOL);
         }
     }
 
@@ -227,8 +227,8 @@ 
         $this->numChecks++;
         if ($this->debug) {
             $check = $event->getConfiguration();
-            $this->writeWithAsterisk('check: [' . $check->type . '] ');
-            $this->write('checking: [' . $check->value . '] ');
+            $this->writeWithAsterisk('check: ['.$check->type.'] ');
+            $this->write('checking: ['.$check->value.'] ');
         }
     }
 
@@ -240,7 +240,7 @@ 
     public function onCheckFailed(Event\Check\Failed $event)
     {
         if ($this->debug) {
-            $this->writeWithColor('fg-white, bg-red, bold', 'failed' . PHP_EOL);
+            $this->writeWithColor('fg-white, bg-red, bold', 'failed'.PHP_EOL);
         }
     }
 
@@ -252,7 +252,7 @@ 
     public function onCheckEnd(Event\Check\End $event)
     {
         if ($this->debug) {
-            $this->writeWithColor('fg-black, bg-green', 'ok' . PHP_EOL);
+            $this->writeWithColor('fg-black, bg-green', 'ok'.PHP_EOL);
         }
     }
 
@@ -266,7 +266,7 @@ 
         $this->numCrypts++;
         if ($this->debug) {
             $crypt = $event->getConfiguration();
-            $this->writeWithAsterisk('crypt: [' . $crypt->type . '] ');
+            $this->writeWithAsterisk('crypt: ['.$crypt->type.'] ');
         }
     }
 
@@ -278,7 +278,7 @@ 
     public function onCryptSkipped(Event\Crypt\Skipped $event)
     {
         if ($this->debug) {
-            $this->writeWithColor('fg-black, bg-yellow', 'skipped' . PHP_EOL);
+            $this->writeWithColor('fg-black, bg-yellow', 'skipped'.PHP_EOL);
         }
     }
 
@@ -290,7 +290,7 @@ 
     public function onCryptFailed(Event\Crypt\Failed $event)
     {
         if ($this->debug) {
-            $this->writeWithColor('fg-white, bg-red, bold', 'failed' . PHP_EOL);
+            $this->writeWithColor('fg-white, bg-red, bold', 'failed'.PHP_EOL);
         }
     }
 
@@ -302,7 +302,7 @@ 
     public function onCryptEnd(Event\Crypt\End $event)
     {
         if ($this->debug) {
-            $this->writeWithColor('fg-black, bg-green', 'ok' . PHP_EOL);
+            $this->writeWithColor('fg-black, bg-green', 'ok'.PHP_EOL);
         }
     }
 
@@ -316,7 +316,7 @@ 
         $this->numSyncs++;
         if ($this->debug) {
             $sync = $event->getConfiguration();
-            $this->writeWithAsterisk('sync: [' . $sync->type . '] ');
+            $this->writeWithAsterisk('sync: ['.$sync->type.'] ');
         }
     }
 
@@ -328,7 +328,7 @@ 
     public function onSyncSkipped(Event\Sync\Skipped $event)
     {
         if ($this->debug) {
-            $this->writeWithColor('fg-black, bg-yellow', 'skipped' . PHP_EOL);
+            $this->writeWithColor('fg-black, bg-yellow', 'skipped'.PHP_EOL);
         }
     }
 
@@ -340,7 +340,7 @@ 
     public function onSyncFailed(Event\Sync\Failed $event)
     {
         if ($this->debug) {
-            $this->writeWithColor('fg-white, bg-red, bold', 'failed' . PHP_EOL);
+            $this->writeWithColor('fg-white, bg-red, bold', 'failed'.PHP_EOL);
         }
     }
 
@@ -352,7 +352,7 @@ 
     public function onSyncEnd(Event\Sync\End $event)
     {
         if ($this->debug) {
-            $this->writeWithColor('fg-black, bg-green', 'ok' . PHP_EOL);
+            $this->writeWithColor('fg-black, bg-green', 'ok'.PHP_EOL);
         }
     }
 
@@ -366,7 +366,7 @@ 
         $this->numCleanups++;
         if ($this->debug) {
             $cleanup = $event->getConfiguration();
-            $this->writeWithAsterisk('cleanup: [' . $cleanup->type . '] ');
+            $this->writeWithAsterisk('cleanup: ['.$cleanup->type.'] ');
         }
     }
 
@@ -378,7 +378,7 @@ 
     public function onCleanupSkipped(Event\Cleanup\Skipped $event)
     {
         if ($this->debug) {
-            $this->writeWithColor('fg-black, bg-yellow', 'skipped' . PHP_EOL);
+            $this->writeWithColor('fg-black, bg-yellow', 'skipped'.PHP_EOL);
         }
     }
 
@@ -390,7 +390,7 @@ 
     public function onCleanupFailed(Event\Cleanup\Failed $event)
     {
         if ($this->debug) {
-            $this->writeWithColor('fg-white, bg-red, bold', 'failed' . PHP_EOL);
+            $this->writeWithColor('fg-white, bg-red, bold', 'failed'.PHP_EOL);
         }
     }
 
@@ -402,7 +402,7 @@ 
     public function onCleanupEnd(Event\Cleanup\End $event)
     {
         if ($this->debug) {
-            $this->writeWithColor('fg-black, bg-green', 'ok' . PHP_EOL);
+            $this->writeWithColor('fg-black, bg-green', 'ok'.PHP_EOL);
         }
     }
 
@@ -414,7 +414,7 @@ 
     public function onDebug(Event\Debug $event)
     {
         if ($this->debug) {
-            $this->write($event->getMessage() . PHP_EOL);
+            $this->write($event->getMessage().PHP_EOL);
         }
     }
 
@@ -452,7 +452,7 @@ 
      */
     protected function printHeader()
     {
-        $this->write(PHP_Timer::resourceUsage() . PHP_EOL . PHP_EOL);
+        $this->write(PHP_Timer::resourceUsage().PHP_EOL.PHP_EOL);
     }
 
     /**
@@ -512,13 +512,13 @@ 
         $clSkipped  = str_pad($backup->cleanupCountSkipped(), 7, ' ', STR_PAD_LEFT);
         $clFailed   = str_pad($backup->cleanupCountFailed(), 6, ' ', STR_PAD_LEFT);
 
-        $out = PHP_EOL . '          | executed | skipped | failed |' . PHP_EOL
-            . '----------+----------+---------+--------+' . PHP_EOL
-            . ' checks   | ' . $chExecuted . ' |         | ' . $chFailed . ' |' . PHP_EOL
-            . ' crypts   | ' . $crExecuted . ' | ' . $crSkipped . ' | ' . $crFailed . ' |' . PHP_EOL
-            . ' syncs    | ' . $syExecuted . ' | ' . $sySkipped . ' | ' . $syFailed . ' |' . PHP_EOL
-            . ' cleanups | ' . $clExecuted . ' | ' . $clSkipped . ' | ' . $clFailed . ' |' . PHP_EOL
-            . '----------+----------+---------+--------+' . PHP_EOL . PHP_EOL;
+        $out = PHP_EOL.'          | executed | skipped | failed |'.PHP_EOL
+            . '----------+----------+---------+--------+'.PHP_EOL
+            . ' checks   | '.$chExecuted.' |         | '.$chFailed.' |'.PHP_EOL
+            . ' crypts   | '.$crExecuted.' | '.$crSkipped.' | '.$crFailed.' |'.PHP_EOL
+            . ' syncs    | '.$syExecuted.' | '.$sySkipped.' | '.$syFailed.' |'.PHP_EOL
+            . ' cleanups | '.$clExecuted.' | '.$clSkipped.' | '.$clFailed.' |'.PHP_EOL
+            . '----------+----------+---------+--------+'.PHP_EOL.PHP_EOL;
 
         $this->write($out);
     }
@@ -539,7 +539,7 @@ 
             $this->writeWithColor(
                 'fg-black, bg-green',
                 sprintf(
-                    'OK (%d %s, %d %s, %d %s, %d %s, %d %s)' . PHP_EOL,
+                    'OK (%d %s, %d %s, %d %s, %d %s, %d %s)'.PHP_EOL,
                     count($result->getBackups()),
                     Util\Str::appendPluralS('backup', count($result->getBackups())),
                     $this->numChecks,
@@ -556,8 +556,8 @@ 
             $this->writeWithColor(
                 'fg-black, bg-yellow',
                 sprintf(
-                    "WARNING, skipped|failed Crypts, Syncs or Cleanups!" . PHP_EOL .
-                    'Backups: %d, Crypts: %d|%d, Syncs: %d|%d, Cleanups: %d|%d ' . PHP_EOL,
+                    "WARNING, skipped|failed Crypts, Syncs or Cleanups!".PHP_EOL.
+                    'Backups: %d, Crypts: %d|%d, Syncs: %d|%d, Cleanups: %d|%d '.PHP_EOL,
                     count($result->getBackups()),
                     $result->cryptsSkippedCount(),
                     $result->cryptsFailedCount(),
@@ -571,8 +571,8 @@ 
             $this->writeWithColor(
                 'fg-white, bg-red',
                 sprintf(
-                    "FAILURE!" . PHP_EOL .
-                    'Backups: %d, failed Checks: %d, failed Crypts: %d, failed Syncs: %d, failed Cleanups: %d.' . PHP_EOL,
+                    "FAILURE!".PHP_EOL.
+                    'Backups: %d, failed Checks: %d, failed Crypts: %d, failed Syncs: %d, failed Cleanups: %d.'.PHP_EOL,
                     count($result->getBackups()),
                     $result->checksFailedCount(),
                     $result->cryptsFailedCount(),
@@ -595,7 +595,7 @@ 
         if ($this->colors) {
             $buffer = Util\Cli::formatWithColor($color, $buffer);
         }
-        $this->write($buffer . PHP_EOL);
+        $this->write($buffer.PHP_EOL);
     }
 
     /**

src/Cli/Executable/OpenSSL.php

Spacing +4 added lines, -4 removed lines

@@ -177,7 +177,7 @@ 
     public function encryptFile($file)
     {
         $this->sourceFile = $file;
-        $this->targetFile = $file . '.enc';
+        $this->targetFile = $file.'.enc';
         return $this;
     }
 
@@ -310,7 +310,7 @@ 
     {
         $cmd->addOption('smime');
         $cmd->addOption('-encrypt');
-        $cmd->addOption('-' . $this->algorithm);
+        $cmd->addOption('-'.$this->algorithm);
         $cmd->addOption('-binary');
         $cmd->addOption('-in', $this->sourceFile, ' ');
         $cmd->addOption('-out', $this->targetFile, ' ');
@@ -325,12 +325,12 @@ 
      */
     protected function setPasswordOptions(Cmd $cmd)
     {
-        $password = 'pass:' . $this->password;
+        $password = 'pass:'.$this->password;
 
         $cmd->addOption('enc');
         $cmd->addOption('-e');
         $cmd->addOptionIfNotEmpty('-a', $this->base64, false);
-        $cmd->addOption('-' . $this->algorithm);
+        $cmd->addOption('-'.$this->algorithm);
         $cmd->addOption('-pass', $password, ' ');
         $cmd->addOption('-in', $this->sourceFile, ' ');
         $cmd->addOption('-out', $this->targetFile, ' ');

src/Cli/Executable/Tar.php

Spacing +1 added lines, -1 removed lines

@@ -150,7 +150,7 @@
         $process = new Process();
         $tar     = new Cmd($this->binary);
 
-        $tar->addOption('-' . $this->compression . 'cf');
+        $tar->addOption('-'.$this->compression.'cf');
         $tar->addArgument($this->tarPathname);
         $tar->addOption('-C', dirname($this->path), ' ');
         $tar->addArgument(basename(($this->path)));

src/Cli/Executable/Elasticdump.php

Spacing +4 added lines, -4 removed lines

@@ -180,13 +180,13 @@ 
 
         // make sure there is a scheme
         if (!isset($parsed['scheme'])) {
-            $parsed = parse_url('http://' . $host);
+            $parsed = parse_url('http://'.$host);
         }
 
-        $url = $parsed['scheme'] . '://' . $this->getAuthUrlSnippet($user, $password) . $parsed['host'];
+        $url = $parsed['scheme'].'://'.$this->getAuthUrlSnippet($user, $password).$parsed['host'];
 
         if (isset($parsed['port'])) {
-            $url .= ':' . $parsed['port'];
+            $url .= ':'.$parsed['port'];
         }
 
         if (!empty($parsed['path'])) {
@@ -214,7 +214,7 @@ 
         $url = $user;
 
         if (!empty($password)) {
-            $url .= ':' . $password;
+            $url .= ':'.$password;
         }
 
         if (!empty($url)) {