@@ -88,16 +88,16 @@ discard block |
||
88 | 88 | |
89 | 89 | public function help($args) { |
90 | 90 | echo "SSPak: manage SilverStripe .sspak archives.\n\nUsage:\n"; |
91 | - foreach($this->getActions() as $action => $info) { |
|
91 | + foreach ($this->getActions() as $action => $info) { |
|
92 | 92 | echo "sspak $action"; |
93 | - if(!empty($info['unnamedArgs'])) { |
|
94 | - foreach($info['unnamedArgs'] as $arg) echo " ($arg)"; |
|
93 | + if (!empty($info['unnamedArgs'])) { |
|
94 | + foreach ($info['unnamedArgs'] as $arg) echo " ($arg)"; |
|
95 | 95 | } |
96 | - if(!empty($info['namedFlags'])) { |
|
97 | - foreach($info['namedFlags'] as $arg) echo " (--$arg)"; |
|
96 | + if (!empty($info['namedFlags'])) { |
|
97 | + foreach ($info['namedFlags'] as $arg) echo " (--$arg)"; |
|
98 | 98 | } |
99 | - if(!empty($info['namedArgs'])) { |
|
100 | - foreach($info['namedArgs'] as $arg) echo " --$arg=\"$arg value\""; |
|
99 | + if (!empty($info['namedArgs'])) { |
|
100 | + foreach ($info['namedArgs'] as $arg) echo " --$arg=\"$arg value\""; |
|
101 | 101 | } |
102 | 102 | echo "\n {$info['description']}\n\n"; |
103 | 103 | } |
@@ -121,13 +121,13 @@ discard block |
||
121 | 121 | |
122 | 122 | $filesystem = new FilesystemEntity(null, $executor); |
123 | 123 | |
124 | - if($pakParts['db']) { |
|
124 | + if ($pakParts['db']) { |
|
125 | 125 | $dbPath = escapeshellarg($namedArgs['db']); |
126 | 126 | $process = $filesystem->createProcess("cat $dbPath | gzip -c"); |
127 | 127 | $sspak->writeFileFromProcess('database.sql.gz', $process); |
128 | 128 | } |
129 | 129 | |
130 | - if($pakParts['assets']) { |
|
130 | + if ($pakParts['assets']) { |
|
131 | 131 | $assetsParentArg = escapeshellarg(dirname($namedArgs['assets'])); |
132 | 132 | $assetsBaseArg = escapeshellarg(basename($namedArgs['assets'])); |
133 | 133 | $process = $filesystem->createProcess("cd $assetsParentArg && tar cfh - $assetsBaseArg | gzip -c"); |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | // from other formats. |
156 | 156 | // There is no cross-platform way of checking the assets.tar.gz size without unpacking, so we assume the size |
157 | 157 | // of database is negligible which lets us approximate the size of assets. |
158 | - if (filesize($file) > 8*1024*1024*1024) { |
|
158 | + if (filesize($file) > 8 * 1024 * 1024 * 1024) { |
|
159 | 159 | $msg = <<<EOM |
160 | 160 | |
161 | 161 | ERROR: SSPak is unable to extract archives over 8 GB. |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | $sspak = new SSPakFile($file, $executor); |
177 | 177 | |
178 | 178 | // Validation |
179 | - if(!$sspak->exists()) throw new Exception("File '$file' doesn't exist."); |
|
179 | + if (!$sspak->exists()) throw new Exception("File '$file' doesn't exist."); |
|
180 | 180 | |
181 | 181 | $phar = $sspak->getPhar(); |
182 | 182 | $phar->extractTo($dest); |
@@ -207,9 +207,9 @@ discard block |
||
207 | 207 | |
208 | 208 | $db = new DatabaseConnector($webroot); |
209 | 209 | |
210 | - foreach($db->getTables() as $table) { |
|
211 | - $filename = $destPath . '/' . $table . '.csv'; |
|
212 | - echo $filename . "...\n"; |
|
210 | + foreach ($db->getTables() as $table) { |
|
211 | + $filename = $destPath.'/'.$table.'.csv'; |
|
212 | + echo $filename."...\n"; |
|
213 | 213 | touch($filename); |
214 | 214 | $writer = new CsvTableWriter($filename); |
215 | 215 | $db->saveTable($table, $writer); |
@@ -230,10 +230,10 @@ discard block |
||
230 | 230 | |
231 | 231 | $db = new DatabaseConnector($webroot); |
232 | 232 | |
233 | - foreach($db->getTables() as $table) { |
|
234 | - $filename = $srcPath . '/' . $table . '.csv'; |
|
235 | - if(file_exists($filename)) { |
|
236 | - echo $filename . "...\n"; |
|
233 | + foreach ($db->getTables() as $table) { |
|
234 | + $filename = $srcPath.'/'.$table.'.csv'; |
|
235 | + if (file_exists($filename)) { |
|
236 | + echo $filename."...\n"; |
|
237 | 237 | $reader = new CsvTableReader($filename); |
238 | 238 | $db->loadTable($table, $reader); |
239 | 239 | } else { |
@@ -255,16 +255,16 @@ discard block |
||
255 | 255 | |
256 | 256 | $webroot = new Webroot($unnamedArgs[0], $executor); |
257 | 257 | $file = $unnamedArgs[1]; |
258 | - if(file_exists($file)) throw new Exception( "File '$file' already exists."); |
|
258 | + if (file_exists($file)) throw new Exception("File '$file' already exists."); |
|
259 | 259 | |
260 | 260 | $sspak = new SSPakFile($file, $executor); |
261 | 261 | |
262 | - if(!empty($namedArgs['identity'])) { |
|
262 | + if (!empty($namedArgs['identity'])) { |
|
263 | 263 | // SSH private key |
264 | 264 | $webroot->setSSHItentityFile($namedArgs['identity']); |
265 | 265 | } |
266 | - if(!empty($namedArgs['from-sudo'])) $webroot->setSudo($namedArgs['from-sudo']); |
|
267 | - else if(!empty($namedArgs['sudo'])) $webroot->setSudo($namedArgs['sudo']); |
|
266 | + if (!empty($namedArgs['from-sudo'])) $webroot->setSudo($namedArgs['from-sudo']); |
|
267 | + else if (!empty($namedArgs['sudo'])) $webroot->setSudo($namedArgs['sudo']); |
|
268 | 268 | |
269 | 269 | // Look up which parts of the sspak are going to be saved |
270 | 270 | $pakParts = $args->pakParts(); |
@@ -273,7 +273,7 @@ discard block |
||
273 | 273 | $details = $webroot->sniff(); |
274 | 274 | |
275 | 275 | // Create a build folder for the sspak file |
276 | - $buildFolder = sprintf("%s/sspak-%d", sys_get_temp_dir(), rand(100000,999999)); |
|
276 | + $buildFolder = sprintf("%s/sspak-%d", sys_get_temp_dir(), rand(100000, 999999)); |
|
277 | 277 | $webroot->exec(array('mkdir', $buildFolder)); |
278 | 278 | |
279 | 279 | $dbFile = "$buildFolder/database.sql.gz"; |
@@ -284,22 +284,22 @@ discard block |
||
284 | 284 | $fileList = array(); |
285 | 285 | |
286 | 286 | // Save DB |
287 | - if($pakParts['db']) { |
|
287 | + if ($pakParts['db']) { |
|
288 | 288 | // Check the database type |
289 | 289 | $dbFunction = 'getdb_'.$details['db_type']; |
290 | - if(!method_exists($this,$dbFunction)) { |
|
291 | - throw new Exception("Can't process database type '" . $details['db_type'] . "'"); |
|
290 | + if (!method_exists($this, $dbFunction)) { |
|
291 | + throw new Exception("Can't process database type '".$details['db_type']."'"); |
|
292 | 292 | } |
293 | 293 | $this->$dbFunction($webroot, $details, $sspak, basename($dbFile)); |
294 | 294 | } |
295 | 295 | |
296 | 296 | // Save Assets |
297 | - if($pakParts['assets']) { |
|
297 | + if ($pakParts['assets']) { |
|
298 | 298 | $this->getassets($webroot, $details['assets_path'], $sspak, basename($assetsFile)); |
299 | 299 | } |
300 | 300 | |
301 | 301 | // Save git-remote |
302 | - if($pakParts['git-remote']) { |
|
302 | + if ($pakParts['git-remote']) { |
|
303 | 303 | $this->getgitremote($webroot, $sspak, basename($gitRemoteFile)); |
304 | 304 | } |
305 | 305 | |
@@ -319,7 +319,7 @@ discard block |
||
319 | 319 | $hostArg = ''; |
320 | 320 | $portArg = ''; |
321 | 321 | if (!empty($conf['db_server']) && $conf['db_server'] != 'localhost') { |
322 | - if (strpos($conf['db_server'], ':')!==false) { |
|
322 | + if (strpos($conf['db_server'], ':') !== false) { |
|
323 | 323 | // Handle "server:port" format. |
324 | 324 | $server = explode(':', $conf['db_server'], 2); |
325 | 325 | $hostArg = escapeshellarg("--host=".$server[0]); |
@@ -358,16 +358,16 @@ discard block |
||
358 | 358 | |
359 | 359 | public function getgitremote($webroot, $sspak, $gitRemoteFile) { |
360 | 360 | // Only do anything if we're copying from a git checkout |
361 | - $gitRepo = $webroot->getPath() .'/.git'; |
|
362 | - if($webroot->exists($gitRepo)) { |
|
361 | + $gitRepo = $webroot->getPath().'/.git'; |
|
362 | + if ($webroot->exists($gitRepo)) { |
|
363 | 363 | // Identify current branch |
364 | 364 | $output = $webroot->exec(array('git', '--git-dir='.$gitRepo, 'branch')); |
365 | - if(preg_match("/\* ([^ \n]*)/", $output['output'], $matches) && strpos("(no branch)", $matches[1])===false) { |
|
365 | + if (preg_match("/\* ([^ \n]*)/", $output['output'], $matches) && strpos("(no branch)", $matches[1]) === false) { |
|
366 | 366 | // If there is a current branch, use that branch's remove |
367 | 367 | $currentBranch = trim($matches[1]); |
368 | - $output = $webroot->exec(array('git', '--git-dir='.$gitRepo, 'config','--get',"branch.$currentBranch.remote")); |
|
368 | + $output = $webroot->exec(array('git', '--git-dir='.$gitRepo, 'config', '--get', "branch.$currentBranch.remote")); |
|
369 | 369 | $remoteName = trim($output['output']); |
370 | - if(!$remoteName) $remoteName = 'origin'; |
|
370 | + if (!$remoteName) $remoteName = 'origin'; |
|
371 | 371 | |
372 | 372 | // Default to origin |
373 | 373 | } else { |
@@ -376,11 +376,11 @@ discard block |
||
376 | 376 | } |
377 | 377 | |
378 | 378 | // Determine the URL of that remote |
379 | - $output = $webroot->exec(array('git', '--git-dir='.$gitRepo, 'config','--get',"remote.$remoteName.url")); |
|
379 | + $output = $webroot->exec(array('git', '--git-dir='.$gitRepo, 'config', '--get', "remote.$remoteName.url")); |
|
380 | 380 | $remoteURL = trim($output['output']); |
381 | 381 | |
382 | 382 | // Determine the current SHA |
383 | - $output = $webroot->exec(array('git', '--git-dir='.$gitRepo, 'log','-1','--format=%H')); |
|
383 | + $output = $webroot->exec(array('git', '--git-dir='.$gitRepo, 'log', '-1', '--format=%H')); |
|
384 | 384 | $sha = trim($output['output']); |
385 | 385 | |
386 | 386 | $content = "remote = $remoteURL\nbranch = $currentBranch\nsha = $sha\n"; |
@@ -408,22 +408,22 @@ discard block |
||
408 | 408 | $pakParts = $args->pakParts(); |
409 | 409 | |
410 | 410 | $namedArgs = $args->getNamedArgs(); |
411 | - if(!empty($namedArgs['identity'])) { |
|
411 | + if (!empty($namedArgs['identity'])) { |
|
412 | 412 | // SSH private key |
413 | 413 | $webroot->setSSHItentityFile($namedArgs['identity']); |
414 | 414 | } |
415 | 415 | |
416 | 416 | // Validation |
417 | - if(!$sspak->exists()) throw new Exception( "File '$file' doesn't exist."); |
|
417 | + if (!$sspak->exists()) throw new Exception("File '$file' doesn't exist."); |
|
418 | 418 | |
419 | 419 | // Push database, if necessary |
420 | 420 | $namedArgs = $args->getNamedArgs(); |
421 | - if($pakParts['db'] && $sspak->contains('database.sql.gz')) { |
|
421 | + if ($pakParts['db'] && $sspak->contains('database.sql.gz')) { |
|
422 | 422 | $webroot->putdb($sspak, isset($namedArgs['drop-db'])); |
423 | 423 | } |
424 | 424 | |
425 | 425 | // Push assets, if neccessary |
426 | - if($pakParts['assets'] && $sspak->contains('assets.tar.gz')) { |
|
426 | + if ($pakParts['assets'] && $sspak->contains('assets.tar.gz')) { |
|
427 | 427 | $webroot->putassets($sspak); |
428 | 428 | } |
429 | 429 | } |
@@ -445,13 +445,13 @@ discard block |
||
445 | 445 | $pakParts = $args->pakParts(); |
446 | 446 | |
447 | 447 | // Validation |
448 | - if($webroot->exists($webroot->getPath())) throw new Exception( "Webroot '$webrootDir' already exists."); |
|
449 | - if(!$sspak->exists()) throw new Exception( "File '$file' doesn't exist."); |
|
448 | + if ($webroot->exists($webroot->getPath())) throw new Exception("Webroot '$webrootDir' already exists."); |
|
449 | + if (!$sspak->exists()) throw new Exception("File '$file' doesn't exist."); |
|
450 | 450 | |
451 | 451 | // Create new dir |
452 | 452 | $webroot->exec(array('mkdir', $webroot->getPath())); |
453 | 453 | |
454 | - if($sspak->contains('git-remote')) { |
|
454 | + if ($sspak->contains('git-remote')) { |
|
455 | 455 | $details = $sspak->gitRemoteDetails(); |
456 | 456 | $webroot->putgit($details); |
457 | 457 | } |
@@ -460,12 +460,12 @@ discard block |
||
460 | 460 | |
461 | 461 | // Push database, if necessary |
462 | 462 | $namedArgs = $args->getNamedArgs(); |
463 | - if($pakParts['db'] && $sspak->contains('database.sql.gz')) { |
|
463 | + if ($pakParts['db'] && $sspak->contains('database.sql.gz')) { |
|
464 | 464 | $webroot->putdb($sspak, isset($namedArgs['drop-db'])); |
465 | 465 | } |
466 | 466 | |
467 | 467 | // Push assets, if neccessary |
468 | - if($pakParts['assets'] && $sspak->contains('assets.tar.gz')) { |
|
468 | + if ($pakParts['assets'] && $sspak->contains('assets.tar.gz')) { |
|
469 | 469 | $webroot->putassets($sspak); |
470 | 470 | } |
471 | 471 | } |
@@ -492,10 +492,10 @@ discard block |
||
492 | 492 | $sspakScript = str_replace('$isSelfExtracting = false;', '$isSelfExtracting = true;', $sspakScript); |
493 | 493 | |
494 | 494 | // Load the sniffer file |
495 | - $snifferFile = dirname(__FILE__) . '/sspak-sniffer.php'; |
|
495 | + $snifferFile = dirname(__FILE__).'/sspak-sniffer.php'; |
|
496 | 496 | $sspakScript = str_replace("\$snifferFileContent = '';\n", |
497 | 497 | "\$snifferFileContent = '" |
498 | - . str_replace(array("\\","'"),array("\\\\", "\\'"), file_get_contents($snifferFile)) . "';\n", $sspakScript); |
|
498 | + . str_replace(array("\\", "'"), array("\\\\", "\\'"), file_get_contents($snifferFile))."';\n", $sspakScript); |
|
499 | 499 | |
500 | 500 | file_put_contents($destFile, $sspakScript); |
501 | 501 | chmod($destFile, 0775); |