@@ -114,12 +114,12 @@ |
||
114 | 114 | { |
115 | 115 | $executable = new Executable\Mcrypt((string) $this->pathToMcrypt); |
116 | 116 | $executable->useAlgorithm($this->algorithm) |
117 | - ->useKey($this->key) |
|
118 | - ->useKeyFile($this->keyFile) |
|
119 | - ->useConfig($this->config) |
|
120 | - ->useHash($this->hash) |
|
121 | - ->saveAt($target->getPathname()) |
|
122 | - ->deleteUncrypted(!$this->keepUncrypted); |
|
117 | + ->useKey($this->key) |
|
118 | + ->useKeyFile($this->keyFile) |
|
119 | + ->useConfig($this->config) |
|
120 | + ->useHash($this->hash) |
|
121 | + ->saveAt($target->getPathname()) |
|
122 | + ->deleteUncrypted(!$this->keepUncrypted); |
|
123 | 123 | return $executable; |
124 | 124 | } |
125 | 125 | } |
@@ -29,7 +29,7 @@ |
||
29 | 29 | public function sync(Target $target, Result $result) |
30 | 30 | { |
31 | 31 | $sourcePath = $target->getPathname(); |
32 | - $targetPath = $this->path . '/' . $target->getFilename(); |
|
32 | + $targetPath = $this->path . '/' . $target->getFilename(); |
|
33 | 33 | |
34 | 34 | $s3 = S3Client::factory( |
35 | 35 | [ |
@@ -48,39 +48,39 @@ |
||
48 | 48 | { |
49 | 49 | self::setSnippets([ |
50 | 50 | 'sBody' => 'style="font-family: Arial, Helvetica, sans-serif; ' . |
51 | - 'background-color:#343b43; ' . |
|
52 | - 'font-size: 15px; margin:0; ' . |
|
53 | - 'padding:0;"', |
|
51 | + 'background-color:#343b43; ' . |
|
52 | + 'font-size: 15px; margin:0; ' . |
|
53 | + 'padding:0;"', |
|
54 | 54 | 'sTableHeader' => 'style="width:100%; ' . |
55 | - 'font-family: Arial, Helvetica, sans-serif; ' . |
|
56 | - 'margin:0; color:#e6e6e6;" ' . |
|
57 | - 'align="center" cellpadding="5" cellspacing="0"', |
|
55 | + 'font-family: Arial, Helvetica, sans-serif; ' . |
|
56 | + 'margin:0; color:#e6e6e6;" ' . |
|
57 | + 'align="center" cellpadding="5" cellspacing="0"', |
|
58 | 58 | 'sTableError' => 'style="width:100%; ' . |
59 | - 'background-color:#e6e6e6; ' . |
|
60 | - 'margin:0 auto 15px; ' . |
|
61 | - 'border:1px solid #011516;" ' . |
|
62 | - 'align="center" cellpadding="5" cellspacing="0"', |
|
59 | + 'background-color:#e6e6e6; ' . |
|
60 | + 'margin:0 auto 15px; ' . |
|
61 | + 'border:1px solid #011516;" ' . |
|
62 | + 'align="center" cellpadding="5" cellspacing="0"', |
|
63 | 63 | 'sTableErrorCol' => 'style="border-top: 1px solid #f6f6f6; ' . |
64 | - 'border-bottom: 1px solid #c9c9c9;"', |
|
64 | + 'border-bottom: 1px solid #c9c9c9;"', |
|
65 | 65 | 'sTableContent' => 'style="width:420px; ' . |
66 | - 'font-family: Arial, Helvetica, sans-serif; ' . |
|
67 | - 'margin:0 auto;" ' . |
|
68 | - 'align="center" cellpadding="0" cellspacing="0"', |
|
66 | + 'font-family: Arial, Helvetica, sans-serif; ' . |
|
67 | + 'margin:0 auto;" ' . |
|
68 | + 'align="center" cellpadding="0" cellspacing="0"', |
|
69 | 69 | 'sTableContentCol' => 'style="padding:0 10px;"', |
70 | 70 | 'sTableStatus' => 'style="background-color:#%s; ' . |
71 | - 'width:100%%; ' . |
|
72 | - 'margin:0 auto 15px; ' . |
|
73 | - 'border:1px solid #011516;" ' . |
|
74 | - 'align="center" cellpadding="10" cellspacing="0"', |
|
71 | + 'width:100%%; ' . |
|
72 | + 'margin:0 auto 15px; ' . |
|
73 | + 'border:1px solid #011516;" ' . |
|
74 | + 'align="center" cellpadding="10" cellspacing="0"', |
|
75 | 75 | 'sTableStatusHead' => 'style="margin:0;"', |
76 | 76 | 'sTableStatusText' => 'style="font-size:16px;"', |
77 | 77 | 'sTableBackup' => 'style="width:100%; font-family: Arial, Helvetica, sans-serif; ' . |
78 | - 'background-color:#e6e6e6; ' . |
|
79 | - 'margin:0 0 15px; ' . |
|
80 | - 'border:1px solid #011516;" ' . |
|
81 | - 'align="center" cellpadding="5" cellspacing="0" width="100%"', |
|
78 | + 'background-color:#e6e6e6; ' . |
|
79 | + 'margin:0 0 15px; ' . |
|
80 | + 'border:1px solid #011516;" ' . |
|
81 | + 'align="center" cellpadding="5" cellspacing="0" width="100%"', |
|
82 | 82 | 'sTableBackupStatusColumn' => 'style="background-color:#%s; ' . |
83 | - 'border-bottom:1px solid #747474;"', |
|
83 | + 'border-bottom:1px solid #747474;"', |
|
84 | 84 | 'sTableBackupStatusText' => 'style="float:right;"', |
85 | 85 | 'sRowHead' => 'style="border-top: 1px solid #f6f6f6; border-bottom: 1px solid #c9c9c9;"', |
86 | 86 | 'sRowCheck' => 'style="border-top: 1px solid #f6f6f6; border-bottom: 1px solid #c9c9c9;"', |
@@ -3,7 +3,6 @@ |
||
3 | 3 | |
4 | 4 | use Google_Client as GClient; |
5 | 5 | use Google_Http_MediaFileUpload as GStream; |
6 | -use Google_Service_Drive as GDrive; |
|
7 | 6 | use Google_Service_Drive as GDriveService; |
8 | 7 | use Google_Service_Drive_DriveFile as GFile; |
9 | 8 | use phpbu\App\Backup\Collector; |
@@ -194,14 +194,14 @@ |
||
194 | 194 | |
195 | 195 | $executable = new Executable\Tar($this->pathToTar); |
196 | 196 | $executable->archiveDirectory($this->path) |
197 | - ->useCompression($this->compression) |
|
198 | - ->useCompressProgram($this->compressProgram) |
|
199 | - ->forceLocal($this->forceLocal) |
|
200 | - ->ignoreFailedRead($this->ignoreFailedRead) |
|
201 | - ->removeSourceDirectory($this->removeSourceDir) |
|
202 | - ->throttle($this->throttle) |
|
203 | - ->archiveTo($this->pathToArchive) |
|
204 | - ->dereference($this->dereference); |
|
197 | + ->useCompression($this->compression) |
|
198 | + ->useCompressProgram($this->compressProgram) |
|
199 | + ->forceLocal($this->forceLocal) |
|
200 | + ->ignoreFailedRead($this->ignoreFailedRead) |
|
201 | + ->removeSourceDirectory($this->removeSourceDir) |
|
202 | + ->throttle($this->throttle) |
|
203 | + ->archiveTo($this->pathToArchive) |
|
204 | + ->dereference($this->dereference); |
|
205 | 205 | // add paths to exclude |
206 | 206 | foreach ($this->excludes as $path) { |
207 | 207 | $executable->addExclude($path); |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | </backups> |
35 | 35 | </phpbu> |
36 | 36 | |
37 | -EOT; |
|
37 | +eot; |
|
38 | 38 | |
39 | 39 | /** |
40 | 40 | * @var string |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | ] |
65 | 65 | } |
66 | 66 | |
67 | -EOT; |
|
67 | +eot; |
|
68 | 68 | |
69 | 69 | /** |
70 | 70 | * Return the config file content |
@@ -194,7 +194,7 @@ |
||
194 | 194 | |
195 | 195 | if ($configLoader->hasValidationErrors()) { |
196 | 196 | echo " Warning - The configuration file did not pass validation!" . \PHP_EOL . |
197 | - " The following problems have been detected:" . \PHP_EOL; |
|
197 | + " The following problems have been detected:" . \PHP_EOL; |
|
198 | 198 | |
199 | 199 | foreach ($configLoader->getValidationErrors() as $line => $errors) { |
200 | 200 | echo \sprintf("\n Line %d:\n", $line); |
@@ -406,7 +406,7 @@ |
||
406 | 406 | -v, --verbose Output more verbose information. |
407 | 407 | -V, --version Output version information and exit. |
408 | 408 | |
409 | -EOT; |
|
409 | +eot; |
|
410 | 410 | if ($this->isPhar) { |
411 | 411 | echo ' --version-check Check whether phpbu is up to date.' . PHP_EOL; |
412 | 412 | echo ' --self-update Upgrade phpbu to the latest version.' . PHP_EOL; |
@@ -123,10 +123,10 @@ |
||
123 | 123 | { |
124 | 124 | $executable = new Executable\Elasticdump($this->pathToElasticdump); |
125 | 125 | $executable->useHost($this->host) |
126 | - ->credentials($this->user, $this->password) |
|
127 | - ->dumpIndex($this->index) |
|
128 | - ->dumpType($this->type) |
|
129 | - ->dumpTo($target->getPathnamePlain()); |
|
126 | + ->credentials($this->user, $this->password) |
|
127 | + ->dumpIndex($this->index) |
|
128 | + ->dumpType($this->type) |
|
129 | + ->dumpTo($target->getPathnamePlain()); |
|
130 | 130 | return $executable; |
131 | 131 | } |
132 | 132 |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | 'mongodump' => [], |
44 | 44 | 'mysqldump' => [ |
45 | 45 | '/usr/local/mysql/bin', // Mac OS X |
46 | - '/usr/mysql/bin', // Linux |
|
46 | + '/usr/mysql/bin', // Linux |
|
47 | 47 | ], |
48 | 48 | 'tar' => [], |
49 | 49 | ]; |
@@ -82,20 +82,20 @@ discard block |
||
82 | 82 | public static function detectCmdLocation(string $cmd, string $path = '', array $optionalLocations = []) : string |
83 | 83 | { |
84 | 84 | $detectionSteps = [ |
85 | - function ($cmd) use ($path) { |
|
85 | + function($cmd) use ($path) { |
|
86 | 86 | if (!empty($path)) { |
87 | 87 | return self::detectCmdLocationInPath($cmd, $path); |
88 | 88 | } |
89 | 89 | return ''; |
90 | 90 | }, |
91 | - function ($cmd) { |
|
91 | + function($cmd) { |
|
92 | 92 | return self::detectCmdLocationWithWhich($cmd); |
93 | 93 | }, |
94 | - function ($cmd) { |
|
94 | + function($cmd) { |
|
95 | 95 | $paths = explode(PATH_SEPARATOR, self::getEnvPath()); |
96 | 96 | return self::detectCmdLocationInPaths($cmd, $paths); |
97 | 97 | }, |
98 | - function ($cmd) use ($optionalLocations) { |
|
98 | + function($cmd) use ($optionalLocations) { |
|
99 | 99 | return self::detectCmdLocationInPaths($cmd, $optionalLocations); |
100 | 100 | } |
101 | 101 | ]; |