@@ -76,7 +76,7 @@ discard block |
||
| 76 | 76 | public function sync(Target $target, Result $result) |
| 77 | 77 | { |
| 78 | 78 | $sourcePath = $target->getPathname(); |
| 79 | - $dropboxPath = $this->path . $target->getFilename(); |
|
| 79 | + $dropboxPath = $this->path.$target->getFilename(); |
|
| 80 | 80 | $client = new DropboxApi\Client($this->token, "phpbu/1.1.0"); |
| 81 | 81 | $pathError = DropboxApi\Path::findErrorNonRoot($dropboxPath); |
| 82 | 82 | |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | } catch (\Exception $e) { |
| 101 | 101 | throw new Exception($e->getMessage(), null, $e); |
| 102 | 102 | } |
| 103 | - $result->debug('upload: done (' . $res['size'] . ')'); |
|
| 103 | + $result->debug('upload: done ('.$res['size'].')'); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | /** |
@@ -112,9 +112,9 @@ discard block |
||
| 112 | 112 | public function simulate(Target $target, Result $result) |
| 113 | 113 | { |
| 114 | 114 | $result->debug( |
| 115 | - 'sync backup to dropbox' . PHP_EOL |
|
| 116 | - . ' token: ********' . PHP_EOL |
|
| 117 | - . ' location: ' . $this->path |
|
| 115 | + 'sync backup to dropbox'.PHP_EOL |
|
| 116 | + . ' token: ********'.PHP_EOL |
|
| 117 | + . ' location: '.$this->path |
|
| 118 | 118 | ); |
| 119 | 119 | } |
| 120 | 120 | } |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | $result->debug($this->getExecutable($target)->getCommandLinePrintable()); |
| 204 | 204 | |
| 205 | 205 | if (!$mysqldump->wasSuccessful()) { |
| 206 | - throw new Exception('mysqldump failed:' . $mysqldump->getStdErr()); |
|
| 206 | + throw new Exception('mysqldump failed:'.$mysqldump->getStdErr()); |
|
| 207 | 207 | } |
| 208 | 208 | |
| 209 | 209 | return $this->createStatus($target); |
@@ -258,6 +258,6 @@ discard block |
||
| 258 | 258 | */ |
| 259 | 259 | private function getDumpTarget(Target $target) |
| 260 | 260 | { |
| 261 | - return $target->getPathnamePlain() . ($this->filePerTable ? '.dump' : ''); |
|
| 261 | + return $target->getPathnamePlain().($this->filePerTable ? '.dump' : ''); |
|
| 262 | 262 | } |
| 263 | 263 | } |
@@ -228,20 +228,20 @@ |
||
| 228 | 228 | if (null == $this->executable) { |
| 229 | 229 | $this->executable = new Executable\Mysqldump($this->pathToMysqldump); |
| 230 | 230 | $this->executable->credentials($this->user, $this->password) |
| 231 | - ->useHost($this->host) |
|
| 232 | - ->useQuickMode($this->quick) |
|
| 233 | - ->lockTables($this->lockTables) |
|
| 234 | - ->dumpBlobsHexadecimal($this->hexBlob) |
|
| 235 | - ->useCompression($this->compress) |
|
| 236 | - ->useExtendedInsert($this->extendedInsert) |
|
| 237 | - ->dumpTables($this->tables) |
|
| 238 | - ->singleTransaction($this->singleTransaction) |
|
| 239 | - ->dumpDatabases($this->databases) |
|
| 240 | - ->ignoreTables($this->ignoreTables) |
|
| 241 | - ->produceFilePerTable($this->filePerTable) |
|
| 242 | - ->dumpNoData($this->noData) |
|
| 243 | - ->dumpStructureOnly($this->structureOnly) |
|
| 244 | - ->dumpTo($this->getDumpTarget($target)); |
|
| 231 | + ->useHost($this->host) |
|
| 232 | + ->useQuickMode($this->quick) |
|
| 233 | + ->lockTables($this->lockTables) |
|
| 234 | + ->dumpBlobsHexadecimal($this->hexBlob) |
|
| 235 | + ->useCompression($this->compress) |
|
| 236 | + ->useExtendedInsert($this->extendedInsert) |
|
| 237 | + ->dumpTables($this->tables) |
|
| 238 | + ->singleTransaction($this->singleTransaction) |
|
| 239 | + ->dumpDatabases($this->databases) |
|
| 240 | + ->ignoreTables($this->ignoreTables) |
|
| 241 | + ->produceFilePerTable($this->filePerTable) |
|
| 242 | + ->dumpNoData($this->noData) |
|
| 243 | + ->dumpStructureOnly($this->structureOnly) |
|
| 244 | + ->dumpTo($this->getDumpTarget($target)); |
|
| 245 | 245 | // if compression is active and commands can be piped |
| 246 | 246 | if ($this->isHandlingCompression($target)) { |
| 247 | 247 | $this->executable->compressOutput($target->getCompression()); |
@@ -101,7 +101,7 @@ |
||
| 101 | 101 | $result->debug($tar->getCmd()); |
| 102 | 102 | |
| 103 | 103 | if (!$tar->wasSuccessful()) { |
| 104 | - throw new Exception('tar failed: ' . $tar->getStdErr()); |
|
| 104 | + throw new Exception('tar failed: '.$tar->getStdErr()); |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | return $this->createStatus($target); |
@@ -141,10 +141,10 @@ |
||
| 141 | 141 | |
| 142 | 142 | $this->executable = new Executable\Tar($this->pathToTar); |
| 143 | 143 | $this->executable->archiveDirectory($this->path) |
| 144 | - ->useCompression($this->compression) |
|
| 145 | - ->ignoreFailedRead($this->ignoreFailedRead) |
|
| 146 | - ->removeSourceDirectory($this->removeSourceDir) |
|
| 147 | - ->archiveTo($this->pathToArchive); |
|
| 144 | + ->useCompression($this->compression) |
|
| 145 | + ->ignoreFailedRead($this->ignoreFailedRead) |
|
| 146 | + ->removeSourceDirectory($this->removeSourceDir) |
|
| 147 | + ->archiveTo($this->pathToArchive); |
|
| 148 | 148 | } |
| 149 | 149 | return $this->executable; |
| 150 | 150 | } |
@@ -27,7 +27,7 @@ |
||
| 27 | 27 | */ |
| 28 | 28 | public function simulate(Target $target, Result $result) |
| 29 | 29 | { |
| 30 | - $result->debug('backup data:' . PHP_EOL . $this->getExecutable($target)->getCommandLinePrintable()); |
|
| 30 | + $result->debug('backup data:'.PHP_EOL.$this->getExecutable($target)->getCommandLinePrintable()); |
|
| 31 | 31 | |
| 32 | 32 | return $this->createStatus($target); |
| 33 | 33 | } |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | public function encryptFile($file) |
| 178 | 178 | { |
| 179 | 179 | $this->sourceFile = $file; |
| 180 | - $this->targetFile = $file . '.enc'; |
|
| 180 | + $this->targetFile = $file.'.enc'; |
|
| 181 | 181 | return $this; |
| 182 | 182 | } |
| 183 | 183 | |
@@ -310,7 +310,7 @@ discard block |
||
| 310 | 310 | { |
| 311 | 311 | $cmd->addOption('smime'); |
| 312 | 312 | $cmd->addOption('-encrypt'); |
| 313 | - $cmd->addOption('-' . $this->algorithm); |
|
| 313 | + $cmd->addOption('-'.$this->algorithm); |
|
| 314 | 314 | $cmd->addOption('-binary'); |
| 315 | 315 | $cmd->addOption('-in', $this->sourceFile, ' '); |
| 316 | 316 | $cmd->addOption('-out', $this->targetFile, ' '); |
@@ -325,12 +325,12 @@ discard block |
||
| 325 | 325 | */ |
| 326 | 326 | protected function setPasswordOptions(Cmd $cmd) |
| 327 | 327 | { |
| 328 | - $password = 'pass:' . $this->password; |
|
| 328 | + $password = 'pass:'.$this->password; |
|
| 329 | 329 | |
| 330 | 330 | $cmd->addOption('enc'); |
| 331 | 331 | $cmd->addOption('-e'); |
| 332 | 332 | $cmd->addOptionIfNotEmpty('-a', $this->base64, false); |
| 333 | - $cmd->addOption('-' . $this->algorithm); |
|
| 333 | + $cmd->addOption('-'.$this->algorithm); |
|
| 334 | 334 | $cmd->addOption('-pass', $password, ' '); |
| 335 | 335 | $cmd->addOption('-in', $this->sourceFile, ' '); |
| 336 | 336 | $cmd->addOption('-out', $this->targetFile, ' '); |
@@ -150,7 +150,7 @@ |
||
| 150 | 150 | $process = new Process(); |
| 151 | 151 | $tar = new Cmd($this->binary); |
| 152 | 152 | |
| 153 | - $tar->addOption('-' . $this->compression . 'cf'); |
|
| 153 | + $tar->addOption('-'.$this->compression.'cf'); |
|
| 154 | 154 | $tar->addArgument($this->tarPathname); |
| 155 | 155 | $tar->addOption('-C', dirname($this->path), ' '); |
| 156 | 156 | $tar->addArgument(basename(($this->path))); |
@@ -180,13 +180,13 @@ discard block |
||
| 180 | 180 | |
| 181 | 181 | // make sure there is a scheme |
| 182 | 182 | if (!isset($parsed['scheme'])) { |
| 183 | - $parsed = parse_url('http://' . $host); |
|
| 183 | + $parsed = parse_url('http://'.$host); |
|
| 184 | 184 | } |
| 185 | 185 | |
| 186 | - $url = $parsed['scheme'] . '://' . $this->getAuthUrlSnippet($user, $password) . $parsed['host']; |
|
| 186 | + $url = $parsed['scheme'].'://'.$this->getAuthUrlSnippet($user, $password).$parsed['host']; |
|
| 187 | 187 | |
| 188 | 188 | if (isset($parsed['port'])) { |
| 189 | - $url .= ':' . $parsed['port']; |
|
| 189 | + $url .= ':'.$parsed['port']; |
|
| 190 | 190 | } |
| 191 | 191 | |
| 192 | 192 | if (!empty($parsed['path'])) { |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | $url = $user; |
| 215 | 215 | |
| 216 | 216 | if (!empty($password)) { |
| 217 | - $url .= ':' . $password; |
|
| 217 | + $url .= ':'.$password; |
|
| 218 | 218 | } |
| 219 | 219 | |
| 220 | 220 | if (!empty($url)) { |
@@ -453,8 +453,8 @@ |
||
| 453 | 453 | protected function createProcess() |
| 454 | 454 | { |
| 455 | 455 | $process = new Process(); |
| 456 | - $password = $this->password ? 'PGPASSWORD=' . escapeshellarg($this->password) . ' ' : ''; |
|
| 457 | - $cmd = new Cmd($password . $this->binary); |
|
| 456 | + $password = $this->password ? 'PGPASSWORD='.escapeshellarg($this->password).' ' : ''; |
|
| 457 | + $cmd = new Cmd($password.$this->binary); |
|
| 458 | 458 | $process->addCommand($cmd); |
| 459 | 459 | |
| 460 | 460 | // always disable password prompt |
@@ -53,8 +53,8 @@ discard block |
||
| 53 | 53 | public function getCommandLine() |
| 54 | 54 | { |
| 55 | 55 | return $this->cmd |
| 56 | - . (count($this->options) ? ' ' . implode(' ', $this->options) : '') |
|
| 57 | - . ($this->isSilent ? ' 2> /dev/null' : ''); |
|
| 56 | + . (count($this->options) ? ' '.implode(' ', $this->options) : '') |
|
| 57 | + . ($this->isSilent ? ' 2> /dev/null' : ''); |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | /** |
@@ -86,11 +86,11 @@ discard block |
||
| 86 | 86 | if (is_array($argument)) { |
| 87 | 87 | $glue = ' '; |
| 88 | 88 | } |
| 89 | - $argument = $glue . $this->escapeArgument($argument); |
|
| 89 | + $argument = $glue.$this->escapeArgument($argument); |
|
| 90 | 90 | } else { |
| 91 | 91 | $argument = ''; |
| 92 | 92 | } |
| 93 | - $this->options[] = $option . $argument; |
|
| 93 | + $this->options[] = $option.$argument; |
|
| 94 | 94 | |
| 95 | 95 | return $this; |
| 96 | 96 | } |