SSHVersionControl / git-web-client

app/src/VersionControl/GitControlBundle/Validator/Constraints/GitFolderExistsValidator.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
         if ($projectEnvironment->getSsh() === true) {
             $this->sftpProcess->setGitEnviroment($projectEnvironment);
             try {
-                if ($this->sftpProcess->fileExists($gitPath.'/.git') === false) {
+                if ($this->sftpProcess->fileExists($gitPath . '/.git') === false) {
                     $this->context->buildViolation($constraint->message)
                          ->atPath('path')
                          ->addViolation();
@@ -55,7 +55,7 @@ 
                         ->addViolation();
             }
         } else {
-            if (file_exists($gitPath.'/.git') === false) {
+            if (file_exists($gitPath . '/.git') === false) {
                 $this->context->buildViolation($constraint->message)
                     ->atPath('path')
                     ->addViolation();

app/src/VersionControl/GitControlBundle/Command/CreateAdminCommand.php

Spacing +4 added lines, -4 removed lines

@@ -80,7 +80,7 @@ 
 
         if (!$input->getArgument('username')) {
             $question = new Question('Please choose a username:');
-            $question->setValidator(function ($username) {
+            $question->setValidator(function($username) {
                 if (empty($username)) {
                     throw new \Exception('Username can not be empty');
                 }
@@ -92,7 +92,7 @@ 
 
         if (!$input->getArgument('email')) {
             $question = new Question('Please choose an email:');
-            $question->setValidator(function ($email) {
+            $question->setValidator(function($email) {
                 if (empty($email)) {
                     throw new \Exception('Email can not be empty');
                 }
@@ -104,7 +104,7 @@ 
 
         if (!$input->getArgument('password')) {
             $question = new Question('Please choose a password:');
-            $question->setValidator(function ($password) {
+            $question->setValidator(function($password) {
                 if (empty($password)) {
                     throw new \Exception('Password can not be empty');
                 }
@@ -117,7 +117,7 @@ 
 
         if (!$input->getArgument('name')) {
             $question = new Question('Please choose a display name:');
-            $question->setValidator(function ($name) {
+            $question->setValidator(function($name) {
                 if (empty($name)) {
                     throw new \Exception('Display name can not be empty');
                 }

app/src/VersionControl/GitControlBundle/Command/InstallerCommand.php

Spacing +1 added lines, -1 removed lines

@@ -166,7 +166,7 @@
         }
 
         $output->writeln(sprintf('Clearing cache for directory <info>%s</info>', $this->cacheDir));
-        $oldCacheDir = $this->cacheDir.'_old';
+        $oldCacheDir = $this->cacheDir . '_old';
 
         if ($this->filesystem->exists($oldCacheDir)) {
             $this->filesystem->remove($oldCacheDir);

app/src/VersionControl/GitControlBundle/Controller/ProjectCommitController.php

Spacing +15 added lines, -15 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);
@@ -146,12 +146,12 @@ 
                 $this->handleIssue($commitEntity);
 
                 $user = $this->get('security.token_storage')->getToken()->getUser();
-                $author = $user->getName().' <'.$user->getEmail().'>';
+                $author = $user->getName() . ' <' . $user->getEmail() . '>';
                 //Git Commit
                 $this->gitCommitCommand->commit($commitEntity->getComment(), $author);
 
                 //Set notice of successfull commit
-                $this->get('session')->getFlashBag()->add('notice', $filesCommited.' files have been committed');
+                $this->get('session')->getFlashBag()->add('notice', $filesCommited . ' files have been committed');
 
                 $this->get('session')->getFlashBag()->add('status-refresh', 'true');
 
@@ -247,7 +247,7 @@ 
             $issueEntity = $this->issueRepository->findIssueById($issueId);
             if ($issueEntity) {
                 $issueAction = $commitEntity->getIssueAction();
-                $commitMessage = $issueAction.' #'.$issueEntity->getId().':'.$commitMessage;
+                $commitMessage = $issueAction . ' #' . $issueEntity->getId() . ':' . $commitMessage;
                 $commitEntity->setComment($commitMessage);
                 if (in_array($issueAction, $issueCloseStatus)) {
                     //Close Issue
@@ -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);
             }
             

app/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))

app/src/VersionControl/GitControlBundle/Controller/ProjectRemoteController.php

Spacing +4 added lines, -4 removed lines

@@ -220,12 +220,12 @@ 
         ->add('remoteName', TextType::class, array(
             'label' => 'Remote Name', 'required' => false, 'constraints' => array(
                 new NotBlank(),
-            ), )
+            ),)
         )
         ->add('remoteUrl', TextType::class, array(
             'label' => 'Remote Url', 'required' => false, 'constraints' => array(
                 new NotBlank(),
-            ), )
+            ),)
         )->add('submit', SubmitType::class, array('label' => 'Add'))
 
         ->getForm();
@@ -242,12 +242,12 @@ 
         ->add('remoteName', HiddenType::class, array(
             'constraints' => array(
                 new NotBlank(),
-            ), )
+            ),)
         )
         ->add('newRemoteName', TextType::class, array(
             'label' => 'New Remote Name', 'required' => false, 'constraints' => array(
                 new NotBlank(),
-            ), )
+            ),)
         )->add('submit', SubmitType::class, array('label' => 'Rename'))
 
         ->getForm();

app/src/VersionControl/GitControlBundle/Controller/ProjectBranchController.php

Spacing +5 added lines, -5 removed lines

@@ -132,7 +132,7 @@ 
         $form->add('remotename', HiddenType::class, array(
             'label' => 'Remote Branch Name', 'required' => true, 'constraints' => array(
                 new NotBlank(),
-            ), )
+            ),)
         );
 
         return array_merge($this->viewVariables, array(
@@ -159,7 +159,7 @@ 
         $form->add('remotename', HiddenType::class, array(
             'label' => 'Remote Branch Name', 'required' => true, 'constraints' => array(
                 new NotBlank(),
-            ), )
+            ),)
         );
 
         $form->handleRequest($request);
@@ -246,7 +246,7 @@ 
                 ->add('name', TextType::class, array(
                     'label' => 'Branch Name', 'required' => true, 'constraints' => array(
                         new NotBlank(),
-                    ), )
+                    ),)
                 )
                 ->add('switch', CheckboxType::class, array(
                     'label' => 'Switch to branch on creation', 'required' => false,
@@ -271,7 +271,7 @@ 
     {
         try {
             $user = $this->get('security.token_storage')->getToken()->getUser();
-            $author = $user->getName().' <'.$user->getEmail().'>';
+            $author = $user->getName() . ' <' . $user->getEmail() . '>';
             $response = $this->gitCommands->command('branch')->mergeBranch($branchName);
             $this->get('session')->getFlashBag()->add('notice', $response);
         } catch (\Exception $e) {
@@ -312,7 +312,7 @@ 
                 ->add('branch', ChoiceType::class, array(
                     'choices' => $branches, 'label' => 'Branch Name', 'required' => true, 'choices_as_values' => true, 'constraints' => array(
                         new NotBlank(),
-                    ), )
+                    ),)
                 )
                 ->getForm();
 

app/src/VersionControl/GitControlBundle/Controller/ProjectFilesController.php

Spacing +3 added lines, -3 removed lines

@@ -49,10 +49,10 @@ 
         $readme = '';
         foreach ($files as $file) {
             if (strtolower($file->getExtension()) == 'md' || strtolower($file->getExtension()) == 'markdown') {
-                if(strtolower($file->getFilename()) === 'readme' ){
+                if (strtolower($file->getFilename()) === 'readme') {
                     $readme = $this->gitFilesCommands->readFile($file);
                     break;
-                }else{
+                } else {
                     //Get last md file
                      $readme = $this->gitFilesCommands->readFile($file);
                 }
@@ -135,7 +135,7 @@ 
 
         if (trim($pathInfo['dirname']) && $pathInfo['dirname'] != '.') {
             $currentDir = $pathInfo['dirname'];
-            $params['currentDir'] = $currentDir.'/';
+            $params['currentDir'] = $currentDir . '/';
         }
 
         try {

app/src/VersionControl/GitControlBundle/Controller/Issues/IssueLabelController.php

Spacing +3 added lines, -3 removed lines

@@ -69,7 +69,7 @@ 
         if ($form->isValid()) {
             $issueLabel = $this->issueLabelRepository->createLabel($issueLabel);
 
-            $this->get('session')->getFlashBag()->add('notice', 'New Issue label Created '.$issueLabel->getId().'.');
+            $this->get('session')->getFlashBag()->add('notice', 'New Issue label Created ' . $issueLabel->getId() . '.');
 
             $this->get('session')->getFlashBag()->add('info', 'It may take a minute or two before you can see the new label in the list below');
 
@@ -186,7 +186,7 @@ 
         if ($editForm->isValid()) {
             $this->issueLabelRepository->updateLabel($issueLabel);
 
-            $this->get('session')->getFlashBag()->add('notice', "Issue label Update '".$issueLabel->getId()."'.");
+            $this->get('session')->getFlashBag()->add('notice', "Issue label Update '" . $issueLabel->getId() . "'.");
             //$this->get('session')->getFlashBag()->add('info', "It may take a minute or two before you can see the updated label in the list below");
 
             return $this->redirect($this->generateUrl('issuelabels', array('id' => $this->project->getId())));
@@ -209,7 +209,7 @@ 
             $this->issueLabelRepository->deleteLabel($labelId);
         }
 
-        $this->get('session')->getFlashBag()->add('notice', "Issue label '".$labelId."' has been deleted");
+        $this->get('session')->getFlashBag()->add('notice', "Issue label '" . $labelId . "' has been deleted");
 
         return $this->redirect($this->generateUrl('issuelabels', array('id' => $this->project->getId())));
     }