console-helpers / svn-buddy

src/SVNBuddy/Command/AbstractCommand.php

Braces +1 added lines, -2 removed lines

@@ -238,8 +238,7 @@
 
 		if ( !$this->repositoryConnector->isUrl($path) ) {
 			$path = realpath($path);
-		}
-		elseif ( !$this->pathAcceptsUrl ) {
+		} elseif ( !$this->pathAcceptsUrl ) {
 			throw new \RuntimeException('The "path" argument must be a working copy path and not URL.');
 		}
 

src/SVNBuddy/Command/AggregateCommand.php

Braces +2 added lines, -4 removed lines

@@ -317,8 +317,7 @@ 
 
 		if ( $all_working_copies_count != $working_copies_count ) {
 			$ignored_suffix = ' (' . ($all_working_copies_count - $working_copies_count) . ' ignored)';
-		}
-		else {
+		} else {
 			$ignored_suffix = '';
 		}
 
@@ -357,8 +356,7 @@ 
 
 			if ( $this->repositoryConnector->isWorkingCopy($sub_folder) ) {
 				$working_copies[] = $sub_folder;
-			}
-			else {
+			} else {
 				$working_copies = array_merge($working_copies, $this->getWorkingCopiesRecursive($sub_folder));
 			}
 		}

src/SVNBuddy/Command/CommitCommand.php

Braces +1 added lines, -2 removed lines

@@ -210,8 +210,7 @@
 				$final_paths[$new_path] = $this->_revisionListParser->expandRanges(
 					explode(',', $new_merged_revisions)
 				);
-			}
-			elseif ( $new_merged_revisions != $old_paths[$new_path] ) {
+			} elseif ( $new_merged_revisions != $old_paths[$new_path] ) {
 				// Merge on existing path.
 				$new_merged_revisions_parsed = $this->_revisionListParser->expandRanges(
 					explode(',', $new_merged_revisions)

src/SVNBuddy/Command/ConfigCommand.php

Braces +2 added lines, -4 removed lines

@@ -185,8 +185,7 @@ 
 				$value = $this->openEditor($value);
 				$config_setting->setValue($value, $this->getScopeFilter());
 				$this->io->writeln('Setting <info>' . $setting_name . '</info> was edited.');
-			}
-			catch ( \InvalidArgumentException $e ) {
+			} catch ( \InvalidArgumentException $e ) {
 				$this->io->writeln(array('<error>' . $e->getMessage() . '</error>', ''));
 
 				if ( $this->io->askConfirmation('Retry editing', false) ) {
@@ -250,8 +249,7 @@ 
 
 		if ( $this->isGlobal() ) {
 			$this->io->writeln('Showing global settings' . $extra_title . ':');
-		}
-		else {
+		} else {
 			$this->io->writeln(
 				'Showing settings' . $extra_title . ' for <info>' . $this->getWorkingCopyPath() . '</info> path:'
 			);

src/SVNBuddy/Command/LogCommand.php

Braces +10 added lines, -20 removed lines

@@ -174,8 +174,7 @@ 
 			$revisions = $this->_revisionListParser->expandRanges($revisions);
 			$revisions_by_path = array_intersect($revisions_by_path, $revisions);
 			$missing_revisions = array_diff($revisions, $revisions_by_path);
-		}
-		elseif ( $bugs ) {
+		} elseif ( $bugs ) {
 			// Only show bug-related revisions on given path. The $missing_revisions is always empty.
 			$revisions_from_bugs = $revision_log->find('bugs', $bugs);
 			$revisions_by_path = array_intersect($revisions_by_path, $revisions_from_bugs);
@@ -197,15 +196,13 @@ 
 
 		if ( $this->io->getOption('merges') ) {
 			$revisions_by_path = array_intersect($revisions_by_path, $revision_log->find('merges', 'all_merges'));
-		}
-		elseif ( $this->io->getOption('no-merges') ) {
+		} elseif ( $this->io->getOption('no-merges') ) {
 			$revisions_by_path = array_diff($revisions_by_path, $revision_log->find('merges', 'all_merges'));
 		}
 
 		if ( $this->io->getOption('merged') ) {
 			$revisions_by_path = array_intersect($revisions_by_path, $revision_log->find('merges', 'all_merged'));
-		}
-		elseif ( $this->io->getOption('not-merged') ) {
+		} elseif ( $this->io->getOption('not-merged') ) {
 			$revisions_by_path = array_diff($revisions_by_path, $revision_log->find('merges', 'all_merged'));
 		}
 
@@ -213,8 +210,7 @@ 
 			throw new CommandException(
 				'No information about ' . implode(', ', $missing_revisions) . ' revision(-s).'
 			);
-		}
-		elseif ( !$revisions_by_path ) {
+		} elseif ( !$revisions_by_path ) {
 			throw new CommandException('No matching revisions found.');
 		}
 
@@ -223,8 +219,7 @@ 
 		if ( $bugs || $revisions ) {
 			// Don't limit revisions, when provided explicitly by user.
 			$revisions_by_path_with_limit = $revisions_by_path;
-		}
-		else {
+		} else {
 			// Apply limit only, when no explicit bugs/revisions are set.
 			$revisions_by_path_with_limit = array_slice($revisions_by_path, 0, $this->getLimit());
 		}
@@ -339,8 +334,7 @@ 
 					$merge_conflict_regexps
 				);
 				$row[] = $merge_conflict_predication ? '<error>' . count($merge_conflict_predication) . '</error>' : '';
-			}
-			else {
+			} else {
 				$merge_conflict_predication = array();
 			}
 
@@ -363,11 +357,9 @@ 
 
 					if ( $path_action == 'A' ) {
 						$color_format = 'fg=green';
-					}
-					elseif ( $path_action == 'D' ) {
+					} elseif ( $path_action == 'D' ) {
 						$color_format = 'fg=red';
-					}
-					else {
+					} else {
 						$color_format = in_array($path_data['path'], $merge_conflict_predication) ? 'error' : '';
 					}
 
@@ -416,11 +408,9 @@ 
 
 			if ( $path_action == 'A' ) {
 				$summary['added']++;
-			}
-			elseif ( $path_action == 'D' ) {
+			} elseif ( $path_action == 'D' ) {
 				$summary['removed']++;
-			}
-			else {
+			} else {
 				$summary['changed']++;
 			}
 		}

src/SVNBuddy/Command/MergeCommand.php

Braces +6 added lines, -12 removed lines

@@ -178,12 +178,10 @@ 
 
 		if ( $this->shouldMergeAll($revisions) ) {
 			$revisions = $this->_unmergedRevisions;
-		}
-		else {
+		} else {
 			if ( $revisions ) {
 				$revisions = $this->getDirectRevisions($revisions, $source_url);
-			}
-			elseif ( $bugs ) {
+			} elseif ( $bugs ) {
 				$revisions = $this->getRevisionLog($source_url)->find('bugs', $bugs);
 			}
 
@@ -198,8 +196,7 @@ 
 
 		if ( $revisions ) {
 			$this->performMerge($source_url, $wc_path, $revisions);
-		}
-		elseif ( $this->_unmergedRevisions ) {
+		} elseif ( $this->_unmergedRevisions ) {
 			$this->runOtherCommand('log', array(
 				'path' => $this->repositoryConnector->getProjectUrl($source_url),
 				'--revisions' => implode(',', $this->_unmergedRevisions),
@@ -342,8 +339,7 @@ 
 			$unmerged_bugs = $revision_log->getBugsFromRevisions($unmerged_revisions);
 			$error_msg = '<error>%d revision(-s) or %d bug(-s) not merged</error>';
 			$this->io->writeln(sprintf($error_msg, count($unmerged_revisions), count($unmerged_bugs)));
-		}
-		else {
+		} else {
 			$this->io->writeln('<info>Up to date</info>');
 		}
 
@@ -426,8 +422,7 @@ 
 			foreach ( $revisions as $revision ) {
 				$revision_log->getRevisionData('summary', $revision);
 			}
-		}
-		catch ( \InvalidArgumentException $e ) {
+		} catch ( \InvalidArgumentException $e ) {
 			throw new CommandException($e->getMessage());
 		}
 
@@ -495,8 +490,7 @@ 
 				'Path',
 				'Associated Revisions (before ' . $largest_suggested_revision . ')',
 			));
-		}
-		else {
+		} else {
 			$table->setHeaders(array(
 				'Path',
 				'Associated Revisions',

src/SVNBuddy/Config/AbstractConfigSetting.php

Braces +2 added lines, -4 removed lines

@@ -143,8 +143,7 @@ 
 				$this->_getScopedName(__METHOD__, $scope_bit),
 				$this->_defaultValue
 			);
-		}
-		else {
+		} else {
 			$value = null;
 
 			if ( $this->isWithinScope(self::SCOPE_WORKING_COPY) ) {
@@ -189,8 +188,7 @@ 
 		if ( !isset($scope_bit) ) {
 			if ( $this->isWithinScope(self::SCOPE_WORKING_COPY) ) {
 				$scope_bit = self::SCOPE_WORKING_COPY;
-			}
-			else {
+			} else {
 				$scope_bit = self::SCOPE_GLOBAL;
 			}
 		}

src/SVNBuddy/Exception/RepositoryCommandException.php

Braces +2 added lines, -4 removed lines

@@ -58,16 +58,14 @@
 				// SVN 1.7+.
 				$error_code = $regs[1];
 				$error_message .= PHP_EOL . $regs[2];
-			}
-			elseif ( preg_match('/^svn\: (.*)$/', $line, $regs) ) {
+			} elseif ( preg_match('/^svn\: (.*)$/', $line, $regs) ) {
 				// SVN 1.6-.
 				if ( preg_match('/^\'(.*)\' is not a working copy$/', $regs[1]) ) {
 					$error_code = self::SVN_ERR_WC_NOT_WORKING_COPY;
 				}
 
 				$error_message .= PHP_EOL . $regs[1];
-			}
-			else {
+			} else {
 				$error_message .= ' ' . $line;
 			}
 		}

src/SVNBuddy/Repository/Connector/Command.php

Braces +1 added lines, -2 removed lines

@@ -168,8 +168,7 @@
 					PHP_EOL . '<fg=white;bg=magenta>[svn, ' . round($runtime, 2) . 's]: ' . $command_line . '</>'
 				);
 			}
-		}
-		catch ( ProcessFailedException $e ) {
+		} catch ( ProcessFailedException $e ) {
 			$process = $e->getProcess();
 
 			throw new RepositoryCommandException(