Skip to content
This repository has been archived by the owner on May 11, 2023. It is now read-only.

Commit

Permalink
Merge pull request #16 from tabuna/analysis-x0JLZ0
Browse files Browse the repository at this point in the history
Apply fixes from StyleCI

[ci skip] [skip ci]
  • Loading branch information
tabuna authored Apr 25, 2020
2 parents e2ac3eb + e5a73e3 commit 6741890
Show file tree
Hide file tree
Showing 7 changed files with 92 additions and 20 deletions.
3 changes: 2 additions & 1 deletion src/Providers/VestaServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ protected function registerConfig()
]);

$this->mergeConfigFrom(
__DIR__.'/../../config/vesta.php', 'vesta'
__DIR__.'/../../config/vesta.php',
'vesta'
);
}
}
12 changes: 10 additions & 2 deletions src/Services/BD.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,16 @@ public function listOnlyBD($database)
*/
public function addDateBase($database, $dbuser, $password, $type, $charset)
{
return $this->send('v-add-database', $this->userName, $database, $dbuser, $password, $type,
'localhost', $charset);
return $this->send(
'v-add-database',
$this->userName,
$database,
$dbuser,
$password,
$type,
'localhost',
$charset
);
}

/**
Expand Down
25 changes: 21 additions & 4 deletions src/Services/Cron.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,16 @@ public function listCron()
*/
public function addCron($min, $hour, $day, $month, $wday, $cmd)
{
return $this->send('v-add-cron-job', $this->userName, $min, $hour, $day, $month, $wday,
$cmd);
return $this->send(
'v-add-cron-job',
$this->userName,
$min,
$hour,
$day,
$month,
$wday,
$cmd
);
}

/**
Expand Down Expand Up @@ -79,7 +87,16 @@ public function deleteCron($job)
*/
public function editCron($job, $min, $hour, $day, $month, $wday, $cmd)
{
return $this->send('v-change-cron-job', $this->userName, $job, $min, $hour, $day, $month,
$wday, $cmd);
return $this->send(
'v-change-cron-job',
$this->userName,
$job,
$min,
$hour,
$day,
$month,
$wday,
$cmd
);
}
}
23 changes: 19 additions & 4 deletions src/Services/DNS.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,17 @@ public function deleteDNSRecord($domain, $recordId)
*/
public function addDNSDomain($domain, $ip, $ns1, $ns2, $ns3 = null, $ns4 = null)
{
return $this->send('v-add-dns-domain', $this->userName, $domain, $ip, $ns1, $ns2, $ns3,
$ns4, 'no');
return $this->send(
'v-add-dns-domain',
$this->userName,
$domain,
$ip,
$ns1,
$ns2,
$ns3,
$ns4,
'no'
);
}

/**
Expand Down Expand Up @@ -131,8 +140,14 @@ public function listDNSRecords($domain)
*/
public function changeDNSDomainRecord($domain, $recordId, $val, $priority)
{
return $this->send('v-change-dns-record', $this->userName, $domain, $recordId, $val,
$priority);
return $this->send(
'v-change-dns-record',
$this->userName,
$domain,
$recordId,
$val,
$priority
);
}

/**
Expand Down
13 changes: 11 additions & 2 deletions src/Services/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,17 @@ public function restoreBackup($arg)
$udir = 'no';
extract($arg, EXTR_OVERWRITE);

return $this->send('v-schedule-user-restore', $this->userName, $backup, $web, $dns, $mail, $db,
$cron, $udir);
return $this->send(
'v-schedule-user-restore',
$this->userName,
$backup,
$web,
$dns,
$mail,
$db,
$cron,
$udir
);
}

/**
Expand Down
8 changes: 7 additions & 1 deletion src/Services/VestaAPI.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@

class VestaAPI
{
use BD, DNS, User, Web, Service, Cron, FileSystem;
use BD;
use DNS;
use User;
use Web;
use Service;
use Cron;
use FileSystem;

/**
* @var
Expand Down
28 changes: 22 additions & 6 deletions src/Services/Web.php
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,14 @@ public function deleteWebDomainAlias($domain, $alias)
*/
public function addFtpDomain($domain, $ftpUserName, $ftpPassword, $ftpPath)
{
return $this->send('v-add-web-domain-ftp', $this->userName, $domain, $ftpUserName, $ftpPassword,
$ftpPath);
return $this->send(
'v-add-web-domain-ftp',
$this->userName,
$domain,
$ftpUserName,
$ftpPassword,
$ftpPath
);
}

/**
Expand Down Expand Up @@ -200,8 +206,13 @@ public function deleteWebDomain($domain, $ftpUserName)
*/
public function changeWebDomain($domain, $ftpUserName, $ftpPath)
{
return $this->send('v-change-web-domain-ftp-path', $this->userName, $domain, $ftpUserName,
$ftpPath);
return $this->send(
'v-change-web-domain-ftp-path',
$this->userName,
$domain,
$ftpUserName,
$ftpPath
);
}

/**
Expand All @@ -215,7 +226,12 @@ public function changeWebDomain($domain, $ftpUserName, $ftpPath)
*/
public function changeFtpPassword($domain, $ftpUserName, $password)
{
return $this->send('v-change-web-domain-ftp-password', $this->userName, $domain, $ftpUserName,
$password);
return $this->send(
'v-change-web-domain-ftp-password',
$this->userName,
$domain,
$ftpUserName,
$password
);
}
}

0 comments on commit 6741890

Please sign in to comment.