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()
 	{

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)
 	{

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()
 	{

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()
 	{

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()
 	{

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()
 	{

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()
 	{

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()
 	{

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

Braces +1 added lines, -2 removed lines

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