sebastianfeldmann / phpbu

src/Cmd.php

Spacing +13 added lines, -13 removed lines

@@ -108,7 +108,7 @@ 
                 $ret = self::EXIT_EXCEPTION;
             }
         } catch (\Exception $e) {
-            echo $e->getMessage() . PHP_EOL;
+            echo $e->getMessage().PHP_EOL;
             $ret = self::EXIT_EXCEPTION;
         }
 
@@ -211,12 +211,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');
         }
     }
 
@@ -276,7 +276,7 @@ 
     protected function overrideConfigWithArgument(Configuration $configuration, $value)
     {
         if (Arr::getValue($this->arguments, $value) === true) {
-            $setter = 'set' . ucfirst($value);
+            $setter = 'set'.ucfirst($value);
             $configuration->{$setter}(true);
         }
     }
@@ -290,7 +290,7 @@ 
 
         $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 ... ';
 
@@ -298,7 +298,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);
@@ -314,11 +314,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);
     }
 
@@ -331,7 +331,7 @@ 
             return;
         }
 
-        echo Version::getVersionString() . PHP_EOL;
+        echo Version::getVersionString().PHP_EOL;
         $this->isVersionStringPrinted = true;
     }
 
@@ -340,7 +340,7 @@ 
      */
     protected function printLogo()
     {
-        echo self::$logo . PHP_EOL;
+        echo self::$logo.PHP_EOL;
     }
 
     /**
@@ -364,7 +364,7 @@ 
 
 EOT;
         if ($this->isPhar) {
-            echo '  --self-update          Update phpbu to the latest version.' . PHP_EOL;
+            echo '  --self-update          Update phpbu to the latest version.'.PHP_EOL;
         }
     }
 
@@ -378,7 +378,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/Log/Mail.php

Spacing +74 added lines, -74 removed lines

@@ -148,8 +148,8 @@ 
         $mails                 = $options['recipients'];
         $server                = gethostname();
         $this->sendOnlyOnError = Str::toBoolean(Arr::getValue($options, 'sendOnlyOnError'), false);
-        $this->subject         = Arr::getValue($options, 'subject', 'PHPBU backup report from ' . $server);
-        $this->senderMail      = Arr::getValue($options, 'sender.mail', 'phpbu@' . $server);
+        $this->subject         = Arr::getValue($options, 'subject', 'PHPBU backup report from '.$server);
+        $this->senderMail      = Arr::getValue($options, 'sender.mail', 'phpbu@'.$server);
         $this->senderName      = Arr::getValue($options, 'sender.name');
         $this->transportType   = Arr::getValue($options, 'transport', 'mail');
         $this->recipients      = array_map('trim', explode(';', $mails));
@@ -176,14 +176,14 @@ 
             $errors  = $this->getErrorHtml($result);
             $info    = $this->getInfoHtml($result);
             $footer  = $this->getFooterHtml();
-            $body    = '<html><body '. TPL::getSnippet('sBody') . '>'
+            $body    = '<html><body '.TPL::getSnippet('sBody').'>'
                      . $header
                      . $status
                      . $errors
                      . $info
                      . $footer
                      . '</body></html>';
-            $sent    = null;
+            $sent = null;
 
             try {
                 /** @var \Swift_Message $message */
@@ -334,10 +334,10 @@ 
             throw new Exception('option \'sendmail.path\' ist missing');
         }
         $path    = $options['sendmail.path'];
-        $options = isset($options['sendmail.options']) ? ' ' . $options['sendmail.options'] : '';
+        $options = isset($options['sendmail.options']) ? ' '.$options['sendmail.options'] : '';
 
         /* @var $transport \Swift_SendmailTransport */
-        $transport = \Swift_SendmailTransport::newInstance($path . $options);
+        $transport = \Swift_SendmailTransport::newInstance($path.$options);
 
         return $transport;
     }
@@ -349,8 +349,8 @@ 
      */
     protected function getHeaderHtml()
     {
-        return '<table ' . TPL::getSnippet('sTableContent') . '><tr><td ' . TPL::getSnippet('sTableContentCol') . '>' .
-                 '<table ' . TPL::getSnippet('sTableHeader') . '><tr><td>PHPBU - backup report</td></tr></table>';
+        return '<table '.TPL::getSnippet('sTableContent').'><tr><td '.TPL::getSnippet('sTableContentCol').'>'.
+                 '<table '.TPL::getSnippet('sTableHeader').'><tr><td>PHPBU - backup report</td></tr></table>';
     }
 
     /**
@@ -387,12 +387,12 @@ 
             $this->numCleanups,
             Str::appendPluralS('cleanup', $this->numCleanups)
         );
-        $html = '<table ' . sprintf(TPL::getSnippet('sTableStatus'), $color) .'>' .
-                 '<tr><td>' .
-                  '<span ' . TPL::getSnippet('sTableStatusText') . '>' . date('Y-m-d H:i') . '</span>' .
-                  '<h1 ' . TPL::getSnippet('sTableStatusHead') . '>' . $status . '</h1>' .
-                  '<span ' . TPL::getSnippet('sTableStatusText') . '>' . $info . '</span>' .
-                 '</td></tr>' .
+        $html = '<table '.sprintf(TPL::getSnippet('sTableStatus'), $color).'>'.
+                 '<tr><td>'.
+                  '<span '.TPL::getSnippet('sTableStatusText').'>'.date('Y-m-d H:i').'</span>'.
+                  '<h1 '.TPL::getSnippet('sTableStatusHead').'>'.$status.'</h1>'.
+                  '<span '.TPL::getSnippet('sTableStatusText').'>'.$info.'</span>'.
+                 '</td></tr>'.
                 '</table>';
 
         return $html;
@@ -409,17 +409,17 @@ 
         $html   = '';
         $errors = $result->getErrors();
         if (count($errors)) {
-            $html .= '<table ' . TPL::getSnippet('sTableError') . '>';
+            $html .= '<table '.TPL::getSnippet('sTableError').'>';
             /* @var $e Exception */
             foreach ($errors as $e) {
-                $html .= '<tr><td ' . TPL::getSnippet('sTableErrorCol') . '>' .
+                $html .= '<tr><td '.TPL::getSnippet('sTableErrorCol').'>'.
                     sprintf(
                         "Exception '%s' with message '%s' in %s:%d",
                         get_class($e),
                         $e->getMessage(),
                         $e->getFile(),
                         $e->getLine()
-                    ) .
+                    ).
                     '</td></tr>';
 
             }
@@ -439,78 +439,78 @@ 
         $html    = '';
         $backups = $result->getBackups();
         if (count($backups)) {
-            $html .= '<table ' . TPL::getSnippet('sTableBackup') . '>';
+            $html .= '<table '.TPL::getSnippet('sTableBackup').'>';
             /** @var \phpbu\App\Result\Backup $backup */
             foreach ($backups as $backup) {
                 if ($backup->allOk()) {
                     $color  = TPL::getSnippet('cStatusOK');
                     $status = 'OK';
-                } elseif($backup->okButSkipsOrFails()) {
+                } elseif ($backup->okButSkipsOrFails()) {
                     $color  = TPL::getSnippet('cStatusWARN');
                     $status = 'WARNING';
                 } else {
                     $color  = TPL::getSnippet('cStatusFAIL');
                     $status = 'FAILURE';
                 }
-                $html .= '<tr>' .
-                          '<td ' . sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color) . ' colspan="4">' .
-                          sprintf('backup <em>%s</em>', $backup->getName()) .
-                          ' <span ' . TPL::getSnippet('sTableBackupStatusText') . '>' . $status .'</span>'.
-                          '</td>' .
-                         '</tr>' .
-                         '<tr>' .
-                          '<td ' . TPL::getSnippet('sRowHead') . '>&nbsp;</td>' .
-                          '<td ' . TPL::getSnippet('sRowHead') . ' align="right">executed</td>' .
-                          '<td ' . TPL::getSnippet('sRowHead') . ' align="right">skipped</td>' .
-                          '<td ' . TPL::getSnippet('sRowHead') . ' align="right">failed</td>' .
+                $html .= '<tr>'.
+                          '<td '.sprintf(TPL::getSnippet('sTableBackupStatusColumn'), $color).' colspan="4">'.
+                          sprintf('backup <em>%s</em>', $backup->getName()).
+                          ' <span '.TPL::getSnippet('sTableBackupStatusText').'>'.$status.'</span>'.
+                          '</td>'.
+                         '</tr>'.
+                         '<tr>'.
+                          '<td '.TPL::getSnippet('sRowHead').'>&nbsp;</td>'.
+                          '<td '.TPL::getSnippet('sRowHead').' align="right">executed</td>'.
+                          '<td '.TPL::getSnippet('sRowHead').' align="right">skipped</td>'.
+                          '<td '.TPL::getSnippet('sRowHead').' align="right">failed</td>'.
                          '</tr>';
 
-                $html .= '<tr>' .
-                          '<td ' . TPL::getSnippet('sRowCheck') . '>checks</td>' .
-                          '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
-                            $backup->checkCount() . '
+                $html .= '<tr>'.
+                          '<td '.TPL::getSnippet('sRowCheck').'>checks</td>'.
+                          '<td '.TPL::getSnippet('sRowCheck').' align="right">'.
+                            $backup->checkCount().'
                            </td>' .
-                          '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">
+                          '<td '.TPL::getSnippet('sRowCheck').' align="right">
                             &nbsp;
                            </td>' .
-                          '<td ' . TPL::getSnippet('sRowCheck') . ' align="right">' .
-                            $backup->checkCountFailed() .
-                          '</td>' .
-                         '</tr>' .
-                         '<tr>' .
-                          '<td ' . TPL::getSnippet('sRowCrypt') . '>crypts</td>' .
-                          '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
-                            $backup->cryptCount() .
-                          '</td>' .
-                          '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
-                            $backup->cryptCountSkipped() .
-                          '</td>' .
-                          '<td ' . TPL::getSnippet('sRowCrypt') . ' align="right">' .
-                            $backup->cryptCountFailed() .
-                          '</td>' .
-                         '</tr>' .
-                         '<tr>' .
-                          '<td ' . TPL::getSnippet('sRowSync') . '>syncs</td>' .
-                          '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
-                            $backup->syncCount() . '</td>' .
-                          '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
-                            $backup->syncCountSkipped() .
-                          '</td>' .
-                          '<td ' . TPL::getSnippet('sRowSync') . ' align="right">' .
-                            $backup->syncCountFailed() .
-                          '</td>' .
-                         '</tr>' .
-                         '<tr>' .
-                          '<td ' . TPL::getSnippet('sRowCleanup') . '>cleanups</td>' .
-                          '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
-                            $backup->cleanupCount() .
-                          '</td>' .
-                          '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
-                            $backup->cleanupCountSkipped() .
-                          '</td>' .
-                          '<td ' . TPL::getSnippet('sRowCleanup') . ' align="right">' .
-                            $backup->cleanupCountFailed() .
-                          '</td>' .
+                          '<td '.TPL::getSnippet('sRowCheck').' align="right">'.
+                            $backup->checkCountFailed().
+                          '</td>'.
+                         '</tr>'.
+                         '<tr>'.
+                          '<td '.TPL::getSnippet('sRowCrypt').'>crypts</td>'.
+                          '<td '.TPL::getSnippet('sRowCrypt').' align="right">'.
+                            $backup->cryptCount().
+                          '</td>'.
+                          '<td '.TPL::getSnippet('sRowCrypt').' align="right">'.
+                            $backup->cryptCountSkipped().
+                          '</td>'.
+                          '<td '.TPL::getSnippet('sRowCrypt').' align="right">'.
+                            $backup->cryptCountFailed().
+                          '</td>'.
+                         '</tr>'.
+                         '<tr>'.
+                          '<td '.TPL::getSnippet('sRowSync').'>syncs</td>'.
+                          '<td '.TPL::getSnippet('sRowSync').' align="right">'.
+                            $backup->syncCount().'</td>'.
+                          '<td '.TPL::getSnippet('sRowSync').' align="right">'.
+                            $backup->syncCountSkipped().
+                          '</td>'.
+                          '<td '.TPL::getSnippet('sRowSync').' align="right">'.
+                            $backup->syncCountFailed().
+                          '</td>'.
+                         '</tr>'.
+                         '<tr>'.
+                          '<td '.TPL::getSnippet('sRowCleanup').'>cleanups</td>'.
+                          '<td '.TPL::getSnippet('sRowCleanup').' align="right">'.
+                            $backup->cleanupCount().
+                          '</td>'.
+                          '<td '.TPL::getSnippet('sRowCleanup').' align="right">'.
+                            $backup->cleanupCountSkipped().
+                          '</td>'.
+                          '<td '.TPL::getSnippet('sRowCleanup').' align="right">'.
+                            $backup->cleanupCountFailed().
+                          '</td>'.
                          '</tr>';
 
             }
@@ -526,7 +526,7 @@ 
      */
     protected function getFooterHtml()
     {
-        return '<p ' . TPL::getSnippet('sStats') . '>' . PHP_Timer::resourceUsage() . '</p>' .
+        return '<p '.TPL::getSnippet('sStats').'>'.PHP_Timer::resourceUsage().'</p>'.
                '</td></tr></table>';
     }
 }

src/Log/MailTemplate.php

Spacing +23 added lines, -23 removed lines

@@ -47,39 +47,39 @@
     public static function setDefaultSnippets()
     {
         self::setSnippets(array(
-            'sBody'                    => 'style="font-family: Arial, Helvetica, sans-serif; ' .
-                                                 'background-color:#343b43; ' .
-                                                 'font-size: 15px; margin:0; ' .
+            'sBody'                    => 'style="font-family: Arial, Helvetica, sans-serif; '.
+                                                 'background-color:#343b43; '.
+                                                 'font-size: 15px; margin:0; '.
                                                  'padding:0;"',
-            'sTableHeader'             => 'style="width:100%; ' .
-                                                 'font-family: Arial, Helvetica, sans-serif; ' .
-                                                 'margin:0; color:#e6e6e6;" ' .
+            'sTableHeader'             => 'style="width:100%; '.
+                                                 'font-family: Arial, Helvetica, sans-serif; '.
+                                                 'margin:0; color:#e6e6e6;" '.
                                           'align="center" cellpadding="5" cellspacing="0"',
-            'sTableError'              => 'style="width:100%; ' .
-                                                 'background-color:#e6e6e6; ' .
-                                                 'margin:0 auto 15px; ' .
-                                                 'border:1px solid #011516;" ' .
+            'sTableError'              => 'style="width:100%; '.
+                                                 'background-color:#e6e6e6; '.
+                                                 'margin:0 auto 15px; '.
+                                                 'border:1px solid #011516;" '.
                                           'align="center" cellpadding="5" cellspacing="0"',
-            'sTableErrorCol'           => 'style="border-top: 1px solid #f6f6f6; ' .
+            'sTableErrorCol'           => 'style="border-top: 1px solid #f6f6f6; '.
                                                  'border-bottom: 1px solid #c9c9c9;"',
-            'sTableContent'            => 'style="width:380px; ' .
-                                                 'font-family: Arial, Helvetica, sans-serif; ' .
-                                                 'margin:0 auto;" ' .
+            'sTableContent'            => 'style="width:380px; '.
+                                                 'font-family: Arial, Helvetica, sans-serif; '.
+                                                 'margin:0 auto;" '.
                                           'align="center" cellpadding="0" cellspacing="0"',
             'sTableContentCol'         => 'style="padding:0 10px;"',
-            'sTableStatus'             => 'style="background-color:#%s; ' .
-                                                 'width:100%%; ' .
-                                                 'margin:0 auto 15px; ' .
-                                                 'border:1px solid #011516;" ' .
+            'sTableStatus'             => 'style="background-color:#%s; '.
+                                                 'width:100%%; '.
+                                                 'margin:0 auto 15px; '.
+                                                 'border:1px solid #011516;" '.
                                           'align="center" cellpadding="10" cellspacing="0"',
             'sTableStatusHead'         => 'style="margin:0;"',
             'sTableStatusText'         => 'style="font-size:16px;"',
-            'sTableBackup'             => 'style="width:100%; font-family: Arial, Helvetica, sans-serif; ' .
-                                                 'background-color:#e6e6e6; ' .
-                                                 'margin:0 0 15px; ' .
-                                                 'border:1px solid #011516;" ' .
+            'sTableBackup'             => 'style="width:100%; font-family: Arial, Helvetica, sans-serif; '.
+                                                 'background-color:#e6e6e6; '.
+                                                 'margin:0 0 15px; '.
+                                                 'border:1px solid #011516;" '.
                                           'align="center" cellpadding="5" cellspacing="0" width="100%"',
-            'sTableBackupStatusColumn' => 'style="background-color:#%s; ' .
+            'sTableBackupStatusColumn' => 'style="background-color:#%s; '.
                                                  'border-bottom:1px solid #747474;"',
             'sTableBackupStatusText'   => 'style="float:right;"',
             'sRowHead'                 => 'style="border-top: 1px solid #f6f6f6; border-bottom: 1px solid #c9c9c9;"',

build/phar-manifest.php

Spacing +4 added lines, -4 removed lines

@@ -9,17 +9,17 @@
 } 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'));
 $packages = array_merge($lock->packages, $lock->{"packages-dev"});
 
 foreach ($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;
 }

build/phar-patch.php

Spacing +4 added lines, -4 removed lines

@@ -6,7 +6,7 @@ 
 $replacements = array();
 
 foreach ($patches as $file) {
-    echo 'patching file: ' . $file['path'] . "...";
+    echo 'patching file: '.$file['path']."...";
     file_put_contents(
         $file['path'],
         str_replace(
@@ -15,11 +15,11 @@ 
             file_get_contents($file['path'])
         )
     );
-    echo ' done' . PHP_EOL;
+    echo ' done'.PHP_EOL;
 };
 
 foreach ($replacements as $file) {
-    echo 'replacing file: ' . $file['path'] . "...";
+    echo 'replacing file: '.$file['path']."...";
     file_put_contents($file['path'], $file['content']);
-    echo ' done' . PHP_EOL;
+    echo ' done'.PHP_EOL;
 }

build/phar-version.php

Spacing +3 added lines, -3 removed lines

@@ -11,11 +11,11 @@
 }
 
 file_put_contents(
-    __DIR__ . '/phar/Version.php',
+    __DIR__.'/phar/Version.php',
     str_replace(
         'private static $pharVersion;',
-        'private static $pharVersion = "' . $version . '";',
-        file_get_contents(__DIR__ . '/phar/Version.php')
+        'private static $pharVersion = "'.$version.'";',
+        file_get_contents(__DIR__.'/phar/Version.php')
     )
 );
 

src/Backup/Sync/AmazonS3v3.php

Spacing +3 added lines, -3 removed lines

@@ -62,8 +62,8 @@ 
     {
         $s3->registerStreamWrapper();
         $source = $this->getFileHandle($target->getPathname(), 'r');
-        $stream = $this->getFileHandle('s3://' . $this->bucket . '/' . $this->getUploadPath($target), 'w');
-        while(!feof($source)) {
+        $stream = $this->getFileHandle('s3://'.$this->bucket.'/'.$this->getUploadPath($target), 'w');
+        while (!feof($source)) {
             fwrite($stream, fread($source, 4096));
         }
         fclose($stream);
@@ -97,7 +97,7 @@ 
     {
         $handle = fopen($path, $mode);
         if (!is_resource($handle)) {
-            throw new Exception('fopen failed: could not open stream ' . $path);
+            throw new Exception('fopen failed: could not open stream '.$path);
         }
         return $handle;
     }

src/Backup/Source/Rsync.php

Spacing +1 added lines, -1 removed lines

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

src/Cli/Executable/Rsync.php

Spacing +1 added lines, -1 removed lines

@@ -216,7 +216,7 @@
             }
 
             // use archive mode, verbose and compress if not already done
-            $options = '-av' . ($this->compressed ? 'z' : '');
+            $options = '-av'.($this->compressed ? 'z' : '');
             $cmd->addOption($options);
 
             if (count($this->excludes)) {