SSHVersionControl / git-web-client

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

Indentation +68 added lines, -68 removed lines

@@ -122,80 +122,80 @@
         ));
     }
 
-     /**
-      * Form to choose which brabch and remote a user will pull.
-      * This is just the form. Also see pullToLocal().
-      *
-      * @Route("/delete/{remote}", name="project_deleteremote")
-      * @Method("GET")
-      * @Template()
-      * @ProjectAccess(grantType="MASTER")
-      */
-     public function deleteAction(Request $request, $id, $remote)
-     {
-         try {
-             $response = $this->gitSyncCommands->deleteRemote($remote);
-             $this->get('session')->getFlashBag()->add('notice', $response);
-         } catch (\Exception $e) {
-             $this->get('session')->getFlashBag()->add('error', $e->getMessage());
-         }
-
-         return $this->redirect($this->generateUrl('project_listremote', array('id' => $id)));
-     }
-
-     /**
-      * Create rename remote form.
-      *
-      * @Route("/rename/{remote}", name="project_renameremote")
-      * @Method("GET")
-      * @Template()
-      * @ProjectAccess(grantType="MASTER")
-      */
-     public function renameAction(Request $request, $id, $remote)
-     {
-         $defaultData = array('remoteName' => $remote);
-         $renameRemoteForm = $this->createRenameRemoteForm($defaultData);
-
-         return array_merge($this->viewVariables, array(
+        /**
+         * Form to choose which brabch and remote a user will pull.
+         * This is just the form. Also see pullToLocal().
+         *
+         * @Route("/delete/{remote}", name="project_deleteremote")
+         * @Method("GET")
+         * @Template()
+         * @ProjectAccess(grantType="MASTER")
+         */
+        public function deleteAction(Request $request, $id, $remote)
+        {
+            try {
+                $response = $this->gitSyncCommands->deleteRemote($remote);
+                $this->get('session')->getFlashBag()->add('notice', $response);
+            } catch (\Exception $e) {
+                $this->get('session')->getFlashBag()->add('error', $e->getMessage());
+            }
+
+            return $this->redirect($this->generateUrl('project_listremote', array('id' => $id)));
+        }
+
+        /**
+         * Create rename remote form.
+         *
+         * @Route("/rename/{remote}", name="project_renameremote")
+         * @Method("GET")
+         * @Template()
+         * @ProjectAccess(grantType="MASTER")
+         */
+        public function renameAction(Request $request, $id, $remote)
+        {
+            $defaultData = array('remoteName' => $remote);
+            $renameRemoteForm = $this->createRenameRemoteForm($defaultData);
+
+            return array_merge($this->viewVariables, array(
             'remote_form' => $renameRemoteForm->createView(),
             'branchName' => $this->branchName,
         ));
-     }
-
-     /**
-      * Changes the name of the remote repositiory in git for the local branch.
-      *
-      * @Route("/rename/{remote}", name="project_remoteupdate")
-      * @Method("POST")
-      * @Template("VersionControlGitControlBundle:ProjectRemote:rename.html.twig")
-      * @ProjectAccess(grantType="MASTER")
-      */
-     public function updateAction(Request $request, $id)
-     {
-         $renameRemoteForm = $this->createRenameRemoteForm();
-
-         $renameRemoteForm->handleRequest($request);
-
-         if ($renameRemoteForm->isValid()) {
-             $data = $renameRemoteForm->getData();
-             $remoteName = $data['remoteName'];
-             $newRemoteName = $data['newRemoteName'];
-
-             try {
-                 $response = $this->gitSyncCommands->renameRemote($remoteName, $newRemoteName);
-                 $this->get('session')->getFlashBag()->add('notice', $response);
-             } catch (\Exception $e) {
-                 $this->get('session')->getFlashBag()->add('error', $e->getMessage());
-             }
-
-             return $this->redirect($this->generateUrl('project_listremote', array('id' => $id)));
-         }
-
-         return array_merge($this->viewVariables, array(
+        }
+
+        /**
+         * Changes the name of the remote repositiory in git for the local branch.
+         *
+         * @Route("/rename/{remote}", name="project_remoteupdate")
+         * @Method("POST")
+         * @Template("VersionControlGitControlBundle:ProjectRemote:rename.html.twig")
+         * @ProjectAccess(grantType="MASTER")
+         */
+        public function updateAction(Request $request, $id)
+        {
+            $renameRemoteForm = $this->createRenameRemoteForm();
+
+            $renameRemoteForm->handleRequest($request);
+
+            if ($renameRemoteForm->isValid()) {
+                $data = $renameRemoteForm->getData();
+                $remoteName = $data['remoteName'];
+                $newRemoteName = $data['newRemoteName'];
+
+                try {
+                    $response = $this->gitSyncCommands->renameRemote($remoteName, $newRemoteName);
+                    $this->get('session')->getFlashBag()->add('notice', $response);
+                } catch (\Exception $e) {
+                    $this->get('session')->getFlashBag()->add('error', $e->getMessage());
+                }
+
+                return $this->redirect($this->generateUrl('project_listremote', array('id' => $id)));
+            }
+
+            return array_merge($this->viewVariables, array(
             'remote_form' => $renameRemoteForm->createView(),
             'branchName' => $this->branchName,
         ));
-     }
+        }
 
     /**
      * @param int $id

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

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

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

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

app/src/VersionControl/GitControlBundle/Tests/Controller/IssueControllerTest.php

Indentation +8 added lines, -8 removed lines

@@ -15,14 +15,14 @@ 
         $url = $this->client->getContainer()->get('router')->generate('issues', array('id' => $project->getId()));
 
         $crawler = $this->client->request('GET', $url, array(), array(), array(
-             'HTTP_X-Requested-With' => 'XMLHttpRequest',
+                'HTTP_X-Requested-With' => 'XMLHttpRequest',
         ));
         //$crawler = $this->client->followRedirect();
         $this->assertEquals(200, $this->client->getResponse()->getStatusCode(), 'Unexpected HTTP status code for GET '.$url);
 
         $newIssueLink = $crawler->filter('.box-tools > form > .pull-right > a')->link();
         $crawler = $this->client->request($newIssueLink->getMethod(), $newIssueLink->getUri(), array(), array(), array(
-             'HTTP_X-Requested-With' => 'XMLHttpRequest',
+                'HTTP_X-Requested-With' => 'XMLHttpRequest',
         ));
 
         $this->assertEquals(200, $this->client->getResponse()->getStatusCode(), 'Unexpected HTTP status code for GET '.$url);
@@ -45,7 +45,7 @@ 
         //Show Issue
         $issueShowLink = $crawler->filter('a:contains("Test")')->link();
         $crawler = $this->client->request($issueShowLink->getMethod(), $issueShowLink->getUri(), array(), array(), array(
-             'HTTP_X-Requested-With' => 'XMLHttpRequest',
+                'HTTP_X-Requested-With' => 'XMLHttpRequest',
         ));
 
         $this->assertGreaterThan(0, $crawler->filter('h1:contains("Test")')->count(), 'Missing element h1:contains("Test") on Issue show page');
@@ -53,7 +53,7 @@ 
         // Edit the entity
         $issueEditLink = $crawler->filter('a:contains("Edit")')->link();
         $crawler = $this->client->request($issueEditLink->getMethod(), $issueEditLink->getUri(), array(), array(), array(
-             'HTTP_X-Requested-With' => 'XMLHttpRequest',
+                'HTTP_X-Requested-With' => 'XMLHttpRequest',
         ));
 
         $form = $crawler->selectButton('Update')->form(array(
@@ -74,13 +74,13 @@ 
 
         //Back to Show Issue
         $crawler = $this->client->request($issueShowLink->getMethod(), $issueShowLink->getUri(), array(), array(), array(
-             'HTTP_X-Requested-With' => 'XMLHttpRequest',
+                'HTTP_X-Requested-With' => 'XMLHttpRequest',
         ));
 
         //Close Issue
         $issueCloseLink = $crawler->filter('a:contains("Close")')->link();
         $crawler = $this->client->request($issueCloseLink->getMethod(), $issueCloseLink->getUri(), array(), array(), array(
-             'HTTP_X-Requested-With' => 'XMLHttpRequest',
+                'HTTP_X-Requested-With' => 'XMLHttpRequest',
         ));
 
         $crawler = $this->client->followRedirect();
@@ -88,13 +88,13 @@ 
 
         //Back to Show Issue
         $crawler = $this->client->request($issueShowLink->getMethod(), $issueShowLink->getUri(), array(), array(), array(
-             'HTTP_X-Requested-With' => 'XMLHttpRequest',
+                'HTTP_X-Requested-With' => 'XMLHttpRequest',
         ));
 
         //Re-Open Issue
         $issueReOpenLink = $crawler->filter('a:contains("Re-Open")')->link();
         $crawler = $this->client->request($issueReOpenLink->getMethod(), $issueReOpenLink->getUri(), array(), array(), array(
-             'HTTP_X-Requested-With' => 'XMLHttpRequest',
+                'HTTP_X-Requested-With' => 'XMLHttpRequest',
         ));
 
         $crawler = $this->client->followRedirect();

app/src/VersionControl/GitControlBundle/Tests/Controller/UserProjectsControllerTest.php

Indentation +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
         // List users for project
         $url = $this->client->getContainer()->get('router')->generate('members_list', array('id' => $project->getId()));
         $crawler = $this->client->request('GET', $url, array(), array(), array(
-             'HTTP_X-Requested-With' => 'XMLHttpRequest',
+                'HTTP_X-Requested-With' => 'XMLHttpRequest',
         ));
         $this->assertEquals(200, $this->client->getResponse()->getStatusCode(), 'Unexpected HTTP status code for GET /userprojects/');
     }

app/src/VersionControl/GitControlBundle/Tests/Controller/IssueMilestoneControllerTest.php

Indentation +8 added lines, -8 removed lines

@@ -14,14 +14,14 @@ 
         // List Issue milestones
         $listMilestoneURL = $this->client->getContainer()->get('router')->generate('issuemilestones', array('id' => $project->getId()));
         $crawler = $this->client->request('GET', $listMilestoneURL, array(), array(), array(
-             'HTTP_X-Requested-With' => 'XMLHttpRequest',
+                'HTTP_X-Requested-With' => 'XMLHttpRequest',
         ));
         $this->assertEquals(200, $this->client->getResponse()->getStatusCode(), 'Unexpected HTTP status code for GET '.$listMilestoneURL);
 
         //Click New Issue Milestone Link
         $newIssueMilestoneLink = $crawler->filter('a:contains("New Milestone")')->link();
         $crawler = $this->client->request($newIssueMilestoneLink->getMethod(), $newIssueMilestoneLink->getUri(), array(), array(), array(
-             'HTTP_X-Requested-With' => 'XMLHttpRequest',
+                'HTTP_X-Requested-With' => 'XMLHttpRequest',
         ));
 
         $this->assertEquals(200, $this->client->getResponse()->getStatusCode(), 'Unexpected HTTP status code for GET '.$newIssueMilestoneLink->getUri());
@@ -41,10 +41,10 @@ 
         $this->assertGreaterThan(0, $crawler->filter('h1:contains("Test Milestone")')->count(), 'Missing element h1:contains("Test Milestone")');
         $showUrl = $this->client->getRequest()->getUri();
 
-         // Edit the issue milestone
+            // Edit the issue milestone
         $issueMilestoneEditLink = $crawler->filter('a:contains("Edit")')->link();
         $crawler = $this->client->request($issueMilestoneEditLink->getMethod(), $issueMilestoneEditLink->getUri(), array(), array(), array(
-             'HTTP_X-Requested-With' => 'XMLHttpRequest',
+                'HTTP_X-Requested-With' => 'XMLHttpRequest',
         ));
         $this->assertEquals(200, $this->client->getResponse()->getStatusCode(), 'Unexpected HTTP status code for edit issue milestone');
 
@@ -62,21 +62,21 @@ 
         //Close Milestone
         $issueMilestoneCloseLink = $crawler->filter('a:contains("Close")')->link();
         $crawler = $this->client->request($issueMilestoneCloseLink->getMethod(), $issueMilestoneCloseLink->getUri(), array(), array(), array(
-             'HTTP_X-Requested-With' => 'XMLHttpRequest',
+                'HTTP_X-Requested-With' => 'XMLHttpRequest',
         ));
         $crawler = $this->client->followRedirect();
         $this->assertNotRegExp('/Test Milestone Edit/', $this->client->getResponse()->getContent());
 
         //Open Show Issue milestone again
         $crawler = $this->client->request('GET', $showUrl, array(), array(), array(
-             'HTTP_X-Requested-With' => 'XMLHttpRequest',
+                'HTTP_X-Requested-With' => 'XMLHttpRequest',
         ));
         $this->assertEquals(200, $this->client->getResponse()->getStatusCode(), 'Unexpected HTTP status code for edit issue milestone');
 
         //Re-open Milestone
         $issueMilestoneReOpenLink = $crawler->filter('a:contains("Re-open")')->link();
         $crawler = $this->client->request($issueMilestoneReOpenLink->getMethod(), $issueMilestoneReOpenLink->getUri(), array(), array(), array(
-             'HTTP_X-Requested-With' => 'XMLHttpRequest',
+                'HTTP_X-Requested-With' => 'XMLHttpRequest',
         ));
         $crawler = $this->client->followRedirect();
         $this->assertGreaterThan(0, $crawler->filter('.alert:contains("has been opened")')->count(), 'Missing element .alert:contains("successfully updated")');
@@ -84,7 +84,7 @@ 
         //Close Milestone Again
         $issueMilestoneCloseLink = $crawler->filter('a:contains("Close")')->link();
         $crawler = $this->client->request($issueMilestoneCloseLink->getMethod(), $issueMilestoneCloseLink->getUri(), array(), array(), array(
-             'HTTP_X-Requested-With' => 'XMLHttpRequest',
+                'HTTP_X-Requested-With' => 'XMLHttpRequest',
         ));
         $crawler = $this->client->followRedirect();
         $this->assertNotRegExp('/Test Milestone Edit/', $this->client->getResponse()->getContent());