SSHVersionControl / git-web-client

src/VersionControl/GitControlBundle/Controller/ProjectBranchController.php

Spacing +4 added lines, -4 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,
@@ -310,7 +310,7 @@ 
                 ->add('branch', ChoiceType::class, array(
                     'choices' => $branches, 'label' => 'Branch Name', 'required' => true, 'choices_as_values' => true, 'constraints' => array(
                         new NotBlank(),
-                    ), )
+                    ),)
                 )
                 ->getForm();
 

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 +5 added lines, -5 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);
@@ -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();

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

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

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

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 +2 added lines, -2 removed lines

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

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 +2 added lines, -2 removed lines

@@ -108,7 +108,7 @@ 
     {
         $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;

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

src/VersionControl/GitControlBundle/Form/Embbed/ProjectEnvironmentEmbbedType.php

Indentation +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
     public function configureOptions(OptionsResolver  $resolver)
     {
         $resolver->setDefaults(array(
-             //'data_class' => 'Lre\MetadataBundle\Entity\Curriculum\ResourceCurriculum',
+                //'data_class' => 'Lre\MetadataBundle\Entity\Curriculum\ResourceCurriculum',
             //'data_class' => NULL,
             //'cascade_validation' => true,
         ));

src/VersionControl/GitControlBundle/Form/DataTransformer/EntityToIdTransformer.php

Indentation +2 added lines, -2 removed lines

@@ -46,8 +46,8 @@
             return null;
         }
         $entity = $this->objectManager
-                       ->getRepository($this->class)
-                       ->find($id);
+                        ->getRepository($this->class)
+                        ->find($id);
         if (null === $entity) {
             throw new TransformationFailedException();
         }