console-helpers / svn-buddy

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/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/CompletionCommand.php

Indentation +2 added lines, -2 removed lines

@@ -31,8 +31,8 @@
 	{
 		$handler->addHandler(new ShellPathCompletion(
 			CompletionInterface::ALL_COMMANDS,
-		    'path',
-		    Completion::TYPE_ARGUMENT
+			'path',
+			Completion::TYPE_ARGUMENT
 		));
 
 		$handler->addHandler(new ShellPathCompletion(

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/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.');
 		}
 

src/SVNBuddy/Config/AbstractConfigSetting.php

Spacing +15 added lines, -15 removed lines

@@ -66,14 +66,14 @@ 
 	 */
 	public function __construct($name, $default, $scope_bit = null)
 	{
-		if ( !isset($scope_bit) ) {
+		if (!isset($scope_bit)) {
 			$scope_bit = self::SCOPE_WORKING_COPY;
 		}
 
 		// Always add global scope.
 		$this->_scope = $scope_bit | self::SCOPE_GLOBAL;
 
-		if ( !in_array($scope_bit, array(self::SCOPE_WORKING_COPY, self::SCOPE_GLOBAL)) ) {
+		if (!in_array($scope_bit, array(self::SCOPE_WORKING_COPY, self::SCOPE_GLOBAL))) {
 			throw new \InvalidArgumentException('The $scope must be either "working copy" or "global".');
 		}
 
@@ -138,7 +138,7 @@ 
 	{
 		$this->assertUsage(__METHOD__, $scope_bit);
 
-		if ( isset($scope_bit) ) {
+		if (isset($scope_bit)) {
 			$value = $this->_editor->get(
 				$this->_getScopedName(__METHOD__, $scope_bit),
 				$this->_defaultValue
@@ -147,19 +147,19 @@ 
 		else {
 			$value = null;
 
-			if ( $this->isWithinScope(self::SCOPE_WORKING_COPY) ) {
+			if ($this->isWithinScope(self::SCOPE_WORKING_COPY)) {
 				$value = $this->_editor->get(
 					$this->_getScopedName(__METHOD__, self::SCOPE_WORKING_COPY)
 				);
 			}
 
-			if ( $value === null ) {
+			if ($value === null) {
 				$value = $this->_editor->get(
 					$this->_getScopedName(__METHOD__, self::SCOPE_GLOBAL)
 				);
 			}
 
-			if ( $value === null ) {
+			if ($value === null) {
 				$value = $this->_defaultValue;
 			}
 		}
@@ -180,14 +180,14 @@ 
 	{
 		$this->assertUsage(__METHOD__, $scope_bit);
 
-		if ( $value !== null ) {
+		if ($value !== null) {
 			$value = $this->normalizeValue($value);
 			$this->validate($value);
 			$value = $this->convertToStorageFormat($value);
 		}
 
-		if ( !isset($scope_bit) ) {
-			if ( $this->isWithinScope(self::SCOPE_WORKING_COPY) ) {
+		if (!isset($scope_bit)) {
+			if ($this->isWithinScope(self::SCOPE_WORKING_COPY)) {
 				$scope_bit = self::SCOPE_WORKING_COPY;
 			}
 			else {
@@ -196,7 +196,7 @@ 
 		}
 
 		// Don't store inherited value.
-		if ( $value === $this->_getInheritedValue(__METHOD__, $scope_bit) ) {
+		if ($value === $this->_getInheritedValue(__METHOD__, $scope_bit)) {
 			$value = null;
 		}
 
@@ -215,11 +215,11 @@ 
 	 */
 	public function assertUsage($caller_method, $scope_bit = null)
 	{
-		if ( !isset($this->_editor) ) {
+		if (!isset($this->_editor)) {
 			throw new \LogicException('Please use setEditor() before calling ' . $caller_method . '().');
 		}
 
-		if ( isset($scope_bit) && !$this->isWithinScope($scope_bit) ) {
+		if (isset($scope_bit) && !$this->isWithinScope($scope_bit)) {
 			$error_msg = 'The usage of "%s" scope bit for "%s" config setting is forbidden.';
 			throw new \InvalidArgumentException(sprintf($error_msg, $scope_bit, $this->getName()));
 		}
@@ -235,7 +235,7 @@ 
 	 */
 	private function _getInheritedValue($caller_method, $scope_bit)
 	{
-		if ( $scope_bit === self::SCOPE_WORKING_COPY ) {
+		if ($scope_bit === self::SCOPE_WORKING_COPY) {
 			return $this->_editor->get($this->_getScopedName($caller_method, self::SCOPE_GLOBAL), $this->_defaultValue);
 		}
 
@@ -253,11 +253,11 @@ 
 	 */
 	private function _getScopedName($caller_method, $scope)
 	{
-		if ( $scope === self::SCOPE_GLOBAL ) {
+		if ($scope === self::SCOPE_GLOBAL) {
 			return 'global-settings.' . $this->_name;
 		}
 
-		if ( !$this->_workingCopyUrl ) {
+		if (!$this->_workingCopyUrl) {
 			throw new \LogicException(
 				'Please call setWorkingCopyUrl() prior to calling ' . $caller_method . '() method.'
 			);

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/Config/ArrayConfigSetting.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 	 */
 	protected function normalizeValue($value)
 	{
-		if ( !is_array($value) ) {
+		if (!is_array($value)) {
 			$value = strlen($value) ? explode(PHP_EOL, $value) : array();
 		}
 

src/SVNBuddy/Config/IntegerConfigSetting.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 	 */
 	protected function validate($value)
 	{
-		if ( !is_numeric($value) ) {
+		if (!is_numeric($value)) {
 			throw new \InvalidArgumentException(
 				'The "' . $this->getName() . '" config setting value must be an integer.'
 			);

src/SVNBuddy/Config/PathsConfigSetting.php

Spacing +2 added lines, -2 removed lines

@@ -26,8 +26,8 @@
 	{
 		parent::validate($value);
 
-		foreach ( $value as $path ) {
-			if ( !file_exists($path) || !is_dir($path) ) {
+		foreach ($value as $path) {
+			if (!file_exists($path) || !is_dir($path)) {
 				throw new \InvalidArgumentException('The "' . $path . '" path doesn\'t exist or not a directory.');
 			}
 		}