console-helpers / svn-buddy

src/SVNBuddy/Cache/CacheManager.php

Spacing +4 added lines, -4 removed lines

@@ -43,7 +43,7 @@ 
 	 */
 	public function setCache($name, $value, $invalidator = null, $duration = null)
 	{
-		if ( is_numeric($duration) ) {
+		if (is_numeric($duration)) {
 			$duration .= ' seconds';
 		}
 
@@ -69,13 +69,13 @@ 
 		$storage = $this->_getStorage($name);
 		$cache = $storage->get();
 
-		if ( !is_array($cache) || $cache['invalidator'] !== $invalidator ) {
+		if (!is_array($cache) || $cache['invalidator'] !== $invalidator) {
 			$storage->invalidate();
 
 			return null;
 		}
 
-		if ( $cache['expiration'] && $cache['expiration'] < time() ) {
+		if ($cache['expiration'] && $cache['expiration'] < time()) {
 			$storage->invalidate();
 
 			return null;
@@ -96,7 +96,7 @@ 
 	{
 		$parts = explode(':', $name, 2);
 
-		if ( count($parts) != 2 ) {
+		if (count($parts) != 2) {
 			throw new \InvalidArgumentException('The $name parameter must be in "namespace:name" format.');
 		}
 

src/SVNBuddy/Cache/FileCacheStorage.php

Spacing +5 added lines, -5 removed lines

@@ -41,19 +41,19 @@ 
 	 */
 	public function get()
 	{
-		if ( !file_exists($this->_file) ) {
+		if (!file_exists($this->_file)) {
 			return null;
 		}
 
 		$file_contents = file_get_contents($this->_file);
 
-		if ( strpos($this->_file, '/log_') !== false ) {
+		if (strpos($this->_file, '/log_') !== false) {
 			$file_contents = gzuncompress($file_contents);
 		}
 
 		$cache = json_decode($file_contents, true);
 
-		if ( $cache ) {
+		if ($cache) {
 			return $cache;
 		}
 
@@ -71,7 +71,7 @@ 
 	{
 		$file_contents = json_encode($cache);
 
-		if ( strpos($this->_file, '/log_') !== false ) {
+		if (strpos($this->_file, '/log_') !== false) {
 			$file_contents = gzcompress($file_contents);
 		}
 
@@ -85,7 +85,7 @@ 
 	 */
 	public function invalidate()
 	{
-		if ( file_exists($this->_file) ) {
+		if (file_exists($this->_file)) {
 			unlink($this->_file);
 		}
 	}

src/SVNBuddy/Command/AbstractCommand.php

Spacing +10 added lines, -10 removed lines

@@ -125,13 +125,13 @@ 
 	 */
 	private function _getConfigSetting($name)
 	{
-		if ( !($this instanceof IConfigAwareCommand) ) {
+		if (!($this instanceof IConfigAwareCommand)) {
 			throw new \LogicException('Command does not have any settings.');
 		}
 
-		foreach ( $this->getConfigSettings() as $config_setting ) {
-			if ( $config_setting->getName() === $name ) {
-				if ( $config_setting->isWithinScope(AbstractConfigSetting::SCOPE_WORKING_COPY) ) {
+		foreach ($this->getConfigSettings() as $config_setting) {
+			if ($config_setting->getName() === $name) {
+				if ($config_setting->isWithinScope(AbstractConfigSetting::SCOPE_WORKING_COPY)) {
 					$config_setting->setWorkingCopyUrl($this->getWorkingCopyUrl());
 				}
 
@@ -153,7 +153,7 @@ 
 	 */
 	protected function getConfigScope($is_global)
 	{
-		if ( $is_global ) {
+		if ($is_global) {
 			return 'global-settings.';
 		}
 
@@ -173,7 +173,7 @@ 
 	 */
 	protected function getRevisionLog($repository_url)
 	{
-		if ( !isset($this->_revisionLogs[$repository_url]) ) {
+		if (!isset($this->_revisionLogs[$repository_url])) {
 			$this->_revisionLogs[$repository_url] = $this->_revisionLogFactory->getRevisionLog($repository_url);
 		}
 
@@ -213,8 +213,8 @@ 
 	{
 		$path = $this->getPath();
 
-		if ( !in_array($path, $this->_workingCopyPaths) ) {
-			if ( !$this->repositoryConnector->isUrl($path)
+		if (!in_array($path, $this->_workingCopyPaths)) {
+			if (!$this->repositoryConnector->isUrl($path)
 				&& !$this->repositoryConnector->isWorkingCopy($path)
 			) {
 				throw new \RuntimeException('The "' . $path . '" isn\'t a working copy.');
@@ -236,10 +236,10 @@ 
 	{
 		$path = $this->io->getArgument('path');
 
-		if ( !$this->repositoryConnector->isUrl($path) ) {
+		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.');
 		}
 

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

Spacing +24 added lines, -24 removed lines

@@ -97,7 +97,7 @@ 
 	{
 		$ret = parent::completeArgumentValues($argumentName, $context);
 
-		if ( $argumentName == 'sub-command' ) {
+		if ($argumentName == 'sub-command') {
 			return $this->getSubCommands();
 		}
 
@@ -113,8 +113,8 @@ 
 	{
 		$ret = array();
 
-		foreach ( $this->getApplication()->all() as $command ) {
-			if ( $command instanceof IAggregatorAwareCommand ) {
+		foreach ($this->getApplication()->all() as $command) {
+			if ($command instanceof IAggregatorAwareCommand) {
 				$ret[] = $command->getName();
 			}
 		}
@@ -129,13 +129,13 @@ 
 	{
 		$sub_command = $this->io->getArgument('sub-command');
 
-		if ( !in_array($sub_command, $this->getSubCommands()) ) {
+		if (!in_array($sub_command, $this->getSubCommands())) {
 			throw new \RuntimeException(
 				'The "' . $sub_command . '" sub-command is unknown or doesn\'t support aggregation.'
 			);
 		}
 
-		if ( $this->processIgnoreAdd() || $this->processIgnoreRemove() || $this->processIgnoreShow() ) {
+		if ($this->processIgnoreAdd() || $this->processIgnoreRemove() || $this->processIgnoreShow()) {
 			return;
 		}
 
@@ -153,18 +153,18 @@ 
 	{
 		$raw_ignore_add = $this->io->getOption('ignore-add');
 
-		if ( $raw_ignore_add === null ) {
+		if ($raw_ignore_add === null) {
 			return false;
 		}
 
 		$ignored = $this->getIgnored();
 		$ignore_add = realpath($this->getPath() . '/' . $raw_ignore_add);
 
-		if ( $ignore_add === false ) {
+		if ($ignore_add === false) {
 			throw new CommandException('The "' . $raw_ignore_add . '" path does not exist.');
 		}
 
-		if ( in_array($ignore_add, $ignored) ) {
+		if (in_array($ignore_add, $ignored)) {
 			throw new CommandException('The "' . $ignore_add . '" directory is already ignored.');
 		}
 
@@ -184,18 +184,18 @@ 
 	{
 		$raw_ignore_remove = $this->io->getOption('ignore-remove');
 
-		if ( $raw_ignore_remove === null ) {
+		if ($raw_ignore_remove === null) {
 			return false;
 		}
 
 		$ignored = $this->getIgnored();
 		$ignore_remove = realpath($this->getPath() . '/' . $raw_ignore_remove);
 
-		if ( $ignore_remove === false ) {
+		if ($ignore_remove === false) {
 			throw new CommandException('The "' . $raw_ignore_remove . '" path does not exist.');
 		}
 
-		if ( !in_array($ignore_remove, $ignored) ) {
+		if (!in_array($ignore_remove, $ignored)) {
 			throw new CommandException('The "' . $ignore_remove . '" directory is not ignored.');
 		}
 
@@ -212,13 +212,13 @@ 
 	 */
 	protected function processIgnoreShow()
 	{
-		if ( !$this->io->getOption('ignore-show') ) {
+		if (!$this->io->getOption('ignore-show')) {
 			return false;
 		}
 
 		$ignored = $this->getIgnored();
 
-		if ( !$ignored ) {
+		if (!$ignored) {
 			$this->io->writeln('No paths found in ignored directory list.');
 
 			return true;
@@ -226,7 +226,7 @@ 
 
 		$this->io->writeln(array('Paths in ignored directory list:', ''));
 
-		foreach ( $ignored as $ignored_path ) {
+		foreach ($ignored as $ignored_path) {
 			$this->io->writeln(' * ' . $ignored_path);
 		}
 
@@ -257,7 +257,7 @@ 
 	{
 		$path = $this->getPath();
 
-		if ( $this->repositoryConnector->isWorkingCopy($path) ) {
+		if ($this->repositoryConnector->isWorkingCopy($path)) {
 			throw new \RuntimeException('The "' . $path . '" must not be a working copy.');
 		}
 
@@ -270,7 +270,7 @@ 
 		$with_details = $this->io->getOption('details');
 		$with_summary = $this->io->getOption('summary');
 
-		foreach ( $working_copies as $index => $wc_path ) {
+		foreach ($working_copies as $index => $wc_path) {
 			$this->io->writeln(array(
 				'',
 				'Executing <info>' . $sub_command . '</info> command on <info>' . $wc_path . '</info> path',
@@ -281,11 +281,11 @@ 
 				'path' => $wc_path,
 			);
 
-			if ( $with_details && in_array($sub_command, array('log', 'merge')) ) {
+			if ($with_details && in_array($sub_command, array('log', 'merge'))) {
 				$sub_command_arguments['--details'] = $with_details;
 			}
 
-			if ( $with_summary && in_array($sub_command, array('log', 'merge')) ) {
+			if ($with_summary && in_array($sub_command, array('log', 'merge'))) {
 				$sub_command_arguments['--summary'] = $with_summary;
 			}
 
@@ -315,14 +315,14 @@ 
 		$all_working_copies_count = count($all_working_copies);
 		$working_copies_count = count($working_copies);
 
-		if ( $all_working_copies_count != $working_copies_count ) {
+		if ($all_working_copies_count != $working_copies_count) {
 			$ignored_suffix = ' (' . ($all_working_copies_count - $working_copies_count) . ' ignored)';
 		}
 		else {
 			$ignored_suffix = '';
 		}
 
-		if ( !$working_copies ) {
+		if (!$working_copies) {
 			$this->io->writeln('<error>None found' . $ignored_suffix . '</error>');
 
 			throw new CommandException('No working copies found at "' . $path . '" path.');
@@ -344,18 +344,18 @@ 
 	{
 		$working_copies = array();
 
-		if ( $this->io->isVerbose() ) {
+		if ($this->io->isVerbose()) {
 			$this->io->writeln(
 				PHP_EOL . '<fg=white;bg=magenta>scanning: ' . $path . '</>'
 			);
 		}
 
-		foreach ( glob($path . '/*', GLOB_ONLYDIR) as $sub_folder ) {
-			if ( file_exists($sub_folder . '/.git') || file_exists($sub_folder . '/CVS') ) {
+		foreach (glob($path . '/*', GLOB_ONLYDIR) as $sub_folder) {
+			if (file_exists($sub_folder . '/.git') || file_exists($sub_folder . '/CVS')) {
 				continue;
 			}
 
-			if ( $this->repositoryConnector->isWorkingCopy($sub_folder) ) {
+			if ($this->repositoryConnector->isWorkingCopy($sub_folder)) {
 				$working_copies[] = $sub_folder;
 			}
 			else {

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

Spacing +12 added lines, -12 removed lines

@@ -86,13 +86,13 @@ 
 		$wc_path = $this->getWorkingCopyPath();
 		$conflicts = $this->repositoryConnector->getWorkingCopyConflicts($wc_path);
 
-		if ( $conflicts ) {
+		if ($conflicts) {
 			throw new CommandException('Conflicts detected. Please resolve them before committing.');
 		}
 
 		$working_copy_status = $this->repositoryConnector->getCompactWorkingCopyStatus($wc_path, false);
 
-		if ( !$working_copy_status ) {
+		if (!$working_copy_status) {
 			throw new CommandException('Nothing to commit.');
 		}
 
@@ -106,13 +106,13 @@ 
 
 		$stop_line_pos = strpos($edited_commit_message, self::STOP_LINE);
 
-		if ( $stop_line_pos !== false ) {
+		if ($stop_line_pos !== false) {
 			$edited_commit_message = trim(substr($edited_commit_message, 0, $stop_line_pos));
 		}
 
 		$this->io->writeln(array('<fg=white;options=bold>Commit message:</>', $edited_commit_message, ''));
 
-		if ( !$this->io->askConfirmation('Run "svn commit"', false) ) {
+		if (!$this->io->askConfirmation('Run "svn commit"', false)) {
 			throw new CommandException('Commit aborted by user.');
 		}
 
@@ -148,7 +148,7 @@ 
 
 		$merged_revisions = $this->getFreshMergedRevisions($wc_path);
 
-		if ( !$merged_revisions ) {
+		if (!$merged_revisions) {
 			return '';
 		}
 
@@ -156,12 +156,12 @@ 
 		$wc_url = $this->repositoryConnector->getWorkingCopyUrl($wc_path);
 		$repository_url = $this->removePathFromURL($wc_url);
 
-		foreach ( $merged_revisions as $path => $revisions ) {
+		foreach ($merged_revisions as $path => $revisions) {
 			$merged_messages = array();
 			$revision_log = $this->getRevisionLog($repository_url . $path);
 			$commit_message .= 'Merging from ' . ucfirst(basename($path)) . ' to ' . ucfirst(basename($wc_url)) . PHP_EOL;
 
-			foreach ( $revisions as $revision ) {
+			foreach ($revisions as $revision) {
 				$revision_data = $revision_log->getRevisionData('summary', $revision);
 				$merged_messages[] = ' * r' . $revision . ': ' . $revision_data['msg'];
 			}
@@ -200,18 +200,18 @@ 
 		$old_paths = $this->getMergedRevisions($wc_path, 'BASE');
 		$new_paths = $this->getMergedRevisions($wc_path);
 
-		if ( $old_paths === $new_paths ) {
+		if ($old_paths === $new_paths) {
 			return array();
 		}
 
-		foreach ( $new_paths as $new_path => $new_merged_revisions ) {
-			if ( !isset($old_paths[$new_path]) ) {
+		foreach ($new_paths as $new_path => $new_merged_revisions) {
+			if (!isset($old_paths[$new_path])) {
 				// Merge from new path.
 				$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)
@@ -243,7 +243,7 @@ 
 		$merge_info = $this->repositoryConnector->getProperty('svn:mergeinfo', $wc_path, $revision);
 		$merge_info = array_filter(explode("\n", $merge_info));
 
-		foreach ( $merge_info as $merge_info_line ) {
+		foreach ($merge_info as $merge_info_line) {
 			list($path, $revisions) = explode(':', $merge_info_line, 2);
 			$paths[$path] = $revisions;
 		}

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

Spacing +22 added lines, -22 removed lines

@@ -121,7 +121,7 @@ 
 	{
 		$ret = parent::completeOptionValues($optionName, $context);
 
-		if ( in_array($optionName, array('show', 'edit', 'delete')) ) {
+		if (in_array($optionName, array('show', 'edit', 'delete'))) {
 			return array_keys($this->configSettings);
 		}
 
@@ -133,7 +133,7 @@ 
 	 */
 	protected function execute(InputInterface $input, OutputInterface $output)
 	{
-		if ( $this->processShow() || $this->processEdit() || $this->processDelete() ) {
+		if ($this->processShow() || $this->processEdit() || $this->processDelete()) {
 			return;
 		}
 
@@ -149,7 +149,7 @@ 
 	{
 		$setting_name = $this->io->getOption('show');
 
-		if ( $setting_name === null ) {
+		if ($setting_name === null) {
 			return false;
 		}
 
@@ -167,7 +167,7 @@ 
 	{
 		$setting_name = $this->io->getOption('edit');
 
-		if ( $setting_name === null ) {
+		if ($setting_name === null) {
 			return false;
 		}
 
@@ -175,7 +175,7 @@ 
 		$value = $config_setting->getValue($this->getValueFilter());
 		$retry = false;
 
-		if ( $config_setting instanceof ArrayConfigSetting ) {
+		if ($config_setting instanceof ArrayConfigSetting) {
 			$value = implode(PHP_EOL, $value);
 		}
 
@@ -186,14 +186,14 @@ 
 				$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) ) {
+				if ($this->io->askConfirmation('Retry editing', false)) {
 					$retry = true;
 				}
 			}
-		} while ( $retry );
+		} while ($retry);
 
 		return true;
 	}
@@ -222,7 +222,7 @@ 
 	{
 		$setting_name = $this->io->getOption('delete');
 
-		if ( $setting_name === null ) {
+		if ($setting_name === null) {
 			return false;
 		}
 
@@ -242,13 +242,13 @@ 
 	 */
 	protected function listSettings($setting_name = null)
 	{
-		if ( isset($setting_name) ) {
+		if (isset($setting_name)) {
 			$this->getConfigSetting($setting_name);
 		}
 
 		$extra_title = isset($setting_name) ? ' (filtered)' : '';
 
-		if ( $this->isGlobal() ) {
+		if ($this->isGlobal()) {
 			$this->io->writeln('Showing global settings' . $extra_title . ':');
 		}
 		else {
@@ -266,8 +266,8 @@ 
 
 		$value_filter = $this->getValueFilter();
 
-		foreach ( $this->getConfigSettingsByScope($this->getScopeFilter()) as $name => $config_setting ) {
-			if ( isset($setting_name) && $name !== $setting_name ) {
+		foreach ($this->getConfigSettingsByScope($this->getScopeFilter()) as $name => $config_setting) {
+			if (isset($setting_name) && $name !== $setting_name) {
 				continue;
 			}
 
@@ -291,8 +291,8 @@ 
 	{
 		$ret = array();
 
-		foreach ( $this->configSettings as $name => $config_setting ) {
-			if ( $config_setting->isWithinScope($scope_filter) ) {
+		foreach ($this->configSettings as $name => $config_setting) {
+			if ($config_setting->isWithinScope($scope_filter)) {
 				$ret[$name] = $config_setting;
 			}
 		}
@@ -310,13 +310,13 @@ 
 	 */
 	protected function getConfigSetting($name)
 	{
-		if ( !array_key_exists($name, $this->configSettings) ) {
+		if (!array_key_exists($name, $this->configSettings)) {
 			throw new \InvalidArgumentException('The "' . $name . '" setting is unknown.');
 		}
 
 		$config_setting = $this->configSettings[$name];
 
-		if ( !$config_setting->isWithinScope($this->getScopeFilter()) ) {
+		if (!$config_setting->isWithinScope($this->getScopeFilter())) {
 			throw new \InvalidArgumentException('The "' . $name . '" setting cannot be used in this scope.');
 		}
 
@@ -353,9 +353,9 @@ 
 		/** @var AbstractConfigSetting[] $config_settings */
 		$config_settings = array();
 
-		foreach ( $this->getApplication()->all() as $command ) {
-			if ( $command instanceof IConfigAwareCommand ) {
-				foreach ( $command->getConfigSettings() as $config_setting ) {
+		foreach ($this->getApplication()->all() as $command) {
+			if ($command instanceof IConfigAwareCommand) {
+				foreach ($command->getConfigSettings() as $config_setting) {
 					$config_settings[$config_setting->getName()] = $config_setting;
 				}
 			}
@@ -364,7 +364,7 @@ 
 		// Allow to operate on global settings outside of working copy.
 		$wc_url = $this->isGlobal() ? '' : $this->getWorkingCopyUrl();
 
-		foreach ( $config_settings as $config_setting ) {
+		foreach ($config_settings as $config_setting) {
 			$config_setting->setWorkingCopyUrl($wc_url);
 			$config_setting->setEditor($this->_configEditor);
 		}
@@ -380,7 +380,7 @@ 
 	protected function isGlobal()
 	{
 		// During auto-complete the IO isn't set.
-		if ( !isset($this->io) ) {
+		if (!isset($this->io)) {
 			return true;
 		}
 

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

Spacing +40 added lines, -40 removed lines

@@ -160,7 +160,7 @@ 
 		$bugs = $this->getList($this->io->getOption('bugs'));
 		$revisions = $this->getList($this->io->getOption('revisions'));
 
-		if ( $bugs && $revisions ) {
+		if ($bugs && $revisions) {
 			throw new \RuntimeException('The "--bugs" and "--revisions" options are mutually exclusive.');
 		}
 
@@ -170,12 +170,12 @@ 
 		$revision_log = $this->getRevisionLog($wc_url);
 		$revisions_by_path = $revision_log->find('paths', $this->repositoryConnector->getPathFromUrl($wc_url));
 
-		if ( $revisions ) {
+		if ($revisions) {
 			$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);
@@ -183,7 +183,7 @@ 
 
 		$merged_by = $this->getList($this->io->getOption('merged-by'));
 
-		if ( $merged_by ) {
+		if ($merged_by) {
 			// Exclude revisions, that were merged outside of project root folder in repository.
 			$merged_by = $this->_revisionListParser->expandRanges($merged_by);
 			$revisions_by_path = $revision_log->find(
@@ -195,32 +195,32 @@ 
 			$revisions_by_path = array_intersect($revisions_by_path, $revision_log->find('merges', $merged_by));
 		}
 
-		if ( $this->io->getOption('merges') ) {
+		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') ) {
+		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'));
 		}
 
-		if ( $missing_revisions ) {
+		if ($missing_revisions) {
 			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.');
 		}
 
 		rsort($revisions_by_path, SORT_NUMERIC);
 
-		if ( $bugs || $revisions ) {
+		if ($bugs || $revisions) {
 			// Don't limit revisions, when provided explicitly by user.
 			$revisions_by_path_with_limit = $revisions_by_path;
 		}
@@ -250,7 +250,7 @@ 
 	{
 		$option_limit = $this->io->getOption('limit');
 
-		if ( $option_limit !== null ) {
+		if ($option_limit !== null) {
 			return $option_limit;
 		}
 
@@ -272,14 +272,14 @@ 
 		$headers = array('Revision', 'Author', 'Date', 'Bug-ID', 'Log Message');
 
 		// Add "Summary" header.
-		if ( $this->io->getOption('summary') ) {
+		if ($this->io->getOption('summary')) {
 			$headers[] = 'Summary';
 		}
 
 		$merge_oracle = $this->io->getOption('merge-oracle');
 
 		// Add "M.O." header.
-		if ( $merge_oracle ) {
+		if ($merge_oracle) {
 			$headers[] = 'M.O.';
 			$merge_conflict_regexps = $this->getMergeConflictRegExps();
 		}
@@ -287,7 +287,7 @@ 
 		// Add "Merged Via" header.
 		$merge_status = $this->io->getOption('merge-status');
 
-		if ( $merge_status ) {
+		if ($merge_status) {
 			$headers[] = 'Merged Via';
 		}
 
@@ -302,18 +302,18 @@ 
 		$revision_log = $this->getRevisionLog($repository_url);
 		$repository_path = $this->repositoryConnector->getPathFromUrl($repository_url) . '/';
 
-		foreach ( $revisions as $revision ) {
+		foreach ($revisions as $revision) {
 			$revision_data = $revision_log->getRevisionData('summary', $revision);
 			list($log_message,) = explode(PHP_EOL, $revision_data['msg']);
 			$log_message = preg_replace('/^\[fixes:.*?\]/', "\xE2\x9C\x94", $log_message);
 
-			if ( mb_strlen($log_message) > 68 ) {
+			if (mb_strlen($log_message) > 68) {
 				$log_message = mb_substr($log_message, 0, 68 - 3) . '...';
 			}
 
 			$new_bugs = implode(', ', $revision_log->getRevisionData('bugs', $revision));
 
-			if ( isset($prev_bugs) && $new_bugs <> $prev_bugs ) {
+			if (isset($prev_bugs) && $new_bugs <> $prev_bugs) {
 				$last_color = $last_color == 'yellow' ? 'magenta' : 'yellow';
 			}
 
@@ -328,12 +328,12 @@ 
 			$revision_paths = $revision_log->getRevisionData('paths', $revision);
 
 			// Add "Summary" column.
-			if ( $this->io->getOption('summary') ) {
+			if ($this->io->getOption('summary')) {
 				$row[] = $this->generateChangeSummary($revision_paths);
 			}
 
 			// Add "M.O." column.
-			if ( $merge_oracle ) {
+			if ($merge_oracle) {
 				$merge_conflict_predication = $this->getMergeConflictPrediction(
 					$revision_paths,
 					$merge_conflict_regexps
@@ -345,26 +345,26 @@ 
 			}
 
 			// Add "Merged Via" column.
-			if ( $merge_status ) {
+			if ($merge_status) {
 				$merged_via = $revision_log->getRevisionData('merges', $revision);
 				$row[] = $merged_via ? implode(', ', $merged_via) : '';
 			}
 
 			$table->addRow($row);
 
-			if ( $with_details ) {
+			if ($with_details) {
 				$details = '<fg=white;options=bold>Changed Paths:</>';
 
-				foreach ( $revision_paths as $path_data ) {
+				foreach ($revision_paths as $path_data) {
 					$path_action = $path_data['action'];
 					$relative_path = $this->_getRelativeLogPath($path_data, 'path', $repository_path);
 
 					$details .= PHP_EOL . ' * ';
 
-					if ( $path_action == 'A' ) {
+					if ($path_action == 'A') {
 						$color_format = 'fg=green';
 					}
-					elseif ( $path_action == 'D' ) {
+					elseif ($path_action == 'D') {
 						$color_format = 'fg=red';
 					}
 					else {
@@ -373,13 +373,13 @@ 
 
 					$to_colorize = $path_action . '    ' . $relative_path;
 
-					if ( isset($path_data['copyfrom-path']) ) {
+					if (isset($path_data['copyfrom-path'])) {
 						$copy_from_rev = $path_data['copyfrom-rev'];
 						$copy_from_path = $this->_getRelativeLogPath($path_data, 'copyfrom-path', $repository_path);
 						$to_colorize .= PHP_EOL . '        (from ' . $copy_from_path . ':' . $copy_from_rev . ')';
 					}
 
-					if ( $color_format ) {
+					if ($color_format) {
 						$to_colorize = '<' . $color_format . '>' . $to_colorize . '</>';
 					}
 
@@ -389,7 +389,7 @@ 
 				$table->addRow(new TableSeparator());
 				$table->addRow(array(new TableCell($details, array('colspan' => 5))));
 
-				if ( $revision != $last_revision ) {
+				if ($revision != $last_revision) {
 					$table->addRow(new TableSeparator());
 				}
 			}
@@ -411,13 +411,13 @@ 
 	{
 		$summary = array('added' => 0, 'changed' => 0, 'removed' => 0);
 
-		foreach ( $revision_paths as $path_data ) {
+		foreach ($revision_paths as $path_data) {
 			$path_action = $path_data['action'];
 
-			if ( $path_action == 'A' ) {
+			if ($path_action == 'A') {
 				$summary['added']++;
 			}
-			elseif ( $path_action == 'D' ) {
+			elseif ($path_action == 'D') {
 				$summary['removed']++;
 			}
 			else {
@@ -425,11 +425,11 @@ 
 			}
 		}
 
-		if ( $summary['added'] ) {
+		if ($summary['added']) {
 			$summary['added'] = '<fg=green>+' . $summary['added'] . '</>';
 		}
 
-		if ( $summary['removed'] ) {
+		if ($summary['removed']) {
 			$summary['removed'] = '<fg=red>-' . $summary['removed'] . '</>';
 		}
 
@@ -446,15 +446,15 @@ 
 	 */
 	protected function getMergeConflictPrediction(array $revision_paths, array $merge_conflict_regexps)
 	{
-		if ( !$merge_conflict_regexps ) {
+		if (!$merge_conflict_regexps) {
 			return array();
 		}
 
 		$conflict_paths = array();
 
-		foreach ( $revision_paths as $revision_path ) {
-			foreach ( $merge_conflict_regexps as $merge_conflict_regexp ) {
-				if ( preg_match($merge_conflict_regexp, $revision_path['path']) ) {
+		foreach ($revision_paths as $revision_path) {
+			foreach ($merge_conflict_regexps as $merge_conflict_regexp) {
+				if (preg_match($merge_conflict_regexp, $revision_path['path'])) {
 					$conflict_paths[] = $revision_path['path'];
 				}
 			}
@@ -486,13 +486,13 @@ 
 	{
 		$ret = $path_data[$path_key];
 
-		if ( $path_data['kind'] == 'dir' ) {
+		if ($path_data['kind'] == 'dir') {
 			$ret .= '/';
 		}
 
 		$ret = str_replace($repository_path, '', $ret);
 
-		if ( $ret === '' ) {
+		if ($ret === '') {
 			$ret = '.';
 		}
 
@@ -508,7 +508,7 @@ 
 	{
 		$wc_path = $this->getWorkingCopyPath();
 
-		if ( !$this->repositoryConnector->isUrl($wc_path) ) {
+		if (!$this->repositoryConnector->isUrl($wc_path)) {
 			return $this->repositoryConnector->getWorkingCopyUrl($wc_path);
 		}
 

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

Spacing +29 added lines, -29 removed lines

@@ -143,7 +143,7 @@ 
 	{
 		$ret = parent::completeOptionValues($optionName, $context);
 
-		if ( $optionName === 'revisions' ) {
+		if ($optionName === 'revisions') {
 			return array('all');
 		}
 
@@ -158,7 +158,7 @@ 
 		$bugs = $this->getList($this->io->getOption('bugs'));
 		$revisions = $this->getList($this->io->getOption('revisions'));
 
-		if ( $bugs && $revisions ) {
+		if ($bugs && $revisions) {
 			throw new \RuntimeException('The "--bugs" and "--revisions" options are mutually exclusive.');
 		}
 
@@ -170,36 +170,36 @@ 
 		$this->printSourceAndTarget($source_url, $wc_path);
 		$this->_unmergedRevisions = $this->getUnmergedRevisions($source_url, $wc_path);
 
-		if ( ($bugs || $revisions) && !$this->_unmergedRevisions ) {
+		if (($bugs || $revisions) && !$this->_unmergedRevisions) {
 			throw new CommandException('Nothing to merge.');
 		}
 
 		$this->ensureWorkingCopyWithoutConflicts($source_url, $wc_path);
 
-		if ( $this->shouldMergeAll($revisions) ) {
+		if ($this->shouldMergeAll($revisions)) {
 			$revisions = $this->_unmergedRevisions;
 		}
 		else {
-			if ( $revisions ) {
+			if ($revisions) {
 				$revisions = $this->getDirectRevisions($revisions, $source_url);
 			}
-			elseif ( $bugs ) {
+			elseif ($bugs) {
 				$revisions = $this->getRevisionLog($source_url)->find('bugs', $bugs);
 			}
 
-			if ( $revisions ) {
+			if ($revisions) {
 				$revisions = array_intersect($revisions, $this->_unmergedRevisions);
 
-				if ( !$revisions ) {
+				if (!$revisions) {
 					throw new CommandException('Requested revisions are already merged');
 				}
 			}
 		}
 
-		if ( $revisions ) {
+		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),
@@ -234,7 +234,7 @@ 
 	{
 		$this->io->write(' * Working Copy Status ... ');
 
-		if ( $this->repositoryConnector->isMixedRevisionWorkingCopy($wc_path) ) {
+		if ($this->repositoryConnector->isMixedRevisionWorkingCopy($wc_path)) {
 			$this->io->writeln('<error>Mixed revisions</error>');
 			$this->updateWorkingCopy($wc_path);
 
@@ -246,7 +246,7 @@ 
 			$this->repositoryConnector->getWorkingCopyUrl($wc_path)
 		);
 
-		if ( $repository_revision > $working_copy_revision ) {
+		if ($repository_revision > $working_copy_revision) {
 			$this->io->writeln('<error>Out of date</error>');
 			$this->updateWorkingCopy($wc_path);
 
@@ -281,20 +281,20 @@ 
 	{
 		$source_url = $this->io->getOption('source-url');
 
-		if ( $source_url === null ) {
+		if ($source_url === null) {
 			$source_url = $this->getSetting(self::SETTING_MERGE_SOURCE_URL);
 		}
 
-		if ( !$source_url ) {
+		if (!$source_url) {
 			$wc_url = $this->repositoryConnector->getWorkingCopyUrl($wc_path);
 			$source_url = $this->_mergeSourceDetector->detect($wc_url);
 
-			if ( $source_url ) {
+			if ($source_url) {
 				$this->setSetting(self::SETTING_MERGE_SOURCE_URL, $source_url);
 			}
 		}
 
-		if ( !$source_url ) {
+		if (!$source_url) {
 			$error_msg = 'Unable to determine source url for merge.' . PHP_EOL;
 			$error_msg .= 'Please specify it manually using "--source-url" option';
 			throw new CommandException($error_msg);
@@ -338,7 +338,7 @@ 
 		$this->io->write(' * Upcoming Merge Status ... ');
 		$unmerged_revisions = $this->calculateUnmergedRevisions($source_url, $wc_path);
 
-		if ( $unmerged_revisions ) {
+		if ($unmerged_revisions) {
 			$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)));
@@ -376,7 +376,7 @@ 
 		$merge_info = $command->run();
 		$merge_info = explode(PHP_EOL, $merge_info);
 
-		foreach ( $merge_info as $index => $revision ) {
+		foreach ($merge_info as $index => $revision) {
 			$merge_info[$index] = ltrim($revision, 'r');
 		}
 
@@ -396,10 +396,10 @@ 
 		$merge_info = $this->repositoryConnector->getProperty('svn:mergeinfo', $wc_path);
 		$merge_info = array_filter(explode("\n", $merge_info));
 
-		foreach ( $merge_info as $merge_info_line ) {
+		foreach ($merge_info as $merge_info_line) {
 			list($path, $revisions) = explode(':', $merge_info_line, 2);
 
-			if ( $path == $source_path ) {
+			if ($path == $source_path) {
 				return $this->_revisionListParser->expandRanges(explode(',', $revisions));
 			}
 		}
@@ -423,11 +423,11 @@ 
 		try {
 			$revisions = $this->_revisionListParser->expandRanges($revisions);
 
-			foreach ( $revisions as $revision ) {
+			foreach ($revisions as $revision) {
 				$revision_log->getRevisionData('summary', $revision);
 			}
 		}
-		catch ( \InvalidArgumentException $e ) {
+		catch (\InvalidArgumentException $e) {
 			throw new CommandException($e->getMessage());
 		}
 
@@ -447,7 +447,7 @@ 
 	{
 		sort($revisions, SORT_NUMERIC);
 
-		foreach ( $revisions as $revision ) {
+		foreach ($revisions as $revision) {
 			$command = $this->repositoryConnector->getCommand(
 				'merge',
 				'-c ' . $revision . ' {' . $source_url . '} {' . $wc_path . '}'
@@ -480,7 +480,7 @@ 
 
 		$conflicts = $this->repositoryConnector->getWorkingCopyConflicts($wc_path);
 
-		if ( !$conflicts ) {
+		if (!$conflicts) {
 			$this->io->writeln('<info>Successful</info>');
 
 			return;
@@ -490,7 +490,7 @@ 
 
 		$table = new Table($this->io->getOutput());
 
-		if ( $largest_suggested_revision ) {
+		if ($largest_suggested_revision) {
 			$table->setHeaders(array(
 				'Path',
 				'Associated Revisions (before ' . $largest_suggested_revision . ')',
@@ -506,11 +506,11 @@ 
 		$revision_log = $this->getRevisionLog($source_url);
 		$source_path = $this->repositoryConnector->getPathFromUrl($source_url) . '/';
 
-		foreach ( $conflicts as $conflict_path ) {
+		foreach ($conflicts as $conflict_path) {
 			$path_revisions = $revision_log->find('paths', $source_path . $conflict_path);
 			$path_revisions = array_intersect($this->_unmergedRevisions, $path_revisions);
 
-			if ( $path_revisions && isset($largest_suggested_revision) ) {
+			if ($path_revisions && isset($largest_suggested_revision)) {
 				$path_revisions = $this->limitRevisions($path_revisions, $largest_suggested_revision);
 			}
 
@@ -537,8 +537,8 @@ 
 	{
 		$ret = array();
 
-		foreach ( $revisions as $revision ) {
-			if ( $revision < $max_revision ) {
+		foreach ($revisions as $revision) {
+			if ($revision < $max_revision) {
 				$ret[] = $revision;
 			}
 		}

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/Command/ResolveCommand.php

Spacing +2 added lines, -2 removed lines

@@ -50,13 +50,13 @@
 		$wc_path = $this->getWorkingCopyPath();
 		$conflicts = $this->repositoryConnector->getWorkingCopyConflicts($wc_path);
 
-		if ( !$conflicts ) {
+		if (!$conflicts) {
 			throw new CommandException('No conflicts detected.');
 		}
 
 		$resolve_path = $this->getResolvePath($conflicts);
 
-		if ( is_dir($resolve_path) ) {
+		if (is_dir($resolve_path)) {
 			throw new CommandException('Interactive tree conflict resolution is not supported.');
 		}