Reintroduce few removed line breaks

src/GitElephant/Command/Caller/Caller.php

@@ -88,10 +88,12 @@ public function execute(
         if ($git) {
             $cmd = $this->getBinaryPath() . ' ' . $cmd;
         }
+
         if (stripos(PHP_OS, 'WIN') !== 0) {
             // We rely on the C locale in all output we parse.
             $cmd = 'LC_ALL=C ' . $cmd;
         }
+
         if (is_null($cwd) || !is_dir($cwd)) {
             $cwd = $this->repositoryPath;
         }
@@ -102,6 +104,7 @@ public function execute(
             // compatibility fix required for symfony/process versions prior to v4.2.
             $process = new Process($cmd, $cwd);
         }
+
         $process->setTimeout(15000);
         $process->run();
         if (!in_array($process->getExitCode(), $acceptedExitCodes)) {
@@ -111,6 +114,7 @@ public function execute(
             $text .= "\n" . $process->getOutput();
             throw new \RuntimeException($text);
         }
+
         $this->rawOutput = $process->getOutput();
         // rtrim values
         $values = array_map('rtrim', explode(PHP_EOL, $process->getOutput()));

src/GitElephant/Command/CloneCommand.php

@@ -63,30 +63,34 @@ public function cloneUrl(
         bool $recursive = false
     ): string {
         // get binary version before reset
-        $v = $this->getBinaryVersion();
+        $version = $this->getBinaryVersion();
+
         $this->clearAll();
         $this->addCommandName(static::GIT_CLONE_COMMAND);
         $this->addCommandSubject($url);
         if (null !== $to) {
             $this->addCommandSubject2($to);
         }
+
         if (null !== $repoReference) {
             // git documentation says the --branch was added in 2.0.0, but it exists undocumented at least back to 1.8.3.1
-            if (version_compare($v, '1.8.3.1', '<')) {
+            if (version_compare($version, '1.8.3.1', '<')) {
                 throw new \RuntimeException(
-                    'Please upgrade to git v1.8.3.1 or newer to support cloning a specific branch. You have ' . $v . '.'
+                    'Please upgrade to git v1.8.3.1 or newer to support cloning a specific branch. You have ' . $version . '.'
                 );
             }
             $this->addCommandArgument('--branch=' . $repoReference);
         }
+
         if (null !== $depth) {
             $this->addCommandArgument('--depth=' . $depth);
             // shallow-submodules is a nice to have feature. Just ignoring if git version not high enough
             // It would be nice if this had a logger injected for us to log notices
-            if (version_compare($v, '2.9.0', '>=') && $recursive && 1 == $depth) {
+            if (version_compare($version, '2.9.0', '>=') && $recursive && 1 == $depth) {
                 $this->addCommandArgument('--shallow-submodules');
             }
         }
+
         if ($recursive) {
             $this->addCommandArgument('--recursive');
         }

src/GitElephant/Command/DiffCommand.php

@@ -67,19 +67,23 @@ public function diff($of, $with = null, $path = null): string
         $this->addCommandArgument('-M');
         $this->addCommandArgument('--dst-prefix=DST/');
         $this->addCommandArgument('--src-prefix=SRC/');
+
         $subject = '';
+
         if (is_null($with)) {
             $subject .= $of . '^..' . $of;
         } else {
             $subject .= $with . '..' . $of;
         }
+
         if (!is_null($path)) {
             if (!is_string($path)) {
                 /** @var Object $path */
                 $path = $path->getPath();
             }
             $this->addPath($path);
         }
+
         $this->addCommandSubject($subject);
 
         return $this->getCommand();

src/GitElephant/Command/FetchCommand.php

@@ -59,12 +59,16 @@ public function fetch($remote = null, $branch = null, array $options = []): stri
         if ($branch instanceof Branch) {
             $branch = $branch->getName();
         }
+
         $normalizedOptions = $this->normalizeOptions($options, $this->fetchCmdSwitchOptions());
+
         $this->clearAll();
         $this->addCommandName(self::GIT_FETCH_COMMAND);
+
         foreach ($normalizedOptions as $value) {
             $this->addCommandArgument($value);
         }
+
         if (!is_null($remote)) {
             $this->addCommandSubject($remote);
         }

src/GitElephant/Command/LogCommand.php

@@ -87,27 +87,34 @@ public function showObjectLog(NodeObject $obj, $branch = null, int $limit = null
     public function showLog($ref, $path = null, $limit = null, int $offset = null, bool $firstParent = false): string
     {
         $this->clearAll();
+
         $this->addCommandName(self::GIT_LOG);
         $this->addCommandArgument('-s');
         $this->addCommandArgument('--pretty=raw');
         $this->addCommandArgument('--no-color');
+
         if (null !== $limit) {
             $limit = (int) $limit;
             $this->addCommandArgument('--max-count=' . $limit);
         }
+
         if (null !== $offset) {
             $offset = (int) $offset;
             $this->addCommandArgument('--skip=' . $offset);
         }
+
         if ($firstParent) {
             $this->addCommandArgument('--first-parent');
         }
+
         if ($ref instanceof TreeishInterface) {
             $ref = $ref->getSha();
         }
+
         if (null !== $path && !empty($path)) {
             $this->addPath($path);
         }
+
         $this->addCommandSubject($ref);
 
         return $this->getCommand();

src/GitElephant/Command/LogRangeCommand.php

@@ -63,30 +63,38 @@ public function showLog(
         $firstParent = false
     ): string {
         $this->clearAll();
+
         $this->addCommandName(self::GIT_LOG);
         $this->addCommandArgument('-s');
         $this->addCommandArgument('--pretty=raw');
         $this->addCommandArgument('--no-color');
+
         if (null !== $limit) {
             $limit = (int) $limit;
             $this->addCommandArgument('--max-count=' . $limit);
         }
+
         if (null !== $offset) {
             $offset = (int) $offset;
             $this->addCommandArgument('--skip=' . $offset);
         }
+
         if ($firstParent) {
             $this->addCommandArgument('--first-parent');
         }
+
         if ($refStart instanceof TreeishInterface) {
             $refStart = $refStart->getSha();
         }
+
         if ($refEnd instanceof TreeishInterface) {
             $refEnd = $refEnd->getSha();
         }
+
         if (null !== $path && !empty($path)) {
             $this->addPath($path);
         }
+
         $this->addCommandSubject($refStart . '..' . $refEnd);
 
         return $this->getCommand();

src/GitElephant/Command/LsTreeCommand.php

@@ -87,14 +87,17 @@ public function tree($ref = 'HEAD', $path = null): string
         } else {
             $subjectPath = $path;
         }
+
         $what = $ref;
         if ($ref instanceof TreeishInterface) {
             $what = $ref->getSha();
         }
+        $subject = $what;
+
         $this->clearAll();
+
         $this->addCommandName(self::LS_TREE_COMMAND);
         $this->addCommandArgument('-l');
-        $subject = $what;
         $this->addCommandSubject($subject);
         $this->addPath($subjectPath);
 

src/GitElephant/Command/MainCommand.php

@@ -142,20 +142,25 @@ public function unstage($what): string
     public function commit($message, $stageAll = false, $author = null, $allowEmpty = false): string
     {
         $this->clearAll();
+
         if (trim($message) === '' || is_null($message)) {
             throw new \InvalidArgumentException(sprintf('You can\'t commit without message'));
         }
         $this->addCommandName(self::GIT_COMMIT);
+
         if ($stageAll) {
             $this->addCommandArgument('-a');
         }
+
         if ($author !== null) {
             $this->addCommandArgument('--author');
             $this->addCommandArgument($author);
         }
+
         if ($allowEmpty) {
             $this->addCommandArgument('--allow-empty');
         }
+
         $this->addCommandArgument('-m');
         $this->addCommandSubject($message);
 
@@ -173,12 +178,14 @@ public function commit($message, $stageAll = false, $author = null, $allowEmpty
     public function checkout($ref): string
     {
         $this->clearAll();
+
         $what = $ref;
         if ($ref instanceof Branch) {
             $what = $ref->getName();
         } elseif ($ref instanceof TreeishInterface) {
             $what = $ref->getSha();
         }
+
         $this->addCommandName(self::GIT_CHECKOUT);
         $this->addCommandArgument('-q');
         $this->addCommandSubject($what);
@@ -199,14 +206,17 @@ public function checkout($ref): string
     public function move($from, $to): string
     {
         $this->clearAll();
+
         $from = trim($from);
         if (!$this->validatePath($from)) {
             throw new \InvalidArgumentException('Invalid source path');
         }
+
         $to = trim($to);
         if (!$this->validatePath($to)) {
             throw new \InvalidArgumentException('Invalid destination path');
         }
+
         $this->addCommandName(self::GIT_MOVE);
         $this->addCommandSubject($from);
         $this->addCommandSubject2($to);
@@ -228,17 +238,22 @@ public function move($from, $to): string
     public function remove($path, $recursive, $force): string
     {
         $this->clearAll();
+
         $path = trim($path);
         if (!$this->validatePath($path)) {
             throw new \InvalidArgumentException('Invalid path');
         }
+
         $this->addCommandName(self::GIT_REMOVE);
+
         if ($recursive) {
             $this->addCommandArgument('-r');
         }
+
         if ($force) {
             $this->addCommandArgument('-f');
         }
+
         $this->addPath($path);
 
         return $this->getCommand();

src/GitElephant/Command/MergeCommand.php

@@ -62,16 +62,21 @@ public function merge(Branch $with, $message = '', array $options = []): string
                 "Invalid options: cannot use flags --ff-only and --no-ff together."
             );
         }
+
         $normalizedOptions = $this->normalizeOptions($options, $this->mergeCmdSwitchOptions());
+
         $this->clearAll();
         $this->addCommandName(static::MERGE_COMMAND);
+
         foreach ($normalizedOptions as $value) {
             $this->addCommandArgument($value);
         }
+
         if (!empty($message)) {
             $this->addCommandArgument('-m');
             $this->addCommandArgument($message);
         }
+
         $this->addCommandSubject($with->getFullRef());
 
         return $this->getCommand();

src/GitElephant/Command/PushCommand.php

@@ -51,16 +51,19 @@ public function __construct(Repository $repo = null)
      */
     public function push($remote = 'origin', $branch = 'master', string $args = null): string
     {
+        $this->clearAll();
+
         if ($remote instanceof Remote) {
             $remote = $remote->getName();
         }
         if ($branch instanceof Branch) {
             $branch = $branch->getName();
         }
-        $this->clearAll();
+
         $this->addCommandName(self::GIT_PUSH_COMMAND);
         $this->addCommandSubject($remote);
         $this->addCommandSubject2($branch);
+
         if (!is_null($args)) {
             $this->addCommandArgument($args);
         }

src/GitElephant/Command/Remote/AddSubCommand.php

@@ -97,6 +97,7 @@ public function prepare($name, $url, $options = []): self
             $this->addCmdSwitchOptions(),
             $this->addCmdValueOptions()
         );
+
         $this->addCommandName(self::GIT_REMOTE_ADD);
         $this->addCommandSubject($name);
         $this->addCommandSubject($url);

src/GitElephant/Command/Remote/ShowSubCommand.php

@@ -69,6 +69,7 @@ public function prepare($name = null, $queryRemotes = true): self
         if ($name) {
             $this->addCommandSubject($name);
         }
+
         if (!$queryRemotes) {
             $this->addCommandArgument('-n');
         }

src/GitElephant/Command/RemoteCommand.php

@@ -65,8 +65,11 @@ public function __construct(Repository $repo = null)
     public function remote(SubCommandCommand $subcommand = null, array $options = []): string
     {
         $normalizedOptions = $this->normalizeOptions($options, $this->remoteCmdSwitchOptions());
+
         $this->clearAll();
+
         $this->addCommandName(self::GIT_REMOTE);
+
         foreach ($normalizedOptions as $value) {
             $this->addCommandArgument($value);
         }

src/GitElephant/Command/ShowCommand.php

@@ -53,6 +53,7 @@ public function __construct(Repository $repo = null)
     public function showCommit($ref): string
     {
         $this->clearAll();
+
         $this->addCommandName(self::GIT_SHOW);
         $this->addCommandArgument('-s');
         $this->addCommandArgument('--pretty=raw');

src/GitElephant/Command/StashCommand.php

@@ -55,13 +55,17 @@ public function __construct(Repository $repo = null)
     public function save($message = null, $includeUntracked = false, $keepIndex = false): string
     {
         $this->clearAll();
+
         $this->addCommandName(self::STASH_COMMAND . ' save');
+
         if (!is_null($message)) {
             $this->addCommandSubject($message);
         }
+
         if ($includeUntracked) {
             $this->addCommandArgument('--include-untracked');
         }
+
         if ($keepIndex) {
             $this->addCommandArgument('--keep-index');
         }
@@ -79,7 +83,9 @@ public function save($message = null, $includeUntracked = false, $keepIndex = fa
     public function listStashes(array $options = null): string
     {
         $this->clearAll();
+
         $this->addCommandName(self::STASH_COMMAND . ' list');
+
         if (null !== $options) {
             $this->addCommandSubject($options);
         }