sebastianfeldmann / phpbu

src/Cli/Executable/Pgdump.php

Spacing +2 added lines, -2 removed lines

@@ -453,8 +453,8 @@
     protected function createCommandLine() : CommandLine
     {
         $process  = new CommandLine();
-        $password = $this->password ? 'PGPASSWORD=' . escapeshellarg($this->password) . ' ' : '';
-        $cmd      = new Cmd($password . $this->binary);
+        $password = $this->password ? 'PGPASSWORD='.escapeshellarg($this->password).' ' : '';
+        $cmd      = new Cmd($password.$this->binary);
         $process->addCommand($cmd);
 
         // always disable password prompt

src/Cli/Executable/Rsync/Location.php

Spacing +2 added lines, -2 removed lines

@@ -102,9 +102,9 @@
         if (!empty($this->host)) {
             // remote user
             if (!empty($this->user)) {
-                $return .= $this->user . '@';
+                $return .= $this->user.'@';
             }
-            $return .= $this->host . ':';
+            $return .= $this->host.':';
         }
         $return .= $this->path;
 

src/Cmd.php

Spacing +19 added lines, -19 removed lines

@@ -110,7 +110,7 @@ 
                 $ret = self::EXIT_EXCEPTION;
             }
         } catch (\Exception $e) {
-            echo $e->getMessage() . PHP_EOL;
+            echo $e->getMessage().PHP_EOL;
             $ret = self::EXIT_EXCEPTION;
         }
 
@@ -218,12 +218,12 @@ 
      */
     protected function findConfigurationInDir()
     {
-        $configurationFile = $this->arguments['configuration'] . '/phpbu.xml';
+        $configurationFile = $this->arguments['configuration'].'/phpbu.xml';
 
         if (file_exists($configurationFile)) {
             $this->arguments['configuration'] = realpath($configurationFile);
-        } elseif (file_exists($configurationFile . '.dist')) {
-            $this->arguments['configuration'] = realpath($configurationFile . '.dist');
+        } elseif (file_exists($configurationFile.'.dist')) {
+            $this->arguments['configuration'] = realpath($configurationFile.'.dist');
         }
     }
 
@@ -284,7 +284,7 @@ 
     {
         $value = Arr::getValue($this->arguments, $arg);
         if (!empty($value)) {
-            $setter = 'set' . ucfirst($arg);
+            $setter = 'set'.ucfirst($arg);
             $configuration->{$setter}($value);
         }
     }
@@ -298,13 +298,13 @@ 
 
         // check if upgrade is necessary
         if (!$this->isPharOutdated($this->getLatestVersion())) {
-            echo 'You already have the latest version of phpbu installed.' . PHP_EOL;
+            echo 'You already have the latest version of phpbu installed.'.PHP_EOL;
             exit(self::EXIT_SUCCESS);
         }
 
         $remoteFilename = 'http://phar.phpbu.de/phpbu.phar';
         $localFilename  = realpath($_SERVER['argv'][0]);
-        $tempFilename   = basename($localFilename, '.phar') . '-temp.phar';
+        $tempFilename   = basename($localFilename, '.phar').'-temp.phar';
 
         echo 'Updating the phpbu PHAR ... ';
 
@@ -312,7 +312,7 @@ 
         $phar = file_get_contents($remoteFilename);
         error_reporting($old);
         if (!$phar) {
-            echo ' failed' . PHP_EOL . 'Could not reach phpbu update site' . PHP_EOL;
+            echo ' failed'.PHP_EOL.'Could not reach phpbu update site'.PHP_EOL;
             exit(self::EXIT_EXCEPTION);
         }
         file_put_contents($tempFilename, $phar);
@@ -328,11 +328,11 @@ 
         } catch (Exception $e) {
             // cleanup crappy phar
             unlink($tempFilename);
-            echo 'failed' . PHP_EOL . $e->getMessage() . PHP_EOL;
+            echo 'failed'.PHP_EOL.$e->getMessage().PHP_EOL;
             exit(self::EXIT_EXCEPTION);
         }
 
-        echo 'done' . PHP_EOL;
+        echo 'done'.PHP_EOL;
         exit(self::EXIT_SUCCESS);
     }
 
@@ -345,10 +345,10 @@ 
 
         $latestVersion = $this->getLatestVersion();
         if ($this->isPharOutdated($latestVersion)) {
-            print 'You are not using the latest version of phpbu.' . PHP_EOL
-                . 'Use "phpunit --self-upgrade" to install phpbu ' . $latestVersion . PHP_EOL;
+            print 'You are not using the latest version of phpbu.'.PHP_EOL
+                . 'Use "phpunit --self-upgrade" to install phpbu '.$latestVersion.PHP_EOL;
         } else {
-            print 'You are using the latest version of phpbu.' . PHP_EOL;
+            print 'You are using the latest version of phpbu.'.PHP_EOL;
         }
         exit(self::EXIT_SUCCESS);
     }
@@ -365,7 +365,7 @@ 
         $version = file_get_contents('https://phar.phpbu.de/latest-version-of/phpbu');
         error_reporting($old);
         if (!$version) {
-            echo 'Network-Error: Could not check latest version.' . PHP_EOL;
+            echo 'Network-Error: Could not check latest version.'.PHP_EOL;
             exit(self::EXIT_EXCEPTION);
         }
         return $version;
@@ -391,7 +391,7 @@ 
             return;
         }
 
-        echo Version::getVersionString() . PHP_EOL . PHP_EOL;
+        echo Version::getVersionString().PHP_EOL.PHP_EOL;
         $this->isVersionStringPrinted = true;
     }
 
@@ -400,7 +400,7 @@ 
      */
     protected function printLogo()
     {
-        echo self::$logo . PHP_EOL;
+        echo self::$logo.PHP_EOL;
     }
 
     /**
@@ -424,8 +424,8 @@ 
 
 EOT;
         if ($this->isPhar) {
-            echo '  --version-check        Check whether phpbu is the latest version.' . PHP_EOL;
-            echo '  --self-upgrade         Upgrade phpbu to the latest version.' . PHP_EOL;
+            echo '  --version-check        Check whether phpbu is the latest version.'.PHP_EOL;
+            echo '  --self-upgrade         Upgrade phpbu to the latest version.'.PHP_EOL;
         }
     }
 
@@ -439,7 +439,7 @@ 
     {
         $help = $hint ? ', use "phpbu -h" for help' : '';
         $this->printVersionString();
-        echo $message . $help . PHP_EOL;
+        echo $message.$help.PHP_EOL;
         exit(self::EXIT_EXCEPTION);
     }
 

src/Result/PrinterCli.php

Spacing +36 added lines, -36 removed lines

@@ -172,8 +172,8 @@ 
         $configuration = $event->getConfiguration();
         if ($this->verbose) {
             $this->write(
-                'Runtime:       ' . $this->runtime->getNameWithVersion() . PHP_EOL .
-                'Configuration: ' . $configuration->getFilename() . 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/Backup/Cli.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
      */
     public function __construct(Runner $runner = null)
     {
-        $this->runner = $runner ? : new Runner\Simple();
+        $this->runner = $runner ?: new Runner\Simple();
     }
 
     /**

src/Backup/Crypter/Abstraction.php

Spacing +3 added lines, -3 removed lines

@@ -33,10 +33,10 @@ 
         $crypt = $this->execute($target);
         $name  = strtolower(get_class($this));
 
-        $result->debug($name . ':' . $this->getExecutable($target)->getCommandPrintable());
+        $result->debug($name.':'.$this->getExecutable($target)->getCommandPrintable());
 
         if (!$crypt->isSuccessful()) {
-            throw new Exception($name . ' failed:' . PHP_EOL . $crypt->getStdErr());
+            throw new Exception($name.' failed:'.PHP_EOL.$crypt->getStdErr());
         }
     }
 
@@ -49,7 +49,7 @@ 
     public function simulate(Target $target, Result $result)
     {
         $result->debug(
-            'execute encryption:' . PHP_EOL .
+            'execute encryption:'.PHP_EOL.
             $this->getExecutable($target)->getCommandPrintable()
         );
     }

src/Backup/Crypter/Mcrypt.php

Spacing +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
      */
     protected function createExecutable(Target $target) : Executable
     {
-        $executable = new Executable\Mcrypt((string)$this->pathToMcrypt);
+        $executable = new Executable\Mcrypt((string) $this->pathToMcrypt);
         $executable->useAlgorithm($this->algorithm)
                    ->useKey($this->key)
                    ->useKeyFile($this->keyFile)

src/Backup/Source/Mongodump.php

Spacing +2 added lines, -2 removed lines

@@ -160,7 +160,7 @@ 
         $result->debug($mongodump->getCmdPrintable());
 
         if (!$mongodump->isSuccessful()) {
-            throw new Exception('mongodump failed: ' . $mongodump->getStdErr());
+            throw new Exception('mongodump failed: '.$mongodump->getStdErr());
         }
 
         return $this->createStatus($target);
@@ -205,6 +205,6 @@ 
      */
     public function getDumpDir(Target $target) : string
     {
-        return $target->getPath() . '/dump';
+        return $target->getPath().'/dump';
     }
 }

src/Backup/Source/Elasticdump.php

Spacing +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
         $result->debug($elasticdump->getCmdPrintable());
 
         if (!$elasticdump->isSuccessful()) {
-            throw new Exception('elasticdump failed: ' . $elasticdump->getStdErr());
+            throw new Exception('elasticdump failed: '.$elasticdump->getStdErr());
         }
 
         return $this->createStatus($target);