@@ -64,14 +64,14 @@ |
||
| 64 | 64 | public function compress(Target $target, Result $result) : string |
| 65 | 65 | { |
| 66 | 66 | if (!$this->isPathValid($this->path)) { |
| 67 | - throw new Exception('path to compress should be valid: ' . $this->path); |
|
| 67 | + throw new Exception('path to compress should be valid: '.$this->path); |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | $res = $this->execute($target); |
| 71 | 71 | $result->debug($res->getCmd()); |
| 72 | 72 | |
| 73 | 73 | if (!$res->isSuccessful()) { |
| 74 | - throw new Exception('Failed to \'compress\' file: ' . $this->path); |
|
| 74 | + throw new Exception('Failed to \'compress\' file: '.$this->path); |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | return $this->getArchiveFile($target); |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | $ret = self::EXIT_EXCEPTION; |
| 99 | 99 | } |
| 100 | 100 | } catch (\Exception $e) { |
| 101 | - echo $e->getMessage() . PHP_EOL; |
|
| 101 | + echo $e->getMessage().PHP_EOL; |
|
| 102 | 102 | $ret = self::EXIT_EXCEPTION; |
| 103 | 103 | } |
| 104 | 104 | |
@@ -219,7 +219,7 @@ discard block |
||
| 219 | 219 | foreach ($settingsToOverride as $arg) { |
| 220 | 220 | $value = Arr::getValue($this->arguments, $arg); |
| 221 | 221 | if (!empty($value)) { |
| 222 | - $setter = 'set' . ucfirst($arg); |
|
| 222 | + $setter = 'set'.ucfirst($arg); |
|
| 223 | 223 | $configuration->{$setter}($value); |
| 224 | 224 | } |
| 225 | 225 | } |
@@ -235,21 +235,21 @@ discard block |
||
| 235 | 235 | // check if upgrade is necessary |
| 236 | 236 | $latestVersion = $this->getLatestVersion(); |
| 237 | 237 | if (!$this->isPharOutdated($latestVersion)) { |
| 238 | - echo 'You already have the latest version of phpbu installed.' . PHP_EOL; |
|
| 238 | + echo 'You already have the latest version of phpbu installed.'.PHP_EOL; |
|
| 239 | 239 | exit(self::EXIT_SUCCESS); |
| 240 | 240 | } |
| 241 | 241 | |
| 242 | 242 | $remoteFilename = 'http://phar.phpbu.de/phpbu.phar'; |
| 243 | 243 | $localFilename = realpath($_SERVER['argv'][0]); |
| 244 | - $tempFilename = basename($localFilename, '.phar') . '-temp.phar'; |
|
| 244 | + $tempFilename = basename($localFilename, '.phar').'-temp.phar'; |
|
| 245 | 245 | |
| 246 | - echo 'Updating the phpbu PHAR to version ' . $latestVersion . ' ... '; |
|
| 246 | + echo 'Updating the phpbu PHAR to version '.$latestVersion.' ... '; |
|
| 247 | 247 | |
| 248 | 248 | $old = error_reporting(0); |
| 249 | 249 | $phar = file_get_contents($remoteFilename); |
| 250 | 250 | error_reporting($old); |
| 251 | 251 | if (!$phar) { |
| 252 | - echo ' failed' . PHP_EOL . 'Could not reach phpbu update site' . PHP_EOL; |
|
| 252 | + echo ' failed'.PHP_EOL.'Could not reach phpbu update site'.PHP_EOL; |
|
| 253 | 253 | exit(self::EXIT_EXCEPTION); |
| 254 | 254 | } |
| 255 | 255 | file_put_contents($tempFilename, $phar); |
@@ -265,11 +265,11 @@ discard block |
||
| 265 | 265 | } catch (Exception $e) { |
| 266 | 266 | // cleanup crappy phar |
| 267 | 267 | unlink($tempFilename); |
| 268 | - echo 'failed' . PHP_EOL . $e->getMessage() . PHP_EOL; |
|
| 268 | + echo 'failed'.PHP_EOL.$e->getMessage().PHP_EOL; |
|
| 269 | 269 | exit(self::EXIT_EXCEPTION); |
| 270 | 270 | } |
| 271 | 271 | |
| 272 | - echo 'done' . PHP_EOL; |
|
| 272 | + echo 'done'.PHP_EOL; |
|
| 273 | 273 | } |
| 274 | 274 | |
| 275 | 275 | /** |
@@ -281,10 +281,10 @@ discard block |
||
| 281 | 281 | |
| 282 | 282 | $latestVersion = $this->getLatestVersion(); |
| 283 | 283 | if ($this->isPharOutdated($latestVersion)) { |
| 284 | - print 'You are not using the latest version of phpbu.' . PHP_EOL |
|
| 285 | - . 'Use "phpbu --self-update" to install phpbu ' . $latestVersion . PHP_EOL; |
|
| 284 | + print 'You are not using the latest version of phpbu.'.PHP_EOL |
|
| 285 | + . 'Use "phpbu --self-update" to install phpbu '.$latestVersion.PHP_EOL; |
|
| 286 | 286 | } else { |
| 287 | - print 'You are using the latest version of phpbu.' . PHP_EOL; |
|
| 287 | + print 'You are using the latest version of phpbu.'.PHP_EOL; |
|
| 288 | 288 | } |
| 289 | 289 | } |
| 290 | 290 | |
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | $version = file_get_contents('https://phar.phpbu.de/latest-version-of/phpbu'); |
| 301 | 301 | error_reporting($old); |
| 302 | 302 | if (!$version) { |
| 303 | - echo 'Network-Error: Could not check latest version.' . PHP_EOL; |
|
| 303 | + echo 'Network-Error: Could not check latest version.'.PHP_EOL; |
|
| 304 | 304 | exit(self::EXIT_EXCEPTION); |
| 305 | 305 | } |
| 306 | 306 | return $version; |
@@ -326,7 +326,7 @@ discard block |
||
| 326 | 326 | return; |
| 327 | 327 | } |
| 328 | 328 | |
| 329 | - echo Version::getVersionString() . PHP_EOL . PHP_EOL; |
|
| 329 | + echo Version::getVersionString().PHP_EOL.PHP_EOL; |
|
| 330 | 330 | $this->isVersionStringPrinted = true; |
| 331 | 331 | } |
| 332 | 332 | |
@@ -351,8 +351,8 @@ discard block |
||
| 351 | 351 | |
| 352 | 352 | EOT; |
| 353 | 353 | if ($this->isPhar) { |
| 354 | - echo ' --version-check Check whether phpbu is up to date.' . PHP_EOL; |
|
| 355 | - echo ' --self-update Upgrade phpbu to the latest version.' . PHP_EOL; |
|
| 354 | + echo ' --version-check Check whether phpbu is up to date.'.PHP_EOL; |
|
| 355 | + echo ' --self-update Upgrade phpbu to the latest version.'.PHP_EOL; |
|
| 356 | 356 | } |
| 357 | 357 | } |
| 358 | 358 | |
@@ -366,7 +366,7 @@ discard block |
||
| 366 | 366 | { |
| 367 | 367 | $help = $hint ? ', use "phpbu -h" for help' : ''; |
| 368 | 368 | $this->printVersionString(); |
| 369 | - echo $message . $help . PHP_EOL; |
|
| 369 | + echo $message.$help.PHP_EOL; |
|
| 370 | 370 | exit(self::EXIT_EXCEPTION); |
| 371 | 371 | } |
| 372 | 372 | |
@@ -48,10 +48,10 @@ |
||
| 48 | 48 | } |
| 49 | 49 | /** @var \Kunnu\Dropbox\Models\FileMetadata $item */ |
| 50 | 50 | // skip currently created backup |
| 51 | - if ($item->getPathDisplay() == $this->path . $this->target->getFilename()) { |
|
| 51 | + if ($item->getPathDisplay() == $this->path.$this->target->getFilename()) { |
|
| 52 | 52 | continue; |
| 53 | 53 | } |
| 54 | - if (preg_match('#' . $this->fileRegex . '#i', $item->getName())) { |
|
| 54 | + if (preg_match('#'.$this->fileRegex.'#i', $item->getName())) { |
|
| 55 | 55 | $this->files[] = new \phpbu\App\Backup\File\Dropbox($this->client, $item); |
| 56 | 56 | } |
| 57 | 57 | } |
@@ -110,8 +110,8 @@ discard block |
||
| 110 | 110 | if ($file->getPathname() == $this->target->getPathname()) { |
| 111 | 111 | continue; |
| 112 | 112 | } |
| 113 | - if (preg_match('#' . $this->fileRegex . '#i', $file->getFilename())) { |
|
| 114 | - $index = date('YmdHis', $file->getMTime()) . '-' . $i . '-' . $file->getPathname(); |
|
| 113 | + if (preg_match('#'.$this->fileRegex.'#i', $file->getFilename())) { |
|
| 114 | + $index = date('YmdHis', $file->getMTime()).'-'.$i.'-'.$file->getPathname(); |
|
| 115 | 115 | $this->files[$index] = new FileLocal($file->getFileInfo()); |
| 116 | 116 | } |
| 117 | 117 | } |
@@ -140,6 +140,6 @@ discard block |
||
| 140 | 140 | { |
| 141 | 141 | $dirTarget = Arr::getValue($this->target->getChangingPathElements(), $depth); |
| 142 | 142 | $dirRegex = Str::datePlaceholdersToRegex($dirTarget); |
| 143 | - return preg_match('#' . $dirRegex . '#i', $dir); |
|
| 143 | + return preg_match('#'.$dirRegex.'#i', $dir); |
|
| 144 | 144 | } |
| 145 | 145 | } |
@@ -52,10 +52,10 @@ |
||
| 52 | 52 | continue; |
| 53 | 53 | } |
| 54 | 54 | // skip currently created backup |
| 55 | - if ($object->name == $this->path . $this->target->getFilename()) { |
|
| 55 | + if ($object->name == $this->path.$this->target->getFilename()) { |
|
| 56 | 56 | continue; |
| 57 | 57 | } |
| 58 | - if (preg_match('#' . $this->fileRegex . '#i', basename($object->name))) { |
|
| 58 | + if (preg_match('#'.$this->fileRegex.'#i', basename($object->name))) { |
|
| 59 | 59 | $this->files[] = new \phpbu\App\Backup\File\OpenStack($this->container, $object); |
| 60 | 60 | } |
| 61 | 61 | } |
@@ -47,7 +47,7 @@ |
||
| 47 | 47 | public function getSimulateInfo(): string |
| 48 | 48 | { |
| 49 | 49 | if ($this->cleaner) { |
| 50 | - return " sync cleanup: {$this->cleanupConfig->type}" . PHP_EOL; |
|
| 50 | + return " sync cleanup: {$this->cleanupConfig->type}".PHP_EOL; |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | return ''; |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | public function sync(Target $target, Result $result) |
| 91 | 91 | { |
| 92 | 92 | $sourcePath = $target->getPathname(); |
| 93 | - $dropboxPath = $this->path . $target->getFilename(); |
|
| 93 | + $dropboxPath = $this->path.$target->getFilename(); |
|
| 94 | 94 | if (!$this->client) { |
| 95 | 95 | $this->connect(); |
| 96 | 96 | } |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | } |
| 103 | 103 | // run remote cleanup |
| 104 | 104 | $this->cleanup($target, $result); |
| 105 | - $result->debug('upload: done (' . $meta->getSize() . ')'); |
|
| 105 | + $result->debug('upload: done ('.$meta->getSize().')'); |
|
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | /** |
@@ -114,9 +114,9 @@ discard block |
||
| 114 | 114 | public function simulate(Target $target, Result $result) |
| 115 | 115 | { |
| 116 | 116 | $result->debug( |
| 117 | - 'sync backup to dropbox' . PHP_EOL |
|
| 118 | - . ' token: ********' . PHP_EOL |
|
| 119 | - . ' location: ' . $this->path . PHP_EOL |
|
| 117 | + 'sync backup to dropbox'.PHP_EOL |
|
| 118 | + . ' token: ********'.PHP_EOL |
|
| 119 | + . ' location: '.$this->path.PHP_EOL |
|
| 120 | 120 | . $this->getSimulateInfo() |
| 121 | 121 | ); |
| 122 | 122 | } |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | { |
| 136 | 136 | foreach (['auth_url', 'region', 'username', 'password', 'container_name'] as $option) { |
| 137 | 137 | if (!Arr::isSetAndNotEmptyString($config, $option)) { |
| 138 | - throw new Exception($option . ' is mandatory'); |
|
| 138 | + throw new Exception($option.' is mandatory'); |
|
| 139 | 139 | } |
| 140 | 140 | } |
| 141 | 141 | } |
@@ -188,12 +188,12 @@ discard block |
||
| 188 | 188 | public function simulate(Target $target, Result $result) |
| 189 | 189 | { |
| 190 | 190 | $result->debug( |
| 191 | - 'sync backup to OpenStack' . PHP_EOL |
|
| 192 | - . ' region: ' . $this->region . PHP_EOL |
|
| 193 | - . ' key: ' . $this->username . PHP_EOL |
|
| 194 | - . ' password: ********' . PHP_EOL |
|
| 195 | - . ' container: ' . $this->containerName |
|
| 196 | - . ' path: "' . $this->path . '"' . PHP_EOL |
|
| 191 | + 'sync backup to OpenStack'.PHP_EOL |
|
| 192 | + . ' region: '.$this->region.PHP_EOL |
|
| 193 | + . ' key: '.$this->username.PHP_EOL |
|
| 194 | + . ' password: ********'.PHP_EOL |
|
| 195 | + . ' container: '.$this->containerName |
|
| 196 | + . ' path: "'.$this->path.'"'.PHP_EOL |
|
| 197 | 197 | . $this->getSimulateInfo() |
| 198 | 198 | ); |
| 199 | 199 | } |
@@ -236,7 +236,7 @@ discard block |
||
| 236 | 236 | */ |
| 237 | 237 | public function getUploadPath(Target $target) |
| 238 | 238 | { |
| 239 | - return $this->path . $target->getFilename(); |
|
| 239 | + return $this->path.$target->getFilename(); |
|
| 240 | 240 | } |
| 241 | 241 | |
| 242 | 242 | /** |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | // check for mandatory options |
| 75 | 75 | foreach (['user', 'secret', 'container', 'host', 'path'] as $option) { |
| 76 | 76 | if (!Arr::isSetAndNotEmptyString($config, $option)) { |
| 77 | - throw new Exception('SoftLayer ' . $option . ' is mandatory'); |
|
| 77 | + throw new Exception('SoftLayer '.$option.' is mandatory'); |
|
| 78 | 78 | } |
| 79 | 79 | } |
| 80 | 80 | |
@@ -98,19 +98,19 @@ discard block |
||
| 98 | 98 | public function sync(Target $target, Result $result) |
| 99 | 99 | { |
| 100 | 100 | $sourcePath = $target->getPathname(); |
| 101 | - $targetPath = $this->path . $target->getFilename(); |
|
| 101 | + $targetPath = $this->path.$target->getFilename(); |
|
| 102 | 102 | |
| 103 | 103 | $options = ['adapter' => ObjectStorage_Http_Client::SOCKET, 'timeout' => 20]; |
| 104 | 104 | $objectStorage = new ObjectStorage($this->host, $this->user, $this->secret, $options); |
| 105 | 105 | |
| 106 | - $result->debug('softlayer source: ' . $sourcePath); |
|
| 107 | - $result->debug('softlayer target: ' . $targetPath); |
|
| 106 | + $result->debug('softlayer source: '.$sourcePath); |
|
| 107 | + $result->debug('softlayer target: '.$targetPath); |
|
| 108 | 108 | |
| 109 | 109 | try { |
| 110 | 110 | /** @var \ObjectStorage_Container $container */ |
| 111 | - $container = $objectStorage->with($this->container . $targetPath) |
|
| 111 | + $container = $objectStorage->with($this->container.$targetPath) |
|
| 112 | 112 | ->setLocalFile($sourcePath) |
| 113 | - ->setMeta('description', 'PHPBU Backup: ' . date('r', time())) |
|
| 113 | + ->setMeta('description', 'PHPBU Backup: '.date('r', time())) |
|
| 114 | 114 | ->setHeader('Content-Type', $target->getMimeType()); |
| 115 | 115 | $container->create(); |
| 116 | 116 | } catch (\Exception $e) { |
@@ -129,12 +129,12 @@ discard block |
||
| 129 | 129 | public function simulate(Target $target, Result $result) |
| 130 | 130 | { |
| 131 | 131 | $result->debug( |
| 132 | - 'sync backup to SoftLayer' . PHP_EOL |
|
| 133 | - . ' host: ' . $this->host . PHP_EOL |
|
| 134 | - . ' user: ' . $this->user . PHP_EOL |
|
| 135 | - . ' secret: ********' . PHP_EOL |
|
| 136 | - . ' container: ' . $this->container . PHP_EOL |
|
| 137 | - . ' location: ' . $this->path |
|
| 132 | + 'sync backup to SoftLayer'.PHP_EOL |
|
| 133 | + . ' host: '.$this->host.PHP_EOL |
|
| 134 | + . ' user: '.$this->user.PHP_EOL |
|
| 135 | + . ' secret: ********'.PHP_EOL |
|
| 136 | + . ' container: '.$this->container.PHP_EOL |
|
| 137 | + . ' location: '.$this->path |
|
| 138 | 138 | ); |
| 139 | 139 | } |
| 140 | 140 | |