sebastianfeldmann / phpbu

src/Configuration/Finder.php

Spacing +2 added lines, -2 removed lines

@@ -64,11 +64,11 @@
     protected function findConfigurationInDir(string $path) : string
     {
         foreach ($this->defaultConfigNames as $file) {
-            $configurationFile = $path . DIRECTORY_SEPARATOR . $file;
+            $configurationFile = $path.DIRECTORY_SEPARATOR.$file;
             if (file_exists($configurationFile)) {
                 return realpath($configurationFile);
             }
         }
-        throw new Exception('Can\'t find configuration in directory \'' . $path . '\'.');
+        throw new Exception('Can\'t find configuration in directory \''.$path.'\'.');
     }
 }

src/Runner/Bootstrap.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
         if (!empty($filename)) {
             $pathToFile = stream_resolve_include_path($filename);
             if (!$pathToFile || !is_readable($pathToFile)) {
-                throw new Exception(sprintf('Cannot open bootstrap file "%s".' . PHP_EOL, $filename));
+                throw new Exception(sprintf('Cannot open bootstrap file "%s".'.PHP_EOL, $filename));
             }
             require $pathToFile;
         }

src/Cmd.php

Spacing +16 added lines, -16 removed lines

@@ -97,7 +97,7 @@ 
                 $ret = self::EXIT_EXCEPTION;
             }
         } catch (\Exception $e) {
-            echo $e->getMessage() . PHP_EOL;
+            echo $e->getMessage().PHP_EOL;
             $ret = self::EXIT_EXCEPTION;
         }
 
@@ -237,7 +237,7 @@ 
     {
         $value = Arr::getValue($this->arguments, $arg);
         if (!empty($value)) {
-            $setter = 'set' . ucfirst($arg);
+            $setter = 'set'.ucfirst($arg);
             $configuration->{$setter}($value);
         }
     }
@@ -252,21 +252,21 @@ 
         // check if upgrade is necessary
         $latestVersion = $this->getLatestVersion();
         if (!$this->isPharOutdated($latestVersion)) {
-            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 to version ' . $latestVersion . ' ... ';
+        echo 'Updating the phpbu PHAR to version '.$latestVersion.' ... ';
 
         $old  = error_reporting(0);
         $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);
@@ -282,11 +282,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);
     }
 
@@ -299,10 +299,10 @@ 
 
         $latestVersion = $this->getLatestVersion();
         if ($this->isPharOutdated($latestVersion)) {
-            print 'You are not using the latest version of phpbu.' . PHP_EOL
-                . 'Use "phpunit --self-update" to install phpbu ' . $latestVersion . PHP_EOL;
+            print 'You are not using the latest version of phpbu.'.PHP_EOL
+                . 'Use "phpunit --self-update" 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);
     }
@@ -319,7 +319,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;
@@ -345,7 +345,7 @@ 
             return;
         }
 
-        echo Version::getVersionString() . PHP_EOL . PHP_EOL;
+        echo Version::getVersionString().PHP_EOL.PHP_EOL;
         $this->isVersionStringPrinted = true;
     }
 
@@ -370,8 +370,8 @@ 
 
 EOT;
         if ($this->isPhar) {
-            echo '  --version-check        Check whether phpbu is up to date.' . PHP_EOL;
-            echo '  --self-update          Upgrade phpbu to the latest version.' . PHP_EOL;
+            echo '  --version-check        Check whether phpbu is up to date.'.PHP_EOL;
+            echo '  --self-update          Upgrade phpbu to the latest version.'.PHP_EOL;
         }
     }
 
@@ -385,7 +385,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/Cmd/Args.php

Spacing +10 added lines, -10 removed lines

@@ -54,7 +54,7 @@ 
     public function __construct(bool $isPhar = false)
     {
         if ($isPhar) {
-            $this->longOptions['self-update']  = true;
+            $this->longOptions['self-update'] = true;
             $this->longOptions['version-check'] = true;
         }
     }
@@ -102,9 +102,9 @@ 
     public function parseShortOption($arg, array &$options)
     {
         if (!isset($this->shortOptions[$arg])) {
-            throw new Exception('unknown option: -' . $arg);
+            throw new Exception('unknown option: -'.$arg);
         }
-        $options['-' . $arg] = true;
+        $options['-'.$arg] = true;
     }
 
     /**
@@ -124,17 +124,17 @@ 
             $argument = $list[1];
         }
         if (count($list) > 2) {
-            throw new Exception('invalid value for option: --' . $arg);
+            throw new Exception('invalid value for option: --'.$arg);
         }
-        if (!isset($this->longOptions[$option]) && !isset($this->longOptions[$option . '='])) {
-            throw new Exception('unknown option: --' . $option);
+        if (!isset($this->longOptions[$option]) && !isset($this->longOptions[$option.'='])) {
+            throw new Exception('unknown option: --'.$option);
         }
-        if ($argument === true && isset($this->longOptions[$option . '='])) {
-            throw new Exception('argument required for option: --' . $option);
+        if ($argument === true && isset($this->longOptions[$option.'='])) {
+            throw new Exception('argument required for option: --'.$option);
         }
         if ($argument !== true && isset($this->longOptions[$option])) {
-            throw new Exception('needless argument for option: --' . $option);
+            throw new Exception('needless argument for option: --'.$option);
         }
-        $options['--' . $option] = $argument;
+        $options['--'.$option] = $argument;
     }
 }

src/Result/PrinterCli.php

Spacing +36 added lines, -36 removed lines

@@ -162,8 +162,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
             );
         }
@@ -179,7 +179,7 @@ 
         $this->numBackups++;
         if ($this->debug) {
             $backup = $event->getConfiguration();
-            $this->writeWithAsterisk('backup: [' . $backup->getSource()->type . '] ');
+            $this->writeWithAsterisk('backup: ['.$backup->getSource()->type.'] ');
         }
     }
 
@@ -191,7 +191,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);
         }
     }
 
@@ -203,7 +203,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);
         }
     }
 
@@ -217,8 +217,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.'] ');
         }
     }
 
@@ -230,7 +230,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);
         }
     }
 
@@ -242,7 +242,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);
         }
     }
 
@@ -256,7 +256,7 @@ 
         $this->numCrypts++;
         if ($this->debug) {
             $crypt = $event->getConfiguration();
-            $this->writeWithAsterisk('crypt: [' . $crypt->type . '] ');
+            $this->writeWithAsterisk('crypt: ['.$crypt->type.'] ');
         }
     }
 
@@ -268,7 +268,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);
         }
     }
 
@@ -280,7 +280,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);
         }
     }
 
@@ -292,7 +292,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);
         }
     }
 
@@ -306,7 +306,7 @@ 
         $this->numSyncs++;
         if ($this->debug) {
             $sync = $event->getConfiguration();
-            $this->writeWithAsterisk('sync: [' . $sync->type . '] ');
+            $this->writeWithAsterisk('sync: ['.$sync->type.'] ');
         }
     }
 
@@ -318,7 +318,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);
         }
     }
 
@@ -330,7 +330,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);
         }
     }
 
@@ -342,7 +342,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);
         }
     }
 
@@ -356,7 +356,7 @@ 
         $this->numCleanups++;
         if ($this->debug) {
             $cleanup = $event->getConfiguration();
-            $this->writeWithAsterisk('cleanup: [' . $cleanup->type . '] ');
+            $this->writeWithAsterisk('cleanup: ['.$cleanup->type.'] ');
         }
     }
 
@@ -368,7 +368,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);
         }
     }
 
@@ -380,7 +380,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);
         }
     }
 
@@ -392,7 +392,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);
         }
     }
 
@@ -404,7 +404,7 @@ 
     public function onDebug(Event\Debug $event)
     {
         if ($this->debug) {
-            $this->write($event->getMessage() . PHP_EOL);
+            $this->write($event->getMessage().PHP_EOL);
         }
     }
 
@@ -442,7 +442,7 @@ 
      */
     protected function printHeader()
     {
-        $this->write(PHP_Timer::resourceUsage() . PHP_EOL . PHP_EOL);
+        $this->write(PHP_Timer::resourceUsage().PHP_EOL.PHP_EOL);
     }
 
     /**
@@ -502,13 +502,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);
     }
@@ -529,7 +529,7 @@ 
             $this->writeWithColor(
                 'fg-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,
@@ -546,8 +546,8 @@ 
             $this->writeWithColor(
                 'fg-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(),
@@ -561,8 +561,8 @@ 
             $this->writeWithColor(
                 'fg-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(),
@@ -585,7 +585,7 @@ 
         if ($this->colors) {
             $buffer = Util\Cli::formatWithColor($color, $buffer);
         }
-        $this->write($buffer . PHP_EOL);
+        $this->write($buffer.PHP_EOL);
     }
 
     /**

src/Backup/Sync/Dropbox.php

Spacing +5 added lines, -5 removed lines

@@ -77,7 +77,7 @@ 
     public function sync(Target $target, Result $result)
     {
         $sourcePath  = $target->getPathname();
-        $dropboxPath = $this->path . $target->getFilename();
+        $dropboxPath = $this->path.$target->getFilename();
         $config      = new DropboxConfig("id", "secret", $this->token);
         $client      = new DropboxApi($config);
         try {
@@ -86,7 +86,7 @@ 
         } catch (\Exception $e) {
             throw new Exception($e->getMessage(), null, $e);
         }
-        $result->debug('upload: done  (' . $meta->getSize() . ')');
+        $result->debug('upload: done  ('.$meta->getSize().')');
     }
 
     /**
@@ -98,9 +98,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
         );
     }
 }

build/phar-manifest.php

Spacing +6 added lines, -6 removed lines

@@ -9,16 +9,16 @@ 
 } else {
     $branch = @exec('git rev-parse --abbrev-ref HEAD');
     $hash   = @exec('git log -1 --format="%H"');
-    echo $branch . '@' . $hash;
+    echo $branch.'@'.$hash;
 }
 echo PHP_EOL;
 
-$lock = json_decode(file_get_contents(__DIR__ . '/../composer.lock'));
+$lock = json_decode(file_get_contents(__DIR__.'/../composer.lock'));
 
 foreach ($lock->packages as $package) {
-    echo $package->name . ': ' . $package->version;
+    echo $package->name.': '.$package->version;
     if (!preg_match('/^[v= ]*(([0-9]+)(\\.([0-9]+)(\\.([0-9]+)(-([0-9]+))?(-?([a-zA-Z-+][a-zA-Z0-9\\.\\-:]*)?)?)?)?)$/', $package->version)) {
-        echo '@' . $package->source->reference;
+        echo '@'.$package->source->reference;
     }
     echo PHP_EOL;
 }
@@ -32,9 +32,9 @@ 
     ])) {
       continue;
     }
-    echo $package->name . ': ' . $package->version;
+    echo $package->name.': '.$package->version;
     if (!preg_match('/^[v= ]*(([0-9]+)(\\.([0-9]+)(\\.([0-9]+)(-([0-9]+))?(-?([a-zA-Z-+][a-zA-Z0-9\\.\\-:]*)?)?)?)?)$/', $package->version)) {
-        echo '@' . $package->source->reference;
+        echo '@'.$package->source->reference;
     }
     echo PHP_EOL;
 }

src/Cli/Executable/Rsync.php

Spacing +3 added lines, -3 removed lines

@@ -244,9 +244,9 @@ 
      */
     protected function createCommandLine() : CommandLine
     {
-        $password = !empty($this->password) ? 'RSYNC_PASSWORD=' . escapeshellarg($this->password) . ' ' : '';
+        $password = !empty($this->password) ? 'RSYNC_PASSWORD='.escapeshellarg($this->password).' ' : '';
         $process  = new CommandLine();
-        $cmd      = new Cmd($password . $this->binary);
+        $cmd      = new Cmd($password.$this->binary);
         $process->addCommand($cmd);
 
         if (!empty($this->args)) {
@@ -256,7 +256,7 @@ 
             $this->validateLocations();
 
             // use archive mode, verbose and compress if not already done
-            $options = '-av' . ($this->compressed ? 'z' : '');
+            $options = '-av'.($this->compressed ? 'z' : '');
             $cmd->addOption($options);
             $this->configureExcludes($cmd, $this->excludes);
             $cmd->addOptionIfNotEmpty('--delete', $this->delete, false);

src/Backup/Sync/AmazonS3.php

Spacing +6 added lines, -6 removed lines

@@ -126,7 +126,7 @@ 
     {
         foreach (['key', 'secret', 'bucket', 'region', 'path'] as $option) {
             if (!Arr::isSetAndNotEmptyString($config, $option)) {
-                throw new Exception('AWS S3 ' . $option . ' is mandatory');
+                throw new Exception('AWS S3 '.$option.' is mandatory');
             }
         }
     }
@@ -150,11 +150,11 @@ 
     public function simulate(Target $target, Result $result)
     {
         $result->debug(
-            'sync backup to Amazon S3' . PHP_EOL
-            . '  region:   ' . $this->region . PHP_EOL
-            . '  key:      ' . $this->key . PHP_EOL
-            . '  secret:    ********' . PHP_EOL
-            . '  location: ' . $this->bucket
+            'sync backup to Amazon S3'.PHP_EOL
+            . '  region:   '.$this->region.PHP_EOL
+            . '  key:      '.$this->key.PHP_EOL
+            . '  secret:    ********'.PHP_EOL
+            . '  location: '.$this->bucket
         );
     }