@@ -116,9 +116,9 @@ |
||
116 | 116 | try { |
117 | 117 | /** @var \ObjectStorage_Container $container */ |
118 | 118 | $container = $objectStorage->with($this->container . $targetPath) |
119 | - ->setLocalFile($sourcePath) |
|
120 | - ->setMeta('description', 'PHPBU Backup: ' . date('r', time())) |
|
121 | - ->setHeader('Content-Type', $target->getMimeType()); |
|
119 | + ->setLocalFile($sourcePath) |
|
120 | + ->setMeta('description', 'PHPBU Backup: ' . date('r', time())) |
|
121 | + ->setHeader('Content-Type', $target->getMimeType()); |
|
122 | 122 | $container->create(); |
123 | 123 | } catch (\Exception $e) { |
124 | 124 | throw new Exception($e->getMessage(), null, $e); |
@@ -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 |
@@ -32,7 +32,7 @@ |
||
32 | 32 | public function sync(Target $target, Result $result) |
33 | 33 | { |
34 | 34 | $sourcePath = $target->getPathname(); |
35 | - $targetPath = $this->path . $target->getFilename(); |
|
35 | + $targetPath = $this->path.$target->getFilename(); |
|
36 | 36 | |
37 | 37 | $s3 = S3Client::factory( |
38 | 38 | [ |
@@ -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)) { |
@@ -381,7 +381,7 @@ discard block |
||
381 | 381 | $loaded = $document->loadXML($contents); |
382 | 382 | |
383 | 383 | foreach (libxml_get_errors() as $error) { |
384 | - $message .= "\n" . $error->message; |
|
384 | + $message .= "\n".$error->message; |
|
385 | 385 | } |
386 | 386 | |
387 | 387 | libxml_use_internal_errors($internal); |
@@ -392,7 +392,7 @@ discard block |
||
392 | 392 | sprintf( |
393 | 393 | 'Error loading file "%s".%s', |
394 | 394 | $filename, |
395 | - $message != '' ? "\n" . $message : '' |
|
395 | + $message != '' ? "\n".$message : '' |
|
396 | 396 | ) |
397 | 397 | ); |
398 | 398 | } |
@@ -101,9 +101,9 @@ discard block |
||
101 | 101 | public function parseShortOption($arg, array &$options) |
102 | 102 | { |
103 | 103 | if (!isset($this->shortOptions[$arg])) { |
104 | - throw new Exception('unknown option: -' . $arg); |
|
104 | + throw new Exception('unknown option: -'.$arg); |
|
105 | 105 | } |
106 | - $options['-' . $arg] = true; |
|
106 | + $options['-'.$arg] = true; |
|
107 | 107 | } |
108 | 108 | |
109 | 109 | /** |
@@ -123,17 +123,17 @@ discard block |
||
123 | 123 | $argument = $list[1]; |
124 | 124 | } |
125 | 125 | if (count($list) > 2) { |
126 | - throw new Exception('invalid value for option: --' . $arg); |
|
126 | + throw new Exception('invalid value for option: --'.$arg); |
|
127 | 127 | } |
128 | - if (!isset($this->longOptions[$option]) && !isset($this->longOptions[$option . '='])) { |
|
129 | - throw new Exception('unknown option: --' . $option); |
|
128 | + if (!isset($this->longOptions[$option]) && !isset($this->longOptions[$option.'='])) { |
|
129 | + throw new Exception('unknown option: --'.$option); |
|
130 | 130 | } |
131 | - if ($argument === true && isset($this->longOptions[$option . '='])) { |
|
132 | - throw new Exception('argument required for option: --' . $option); |
|
131 | + if ($argument === true && isset($this->longOptions[$option.'='])) { |
|
132 | + throw new Exception('argument required for option: --'.$option); |
|
133 | 133 | } |
134 | 134 | if ($argument !== true && isset($this->longOptions[$option])) { |
135 | - throw new Exception('needless argument for option: --' . $option); |
|
135 | + throw new Exception('needless argument for option: --'.$option); |
|
136 | 136 | } |
137 | - $options['--' . $option] = $argument; |
|
137 | + $options['--'.$option] = $argument; |
|
138 | 138 | } |
139 | 139 | } |
@@ -6,7 +6,7 @@ discard block |
||
6 | 6 | $replacements = array(); |
7 | 7 | |
8 | 8 | foreach ($patches as $file) { |
9 | - echo 'patching file: ' . $file['path'] . "..."; |
|
9 | + echo 'patching file: '.$file['path']."..."; |
|
10 | 10 | file_put_contents( |
11 | 11 | $file['path'], |
12 | 12 | str_replace( |
@@ -15,11 +15,11 @@ discard block |
||
15 | 15 | file_get_contents($file['path']) |
16 | 16 | ) |
17 | 17 | ); |
18 | - echo ' done' . PHP_EOL; |
|
18 | + echo ' done'.PHP_EOL; |
|
19 | 19 | }; |
20 | 20 | |
21 | 21 | foreach ($replacements as $file) { |
22 | - echo 'replacing file: ' . $file['path'] . "..."; |
|
22 | + echo 'replacing file: '.$file['path']."..."; |
|
23 | 23 | file_put_contents($file['path'], $file['content']); |
24 | - echo ' done' . PHP_EOL; |
|
24 | + echo ' done'.PHP_EOL; |
|
25 | 25 | } |
@@ -11,11 +11,11 @@ |
||
11 | 11 | } |
12 | 12 | |
13 | 13 | file_put_contents( |
14 | - __DIR__ . '/phar/Version.php', |
|
14 | + __DIR__.'/phar/Version.php', |
|
15 | 15 | str_replace( |
16 | 16 | 'private static $pharVersion;', |
17 | - 'private static $pharVersion = "' . $version . '";', |
|
18 | - file_get_contents(__DIR__ . '/phar/Version.php') |
|
17 | + 'private static $pharVersion = "'.$version.'";', |
|
18 | + file_get_contents(__DIR__.'/phar/Version.php') |
|
19 | 19 | ) |
20 | 20 | ); |
21 | 21 |
@@ -112,7 +112,7 @@ |
||
112 | 112 | { |
113 | 113 | // remove leading slash |
114 | 114 | return (substr($this->path, 0, 1) == '/' ? substr($this->path, 1) : $this->path) |
115 | - . (substr($this->path, -1, 1) == '/' ? '' : '/') |
|
116 | - . $target->getFilename(); |
|
115 | + . (substr($this->path, -1, 1) == '/' ? '' : '/') |
|
116 | + . $target->getFilename(); |
|
117 | 117 | } |
118 | 118 | } |
@@ -62,8 +62,8 @@ discard block |
||
62 | 62 | { |
63 | 63 | $s3->registerStreamWrapper(); |
64 | 64 | $source = $this->getFileHandle($target->getPathname(), 'r'); |
65 | - $stream = $this->getFileHandle('s3://' . $this->bucket . '/' . $this->getUploadPath($target), 'w'); |
|
66 | - while(!feof($source)) { |
|
65 | + $stream = $this->getFileHandle('s3://'.$this->bucket.'/'.$this->getUploadPath($target), 'w'); |
|
66 | + while (!feof($source)) { |
|
67 | 67 | fwrite($stream, fread($source, 4096)); |
68 | 68 | } |
69 | 69 | fclose($stream); |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | { |
98 | 98 | $handle = fopen($path, $mode); |
99 | 99 | if (!is_resource($handle)) { |
100 | - throw new Exception('fopen failed: could not open stream ' . $path); |
|
100 | + throw new Exception('fopen failed: could not open stream '.$path); |
|
101 | 101 | } |
102 | 102 | return $handle; |
103 | 103 | } |
@@ -477,7 +477,7 @@ |
||
477 | 477 | // disable output redirection if files per table is active |
478 | 478 | if (!$this->filePerTable) { |
479 | 479 | $process->redirectOutputTo( |
480 | - $this->dumpPathname . (!empty($this->compression) ? '.' . $this->compression->getSuffix() : '') |
|
480 | + $this->dumpPathname.(!empty($this->compression) ? '.'.$this->compression->getSuffix() : '') |
|
481 | 481 | ); |
482 | 482 | } |
483 | 483 | } |