SSHVersionControl / git-web-client

src/VersionControl/GitControlBundle/Tests/Controller/IssueLabelControllerTest.php

Indentation +5 added lines, -5 removed lines

@@ -14,14 +14,14 @@ 
         // List Issue labels
         $listLabelURL = $this->client->getContainer()->get('router')->generate('issuelabels', array('id' => $project->getId()));
         $crawler = $this->client->request('GET', $listLabelURL, 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 '.$listLabelURL);
 
         //Click New Issue Label Link
         $newIssueLabelLink = $crawler->filter('a:contains("New Label")')->link();
         $crawler = $this->client->request($newIssueLabelLink->getMethod(), $newIssueLabelLink->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 '.$newIssueLabelLink->getUri());
@@ -39,10 +39,10 @@ 
         // Check data in the show view
         $this->assertGreaterThan(0, $crawler->filter('a:contains("Test Label")')->count(), 'Missing element a:contains("Test Label")');
 
-         // Edit the issue label
+            // Edit the issue label
         $issueLabelEditLink = $crawler->filter('a:contains("Test Label")')->link();
         $crawler = $this->client->request($issueLabelEditLink->getMethod(), $issueLabelEditLink->getUri(), array(), array(), array(
-             'HTTP_X-Requested-With' => 'XMLHttpRequest',
+                'HTTP_X-Requested-With' => 'XMLHttpRequest',
         ));
 
         $this->assertGreaterThan(0, $crawler->filter('h1:contains("Test Label")')->count(), 'Missing element h1:contains("Test Label") on Issue label show page');
@@ -60,7 +60,7 @@ 
         //Click Delete link
         $issueLabelDeleteLink = $crawler->filter('a:contains("Delete")')->link();
         $crawler = $this->client->request($issueLabelDeleteLink->getMethod(), $issueLabelDeleteLink->getUri(), array(), array(), array(
-             'HTTP_X-Requested-With' => 'XMLHttpRequest',
+                'HTTP_X-Requested-With' => 'XMLHttpRequest',
         ));
         $crawler = $this->client->followRedirect();
         $this->assertNotRegExp('/Test Label Edit/', $this->client->getResponse()->getContent());

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

Indentation +8 added lines, -8 removed lines

@@ -15,7 +15,7 @@ 
         $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',
         ));
         //$this->assertEquals(302, $this->client->getResponse()->getStatusCode(), "Unexpected HTTP status code for GET ".$url);
         //$crawler = $this->client->followRedirect();
@@ -23,7 +23,7 @@ 
 
         $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);
@@ -46,7 +46,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');
@@ -54,7 +54,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(
@@ -75,13 +75,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();
@@ -89,13 +89,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();

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

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

src/VersionControl/GitControlBundle/Repository/IssueRepository.php

Indentation +24 added lines, -24 removed lines

@@ -174,19 +174,19 @@ 
         return $this->findByProjectAndStatus($state, $keyword, $issueMilestoneId, true);
     }
 
-     /**
-      * @param type $project
-      *
-      * @return int
-      */
-     public function countIssuesForProjectWithStatus($status = 'open', $keyword = false, $milestone = null)
-     {
-         $qb = $this->findByProjectAndStatus($status, $keyword, $milestone, true);
-
-         $qb->select('count(a)');
-
-         return $qb->getQuery()->getSingleScalarResult();
-     }
+        /**
+         * @param type $project
+         *
+         * @return int
+         */
+        public function countIssuesForProjectWithStatus($status = 'open', $keyword = false, $milestone = null)
+        {
+            $qb = $this->findByProjectAndStatus($status, $keyword, $milestone, true);
+
+            $qb->select('count(a)');
+
+            return $qb->getQuery()->getSingleScalarResult();
+        }
 
     public function findByProjectAndStatus($status = 'open', $keyword = false, $milestone = null, $queryOnly = false)
     {
@@ -197,29 +197,29 @@ 
         $parameters = array('project' => $this->project);
 
         $qb->select('a')
-          ->from('VersionControlGitControlBundle:Issue', 'a')
-          ->where($where)
-          ->setParameters($parameters);
+            ->from('VersionControlGitControlBundle:Issue', 'a')
+            ->where($where)
+            ->setParameters($parameters);
 
         if ($status) {
             $qb->andWhere(
-               $qb->expr()->like('a.status', ':status')
-             )->setParameter('status', $status);
+                $qb->expr()->like('a.status', ':status')
+                )->setParameter('status', $status);
         }
-         //If keyword is set
-         if ($keyword) {
-             $qb->andWhere(
+            //If keyword is set
+            if ($keyword) {
+                $qb->andWhere(
                 $qb->expr()->orX(
                     $qb->expr()->like('a.title', ':keyword'),
                     $qb->expr()->like('a.description', ':keyword')
                 )
             )->setParameter('keyword', '%'.$keyword.'%');
-         }
+            }
 
         if ($milestone != null) {
             $qb->andWhere(
-               $qb->expr()->eq('a.issueMilestone', ':milestone')
-             )->setParameter('milestone', $milestone);
+                $qb->expr()->eq('a.issueMilestone', ':milestone')
+                )->setParameter('milestone', $milestone);
         }
 
         $qb->orderBy('a.updatedAt', 'desc');

src/VersionControl/GitControlBundle/Repository/UserProjectsRepository.php

Indentation +6 added lines, -6 removed lines

@@ -20,16 +20,16 @@
         $qb = $em->createQueryBuilder();
 
         $qb->select('a')
-       ->from('VersionControlGitControlBundle:UserProjects', 'a')
+        ->from('VersionControlGitControlBundle:UserProjects', 'a')
         ->leftJoin('a.project', 'b')
         ->where('a.user = :user')
         ->setParameter('user', $user);
 
-      //If keyword is set
-      if ($keyword) {
-          $qb->andWhere(' b.title LIKE :keyword OR b.description LIKE :keyword ')
-          ->setParameter('keyword', '%'.$keyword.'%');
-      }
+        //If keyword is set
+        if ($keyword) {
+            $qb->andWhere(' b.title LIKE :keyword OR b.description LIKE :keyword ')
+            ->setParameter('keyword', '%'.$keyword.'%');
+        }
 
         if ($queryOnly === true) {
             return $qb;

src/VersionControl/GitControlBundle/Repository/ProjectRepository.php

Indentation +6 added lines, -6 removed lines

@@ -20,13 +20,13 @@
         $qb = $em->createQueryBuilder();
 
         $qb->select('a')
-       ->from('VersionControlGitControlBundle:Project', 'a');
+        ->from('VersionControlGitControlBundle:Project', 'a');
 
-      //If keyword is set
-      if ($keyword) {
-          $qb->andWhere('a.title LIKE :keyword OR a.title LIKE :keyword')
-          ->setParameter('keyword', '%'.$keyword.'%');
-      }
+        //If keyword is set
+        if ($keyword) {
+            $qb->andWhere('a.title LIKE :keyword OR a.title LIKE :keyword')
+            ->setParameter('keyword', '%'.$keyword.'%');
+        }
 
         if ($queryOnly === true) {
             return $qb;

src/VersionControl/GitControlBundle/Repository/IssueMilestoneRepository.php

Indentation +15 added lines, -15 removed lines

@@ -190,19 +190,19 @@ 
         return $issueMilestone;
     }
 
-  /**
-   * @param type $project
-   *
-   * @return int
-   */
-  public function countForProjectWithStatus($status = 'open')
-  {
-      $qb = $this->findByProjectAndStatus($status, true);
+    /**
+     * @param type $project
+     *
+     * @return int
+     */
+    public function countForProjectWithStatus($status = 'open')
+    {
+        $qb = $this->findByProjectAndStatus($status, true);
 
-      $qb->select('count(a)');
+        $qb->select('count(a)');
 
-      return $qb->getQuery()->getSingleScalarResult();
-  }
+        return $qb->getQuery()->getSingleScalarResult();
+    }
 
     public function findByProjectAndStatus($status = 'open', $queryOnly = false)
     {
@@ -213,14 +213,14 @@ 
         $parameters = array('project' => $this->project);
 
         $qb->select('a')
-       ->from('VersionControlGitControlBundle:IssueMilestone', 'a')
-       ->where($where)
-       ->setParameters($parameters);
+        ->from('VersionControlGitControlBundle:IssueMilestone', 'a')
+        ->where($where)
+        ->setParameters($parameters);
 
         if ($status) {
             $qb->andWhere(
             $qb->expr()->like('a.state', ':status')
-          )->setParameter('status', $status);
+            )->setParameter('status', $status);
         }
 
         if ($queryOnly === true) {

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

Indentation +15 added lines, -15 removed lines

@@ -117,8 +117,8 @@ 
     {
         $gitFiles = $this->getFilesToCommit();
 
-         //Validated that this status is same as previous
-         $deleteFiles = array();
+            //Validated that this status is same as previous
+            $deleteFiles = array();
         $addFiles = array();
 
         $flippedFiles = array_flip($files);
@@ -129,31 +129,31 @@ 
                     //do Nothing ignore
                 } elseif (($fileEntity->getIndexStatus() == ' ' || $fileEntity->getIndexStatus() == 'M' || $fileEntity->getIndexStatus() == 'A') && $fileEntity->getWorkTreeStatus() == 'D') {
                     //Delete files
-                     //[ MA]     D    deleted in work tree
-                     $deleteFiles[] = escapeshellarg($fileEntity->getPath1());
+                        //[ MA]     D    deleted in work tree
+                        $deleteFiles[] = escapeshellarg($fileEntity->getPath1());
                 } elseif ($fileEntity->getIndexStatus() == 'R' && ($fileEntity->getWorkTreeStatus() == 'D')) {
                     //Rename delete
-                     //[R]     D    deleted in work tree
-                     //$deleteFiles[] = escapeshellarg($fileEntity->getPath1());
-                     $deleteFiles[] = escapeshellarg($fileEntity->getPath2());
+                        //[R]     D    deleted in work tree
+                        //$deleteFiles[] = escapeshellarg($fileEntity->getPath1());
+                        $deleteFiles[] = escapeshellarg($fileEntity->getPath2());
                 } elseif ($fileEntity->getIndexStatus() == 'R' && ($fileEntity->getWorkTreeStatus() == 'M' || $fileEntity->getWorkTreeStatus() == 'A' || $fileEntity->getWorkTreeStatus() == ' ')) {
                     //Rename ADD
-                     //[R]     [ M]
-                     //$deleteFiles[] = escapeshellarg($fileEntity->getPath1());
-                     $addFiles[] = escapeshellarg($fileEntity->getPath2());
+                        //[R]     [ M]
+                        //$deleteFiles[] = escapeshellarg($fileEntity->getPath1());
+                        $addFiles[] = escapeshellarg($fileEntity->getPath2());
                 } elseif ($fileEntity->getWorkTreeStatus() == ' ') {
                     //[MARC]           index and work tree matches
-                     //Do Nothing
+                        //Do Nothing
                 } else {
                     $addFiles[] = escapeshellarg($fileEntity->getPath1());
                 }
             }
         }
 
-         //Run the commands once for add and delete
-         if (count($deleteFiles) > 0) {
-             $this->command->runCommand('git rm '.implode(' ', $deleteFiles));
-         }
+            //Run the commands once for add and delete
+            if (count($deleteFiles) > 0) {
+                $this->command->runCommand('git rm '.implode(' ', $deleteFiles));
+            }
 
         if (count($addFiles) > 0) {
             $this->command->runCommand('git add '.implode(' ', $addFiles));