SSHVersionControl / git-web-client

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

Braces +3 added lines, -3 removed lines

@@ -354,7 +354,7 @@ 
             
             if($this->isFileIgnored($filePath) === false){
                 $response = $this->addToGitIgnore($filePath);
-            }else {
+            } else {
                 throw new \VersionControl\GitCommandBundle\GitCommands\Exception\FileStatusException('File path is already ignored');
             }
 
@@ -387,10 +387,10 @@ 
                 if($statusCount <= 0){
                     $response .= $this->command->runCommand(sprintf('git rm --cached %s', escapeshellarg($filePath)));
                     $response .= "\n Please commit to complete the removal of this file from git index";
-                }else{
+                } else{
                     throw new \VersionControl\GitCommandBundle\GitCommands\Exception\FileStatusException('Please commit all files first');
                 }
-            }else{
+            } else{
                 throw new \VersionControl\GitCommandBundle\GitCommands\Exception\FileStatusException('File path is not been tracked');
             }
 

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

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

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/GitControlBundle/Controller/ProjectCommitController.php

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/ProjectFilesController.php

Braces +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
                 if(strtolower($file->getFilename()) === 'readme' ){
                     $readme = $this->gitFilesCommands->readFile($file);
                     break;
-                }else{
+                } else{
                     //Get last md file
                      $readme = $this->gitFilesCommands->readFile($file);
                 }

src/VersionControl/GitControlBundle/Encryptors/AES256Encryptor.php

Braces +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
                 $this->secretKey,
                 0,
                 $iv)));
-        }else{
+        } else{
             return trim(base64_encode(mcrypt_encrypt(
                                         MCRYPT_RIJNDAEL_256, $this->secretKey, $data, MCRYPT_MODE_ECB, mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB), MCRYPT_RAND
                                         ))));
@@ -80,7 +80,7 @@ 
                 $this->secretKey,
                 0,
                 $iv));
-        }else{
+        } else{
             return trim(mcrypt_decrypt(
                                 MCRYPT_RIJNDAEL_256, $this->secretKey, base64_decode($data), MCRYPT_MODE_ECB, mcrypt_create_iv(
                                         mcrypt_get_iv_size(

src/VersionControl/DoctrineEncryptBundle/Encryptors/AES256Encryptor.php

Braces +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
                 $this->secretKey,
                 0,
                 $iv)));
-        }else{
+        } else{
             return trim(base64_encode(mcrypt_encrypt(
                                         MCRYPT_RIJNDAEL_256, $this->secretKey, $data, MCRYPT_MODE_ECB, mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB), MCRYPT_RAND
                                         ))));
@@ -69,7 +69,7 @@ 
                 $this->secretKey,
                 0,
                 $iv));
-        }else{
+        } else{
             return trim(mcrypt_decrypt(
                                 MCRYPT_RIJNDAEL_256, $this->secretKey, base64_decode($data), MCRYPT_MODE_ECB, mcrypt_create_iv(
                                         mcrypt_get_iv_size(