console-helpers / svn-buddy

src/SVNBuddy/Command/AggregateCommand.php

Doc Comments +1 added lines, -1 removed lines

@@ -369,7 +369,7 @@
 	/**
 	 * Returns list of config settings.
 	 *
-	 * @return AbstractConfigSetting[]
+	 * @return PathsConfigSetting[]
 	 */
 	public function getConfigSettings()
 	{

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

Doc Comments +1 added lines, -1 removed lines

@@ -203,7 +203,7 @@
 	 *
 	 * @param mixed $value Value.
 	 *
-	 * @return mixed
+	 * @return string
 	 */
 	protected function openEditor($value)
 	{

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

Doc Comments +1 added lines, -1 removed lines

@@ -549,7 +549,7 @@
 	/**
 	 * Returns list of config settings.
 	 *
-	 * @return AbstractConfigSetting[]
+	 * @return StringConfigSetting[]
 	 */
 	public function getConfigSettings()
 	{

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/Repository/RevisionLog/BugsRevisionLogPlugin.php

Doc Comments +1 added lines, -1 removed lines

@@ -155,7 +155,7 @@
 	/**
 	 * Returns cache invalidator for this plugin data.
 	 *
-	 * @return string
+	 * @return integer
 	 */
 	public function getCacheInvalidator()
 	{

Spacing +8 added lines, -8 removed lines

@@ -67,12 +67,12 @@ 
 	 */
 	public function parse(\SimpleXMLElement $log)
 	{
-		foreach ( $log->logentry as $log_entry ) {
+		foreach ($log->logentry as $log_entry) {
 			$revision = (int)$log_entry['revision'];
 			$this->_revisionBugs[$revision] = $this->_logMessageParser->parse((string)$log_entry->msg);
 
-			foreach ( $this->_revisionBugs[$revision] as $bug_id ) {
-				if ( !isset($this->_bugRevisions[$bug_id]) ) {
+			foreach ($this->_revisionBugs[$revision] as $bug_id) {
+				if (!isset($this->_bugRevisions[$bug_id])) {
 					$this->_bugRevisions[$bug_id] = array();
 				}
 
@@ -92,12 +92,12 @@ 
 	{
 		$bug_revisions = array();
 
-		foreach ( $criteria as $bug_id ) {
-			if ( !array_key_exists($bug_id, $this->_bugRevisions) ) {
+		foreach ($criteria as $bug_id) {
+			if (!array_key_exists($bug_id, $this->_bugRevisions)) {
 				continue;
 			}
 
-			foreach ( $this->_bugRevisions[$bug_id] as $revision ) {
+			foreach ($this->_bugRevisions[$bug_id] as $revision) {
 				$bug_revisions[$revision] = true;
 			}
 		}
@@ -118,7 +118,7 @@ 
 	 */
 	public function getRevisionData($revision)
 	{
-		if ( !isset($this->_revisionBugs[$revision]) ) {
+		if (!isset($this->_revisionBugs[$revision])) {
 			$error_msg = 'Revision "%s" not found by "%s" plugin.';
 			throw new \InvalidArgumentException(sprintf($error_msg, $revision, $this->getName()));
 		}
@@ -169,7 +169,7 @@ 
 	 */
 	public function getLastRevision()
 	{
-		if ( !$this->_revisionBugs ) {
+		if (!$this->_revisionBugs) {
 			return null;
 		}
 

src/SVNBuddy/Repository/RevisionLog/MergesRevisionLogPlugin.php

Doc Comments +1 added lines, -1 removed lines

@@ -153,7 +153,7 @@
 	/**
 	 * Returns cache invalidator for this plugin data.
 	 *
-	 * @return string
+	 * @return integer
 	 */
 	public function getCacheInvalidator()
 	{

Spacing +11 added lines, -11 removed lines

@@ -48,23 +48,23 @@ 
 	 */
 	public function parse(\SimpleXMLElement $log)
 	{
-		foreach ( $log->logentry as $log_entry ) {
+		foreach ($log->logentry as $log_entry) {
 			$revision_merges = array();
 			$revision = (int)$log_entry['revision'];
 
-			foreach ( $log_entry->logentry as $merged_log_entry ) {
+			foreach ($log_entry->logentry as $merged_log_entry) {
 				$merged_revision = (int)$merged_log_entry['revision'];
 
 				$revision_merges[] = $merged_revision;
 
-				if ( !isset($this->_mergedRevisions[$merged_revision]) ) {
+				if (!isset($this->_mergedRevisions[$merged_revision])) {
 					$this->_mergedRevisions[$merged_revision] = array();
 				}
 
 				$this->_mergedRevisions[$merged_revision][] = $revision;
 			}
 
-			if ( $revision_merges ) {
+			if ($revision_merges) {
 				$this->_mergeRevisions[$revision] = $revision_merges;
 			}
 		}
@@ -80,27 +80,27 @@ 
 	 */
 	public function find(array $criteria)
 	{
-		if ( !$criteria ) {
+		if (!$criteria) {
 			return array();
 		}
 
 		$first_criteria = reset($criteria);
 
-		if ( $first_criteria === 'all_merges' ) {
+		if ($first_criteria === 'all_merges') {
 			return array_keys($this->_mergeRevisions);
 		}
-		elseif ( $first_criteria === 'all_merged' ) {
+		elseif ($first_criteria === 'all_merged') {
 			return array_keys($this->_mergedRevisions);
 		}
 
 		$merged_revisions = array();
 
-		foreach ( $criteria as $merge_revision ) {
-			if ( !array_key_exists($merge_revision, $this->_mergeRevisions) ) {
+		foreach ($criteria as $merge_revision) {
+			if (!array_key_exists($merge_revision, $this->_mergeRevisions)) {
 				throw new \InvalidArgumentException('The merge revision ' . $merge_revision . ' not found.');
 			}
 
-			foreach ( $this->_mergeRevisions[$merge_revision] as $merged_revision ) {
+			foreach ($this->_mergeRevisions[$merge_revision] as $merged_revision) {
 				$merged_revisions[$merged_revision] = true;
 			}
 		}
@@ -167,7 +167,7 @@ 
 	 */
 	public function getLastRevision()
 	{
-		if ( !$this->_mergeRevisions ) {
+		if (!$this->_mergeRevisions) {
 			return null;
 		}
 

Braces +1 added lines, -2 removed lines

@@ -88,8 +88,7 @@
 
 		if ( $first_criteria === 'all_merges' ) {
 			return array_keys($this->_mergeRevisions);
-		}
-		elseif ( $first_criteria === 'all_merged' ) {
+		} elseif ( $first_criteria === 'all_merged' ) {
 			return array_keys($this->_mergedRevisions);
 		}
 

src/SVNBuddy/Repository/RevisionLog/PathsRevisionLogPlugin.php

Doc Comments +1 added lines, -1 removed lines

@@ -149,7 +149,7 @@
 	/**
 	 * Returns cache invalidator for this plugin data.
 	 *
-	 * @return string
+	 * @return integer
 	 */
 	public function getCacheInvalidator()
 	{

Spacing +10 added lines, -10 removed lines

@@ -48,15 +48,15 @@ 
 	 */
 	public function parse(\SimpleXMLElement $log)
 	{
-		foreach ( $log->logentry as $log_entry ) {
+		foreach ($log->logentry as $log_entry) {
 			$revision = (int)$log_entry['revision'];
 			$this->_revisionPaths[$revision] = array();
 
-			foreach ( $log_entry->paths->path as $path_node ) {
+			foreach ($log_entry->paths->path as $path_node) {
 				/** @var \SimpleXMLElement $path_node */
 				$path = (string)$path_node;
 
-				if ( !isset($this->_pathRevisions[$path]) ) {
+				if (!isset($this->_pathRevisions[$path])) {
 					$this->_pathRevisions[$path] = array();
 				}
 
@@ -64,7 +64,7 @@ 
 
 				$path_data = array('path' => $path);
 
-				foreach ( $path_node->attributes() as $attribute_name => $attribute_value ) {
+				foreach ($path_node->attributes() as $attribute_name => $attribute_value) {
 					$path_data[$attribute_name] = (string)$attribute_value;
 				}
 
@@ -84,12 +84,12 @@ 
 	{
 		$path_revisions = array();
 
-		foreach ( $criteria as $path ) {
+		foreach ($criteria as $path) {
 			$path_length = strlen($path);
 
-			foreach ( $this->_pathRevisions as $test_path => $revisions ) {
-				if ( substr($test_path, 0, $path_length) == $path ) {
-					foreach ( $revisions as $revision ) {
+			foreach ($this->_pathRevisions as $test_path => $revisions) {
+				if (substr($test_path, 0, $path_length) == $path) {
+					foreach ($revisions as $revision) {
 						$path_revisions[$revision] = true;
 					}
 				}
@@ -112,7 +112,7 @@ 
 	 */
 	public function getRevisionData($revision)
 	{
-		if ( !isset($this->_revisionPaths[$revision]) ) {
+		if (!isset($this->_revisionPaths[$revision])) {
 			$error_msg = 'Revision "%s" not found by "%s" plugin.';
 			throw new \InvalidArgumentException(sprintf($error_msg, $revision, $this->getName()));
 		}
@@ -163,7 +163,7 @@ 
 	 */
 	public function getLastRevision()
 	{
-		if ( !$this->_revisionPaths ) {
+		if (!$this->_revisionPaths) {
 			return null;
 		}
 

src/SVNBuddy/Repository/RevisionLog/RevisionLog.php

Doc Comments +1 added lines, -1 removed lines

@@ -119,7 +119,7 @@
 	/**
 	 * Returns format version.
 	 *
-	 * @return mixed
+	 * @return string
 	 */
 	private function _getCacheInvalidator()
 	{

Spacing +14 added lines, -14 removed lines

@@ -83,7 +83,7 @@ 
 	 */
 	public function refresh()
 	{
-		if ( !$this->_plugins ) {
+		if (!$this->_plugins) {
 			throw new \LogicException('Please register at least one revision log plugin.');
 		}
 
@@ -93,8 +93,8 @@ 
 		$cache_key = 'log:' . $project_url;
 		$cache = $this->_cacheManager->getCache($cache_key, $this->_getCacheInvalidator());
 
-		if ( is_array($cache) ) {
-			foreach ( $this->_plugins as $plugin_name => $plugin ) {
+		if (is_array($cache)) {
+			foreach ($this->_plugins as $plugin_name => $plugin) {
 				$plugin->setCollectedData($cache[$plugin_name]);
 			}
 		}
@@ -102,13 +102,13 @@ 
 		$from_revision = $this->_getLastRevision();
 		$to_revision = $this->_repositoryConnector->getLastRevision($project_url);
 
-		if ( $to_revision > $from_revision ) {
+		if ($to_revision > $from_revision) {
 			$this->_queryRevisionData($from_revision, $to_revision);
 
 			// Collect and cache plugin data.
 			$cache = array();
 
-			foreach ( $this->_plugins as $plugin_name => $plugin ) {
+			foreach ($this->_plugins as $plugin_name => $plugin) {
 				$cache[$plugin_name] = $plugin->getCollectedData();
 			}
 
@@ -125,7 +125,7 @@ 
 	{
 		$invalidators = array('main' => 'main:' . self::CACHE_FORMAT_VERSION);
 
-		foreach ( $this->_plugins as $plugin_name => $plugin ) {
+		foreach ($this->_plugins as $plugin_name => $plugin) {
 			$invalidator_key = 'plugin(' . $plugin_name . ')';
 			$invalidators[$invalidator_key] = $invalidator_key . ':' . $plugin->getCacheInvalidator();
 		}
@@ -146,7 +146,7 @@ 
 		$plugin = reset($this->_plugins);
 		$last_revision = $plugin->getLastRevision();
 
-		if ( $last_revision === null ) {
+		if ($last_revision === null) {
 			return $this->_repositoryConnector->getFirstRevision(
 				$this->_repositoryConnector->getProjectUrl($this->_repositoryUrl)
 			);
@@ -174,7 +174,7 @@ 
 		);
 		$progress_bar->start();
 
-		while ( $range_start < $to_revision ) {
+		while ($range_start < $to_revision) {
 			$range_end = min($range_start + 1000, $to_revision);
 
 			$command = $this->_repositoryConnector->getCommand(
@@ -201,7 +201,7 @@ 
 	 */
 	private function _parseLog(\SimpleXMLElement $log)
 	{
-		foreach ( $this->_plugins as $plugin ) {
+		foreach ($this->_plugins as $plugin) {
 			$plugin->parse($log);
 		}
 	}
@@ -218,7 +218,7 @@ 
 	{
 		$plugin_name = $plugin->getName();
 
-		if ( $this->pluginRegistered($plugin_name) ) {
+		if ($this->pluginRegistered($plugin_name)) {
 			throw new \LogicException('The "' . $plugin_name . '" revision log plugin is already registered.');
 		}
 
@@ -236,7 +236,7 @@ 
 	 */
 	public function find($plugin_name, $criteria)
 	{
-		if ( !$this->pluginRegistered($plugin_name) ) {
+		if (!$this->pluginRegistered($plugin_name)) {
 			throw new \InvalidArgumentException('The "' . $plugin_name . '" revision log plugin is unknown.');
 		}
 
@@ -254,7 +254,7 @@ 
 	 */
 	public function getRevisionData($plugin_name, $revision)
 	{
-		if ( !$this->pluginRegistered($plugin_name) ) {
+		if (!$this->pluginRegistered($plugin_name)) {
 			throw new \InvalidArgumentException('The "' . $plugin_name . '" revision log plugin is unknown.');
 		}
 
@@ -284,10 +284,10 @@ 
 	{
 		$bugs = array();
 
-		foreach ( $revisions as $revision ) {
+		foreach ($revisions as $revision) {
 			$revision_bugs = $this->getRevisionData('bugs', $revision);
 
-			foreach ( $revision_bugs as $bug_id ) {
+			foreach ($revision_bugs as $bug_id) {
 				$bugs[$bug_id] = true;
 			}
 		}

src/SVNBuddy/Repository/RevisionLog/SummaryRevisionLogPlugin.php

Doc Comments +1 added lines, -1 removed lines

@@ -155,7 +155,7 @@
 	/**
 	 * Returns cache invalidator for this plugin data.
 	 *
-	 * @return string
+	 * @return integer
 	 */
 	public function getCacheInvalidator()
 	{

Spacing +9 added lines, -9 removed lines

@@ -48,11 +48,11 @@ 
 	 */
 	public function parse(\SimpleXMLElement $log)
 	{
-		foreach ( $log->logentry as $log_entry ) {
+		foreach ($log->logentry as $log_entry) {
 			$revision = (int)$log_entry['revision'];
 			$author = (string)$log_entry->author;
 
-			if ( !isset($this->_authorRevisions[$author]) ) {
+			if (!isset($this->_authorRevisions[$author])) {
 				$this->_authorRevisions[$author] = array();
 			}
 
@@ -79,20 +79,20 @@ 
 	{
 		$summary_revisions = array();
 
-		foreach ( $criteria as $criterion ) {
-			if ( strpos($criterion, ':') === false ) {
+		foreach ($criteria as $criterion) {
+			if (strpos($criterion, ':') === false) {
 				$error_msg = 'Each criterion of "%s" plugin must be in "%s" format.';
 				throw new \InvalidArgumentException(sprintf($error_msg, $this->getName(), 'field:value'));
 			}
 
 			list ($field, $value) = explode(':', $criterion, 2);
 
-			if ( $field === 'author' ) {
-				if ( !array_key_exists($value, $this->_authorRevisions) ) {
+			if ($field === 'author') {
+				if (!array_key_exists($value, $this->_authorRevisions)) {
 					continue;
 				}
 
-				foreach ( $this->_authorRevisions[$value] as $revision ) {
+				foreach ($this->_authorRevisions[$value] as $revision) {
 					$summary_revisions[$revision] = true;
 				}
 			}
@@ -118,7 +118,7 @@ 
 	 */
 	public function getRevisionData($revision)
 	{
-		if ( !isset($this->_revisionSummary[$revision]) ) {
+		if (!isset($this->_revisionSummary[$revision])) {
 			$error_msg = 'Revision "%s" not found by "%s" plugin.';
 			throw new \InvalidArgumentException(sprintf($error_msg, $revision, $this->getName()));
 		}
@@ -169,7 +169,7 @@ 
 	 */
 	public function getLastRevision()
 	{
-		if ( !$this->_revisionSummary ) {
+		if (!$this->_revisionSummary) {
 			return null;
 		}
 

Braces +1 added lines, -2 removed lines

@@ -95,8 +95,7 @@
 				foreach ( $this->_authorRevisions[$value] as $revision ) {
 					$summary_revisions[$revision] = true;
 				}
-			}
-			else {
+			} else {
 				$error_msg = 'Searching by "%s" is not supported by "%s" plugin.';
 				throw new \InvalidArgumentException(sprintf($error_msg, $field, $this->getName()));
 			}

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