SSHVersionControl / git-web-client

app/src/VersionControl/GitControlBundle/Twig/Extension/CommitHashLinkExtension.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
             foreach ($matches as $commitHash) {
                 if ($this->validateCommitHash($commitHash)) {
                     $url = $this->generateCommitHistoryUrl($commitHash, $projectId);
-                    $link = '<a href="'.$url.'" title="Related to Commit Hash '.$commitHash.'">'.$commitHash.'</a>';
+                    $link = '<a href="' . $url . '" title="Related to Commit Hash ' . $commitHash . '">' . $commitHash . '</a>';
                     $text = str_replace($commitHash, $link, $text);
                 }
             }

app/src/VersionControl/GitControlBundle/Twig/Extension/PaginationExtension.php

Indentation +6 added lines, -6 removed lines

@@ -135,12 +135,12 @@
             $listPages = '';
             for ($i = ($this->currentPage - $this->midRange); $i < (($this->currentPage + $this->midRange) + 1); ++$i) {
                 if (($i > 0) && ($i <= $this->numPages)) {  //  if page number are within page range
-                  if ($i == $this->currentPage) {
-                      $listPages .= '<li class="active"><a href="'.$this->generateUrl($i).'">'.$i.'</a></li>';
-                  }  //  if we're on current page
-                  else {
-                      $listPages .= '<li><a href="'.$this->generateUrl($i).'">'.$i.'</a></li>';
-                  }  //  if not current page
+                    if ($i == $this->currentPage) {
+                        $listPages .= '<li class="active"><a href="'.$this->generateUrl($i).'">'.$i.'</a></li>';
+                    }  //  if we're on current page
+                    else {
+                        $listPages .= '<li><a href="'.$this->generateUrl($i).'">'.$i.'</a></li>';
+                    }  //  if not current page
                 }
             }
 

Spacing +7 added lines, -7 removed lines

@@ -80,7 +80,7 @@ 
         if ($totalRecords > 0) {
             $this->numPages = ceil($totalRecords / $recordsPerPage);
             $this->currentPage = $currentPage;
-            $content = '<nav><ul class="pagination">'.$this->firstPage().$this->prevPage().$this->listPages().$this->nextPage().$this->lastPage().'</ul></nav>';
+            $content = '<nav><ul class="pagination">' . $this->firstPage() . $this->prevPage() . $this->listPages() . $this->nextPage() . $this->lastPage() . '</ul></nav>';
         } else {
             $content = '';
         }
@@ -93,7 +93,7 @@ 
         if ($this->currentPage > 1) {
             $prevPage = ($this->currentPage - 1);
 
-            return '<li><a href="'.$this->generateUrl($prevPage).'" class="prev">prev</a></li>';
+            return '<li><a href="' . $this->generateUrl($prevPage) . '" class="prev">prev</a></li>';
         }
     }
     protected function nextPage()
@@ -101,14 +101,14 @@ 
         if ($this->currentPage < $this->numPages) {
             $nextPage = $this->currentPage + 1;
 
-            return '<li><a href="'.$this->generateUrl($nextPage).'" class="next">next</a></li>';
+            return '<li><a href="' . $this->generateUrl($nextPage) . '" class="next">next</a></li>';
         }
     }
     protected function firstPage()
     {
         $firstPage = '';
         if ($this->currentPage > ($this->midRange + 1)) {  //  if number of pages between "currentPage" and "firstPage" exceeds $midRange with 1...
-                $firstPage .= '<li><a href="'.$this->generateUrl(1).'" class="first">First Page</a></li>';  //  ...show "first page"-link
+                $firstPage .= '<li><a href="' . $this->generateUrl(1) . '" class="first">First Page</a></li>'; //  ...show "first page"-link
                 if ($this->currentPage > ($this->midRange + 2)) {   //  if number of pages between $currentPage and "first page" exceeds $midRange with more than 1
                     //$firstPage .= '&hellip;';  //  add "..." between "1st page"-link and first page in $range
                 }
@@ -123,7 +123,7 @@ 
                 if (($this->currentPage < ($this->numPages - $this->midRange) - 1)) {  //  if number of pages between $currentPage and "last page" exceeds $range with more than two
                     //$lastPage .= '&hellip;';  //  add "..." between "last page"-link and last page in $range
                 }
-            $lastPage .= '<li><a href="'.$this->generateUrl($this->numPages).'" class="last">'.$this->numPages.'</a></li>';   //  show "last page"-link
+            $lastPage .= '<li><a href="' . $this->generateUrl($this->numPages) . '" class="last">' . $this->numPages . '</a></li>'; //  show "last page"-link
         }
 
         return $lastPage;
@@ -136,10 +136,10 @@ 
             for ($i = ($this->currentPage - $this->midRange); $i < (($this->currentPage + $this->midRange) + 1); ++$i) {
                 if (($i > 0) && ($i <= $this->numPages)) {  //  if page number are within page range
                   if ($i == $this->currentPage) {
-                      $listPages .= '<li class="active"><a href="'.$this->generateUrl($i).'">'.$i.'</a></li>';
+                      $listPages .= '<li class="active"><a href="' . $this->generateUrl($i) . '">' . $i . '</a></li>';
                   }  //  if we're on current page
                   else {
-                      $listPages .= '<li><a href="'.$this->generateUrl($i).'">'.$i.'</a></li>';
+                      $listPages .= '<li><a href="' . $this->generateUrl($i) . '">' . $i . '</a></li>';
                   }  //  if not current page
                 }
             }

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

Spacing +2 added lines, -2 removed lines

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

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

Indentation +2 added lines, -2 removed lines

@@ -42,8 +42,8 @@
             try {
                 if ($this->sftpProcess->fileExists($gitPath.'/.git') === false) {
                     $this->context->buildViolation($constraint->message)
-                         ->atPath('path')
-                         ->addViolation();
+                            ->atPath('path')
+                            ->addViolation();
                 }
             } catch (SshLoginException $sshLoginException) {
                 $this->context->buildViolation($sshLoginException->getMessage())

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

Indentation +1 added lines, -1 removed lines

@@ -139,7 +139,7 @@
     {
         $form = $this->createFormBuilder(array(), array(
                 'method' => 'POST',
-           ))
+            ))
                 ->add('roles', ChoiceType::class, array(
                     'label' => 'User Role', 'choices' => array('Reporter' => 'Reporter', 'Developer' => 'Developer', 'Master' => 'Master'), 'required' => false, 'placeholder' => 'Please select a role', 'choices_as_values' => true, 'constraints' => array(
                         new NotBlank(),

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);
             }
             

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);
             }
             

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