SSHVersionControl / git-web-client

src/VersionControl/GitCommandBundle/Service/SecLibSshProcess.php

Indentation +2 added lines, -2 removed lines

@@ -118,7 +118,7 @@ 
             $this->execute($command);
         }
 
-       //$this->disconnect();
+        //$this->disconnect();
 
         return $this->stdout;
     }
@@ -189,7 +189,7 @@ 
 
         if ($exitStatus != 0) {
             //print_r($stderr);
-             throw new RunGitCommandException(sprintf("Error in command shell:%s \n Error Response:%s%s", $command, implode("\n", $stderr), $stdOutput));
+                throw new RunGitCommandException(sprintf("Error in command shell:%s \n Error Response:%s%s", $command, implode("\n", $stderr), $stdOutput));
         }
 
         $this->stdout = array_merge($this->stdout, $stdout);

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

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,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("\VersionControl\GitCommandBundle\Entity\GitDiff", $diff);
         }

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

Spacing +7 added lines, -7 removed lines

@@ -35,10 +35,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);
         
     }
 
@@ -50,26 +50,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("\VersionControl\GitCommandBundle\Entity\GitDiff", $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("\VersionControl\GitCommandBundle\Entity\GitDiff", $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("VersionControl\GitCommandBundle\Entity\GitCommitFile", $commitFile);

src/VersionControl/GitCommandBundle/Tests/GitCommands/Command/GitTagCommandTest.php

Indentation +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
         $this->assertEquals("fatal: tag 'tag1' already exists", trim($errorMessage), 'create branch command error');
     }
     
-     public function testPushTag()
+        public function testPushTag()
     {
         $tagCommand = $this->gitCommands->command('tag');
         

Spacing +7 added lines, -7 removed lines

@@ -40,7 +40,7 @@ 
     public function testGetTagsNoTags()
     {
         $tags = $this->gitCommands->command('tag')->getTags();
-        $this->assertCount(0, $tags,'Tag count does not equal expected 0. Actual:'.count($tags));
+        $this->assertCount(0, $tags, 'Tag count does not equal expected 0. Actual:'.count($tags));
     }
 
     /**
@@ -50,14 +50,14 @@ 
     {
         $tagCommand = $this->gitCommands->command('tag');
 
-        $this->assertEquals('', $tagCommand->createAnnotatedTag('tag1','Test of tag1'), 'create tag command');
+        $this->assertEquals('', $tagCommand->createAnnotatedTag('tag1', 'Test of tag1'), 'create tag command');
         
         $tags = $this->gitCommands->command('tag')->getTags();
-        $this->assertCount(1, $tags,'Tag count does not equal expected 1. Actual:'.count($tags));
+        $this->assertCount(1, $tags, 'Tag count does not equal expected 1. Actual:'.count($tags));
 
         $errorMessage = '';
         try {
-            $tagCommand->createAnnotatedTag('tag1','Test of tag1');
+            $tagCommand->createAnnotatedTag('tag1', 'Test of tag1');
         } catch (\VersionControl\GitCommandBundle\GitCommands\Exception\RunGitCommandException $e) {
             $errorMessage = $e->getMessage();
         }
@@ -68,12 +68,12 @@ 
     {
         $tagCommand = $this->gitCommands->command('tag');
         
-        $this->assertEquals('', $tagCommand->createAnnotatedTag('tag1','Test of tag1'), 'create tag command');
+        $this->assertEquals('', $tagCommand->createAnnotatedTag('tag1', 'Test of tag1'), 'create tag command');
 
         //
         try {
-            $this->assertEquals('', $tagCommand->pushTag('origin','tag1'), 'Push tag1 to origin');
-        }catch (\VersionControl\GitCommandBundle\GitCommands\Exception\RunGitCommandException $e) {
+            $this->assertEquals('', $tagCommand->pushTag('origin', 'tag1'), 'Push tag1 to origin');
+        } catch (\VersionControl\GitCommandBundle\GitCommands\Exception\RunGitCommandException $e) {
             $errorMessage = $e->getMessage();
         }
         $this->assertContains("fatal: 'origin' does not appear to be a git repository", trim($errorMessage), 'push tag command error');

Braces +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
         //
         try {
             $this->assertEquals('', $tagCommand->pushTag('origin','tag1'), 'Push tag1 to origin');
-        }catch (\VersionControl\GitCommandBundle\GitCommands\Exception\RunGitCommandException $e) {
+        } catch (\VersionControl\GitCommandBundle\GitCommands\Exception\RunGitCommandException $e) {
             $errorMessage = $e->getMessage();
         }
         $this->assertContains("fatal: 'origin' does not appear to be a git repository", trim($errorMessage), 'push tag command error');

src/VersionControl/GitCommandBundle/Tests/GitCommands/Command/GitFilesCommandTest.php

Indentation +1 added lines, -1 removed lines

@@ -166,7 +166,7 @@
         $this->assertEquals('File path is been tracked. Please untrack file first',$message);
         
         try{
-             $filesCommand->ignoreFile('testFileDoesNotExist');
+                $filesCommand->ignoreFile('testFileDoesNotExist');
         }catch(\VersionControl\GitCommandBundle\GitCommands\Exception\InvalidFilePathException $e){
             $message = $e->getMessage();
         }

Spacing +36 added lines, -36 removed lines

@@ -25,14 +25,14 @@ 
     {
         $this->initGitCommandsLocal();
         $this->gitCommands->command('init')->initRepository();
-        $this->addFile('test',null,'Test Of List Files');
+        $this->addFile('test', null, 'Test Of List Files');
         $this->addFolder('MoreFiles');
-        $this->addFile('test2','MoreFiles','Test Of file in MoreFiles folder');
+        $this->addFile('test2', 'MoreFiles', 'Test Of file in MoreFiles folder');
         
         $this->gitCommands->command('commit')->stageAll();
         $this->gitCommands->command('commit')->commit('first commit', 'Paul Schweppe <paulschweppe@gmail.com>');
         
-        $this->addFile('test3',null,'This file is not commited');
+        $this->addFile('test3', null, 'This file is not commited');
         
        
     }
@@ -44,9 +44,9 @@ 
     {
         $files = $this->gitCommands->command('files')->listFiles('');
         
-        $this->assertCount(3, $files,'File list count does not equal expected 3. Actual:'.count($files));
+        $this->assertCount(3, $files, 'File list count does not equal expected 3. Actual:'.count($files));
         
-        foreach($files as $file){
+        foreach ($files as $file) {
             $this->assertInstanceOf("\SplFileInfo", $file);
         }
         
@@ -57,9 +57,9 @@ 
         $this->assertNull($files[2]->getGitLog(), 'Third file should not have a git log');
         
         $errorMessage = '';
-        try{
+        try {
             $this->gitCommands->command('files')->listFiles('../');
-        }catch(\VersionControl\GitCommandBundle\GitCommands\Exception\InvalidDirectoryException $e){
+        } catch (\VersionControl\GitCommandBundle\GitCommands\Exception\InvalidDirectoryException $e) {
             $errorMessage = $e->getMessage();
         }
         $this->assertContains("Directory path is not valid", trim($errorMessage), 'Invalid Directory error');
@@ -77,9 +77,9 @@ 
         
         
         $errorMessage = '';
-        try{
+        try {
             $fileNotExisting = $this->gitCommands->command('files')->getFile('MoreFiles/testDoesNotExist');
-        }catch(\VersionControl\GitCommandBundle\GitCommands\Exception\InvalidDirectoryException $e){
+        } catch (\VersionControl\GitCommandBundle\GitCommands\Exception\InvalidDirectoryException $e) {
             $errorMessage = $e->getMessage();
         }
         
@@ -90,7 +90,7 @@ 
     /**
      * Test Read File
      */
-    public function testReadFile(){
+    public function testReadFile() {
         $file = $this->gitCommands->command('files')->getFile('MoreFiles/test2');
         $fileContent = $this->gitCommands->command('files')->readFile($file);
         $this->assertContains("Test Of file in MoreFiles folder", trim($fileContent), 'File content did not match:'.$fileContent);
@@ -100,7 +100,7 @@ 
     /**
      * Test malicious file paths
      */
-    public function testValidPathStr(){
+    public function testValidPathStr() {
         
         $filesCommand = $this->gitCommands->command('files');
         $this->assertTrue($filesCommand->ValidPathStr('MoreFiles/test2'), 'Path "MoreFiles/test2" should be valid');
@@ -118,60 +118,60 @@ 
     public function testIsFileIgnored()
     {
         $filesCommand = $this->gitCommands->command('files');
-        $this->addFile('ignoretest',null,'Git should Ignore');
-        $this->addFile('.gitignore',null,'ignoretest');
+        $this->addFile('ignoretest', null, 'Git should Ignore');
+        $this->addFile('.gitignore', null, 'ignoretest');
         
-        $this->assertTrue($filesCommand->isFileIgnored('ignoretest'),'File ignoretest should be ignored');
+        $this->assertTrue($filesCommand->isFileIgnored('ignoretest'), 'File ignoretest should be ignored');
         
-        $this->updateFile('.gitignore',null,'test');
-        $this->assertFalse($filesCommand->isFileIgnored('test'),'File test is not ignored because it is commited already');
+        $this->updateFile('.gitignore', null, 'test');
+        $this->assertFalse($filesCommand->isFileIgnored('test'), 'File test is not ignored because it is commited already');
         
-        $this->assertFalse($filesCommand->isFileIgnored('notest'),'File does not exist');
+        $this->assertFalse($filesCommand->isFileIgnored('notest'), 'File does not exist');
         
-        $this->assertFalse($filesCommand->isFileIgnored('MoreFiles/test2'),'File exists and should not be ignored');
+        $this->assertFalse($filesCommand->isFileIgnored('MoreFiles/test2'), 'File exists and should not be ignored');
     }
     
     public function testIsFileTracked()
     {
         $filesCommand = $this->gitCommands->command('files');
-        $this->addFile('ignoretest',null,'Git should Ignore');
-        $this->addFile('.gitignore',null,'ignoretest');
+        $this->addFile('ignoretest', null, 'Git should Ignore');
+        $this->addFile('.gitignore', null, 'ignoretest');
         
-        $this->assertFalse($filesCommand->isFileTracked('ignoretest'),'File ignoretest should be ignored');
+        $this->assertFalse($filesCommand->isFileTracked('ignoretest'), 'File ignoretest should be ignored');
         
-        $this->updateFile('.gitignore',null,'test');
-        $this->assertTrue($filesCommand->isFileTracked('test'),'File test is not ignored because it is commited already');
+        $this->updateFile('.gitignore', null, 'test');
+        $this->assertTrue($filesCommand->isFileTracked('test'), 'File test is not ignored because it is commited already');
         
-        $this->assertFalse($filesCommand->isFileTracked('notest'),'File does not exist');
+        $this->assertFalse($filesCommand->isFileTracked('notest'), 'File does not exist');
         
-        $this->assertTrue($filesCommand->isFileTracked('MoreFiles/test2'),'File exists and should not be ignored');
+        $this->assertTrue($filesCommand->isFileTracked('MoreFiles/test2'), 'File exists and should not be ignored');
     }
     
     public function testIgnoreFile()
     {
         $filesCommand = $this->gitCommands->command('files');
-        $this->addFile('ignoretest',null,'Git should Ignore');
+        $this->addFile('ignoretest', null, 'Git should Ignore');
         
         $response = $filesCommand->ignoreFile('ignoretest');
         
-        $this->assertEquals('File added to .gitignore',$response);
+        $this->assertEquals('File added to .gitignore', $response);
         
         $message = '';
-        try{
+        try {
             $filesCommand->ignoreFile('test');
-        }catch(\VersionControl\GitCommandBundle\GitCommands\Exception\FileStatusException $e){
+        } catch (\VersionControl\GitCommandBundle\GitCommands\Exception\FileStatusException $e) {
             $message = $e->getMessage();
         }
         
-        $this->assertEquals('File path is been tracked. Please untrack file first',$message);
+        $this->assertEquals('File path is been tracked. Please untrack file first', $message);
         
-        try{
+        try {
              $filesCommand->ignoreFile('testFileDoesNotExist');
-        }catch(\VersionControl\GitCommandBundle\GitCommands\Exception\InvalidFilePathException $e){
+        } catch (\VersionControl\GitCommandBundle\GitCommands\Exception\InvalidFilePathException $e) {
             $message = $e->getMessage();
         }
         
-        $this->assertEquals('File path was not valid. Please check that the file exists.',$message);
+        $this->assertEquals('File path was not valid. Please check that the file exists.', $message);
     }
     
     /**
@@ -198,7 +198,7 @@ 
         
         //Untrack file should now work
         $response = $filesCommand->unTrackFile('test');
-        $this->assertContains('Please commit to complete the removal',$response);
+        $this->assertContains('Please commit to complete the removal', $response);
 
     }
     
@@ -214,14 +214,14 @@ 
         $filesCommand->unTrackFile('test');
         
         //Add test to .gitignore. Must happen before commit
-        $this->updateFile('.gitignore','test');
+        $this->updateFile('.gitignore', 'test');
         
         //Commit change to untracked file
         $this->gitCommands->command('commit')->stageAll();
         $this->gitCommands->command('commit')->commit('Remove file from git index', 'Paul Schweppe <paulschweppe@gmail.com>');
         
         //Test that file is no longer tracked
-        $this->assertFalse($filesCommand->isFileTracked('test'),'Test that test file is no longer tracked');
+        $this->assertFalse($filesCommand->isFileTracked('test'), 'Test that test file is no longer tracked');
 
     }
     

Braces +4 added lines, -4 removed lines

@@ -59,7 +59,7 @@ 
         $errorMessage = '';
         try{
             $this->gitCommands->command('files')->listFiles('../');
-        }catch(\VersionControl\GitCommandBundle\GitCommands\Exception\InvalidDirectoryException $e){
+        } catch(\VersionControl\GitCommandBundle\GitCommands\Exception\InvalidDirectoryException $e){
             $errorMessage = $e->getMessage();
         }
         $this->assertContains("Directory path is not valid", trim($errorMessage), 'Invalid Directory error');
@@ -79,7 +79,7 @@ 
         $errorMessage = '';
         try{
             $fileNotExisting = $this->gitCommands->command('files')->getFile('MoreFiles/testDoesNotExist');
-        }catch(\VersionControl\GitCommandBundle\GitCommands\Exception\InvalidDirectoryException $e){
+        } catch(\VersionControl\GitCommandBundle\GitCommands\Exception\InvalidDirectoryException $e){
             $errorMessage = $e->getMessage();
         }
         
@@ -159,7 +159,7 @@ 
         $message = '';
         try{
             $filesCommand->ignoreFile('test');
-        }catch(\VersionControl\GitCommandBundle\GitCommands\Exception\FileStatusException $e){
+        } catch(\VersionControl\GitCommandBundle\GitCommands\Exception\FileStatusException $e){
             $message = $e->getMessage();
         }
         
@@ -167,7 +167,7 @@ 
         
         try{
              $filesCommand->ignoreFile('testFileDoesNotExist');
-        }catch(\VersionControl\GitCommandBundle\GitCommands\Exception\InvalidFilePathException $e){
+        } catch(\VersionControl\GitCommandBundle\GitCommands\Exception\InvalidFilePathException $e){
             $message = $e->getMessage();
         }
         

src/VersionControl/GitCommandBundle/Tests/GitCommandTestCase.php

Indentation +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 use Symfony\Component\Filesystem\Filesystem;
 
 if (!class_exists('\PHPUnit_Framework_TestCase') && class_exists('\PHPUnit\Framework\TestCase')) {
-  class_alias('\PHPUnit\Framework\TestCase', '\PHPUnit_Framework_TestCase');
+    class_alias('\PHPUnit\Framework\TestCase', '\PHPUnit_Framework_TestCase');
 }
 
 /**

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, 'w');
         $fileContent = $content == null ? 'test content' : $content;
         $this->assertTrue(false !== fwrite($handle, $fileContent), sprintf('unable to write the file %s', $name));

src/VersionControl/GitControlBundle/Controller/ProjectHistoryController.php

Spacing +1 added lines, -1 removed lines

@@ -251,7 +251,7 @@
             ->add('branch', ChoiceType::class, array(
                 'label' => 'Branch', 'choices' => $branchChoices, 'preferred_choices' => array($currentBranch), 'data' => trim($currentBranch), 'required' => false, 'choices_as_values' => true, 'constraints' => array(
                     //new NotBlank()
-                ), )
+                ),)
             )
             ->add('filter', HiddenType::class)
             ->add('keyword', TextType::class, array('required' => false))

src/VersionControl/GitControlBundle/Controller/ProjectCommitController.php

Spacing +12 added lines, -12 removed lines

@@ -76,7 +76,7 @@ 
         //Get merge conflicts
         $conflictFileNames = $this->gitCommands->command('diff')->getConflictFileNames();
         
-        $files = $this->filterConflicts($files,$conflictFileNames);
+        $files = $this->filterConflicts($files, $conflictFileNames);
 
         $commitEntity = new Commit();
         $commitEntity->setProject($this->project);
@@ -111,7 +111,7 @@ 
         
         //Get merge conflicts
         $conflictFileNames = $this->gitCommands->command('diff')->getConflictFileNames();
-        $files = $this->filterConflicts($files,$conflictFileNames);
+        $files = $this->filterConflicts($files, $conflictFileNames);
 
         $commitEntity = new Commit();
         $commitEntity->setProject($this->project);
@@ -316,17 +316,17 @@ 
      * @param array $conflictedFiles
      * @return type
      */
-    public function filterConflicts($files,$conflictedFiles){
+    public function filterConflicts($files, $conflictedFiles) {
         
         //Get merge conflicts
         $conflictFileNames = $this->gitCommands->command('diff')->getConflictFileNames();
-        if(count($conflictFileNames) > 0){
+        if (count($conflictFileNames) > 0) {
             $conflictedFiles = array();
-            foreach($files as $file){
-                if(($file->getIndexStatus() == 'U' || $file->getWorkTreeStatus() == 'U')
+            foreach ($files as $file) {
+                if (($file->getIndexStatus() == 'U' || $file->getWorkTreeStatus() == 'U')
                         || ($file->getIndexStatus() == 'D' && $file->getWorkTreeStatus() == 'D')
                         || ($file->getIndexStatus() == 'A' && $file->getWorkTreeStatus() == 'A')
-                        ){
+                        ) {
                     $conflictedFiles[] = $file;
                 }
             } 
@@ -398,18 +398,18 @@ 
      * @ProjectAccess(grantType="EDIT")
      * @Template()
      */
-    public function fixedConflictAction($filePath,$option)
+    public function fixedConflictAction($filePath, $option)
     {
         $file = urldecode($filePath);
         try {
             $gitUndoCommand = $this->gitCommands->command('undo');
-            if($option === 'theirs'){
+            if ($option === 'theirs') {
                 $response = $gitUndoCommand->checkoutTheirFile($file);
-            }elseif($option === 'ours'){
+            }elseif ($option === 'ours') {
                 $response = $gitUndoCommand->checkoutOurFile($file);
-            }elseif($option === 'delete'){
+            }elseif ($option === 'delete') {
                 $response = $gitUndoCommand->deleteFile($file);
-            }else{
+            } else {
                 $response = $gitUndoCommand->addFile($file);
             }
             

Braces +3 added lines, -3 removed lines

@@ -405,11 +405,11 @@
             $gitUndoCommand = $this->gitCommands->command('undo');
             if($option === 'theirs'){
                 $response = $gitUndoCommand->checkoutTheirFile($file);
-            }elseif($option === 'ours'){
+            } elseif($option === 'ours'){
                 $response = $gitUndoCommand->checkoutOurFile($file);
-            }elseif($option === 'delete'){
+            } elseif($option === 'delete'){
                 $response = $gitUndoCommand->deleteFile($file);
-            }else{
+            } else{
                 $response = $gitUndoCommand->addFile($file);
             }
             

src/VersionControl/GitControlBundle/Controller/Issues/IssueController.php

Indentation +2 added lines, -2 removed lines

@@ -407,8 +407,8 @@
                 $this->issueRepository->closeIssue($issueId);
             }
 
-           // $em->persist($entity);
-           // $em->flush();
+            // $em->persist($entity);
+            // $em->flush();
 
             return $this->redirect($this->generateUrl('issue_show', array('id' => $this->project->getId(), 'issueId' => $issueId)));
         }