SSHVersionControl / git-web-client

app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitFilesCommand.php

Spacing +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
      */
     protected function sortFilesByDirectoryThenName(array &$fileArray): void
     {
-        usort($fileArray, static function (FileInfoInterface $a, FileInfoInterface $b) {
+        usort($fileArray, static function(FileInfoInterface $a, FileInfoInterface $b) {
             if ($a->isDir()) {
                 if ($b->isDir()) {
                     return strnatcasecmp($a->getFilename(), $b->getFilename());

app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitDiffCommand.php

Spacing +6 added lines, -6 removed lines

@@ -68,7 +68,7 @@ 
      */
     public function getDiffFile($filename)
     {
-        $diffString = $this->command->runCommand('git --no-pager diff  --oneline '.escapeshellarg($filename).'');
+        $diffString = $this->command->runCommand('git --no-pager diff  --oneline ' . escapeshellarg($filename) . '');
         $diffParser = new GitDiffParser($diffString);
         return $diffParser->parse();
     }
@@ -86,7 +86,7 @@ 
      */
     public function getDiffFileBetweenCommits($filename, $previousCommitHash, $commitHash)
     {
-        $diffString = $this->command->runCommand('git --no-pager diff  --oneline '.escapeshellarg($previousCommitHash).' '.escapeshellarg($commitHash).' -- '.escapeshellarg($filename).'');
+        $diffString = $this->command->runCommand('git --no-pager diff  --oneline ' . escapeshellarg($previousCommitHash) . ' ' . escapeshellarg($commitHash) . ' -- ' . escapeshellarg($filename) . '');
         $diffParser = new GitDiffParser($diffString);
         return $diffParser->parse();
     }
@@ -101,7 +101,7 @@ 
      */
     public function getFilesInCommit($commitHash)
     {
-        $response = $this->command->runCommand('git diff-tree --no-commit-id --name-status -r '.escapeshellarg($commitHash).'');
+        $response = $this->command->runCommand('git diff-tree --no-commit-id --name-status -r ' . escapeshellarg($commitHash) . '');
         $responseLines = $this->splitOnNewLine($response);
         $files = new GitCommitFileCollection();
         foreach ($responseLines as $line) {
@@ -124,9 +124,9 @@ 
     public function getPreviousCommitHash($commitHash = 'HEAD', $fileName = false)
     {
         $previousCommitHash = '';
-        $command = " git log --pretty=format:'%h' -n 2 ".escapeshellarg($commitHash).'';
+        $command = " git log --pretty=format:'%h' -n 2 " . escapeshellarg($commitHash) . '';
         if ($fileName !== false) {
-            $command .= ' '.escapeshellarg($fileName);
+            $command .= ' ' . escapeshellarg($fileName);
         }
         $response = $this->command->runCommand($command);
         $responseLines = $this->splitOnNewLine($response);
@@ -144,7 +144,7 @@ 
      * @throws RunGitCommandException
      * @throws RuntimeException
      */
-    public function getConflictFileNames(){
+    public function getConflictFileNames() {
 
         $command = ' git diff --name-only --diff-filter=U';
         $response = $this->command->runCommand($command);

app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitLogCommand.php

Spacing +1 added lines, -1 removed lines

@@ -185,7 +185,7 @@
     {
         $this->logCommand = 'git --no-pager log -m "--pretty=format:\'' . $this->format . '\'"';
         if ($this->logCount) {
-            $this->logCommand .= ' -' . (int)$this->logCount . ' ';
+            $this->logCommand .= ' -' . (int) $this->logCount . ' ';
         }
 
         if ($this->showReferences === true) {

app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitBranchCommand.php

Spacing +1 added lines, -1 removed lines

@@ -311,7 +311,7 @@
         $currentBranch = $this->getCurrentBranch();
         if ($branchName === $currentBranch) {
             throw new RuntimeException(
-                'You cannot merge a branch with itself. Please checkout a '.
+                'You cannot merge a branch with itself. Please checkout a ' .
                 'different branch before trying to merge.'
             );
         }

app/src/VersionControl/GitCommandBundle/GitCommands/Command/GitTagCommand.php

Spacing +2 added lines, -2 removed lines

@@ -65,7 +65,7 @@ 
             throw new InvalidBranchNameException('This is not a valid branch name');
         }
 
-        $command = sprintf($this->initGitCommand().' tag -a %s -m %s', escapeshellarg($version), escapeshellarg($message));
+        $command = sprintf($this->initGitCommand() . ' tag -a %s -m %s', escapeshellarg($version), escapeshellarg($message));
         if ($commitShortCode) {
             $command .= ' ' . escapeshellarg($commitShortCode);
         }
@@ -85,7 +85,7 @@ 
      */
     public function pushTag($remote, $tag): string
     {
-        $command = sprintf($this->initGitCommand().' push %s %s', escapeshellarg(trim($remote)), escapeshellarg(trim($tag)));
+        $command = sprintf($this->initGitCommand() . ' push %s %s', escapeshellarg(trim($remote)), escapeshellarg(trim($tag)));
 
         return $this->command->runCommand($command);
     }

app/src/VersionControl/GitCommandBundle/Service/SecLibSftpProcess.php

Indentation +8 added lines, -8 removed lines

@@ -72,16 +72,16 @@
         if (isset($username) && $privateKey != null) {
             $key = new RSA();
 
-             //Set Private Key Password
-             if ($privateKeyPassword) {
-                 $key->setPassword($privateKeyPassword);
-             }
+                //Set Private Key Password
+                if ($privateKeyPassword) {
+                    $key->setPassword($privateKeyPassword);
+                }
             $key->loadKey($privateKey);
 
-             //Login using private key
-             if (!$this->sftp->login($username, $key)) {
-                 throw new SshLoginException(sprintf('SFTP authentication failed for user "%s" using private key', $username));
-             }
+                //Login using private key
+                if (!$this->sftp->login($username, $key)) {
+                    throw new SshLoginException(sprintf('SFTP authentication failed for user "%s" using private key', $username));
+                }
         } else {
             if (!$this->sftp->login($username, $password)) {
                 throw new SshLoginException(sprintf('SFTP authentication failed for user "%s" using password', $username));

app/src/VersionControl/GitCommandBundle/Tests/GitCommandTestCase.php

Spacing +1 added lines, -2 removed lines

@@ -108,8 +108,7 @@
         $path = $this->path;
 
         $filename = $folder == null ?
-            $path . DIRECTORY_SEPARATOR . $name :
-            $path . DIRECTORY_SEPARATOR . $folder . DIRECTORY_SEPARATOR . $name;
+            $path . DIRECTORY_SEPARATOR . $name : $path . DIRECTORY_SEPARATOR . $folder . DIRECTORY_SEPARATOR . $name;
         $handle = fopen($filename, 'wb');
         $fileContent = $content == null ? 'test content' : $content;
         $this->assertNotSame(false, fwrite($handle, $fileContent), sprintf('unable to write the file %s', $name));

app/src/VersionControl/GitCommandBundle/Tests/GitCommands/Command/GitDiffCommandTest.php

Spacing +7 added lines, -7 removed lines

@@ -37,10 +37,10 @@ 
         $this->updateFile('test', 'Test Data has changed');
     }
 
-    public function testGetPreviousCommitHash(){
+    public function testGetPreviousCommitHash() {
 
         $previousCommitHash = $this->gitCommands->command('diff')->getPreviousCommitHash();
-        $this->assertTrue(strlen($previousCommitHash) === 7,'Previous Commit hash does not equal 7 characters: '.$previousCommitHash);
+        $this->assertTrue(strlen($previousCommitHash) === 7, 'Previous Commit hash does not equal 7 characters: ' . $previousCommitHash);
 
     }
 
@@ -52,26 +52,26 @@ 
 
         $diffs = $this->gitCommands->command('diff')->getDiffFile('test');
 
-        $this->assertCount(1, $diffs,'Diff count does not equal expected 17. Actual:'.count($diffs).print_r($diffs,true));
+        $this->assertCount(1, $diffs, 'Diff count does not equal expected 17. Actual:' . count($diffs) . print_r($diffs, true));
         foreach ($diffs as $diff) {
             $this->assertInstanceOf(GitDiff::class, $diff);
         }
     }
 
-    public function testGetDiffFileBetweenCommits(){
+    public function testGetDiffFileBetweenCommits() {
 
         $previousCommitHash = $this->gitCommands->command('diff')->getPreviousCommitHash();
 
-        $diffs = $this->gitCommands->command('diff')->getDiffFileBetweenCommits('test',$previousCommitHash,'HEAD');
+        $diffs = $this->gitCommands->command('diff')->getDiffFileBetweenCommits('test', $previousCommitHash, 'HEAD');
         foreach ($diffs as $diff) {
             $this->assertInstanceOf(GitDiff::class, $diff);
         }
     }
 
-    public function testGetFilesInCommit(){
+    public function testGetFilesInCommit() {
         $filesCommitted = $this->gitCommands->command('diff')->getFilesInCommit('HEAD');
 
-        $this->assertCount(1, $filesCommitted,'Only one file should have been commited. Actual:'.count($filesCommitted));
+        $this->assertCount(1, $filesCommitted, 'Only one file should have been commited. Actual:' . count($filesCommitted));
 
         foreach ($filesCommitted as $commitFile) {
             $this->assertInstanceOf(GitCommitFile::class, $commitFile);

app/src/VersionControl/GitCommandBundle/Tests/GitCommands/GitDiffParserTest.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
         $diffParser = new GitDiffParser($diffString);
         $diffs = $diffParser->parse();
         
-        $this->assertCount(1, $diffs,'Diff count does not equal expected 17. Actual:'.count($diffs).print_r($diffs,true));
+        $this->assertCount(1, $diffs, 'Diff count does not equal expected 17. Actual:' . count($diffs) . print_r($diffs, true));
         foreach ($diffs as $diff) {
             $this->assertInstanceOf(GitDiff::class, $diff);
         }