SSHVersionControl / git-web-client

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

Indentation +1 added lines, -1 removed lines

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

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 {

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

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

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

Spacing +4 added lines, -4 removed lines

@@ -120,7 +120,7 @@ 
 
         if ($form->isValid()) {
             $issueEntity = $this->issueRepository->createIssue($issueEntity);
-            $this->get('session')->getFlashBag()->add('notice', 'Issue #'.$issueEntity->getId().' successfully updated');
+            $this->get('session')->getFlashBag()->add('notice', 'Issue #' . $issueEntity->getId() . ' successfully updated');
 
             return $this->redirect($this->generateUrl('issues', array('id' => $this->project->getId())));
         }
@@ -264,7 +264,7 @@ 
         if ($editForm->isValid()) {
             $this->issueRepository->updateIssue($issueEntity);
 
-            $this->get('session')->getFlashBag()->add('notice', 'Issue #'.$issueEntity->getId().' successfully updated');
+            $this->get('session')->getFlashBag()->add('notice', 'Issue #' . $issueEntity->getId() . ' successfully updated');
 
             return $this->redirect($this->generateUrl('issue_edit', array('id' => $this->project->getId(), 'issueId' => $issueId)));
         }
@@ -313,7 +313,7 @@ 
             throw $this->createNotFoundException('Unable to find Issue entity.');
         }
 
-        $this->get('session')->getFlashBag()->add('notice', 'Issue #'.$issueEntity->getId().' has been closed');
+        $this->get('session')->getFlashBag()->add('notice', 'Issue #' . $issueEntity->getId() . ' has been closed');
 
         return $this->redirect($this->generateUrl('issues', array('id' => $this->project->getId())));
     }
@@ -333,7 +333,7 @@ 
             throw $this->createNotFoundException('Unable to find Issue entity.');
         }
 
-        $this->get('session')->getFlashBag()->add('notice', 'Issue #'.$issueEntity->getId().' has been re-opened');
+        $this->get('session')->getFlashBag()->add('notice', 'Issue #' . $issueEntity->getId() . ' has been re-opened');
 
         return $this->redirect($this->generateUrl('issue_show', array('id' => $this->project->getId(), 'issueId' => $issueEntity->getId())));
     }

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

Spacing +5 added lines, -5 removed lines

@@ -83,7 +83,7 @@ 
         if ($form->isValid()) {
             $issueMilestone = $this->issueMilestoneRepository->createMilestone($issueMilestone);
 
-            $this->get('session')->getFlashBag()->add('notice', 'New Milestone:'.$issueMilestone->getTitle());
+            $this->get('session')->getFlashBag()->add('notice', 'New Milestone:' . $issueMilestone->getTitle());
 
             return $this->redirect($this->generateUrl('issuemilestone_show', array('milestoneId' => $issueMilestone->getId())));
         }
@@ -231,7 +231,7 @@ 
 
         if ($editForm->isValid()) {
             $this->issueMilestoneRepository->updateMilestone($issueMilestone);
-            $this->get('session')->getFlashBag()->add('notice', 'Updated Milestone:'.$issueMilestone->getTitle());
+            $this->get('session')->getFlashBag()->add('notice', 'Updated Milestone:' . $issueMilestone->getTitle());
 
             return $this->redirect($this->generateUrl('issuemilestone_show', array('id' => $id, 'milestoneId' => $milestoneId)));
         }
@@ -257,7 +257,7 @@ 
         if ($form->isValid()) {
             $this->issueMilestoneRepository->deleteMilestone($milestoneId);
 
-            $this->get('session')->getFlashBag()->add('notice', 'Deleted Milestone:'.$milestoneId);
+            $this->get('session')->getFlashBag()->add('notice', 'Deleted Milestone:' . $milestoneId);
         }
 
         return $this->redirect($this->generateUrl('issuemilestones', array('id' => $id)));
@@ -295,7 +295,7 @@ 
             throw $this->createNotFoundException('Unable to find Issue Milestone entity.');
         }
 
-        $this->get('session')->getFlashBag()->add('notice', 'Milestone #'.$issueMilestone->getId().' has been closed');
+        $this->get('session')->getFlashBag()->add('notice', 'Milestone #' . $issueMilestone->getId() . ' has been closed');
 
         return $this->redirect($this->generateUrl('issuemilestones', array('project' => $issueMilestone->getProject()->getId())));
     }
@@ -315,7 +315,7 @@ 
             throw $this->createNotFoundException('Unable to find Issue Milestone entity.');
         }
 
-        $this->get('session')->getFlashBag()->add('notice', 'Milestone #'.$issueMilestone->getId().' has been opened');
+        $this->get('session')->getFlashBag()->add('notice', 'Milestone #' . $issueMilestone->getId() . ' has been opened');
 
         return $this->redirect($this->generateUrl('issuemilestone_show', array('id' => $this->project->getId(), 'milestoneId' => $issueMilestone->getId())));
     }

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

Indentation +2 added lines, -2 removed lines

@@ -154,7 +154,7 @@ 
                     $this->get('session')->getFlashBag()->add('error', $e->getMessage());
                 }
 
-               //return $this->redirect($this->generateUrl('project_push', array('id' => $id)));
+                //return $this->redirect($this->generateUrl('project_push', array('id' => $id)));
                 $data = ['redirect' => $this->generateUrl('project_tags', array('id' => $this->project->getId()))];
 
                 return $this->viewHandler($data, 'json', true);
@@ -168,7 +168,7 @@ 
         $gitRemoteVersions = $this->gitCommands->command('sync')->getRemoteVersions();
         
         $content = $this->render('VersionControlGitControlBundle:ProjectTag:pushTag.html.twig', 
-             array_merge($this->viewVariables, array(
+                array_merge($this->viewVariables, array(
                 'remoteVersions' => $gitRemoteVersions,
                 'push_form' => $form->createView()
             )

Spacing +6 added lines, -6 removed lines

@@ -44,7 +44,7 @@ 
     {
         $tags = $this->gitCommands->command('tag')->getTags();
 
-        $defaultData =array();
+        $defaultData = array();
         $form = $this->createNewTagForm($this->project, $defaultData);
 
         return array_merge($this->viewVariables, array(
@@ -108,12 +108,12 @@ 
                 ->add('name', TextType::class, array(
                     'label' => 'Tag Name', 'required' => true, 'constraints' => array(
                         new NotBlank(),
-                    ), )
+                    ),)
                 )
                 ->add('message', TextType::class, array(
                     'label' => 'Tag Message', 'required' => true, 'constraints' => array(
                         new NotBlank(),
-                    ), )
+                    ),)
                 )
                 ->add('commit', HiddenType::class)
                 ->getForm();
@@ -135,7 +135,7 @@ 
     public function pushTagAction(Request $request, $tag, $responseType)
     {
         $success = true;
-        $form = $this->createPushTagForm($this->project,$tag);
+        $form = $this->createPushTagForm($this->project, $tag);
         $form->add('push', SubmitType::class, array('label' => 'Push'));
         
         $form->handleRequest($request);
@@ -190,7 +190,7 @@ 
         $gitRemoteVersions = $this->gitCommands->command('sync')->getRemoteVersions();
         $remoteChoices = array();
         foreach ($gitRemoteVersions as $remoteVersion) {
-            $remoteChoices[$remoteVersion[0].'('.$remoteVersion[1].')'] = $remoteVersion[0];
+            $remoteChoices[$remoteVersion[0] . '(' . $remoteVersion[1] . ')'] = $remoteVersion[0];
         }
 
         $firstOrigin = reset($remoteChoices);
@@ -204,7 +204,7 @@ 
             ->add('remote', ChoiceType::class, array(
                 'label' => 'Remote Server', 'choices' => $remoteChoices, 'data' => $firstOrigin, 'required' => false, 'choices_as_values' => true, 'constraints' => array(
                     new NotBlank(),
-                ), )
+                ),)
             )
             ->add('tag', HiddenType::class)
             ->getForm();

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

Indentation +1 added lines, -1 removed lines

@@ -149,7 +149,7 @@
             $data = $pullForm->getData();
             $remote = $data['remote'];
             $branch = $data['branch'];
-             //die('form valid');
+                //die('form valid');
             if ($pullForm->get('viewDiff')->isClicked()) {
                 $response = $this->gitSyncCommands->fetch($remote, $branch);
                 $this->get('session')->getFlashBag()->add('notice', $response);

Spacing +3 added lines, -3 removed lines

@@ -196,7 +196,7 @@ 
         $gitRemoteVersions = $this->gitSyncCommands->getRemoteVersions();
         $remoteChoices = array();
         foreach ($gitRemoteVersions as $remoteVersion) {
-            $remoteChoices[$remoteVersion[0].'('.$remoteVersion[1].')'] = $remoteVersion[0];
+            $remoteChoices[$remoteVersion[0] . '(' . $remoteVersion[1] . ')'] = $remoteVersion[0];
         }
 
         //Local Branch choice
@@ -219,12 +219,12 @@ 
             ->add('remote', ChoiceType::class, array(
                 'label' => 'Remote Server', 'choices' => $remoteChoices, 'data' => $firstOrigin, 'required' => false, 'choices_as_values' => true, 'constraints' => array(
                     new NotBlank(),
-                ), )
+                ),)
             )
             ->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(),
-                ), )
+                ),)
             )
             ->getForm();
 

app/src/VersionControl/GitControlBundle/Utility/ProjectEnvironmentStorage.php

Spacing +3 added lines, -3 removed lines

@@ -53,7 +53,7 @@ 
      */
     public function setProjectEnvironment($projectId, $projectEnvironmentId)
     {
-        $this->session->set('projectEnvironment'.$projectId, $projectEnvironmentId);
+        $this->session->set('projectEnvironment' . $projectId, $projectEnvironmentId);
     }
 
     /**
@@ -65,8 +65,8 @@ 
      */
     public function getProjectEnviromment(Project $project)
     {
-        if ($this->session->has('projectEnvironment'.$project->getId())) {
-            $projectEnvironmentId = $this->session->get('projectEnvironment'.$project->getId());
+        if ($this->session->has('projectEnvironment' . $project->getId())) {
+            $projectEnvironmentId = $this->session->get('projectEnvironment' . $project->getId());
 
             $currentProjectEnvironment = $this->em->getRepository('VersionControlGitControlBundle:ProjectEnvironment')->find($projectEnvironmentId);
             if ($currentProjectEnvironment->getProject()->getId() === $project->getId()) {

app/src/VersionControl/GitControlBundle/Security/Authentication/FOSVersionUserProvider.php

Spacing +7 added lines, -7 removed lines

@@ -25,9 +25,9 @@ 
         $username = $response->getUsername();
         //on connect - get the access token and the user ID
         $service = $response->getResourceOwner()->getName();
-        $setter = 'set'.ucfirst($service);
-        $setter_id = $setter.'Id';
-        $setter_token = $setter.'AccessToken';
+        $setter = 'set' . ucfirst($service);
+        $setter_id = $setter . 'Id';
+        $setter_token = $setter . 'AccessToken';
 
         //we "disconnect" previously connected users
         if (null !== $previousUser = $this->userManager->findUserBy(array($property => $username))) {
@@ -51,9 +51,9 @@ 
         //when the user is registrating
         if (null === $user) {
             $service = $response->getResourceOwner()->getName();
-            $setter = 'set'.ucfirst($service);
-            $setter_id = $setter.'Id';
-            $setter_token = $setter.'AccessToken';
+            $setter = 'set' . ucfirst($service);
+            $setter_id = $setter . 'Id';
+            $setter_token = $setter . 'AccessToken';
             // create new user here
             $user = $this->userManager->createUser();
             $user->$setter_id($username);
@@ -74,7 +74,7 @@ 
 
         //update access token
         $serviceName = $response->getResourceOwner()->getName();
-        $setter = 'set'.ucfirst($serviceName).'AccessToken';
+        $setter = 'set' . ucfirst($serviceName) . 'AccessToken';
         $user->$setter($response->getAccessToken());
 
         return $user;