@@ -58,7 +58,7 @@ |
||
| 58 | 58 | if ($firstCharacter !== false) { |
| 59 | 59 | if ($firstCharacter == '+') { |
| 60 | 60 | $this->type = self::ADDED; |
| 61 | - // $type = Line::ADDED; |
|
| 61 | + // $type = Line::ADDED; |
|
| 62 | 62 | } elseif ($firstCharacter == '-') { |
| 63 | 63 | $this->type = self::REMOVED; |
| 64 | 64 | } else { |
@@ -16,7 +16,6 @@ |
||
| 16 | 16 | * Remote File Info. |
| 17 | 17 | * |
| 18 | 18 | * "git for-each-ref --format '%(refname:short)|%(subject)|%(taggerDate)|%(taggerName)|%(taggerEmail)|%(*objectname)|%(*objectname:short)' refs/tags --sort=taggerDate"; |
| 19 | - |
|
| 20 | 19 | * |
| 21 | 20 | * @author Paul Schweppe <[email protected]> |
| 22 | 21 | */ |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | $this->execute($command); |
| 121 | 121 | } |
| 122 | 122 | |
| 123 | - //$this->disconnect(); |
|
| 123 | + //$this->disconnect(); |
|
| 124 | 124 | |
| 125 | 125 | return $this->stdout; |
| 126 | 126 | } |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | |
| 200 | 200 | if (count($stderr) > 1) { |
| 201 | 201 | //print_r($stderr); |
| 202 | - throw new \RuntimeException(sprintf("Error in command shell:%s \n Error Response:%s", $command, implode("\n", $stderr))); |
|
| 202 | + throw new \RuntimeException(sprintf("Error in command shell:%s \n Error Response:%s", $command, implode("\n", $stderr))); |
|
| 203 | 203 | //$this->dispatcher->dispatch(Events::onDeploymentRsyncFeedback, new FeedbackEvent('err', implode("\n", $stderr))); |
| 204 | 204 | } |
| 205 | 205 | |
@@ -72,16 +72,16 @@ |
||
| 72 | 72 | if (isset($username) && $privateKey != null) { |
| 73 | 73 | $key = new RSA(); |
| 74 | 74 | |
| 75 | - //Set Private Key Password |
|
| 76 | - if ($privateKeyPassword) { |
|
| 77 | - $key->setPassword($privateKeyPassword); |
|
| 78 | - } |
|
| 75 | + //Set Private Key Password |
|
| 76 | + if ($privateKeyPassword) { |
|
| 77 | + $key->setPassword($privateKeyPassword); |
|
| 78 | + } |
|
| 79 | 79 | $key->loadKey($privateKey); |
| 80 | 80 | |
| 81 | - //Login using private key |
|
| 82 | - if (!$this->sftp->login($username, $key)) { |
|
| 83 | - throw new SshLoginException(sprintf('SFTP authentication failed for user "%s" using private key', $username)); |
|
| 84 | - } |
|
| 81 | + //Login using private key |
|
| 82 | + if (!$this->sftp->login($username, $key)) { |
|
| 83 | + throw new SshLoginException(sprintf('SFTP authentication failed for user "%s" using private key', $username)); |
|
| 84 | + } |
|
| 85 | 85 | } else { |
| 86 | 86 | if (!$this->sftp->login($username, $password)) { |
| 87 | 87 | throw new SshLoginException(sprintf('SFTP authentication failed for user "%s" using password', $username)); |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | $this->execute($command); |
| 119 | 119 | } |
| 120 | 120 | |
| 121 | - //$this->disconnect(); |
|
| 121 | + //$this->disconnect(); |
|
| 122 | 122 | |
| 123 | 123 | return $this->stdout; |
| 124 | 124 | } |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | |
| 190 | 190 | if ($exitStatus != 0) { |
| 191 | 191 | //print_r($stderr); |
| 192 | - throw new RunGitCommandException(sprintf("Error in command shell:%s \n Error Response:%s%s", $command, implode("\n", $stderr), $stdOutput)); |
|
| 192 | + throw new RunGitCommandException(sprintf("Error in command shell:%s \n Error Response:%s%s", $command, implode("\n", $stderr), $stdOutput)); |
|
| 193 | 193 | } |
| 194 | 194 | |
| 195 | 195 | $this->stdout = array_merge($this->stdout, $stdout); |
@@ -64,7 +64,7 @@ |
||
| 64 | 64 | $this->assertEquals("fatal: tag 'tag1' already exists", trim($errorMessage), 'create branch command error'); |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | - public function testPushTag() |
|
| 67 | + public function testPushTag() |
|
| 68 | 68 | { |
| 69 | 69 | $tagCommand = $this->gitCommands->command('tag'); |
| 70 | 70 | |
@@ -166,7 +166,7 @@ |
||
| 166 | 166 | $this->assertEquals('File path is been tracked. Please untrack file first',$message); |
| 167 | 167 | |
| 168 | 168 | try{ |
| 169 | - $filesCommand->ignoreFile('testFileDoesNotExist'); |
|
| 169 | + $filesCommand->ignoreFile('testFileDoesNotExist'); |
|
| 170 | 170 | }catch(\VersionControl\GitCommandBundle\GitCommands\Exception\InvalidFilePathException $e){ |
| 171 | 171 | $message = $e->getMessage(); |
| 172 | 172 | } |
@@ -6,7 +6,7 @@ |
||
| 6 | 6 | use Symfony\Component\Filesystem\Filesystem; |
| 7 | 7 | |
| 8 | 8 | if (!class_exists('\PHPUnit_Framework_TestCase') && class_exists('\PHPUnit\Framework\TestCase')) { |
| 9 | - class_alias('\PHPUnit\Framework\TestCase', '\PHPUnit_Framework_TestCase'); |
|
| 9 | + class_alias('\PHPUnit\Framework\TestCase', '\PHPUnit_Framework_TestCase'); |
|
| 10 | 10 | } |
| 11 | 11 | |
| 12 | 12 | /** |
@@ -407,8 +407,8 @@ |
||
| 407 | 407 | $this->issueRepository->closeIssue($issueId); |
| 408 | 408 | } |
| 409 | 409 | |
| 410 | - // $em->persist($entity); |
|
| 411 | - // $em->flush(); |
|
| 410 | + // $em->persist($entity); |
|
| 411 | + // $em->flush(); |
|
| 412 | 412 | |
| 413 | 413 | return $this->redirect($this->generateUrl('issue_show', array('id' => $this->project->getId(), 'issueId' => $issueId))); |
| 414 | 414 | } |