Fixes "Logical operators should be avoided" errors.

pocketarc · pocketarc · commit e84f05905b10 · 2015-02-04T17:54:48.000Z
diff --git a/tools/src/Config.php b/tools/src/Config.php
@@ -74,7 +74,7 @@ public static function getServers($config_file) {
                     'upload_untracked' => array()
                         ), $options);
 
-                if (!isset($options['pass']) and ! isset($options['sftp_key'])) {
+                if (!isset($options['pass']) && ! isset($options['sftp_key'])) {
                     $options['pass'] = self::promptPassword();
                 }
 
diff --git a/tools/src/Ftp.php b/tools/src/Ftp.php
@@ -129,7 +129,7 @@ protected function recursive_remove($file_or_directory, $die_if_fail = false) {
             $filelist = ftp_nlist($this->connection, $file_or_directory);
 
             foreach ($filelist as $file) {
-                if ($file != '.' and $file != '..') {
+                if ($file != '.' && $file != '..') {
                     $this->recursive_remove($file);
                 }
             }
diff --git a/tools/src/Server.php b/tools/src/Server.php
@@ -100,7 +100,7 @@ public function deploy(Git $git, $target_commit, $is_revert = false, $list_only
         $count_upload = count($changes['upload']);
         $count_delete = count($changes['delete']);
 
-        if ($count_upload == 0 and $count_delete == 0) {
+        if ($count_upload == 0 && $count_delete == 0) {
             Helpers::logmessage("Nothing to update on: $this->host");
             return;
         }
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 \Crypt_RSA();
-                if (isset($server['pass']) and ! empty($server['pass'])) {
+                if (isset($server['pass']) && ! empty($server['pass'])) {
                     $key->setPassword($server['pass']);
                 }
                 $key->loadKey(file_get_contents($server['sftp_key']));
@@ -113,7 +113,7 @@ protected function recursive_remove($file_or_directory, $if_dir = false) {
         if ($this->connection->delete($file_or_directory, $if_dir)) {
             $filelist = $this->connection->nlist($parent);
             foreach ($filelist as $file) {
-                if ($file != '.' and $file != '..') {
+                if ($file != '.' && $file != '..') {
                     return false;
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public static function getServers($config_file) {`
`74`	`74`	`'upload_untracked' => array()`
`75`	`75`	`), $options);`
`76`	`76`
`77`		`- if (!isset($options['pass']) and ! isset($options['sftp_key'])) {`
	`77`	`+ if (!isset($options['pass']) && ! isset($options['sftp_key'])) {`
`78`	`78`	`$options['pass'] = self::promptPassword();`
`79`	`79`	`}`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ protected function recursive_remove($file_or_directory, $die_if_fail = false) {`
`129`	`129`	`$filelist = ftp_nlist($this->connection, $file_or_directory);`
`130`	`130`
`131`	`131`	`foreach ($filelist as $file) {`
`132`		`- if ($file != '.' and $file != '..') {`
	`132`	`+ if ($file != '.' && $file != '..') {`
`133`	`133`	`$this->recursive_remove($file);`
`134`	`134`	`}`
`135`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public function deploy(Git $git, $target_commit, $is_revert = false, $list_only`
`100`	`100`	`$count_upload = count($changes['upload']);`
`101`	`101`	`$count_delete = count($changes['delete']);`
`102`	`102`
`103`		`- if ($count_upload == 0 and $count_delete == 0) {`
	`103`	`+ if ($count_upload == 0 && $count_delete == 0) {`
`104`	`104`	`Helpers::logmessage("Nothing to update on: $this->host");`
`105`	`105`	`return;`
`106`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public function connect($test = false) {`
`17`	`17`
`18`	`18`	`if (isset($server['sftp_key'])) {`
`19`	`19`	`$key = new \Crypt_RSA();`
`20`		`- if (isset($server['pass']) and ! empty($server['pass'])) {`
	`20`	`+ if (isset($server['pass']) && ! empty($server['pass'])) {`
`21`	`21`	`$key->setPassword($server['pass']);`
`22`	`22`	`}`
`23`	`23`	`$key->loadKey(file_get_contents($server['sftp_key']));`
`@@ -113,7 +113,7 @@ protected function recursive_remove($file_or_directory, $if_dir = false) {`
`113`	`113`	`if ($this->connection->delete($file_or_directory, $if_dir)) {`
`114`	`114`	`$filelist = $this->connection->nlist($parent);`
`115`	`115`	`foreach ($filelist as $file) {`
`116`		`- if ($file != '.' and $file != '..') {`
	`116`	`+ if ($file != '.' && $file != '..') {`
`117`	`117`	`return false;`
`118`	`118`	`}`
`119`	`119`	`}`