Reformats all the code according to the project's code style.

pocketarc · pocketarc · commit 78dddccf7f2c · 2015-10-20T14:39:24.000+01:00
diff --git a/git-deploy b/git-deploy
diff --git a/tools/src/Config.php b/tools/src/Config.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Brunodebarros\Gitdeploy;
+
 use Brunodebarros\Gitdeploy\Helpers;
 
 class Config {
@@ -42,7 +43,7 @@ public static function getArgs() {
             'target_commit' => isset($opts['r']) ? $opts['r'] : 'HEAD',
             'list_only' => isset($opts['l']),
             'revert' => isset($opts['revert']),
-            'repo_path' => $repo_path
+            'repo_path' => $repo_path,
         );
     }
 
@@ -71,10 +72,10 @@ public static function getServers($config_file) {
                     'clean_directories' => array(),
                     'ignore_files' => array(),
                     'ignore_directories' => array(),
-                    'upload_untracked' => array()
-                        ), $options);
+                    'upload_untracked' => array(),
+                ), $options);
 
-                if (!isset($options['pass']) && ! isset($options['sftp_key'])) {
+                if (!isset($options['pass']) && !isset($options['sftp_key'])) {
                     $options['pass'] = self::promptPassword();
                 }
 
@@ -88,7 +89,7 @@ public static function getServers($config_file) {
                     continue;
                 } else {
                     unset($options['skip']);
-                    $type = "Brunodebarros\\Gitdeploy\\".ucfirst(strtolower($options['scheme']));
+                    $type = "Brunodebarros\\Gitdeploy\\" . ucfirst(strtolower($options['scheme']));
                     $return[$uri] = new $type($options, $config_file);
                 }
             }
@@ -107,8 +108,8 @@ public static function promptPassword() {
         }
 
         $command = "/usr/bin/env bash -c 'read -s -p \""
-                . addslashes($prompt)
-                . "\" mypassword && echo \$mypassword'";
+            . addslashes($prompt)
+            . "\" mypassword && echo \$mypassword'";
         $password = rtrim(shell_exec($command));
         echo "\n";
 
diff --git a/tools/src/Ftp.php b/tools/src/Ftp.php
@@ -78,7 +78,7 @@ public function set_file($file, $contents, $die_if_fail = false) {
         $path = "";
 
         for ($i = 0; $i < $dir_part_count; $i++) {
-            $path.= $dir[$i] . '/';
+            $path .= $dir[$i] . '/';
 
             if (!isset($this->existing_paths_cache[$path])) {
                 $origin = ftp_pwd($this->connection);
diff --git a/tools/src/Git.php b/tools/src/Git.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Brunodebarros\Gitdeploy;
+
 use Brunodebarros\Gitdeploy\Helpers;
 
 class Git {
@@ -50,7 +51,7 @@ public function get_changes($target_commit, $current_commit) {
         $return = array(
             'upload' => array(),
             'delete' => array(),
-            'submodules' => $submodule_paths
+            'submodules' => $submodule_paths,
         );
 
         $command = str_replace(array("\n", "\r\n"), '', $command);
@@ -87,7 +88,7 @@ public function get_changes($target_commit, $current_commit) {
 
     protected function get_file_contents($path) {
         $temp = tempnam(sys_get_temp_dir(), "git-deploy-");
-        $this->exec('show "'.$path.'"', "> \"$temp\"");
+        $this->exec('show "' . $path . '"', "> \"$temp\"");
         return file_get_contents($temp);
     }
 
diff --git a/tools/src/Server.php b/tools/src/Server.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Brunodebarros\Gitdeploy;
+
 use Brunodebarros\Gitdeploy\Helpers;
 
 abstract class Server {
@@ -19,8 +20,8 @@ public function __construct($server, $deploy_script = 'deploy.ini') {
         $this->server = $server;
         $this->clean_directories = $server['clean_directories'];
         $this->ignore_files = array_merge(array(
-            '.gitignore', '.gitattributes', '.gitmodules', 'deploy.ini', 'git-deploy', $deploy_script
-                ), $server['ignore_files']);
+            '.gitignore', '.gitattributes', '.gitmodules', 'deploy.ini', 'git-deploy', $deploy_script,
+        ), $server['ignore_files']);
         $this->ignore_directories = $server['ignore_directories'];
         $this->upload_untracked = $server['upload_untracked'];
         $this->host = "{$server['scheme']}://{$server['user']}@{$server['host']}:{$server['port']}{$server['path']}";
@@ -85,7 +86,7 @@ public function deploy(Git $git, $target_commit, $is_revert = false, $list_only
 
             $submodule_meta[$submodule] = array(
                 'target_subcommit' => $target_subcommit,
-                'current_subcommit' => $current_subcommit
+                'current_subcommit' => $current_subcommit,
             );
 
             foreach ($subchanges['upload'] as $file => $contents) {
@@ -164,10 +165,11 @@ protected function set_current_commit($target_commit, $list_only = false) {
         }
 
         if (isset($this->server['maintenance_file'])) {
-            if (isset($this->server['maintenance_off_value']))
+            if (isset($this->server['maintenance_off_value'])) {
                 $this->set_file($this->server['maintenance_file'], $this->server['maintenance_off_value']);
-            else
+            } else {
                 $this->unset_file($this->server['maintenance_file']);
+            }
             Helpers::logmessage("Turned maintenance mode off.");
         }
 
diff --git a/tools/src/Sftp.php b/tools/src/Sftp.php
@@ -17,7 +17,7 @@ public function connect($test = false) {
 
             if (isset($server['sftp_key'])) {
                 $key = new \phpseclib\Crypt\RSA();
-                if (isset($server['pass']) && ! empty($server['pass'])) {
+                if (isset($server['pass']) && !empty($server['pass'])) {
                     $key->setPassword($server['pass']);
                 }
                 $key->loadKey(file_get_contents($server['sftp_key']));
@@ -78,7 +78,7 @@ public function set_file($file, $contents) {
         $path = "";
 
         for ($i = 0; $i < $dir_part_count; $i++) {
-            $path.= $dir[$i] . '/';
+            $path .= $dir[$i] . '/';
 
             if (!isset($this->existing_paths_cache[$path])) {
                 $origin = $this->connection->pwd();
