@@ -596,7 +596,7 @@ discard block |
||
| 596 | 596 | $this->config = array_merge($this->config, $config ?: []); |
| 597 | 597 | |
| 598 | 598 | $this->setOptions($this->config[self::CONF_OPTIONS]) |
| 599 | - ->setSSH($this->config[self::CONF_SSH]); |
|
| 599 | + ->setSSH($this->config[self::CONF_SSH]); |
|
| 600 | 600 | |
| 601 | 601 | parent::__construct($this->config[self::CONF_EXECUTABLE], $this->config[self::CONF_CWD], '='); |
| 602 | 602 | } |
@@ -646,7 +646,7 @@ discard block |
||
| 646 | 646 | |
| 647 | 647 | $this->setParameters([$from, $to]); |
| 648 | 648 | $this->execute() |
| 649 | - ->clearParameters(); |
|
| 649 | + ->clearParameters(); |
|
| 650 | 650 | |
| 651 | 651 | return $this; |
| 652 | 652 | } |
@@ -628,14 +628,11 @@ |
||
| 628 | 628 | public function setSSH($ssh) :self { |
| 629 | 629 | if ($ssh instanceof SSH) { |
| 630 | 630 | $this->config[self::CONF_SSH] = $ssh; |
| 631 | - } |
|
| 632 | - else if (is_array($ssh)) { |
|
| 631 | + } else if (is_array($ssh)) { |
|
| 633 | 632 | $this->config[self::CONF_SSH] = new SSH($ssh); |
| 634 | - } |
|
| 635 | - else if ($ssh === null) { |
|
| 633 | + } else if ($ssh === null) { |
|
| 636 | 634 | $this->config[self::CONF_SSH] = null; |
| 637 | - } |
|
| 638 | - else { |
|
| 635 | + } else { |
|
| 639 | 636 | throw new Exception\Command('ssh config has to be an instance of \xobotyi\rsync\SSH, array or null, got ' . gettype($ssh)); |
| 640 | 637 | } |
| 641 | 638 | |
@@ -63,8 +63,8 @@ |
||
| 63 | 63 | */ |
| 64 | 64 | public function __construct(string $executable, string $cwd = './', string $optionValueAssigner = ' ') { |
| 65 | 65 | $this->setExecutable($executable) |
| 66 | - ->setCWD($cwd) |
|
| 67 | - ->setOptionValueAssigner($optionValueAssigner); |
|
| 66 | + ->setCWD($cwd) |
|
| 67 | + ->setOptionValueAssigner($optionValueAssigner); |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | /** |
@@ -369,8 +369,7 @@ |
||
| 369 | 369 | if (is_bool($val)) { |
| 370 | 370 | if ($val) { |
| 371 | 371 | $this->options[$optName] = $val; |
| 372 | - } |
|
| 373 | - else { |
|
| 372 | + } else { |
|
| 374 | 373 | unset($this->options[$optName]); |
| 375 | 374 | } |
| 376 | 375 | |
@@ -10,9 +10,9 @@ |
||
| 10 | 10 | use xobotyi\rsync; |
| 11 | 11 | |
| 12 | 12 | $ssh = new rsync\SSH([ |
| 13 | - rsync\SSH::CONF_EXECUTABLE => 'C:\rsync\ssh.exe', |
|
| 14 | - rsync\SSH::CONF_OPTIONS => [ |
|
| 15 | - rsync\SSH::OPT_IDENTIFICATION_FILE => __DIR__ . '/../tests/ident.txt', |
|
| 16 | - rsync\SSH::OPT_OPTION => ['BatchMode=yes', 'StrictHostKeyChecking=no'], |
|
| 17 | - ], |
|
| 18 | - ]); |
|
| 19 | 13 | \ No newline at end of file |
| 14 | + rsync\SSH::CONF_EXECUTABLE => 'C:\rsync\ssh.exe', |
|
| 15 | + rsync\SSH::CONF_OPTIONS => [ |
|
| 16 | + rsync\SSH::OPT_IDENTIFICATION_FILE => __DIR__ . '/../tests/ident.txt', |
|
| 17 | + rsync\SSH::OPT_OPTION => ['BatchMode=yes', 'StrictHostKeyChecking=no'], |
|
| 18 | + ], |
|
| 19 | + ]); |
|
| 20 | 20 | \ No newline at end of file |