sebastianfeldmann / phpbu

src/Backup/Sync/Rsync.php

Spacing +2 added lines, -2 removed lines

@@ -59,7 +59,7 @@ 
         $result->debug($rsync->getCmd());
 
         if (!$rsync->isSuccessful()) {
-            throw new Exception('rsync failed: ' . $rsync->getStdErr());
+            throw new Exception('rsync failed: '.$rsync->getStdErr());
         }
     }
 
@@ -72,7 +72,7 @@ 
     public function simulate(Target $target, Result $result)
     {
         $result->debug(
-            'sync backup with rsync' . PHP_EOL
+            'sync backup with rsync'.PHP_EOL
             . $this->getExecutable($target)->getCommandPrintable()
         );
     }

Indentation +8 added lines, -8 removed lines

@@ -95,14 +95,14 @@
             );
         } else {
             $executable->fromPath($this->getRsyncLocation($target))
-                       ->usePassword($this->password)
-                       ->usePasswordFile($this->passwordFile)
-                       ->toHost($this->host)
-                       ->toPath($this->path)
-                       ->toUser($this->user)
-                       ->compressed(!$target->shouldBeCompressed())
-                       ->removeDeleted($this->delete)
-                       ->exclude($this->excludes);
+                        ->usePassword($this->password)
+                        ->usePasswordFile($this->passwordFile)
+                        ->toHost($this->host)
+                        ->toPath($this->path)
+                        ->toUser($this->user)
+                        ->compressed(!$target->shouldBeCompressed())
+                        ->removeDeleted($this->delete)
+                        ->exclude($this->excludes);
         }
         return $executable;
     }

src/Backup/Target.php

Spacing +8 added lines, -8 removed lines

@@ -179,7 +179,7 @@ 
                 $this->pathElementsChanging[] = $d;
                 $foundChangingElement         = true;
             } else {
-                $this->pathNotChanging .= DIRECTORY_SEPARATOR . $d;
+                $this->pathNotChanging .= DIRECTORY_SEPARATOR.$d;
             }
         }
     }
@@ -271,7 +271,7 @@ 
      */
     public function getFilename(bool $plain = false) : string
     {
-        return $this->filename . $this->getFilenameSuffix($plain);
+        return $this->filename.$this->getFilenameSuffix($plain);
     }
 
     /**
@@ -292,7 +292,7 @@ 
      */
     public function getFilenameRaw($plain = false) : string
     {
-        return $this->filenameRaw . $this->getFilenameSuffix($plain);
+        return $this->filenameRaw.$this->getFilenameSuffix($plain);
     }
 
     /**
@@ -303,7 +303,7 @@ 
      */
     public function getFilenameSuffix($plain = false) : string
     {
-        return $this->getSuffixToAppend() . ($plain ? '' : $this->getCompressionSuffix() . $this->getCrypterSuffix());
+        return $this->getSuffixToAppend().($plain ? '' : $this->getCompressionSuffix().$this->getCrypterSuffix());
     }
 
     /**
@@ -313,7 +313,7 @@ 
      */
     public function getSuffixToAppend() : string
     {
-        return count($this->fileSuffixes) ? '.' . implode('.', $this->fileSuffixes) : '';
+        return count($this->fileSuffixes) ? '.'.implode('.', $this->fileSuffixes) : '';
     }
 
     /**
@@ -323,7 +323,7 @@ 
      */
     public function getCompressionSuffix() : string
     {
-        return $this->shouldBeCompressed() ? '.' . $this->compression->getSuffix() : '';
+        return $this->shouldBeCompressed() ? '.'.$this->compression->getSuffix() : '';
     }
 
     /**
@@ -333,7 +333,7 @@ 
      */
     public function getCrypterSuffix() : string
     {
-        return $this->shouldBeEncrypted() ? '.' . $this->crypter->getSuffix() : '';
+        return $this->shouldBeEncrypted() ? '.'.$this->crypter->getSuffix() : '';
     }
 
     /**
@@ -406,7 +406,7 @@ 
      */
     public function getPathname(bool $plain = false) : string
     {
-        return $this->path . DIRECTORY_SEPARATOR . $this->getFilename($plain);
+        return $this->path.DIRECTORY_SEPARATOR.$this->getFilename($plain);
     }
 
     /**

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/Cmd.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -368,7 +368,7 @@
   -v, --verbose          Output more verbose information.
   -V, --version          Output version information and exit.
 
-EOT;
+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;

Spacing +16 added lines, -16 removed lines

@@ -98,7 +98,7 @@ 
                 $ret = self::EXIT_EXCEPTION;
             }
         } catch (\Exception $e) {
-            echo $e->getMessage() . PHP_EOL;
+            echo $e->getMessage().PHP_EOL;
             $ret = self::EXIT_EXCEPTION;
         }
 
@@ -219,7 +219,7 @@ 
         foreach ($settingsToOverride as $arg) {
             $value = Arr::getValue($this->arguments, $arg);
             if (!empty($value)) {
-                $setter = 'set' . ucfirst($arg);
+                $setter = 'set'.ucfirst($arg);
                 $configuration->{$setter}($value);
             }
         }
@@ -235,21 +235,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);
@@ -265,11 +265,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;
     }
 
     /**
@@ -281,10 +281,10 @@ 
 
         $latestVersion = $this->getLatestVersion();
         if ($this->isPharOutdated($latestVersion)) {
-            print 'You are not using the latest version of phpbu.' . PHP_EOL
-                . 'Use "phpbu --self-update" to install phpbu ' . $latestVersion . PHP_EOL;
+            print 'You are not using the latest version of phpbu.'.PHP_EOL
+                . 'Use "phpbu --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;
         }
     }
 
@@ -300,7 +300,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;
@@ -326,7 +326,7 @@ 
             return;
         }
 
-        echo Version::getVersionString() . PHP_EOL . PHP_EOL;
+        echo Version::getVersionString().PHP_EOL.PHP_EOL;
         $this->isVersionStringPrinted = true;
     }
 
@@ -351,8 +351,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;
         }
     }
 
@@ -366,7 +366,7 @@ 
     {
         $help = $hint ? ', use "phpbu -h" for help' : '';
         $this->printVersionString();
-        echo $message . $help . PHP_EOL;
+        echo $message.$help.PHP_EOL;
         exit(self::EXIT_EXCEPTION);
     }
 

build/phar-manifest.php

Indentation +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
         "softlayer/objectstorage",
         "vlucas/phpdotenv"
     ])) {
-      continue;
+        continue;
     }
     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)) {

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
         );
     }
 

src/Log/ResultFormatter/FormData.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
         $messages = [];
         /** @var \Exception $e */
         foreach ($errors as $e) {
-            $messages[] = $e->getMessage() . ' in file:' . $e->getFile() . ' at line' . $e->getLine();
+            $messages[] = $e->getMessage().' in file:'.$e->getFile().' at line'.$e->getLine();
         }
         return implode(';', $messages);
     }

src/Log/ResultFormatter/Template.php

Spacing +6 added lines, -6 removed lines

@@ -45,7 +45,7 @@ 
     private function loadBodyFromTemplate(string $template) : string
     {
         if (!file_exists($template)) {
-            throw new Exception('template not found: ' . $template);
+            throw new Exception('template not found: '.$template);
         }
         return file_get_contents($template);
     }
@@ -115,7 +115,7 @@ 
     {
         $subTemplate = '';
         $match       = [];
-        if (preg_match('#%%' . $loop . '%%([\w\W\s]*)%%' . $loop . '%%#im', $template, $match)) {
+        if (preg_match('#%%'.$loop.'%%([\w\W\s]*)%%'.$loop.'%%#im', $template, $match)) {
             $subTemplate = $match[1];
         }
         return $subTemplate;
@@ -133,7 +133,7 @@ 
         $markup = '';
         /* @var $e \Exception */
         foreach ($errors as $e) {
-            $data   = [
+            $data = [
                 'class'   => get_class($e),
                 'message' => $e->getMessage(),
                 'file'    => $e->getFile(),
@@ -156,7 +156,7 @@ 
         $markup = '';
         /* @var $b \phpbu\App\Result\Backup */
         foreach ($backups as $b) {
-            $data   = [
+            $data = [
                 'name'           => $b->getName(),
                 'status'         => $b->allOk() ? 0 : 1,
                 'checkCount'     => $b->checkCount(),
@@ -186,7 +186,7 @@ 
     private function renderTemplate(string $template, array $data) : string
     {
         foreach ($data as $name => $value) {
-            $template = str_replace('%' . $name . '%', $value, $template);
+            $template = str_replace('%'.$name.'%', $value, $template);
         }
         return $template;
     }
@@ -199,6 +199,6 @@ 
      */
     private function renderLoop(string $loop, string $markup)
     {
-        $this->template = preg_replace('#%%' . $loop . '%%[\w\W\s]*%%' . $loop . '%%#im', $markup, $this->template);
+        $this->template = preg_replace('#%%'.$loop.'%%[\w\W\s]*%%'.$loop.'%%#im', $markup, $this->template);
     }
 }