SSHVersionControl / git-web-client

src/VersionControl/GithubIssueBundle/Form/ProjectIssueIntegratorGithubType.php

Indentation +7 added lines, -7 removed lines

@@ -29,15 +29,15 @@
         ;
     }
 
-   /**
-    * @param OptionsResolverInterface $resolver
-    */
-   public function configureOptions(OptionsResolver $resolver)
-   {
-       $resolver->setDefaults(array(
+    /**
+     * @param OptionsResolverInterface $resolver
+     */
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults(array(
             'data_class' => 'VersionControl\GithubIssueBundle\Entity\ProjectIssueIntegratorGithub',
         ));
-   }
+    }
 
     /**
      * @return string

src/VersionControl/GithubIssueBundle/Form/IssueType.php

Indentation +2 added lines, -2 removed lines

@@ -66,8 +66,8 @@
                     },*/
                 ))
             //->add('project', 'hidden_entity',array(
-             //       'class' => 'VersionControl\GitControlBundle\Entity\Project'
-             //   ))
+                //       'class' => 'VersionControl\GitControlBundle\Entity\Project'
+                //   ))
             //->add('verUser')
             ->add('issueLabel', ChoiceType::class, array(
                     'choices' => $this->getIssueLabelChoices(),

Spacing +7 added lines, -7 removed lines

@@ -37,20 +37,20 @@ 
             ->add('description', TextareaType::class)
             ->add('issueMilestone', 'choice', array(
                     'choices' => $this->getIssueMilestoneChoices(),
-                    'multiple' => false,   // Multiple selection allowed
+                    'multiple' => false, // Multiple selection allowed
                     //'expanded' => true,   // Render as checkboxes
                     'placeholder' => 'Choose a milestone',
                     'required' => false,
                     'choices_as_values' => true,
                     //'property' => 'title', // Assuming that the entity has a "name" property
-                    'choice_label' => function ($issueMilestone) {
+                    'choice_label' => function($issueMilestone) {
                         if ($issueMilestone) {
                             return $issueMilestone->getTitle();
                         }
 
                         return;
                     },
-                    'choice_value' => function ($issueMilestone) {
+                    'choice_value' => function($issueMilestone) {
                         if ($issueMilestone) {
                             return $issueMilestone->getId();
                         }
@@ -71,20 +71,20 @@ 
             //->add('verUser')
             ->add('issueLabel', ChoiceType::class, array(
                     'choices' => $this->getIssueLabelChoices(),
-                    'multiple' => true,   // Multiple selection allowed
-                    'expanded' => true,   // Render as checkboxes
+                    'multiple' => true, // Multiple selection allowed
+                    'expanded' => true, // Render as checkboxes
                     //'property' => 'title', // Assuming that the entity has a "name" property
                     //'class' => 'VersionControl\GitControlBundle\Entity\IssueLabel',
                     'required' => false,
                     'choices_as_values' => true,
-                    'choice_label' => function ($issueLabel) {
+                    'choice_label' => function($issueLabel) {
                         if ($issueLabel) {
                             return $issueLabel->getTitle();
                         }
 
                         return;
                     },
-                    'choice_value' => function ($issueLabel) {
+                    'choice_value' => function($issueLabel) {
                         if ($issueLabel) {
                             return $issueLabel->getId();
                         }

src/VersionControl/GithubIssueBundle/Form/IssueEditType.php

Spacing +7 added lines, -7 removed lines

@@ -38,20 +38,20 @@ 
                     )
             ->add('issueMilestone', ChoiceType::class, array(
                     'choices' => $this->getIssueMilestoneChoices(),
-                    'multiple' => false,   // Multiple selection allowed
+                    'multiple' => false, // Multiple selection allowed
                     //'expanded' => true,   // Render as checkboxes
                     'placeholder' => 'Choose a milestone',
                     'required' => false,
                     'choices_as_values' => true,
                     //'property' => 'title', // Assuming that the entity has a "name" property
-                    'choice_label' => function ($issueMilestone) {
+                    'choice_label' => function($issueMilestone) {
                         if ($issueMilestone) {
                             return $issueMilestone->getTitle();
                         }
 
                         return;
                     },
-                    'choice_value' => function ($issueMilestone) {
+                    'choice_value' => function($issueMilestone) {
                         if ($issueMilestone) {
                             return $issueMilestone->getId();
                         }
@@ -68,20 +68,20 @@ 
                 ))
             ->add('issueLabel', ChoiceType::class, array(
                     'choices' => $this->getIssueLabelChoices(),
-                    'multiple' => true,   // Multiple selection allowed
-                    'expanded' => true,   // Render as checkboxes
+                    'multiple' => true, // Multiple selection allowed
+                    'expanded' => true, // Render as checkboxes
                     //'property' => 'title', // Assuming that the entity has a "name" property
                     //'class' => 'VersionControl\GitControlBundle\Entity\IssueLabel',
                     'required' => false,
                     'choices_as_values' => true,
-                    'choice_label' => function ($issueLabel) {
+                    'choice_label' => function($issueLabel) {
                         if ($issueLabel) {
                             return $issueLabel->getTitle();
                         }
 
                         return;
                     },
-                    'choice_value' => function ($issueLabel) {
+                    'choice_value' => function($issueLabel) {
                         if ($issueLabel) {
                             return $issueLabel->getId();
                         }

src/VersionControl/GithubIssueBundle/Repository/GithubBase.php

Indentation +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
     public function __construct()
     {
         $this->client = new \Github\Client(
-               new \Github\HttpClient\CachedHttpClient(array('cache_dir' => $this->getCacheDir()))
+                new \Github\HttpClient\CachedHttpClient(array('cache_dir' => $this->getCacheDir()))
         );
     }
 

src/VersionControl/GitCommandBundle/GitCommands/GitCommand.php

Indentation +8 added lines, -8 removed lines

@@ -396,28 +396,28 @@
                 break;
             case 'commit':
                  $command = new Command\GitCommitCommand($this);
-                 break;
+                    break;
             case 'diff':
                  $command = new Command\GitDiffCommand($this);
-                 break;
+                    break;
             case 'files':
                  $command = new Command\GitFilesCommand($this);
-                 break;
+                    break;
             case 'init':
                  $command = new Command\GitInitCommand($this);
-                 break;
+                    break;
             case 'log':
                  $command = new Command\GitLogCommand($this);
-                 break;
+                    break;
             case 'status':
                  $command = new Command\GitStatusCommand($this);
-                 break;
+                    break;
             case 'sync':
                  $command = new Command\GitSyncCommand($this);
-                 break;
+                    break;
             case 'undo':
                  $command = new Command\GitUndoCommand($this);
-                 break;
+                    break;
             default:
                 throw new InvalidArgumentException(sprintf('Unknown command instance called: "%s"', $name));
         }

Spacing +1 added lines, -1 removed lines

@@ -219,7 +219,7 @@
      */
     protected function setGitPath($gitPath)
     {
-        $this->gitPath = rtrim(trim($gitPath), DIRECTORY_SEPARATOR );
+        $this->gitPath = rtrim(trim($gitPath), DIRECTORY_SEPARATOR);
 
         return $this;
     }

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

Indentation +2 added lines, -2 removed lines

@@ -204,7 +204,7 @@ 
             return true;
         } else {
             //$output = $this->command->runCommand(sprintf('(git check-ref-format "refs/heads/%s");echo -e "\n$?"',$branchName));
-           $response = $this->command->runCommand(sprintf('git check-ref-format "refs/heads/%s"', $branchName), false);
+            $response = $this->command->runCommand(sprintf('git check-ref-format "refs/heads/%s"', $branchName), false);
 
             if ($this->command->getLastExitStatus() !== 0) {
                 return false;
@@ -326,7 +326,7 @@ 
     {
         $response = $this->command->runCommand('git merge --abort 2>&1');
 
-         //Trigger file alter Event
+            //Trigger file alter Event
         $this->triggerGitAlterFilesEvent();
 
         return $response;

Spacing +5 added lines, -5 removed lines

@@ -152,7 +152,7 @@ 
             $output = $this->command->runCommand(sprintf('git branch %s', escapeshellarg($branchName)));
 
             if ($switchToBranch) {
-                $output .= $this->command->runCommand(sprintf('git checkout %s 2>&1',  escapeshellarg($branchName)));
+                $output .= $this->command->runCommand(sprintf('git checkout %s 2>&1', escapeshellarg($branchName)));
 
                 //Trigger file alter Event
                 $this->triggerGitAlterFilesEvent();
@@ -180,7 +180,7 @@ 
             $output = $this->command->runCommand(sprintf('git branch %s %s 2>&1', escapeshellarg($branchName), escapeshellarg($remoteBranchName)));
 
             if ($switchToBranch) {
-                $output .= $this->command->runCommand(sprintf('git checkout %s 2>&1',  escapeshellarg($branchName)));
+                $output .= $this->command->runCommand(sprintf('git checkout %s 2>&1', escapeshellarg($branchName)));
                 //Trigger file alter Event
                 $this->triggerGitAlterFilesEvent();
             }
@@ -247,7 +247,7 @@ 
      */
     public function checkoutBranch($branchName)
     {
-        $response = $this->command->runCommand(sprintf('git checkout %s 2>&1',  escapeshellarg($branchName)));
+        $response = $this->command->runCommand(sprintf('git checkout %s 2>&1', escapeshellarg($branchName)));
 
         //Trigger file alter Event
         $this->triggerGitAlterFilesEvent();
@@ -278,7 +278,7 @@ 
             $deleteFlag = '-d';
         }
 
-        return $this->command->runCommand(sprintf('git branch '.$deleteFlag.' %s 2>&1',  escapeshellarg($branchName)));
+        return $this->command->runCommand(sprintf('git branch '.$deleteFlag.' %s 2>&1', escapeshellarg($branchName)));
     }
 
     /**
@@ -295,7 +295,7 @@ 
         if ($branchName === $currentBranch) {
             throw new \Exception('You cannot merge a branch with itself. Please checkout a different branch before trying to merge.');
         }
-        $response = $this->command->runCommand(sprintf('git merge --no-ff %s 2>&1',  escapeshellarg($branchName)));
+        $response = $this->command->runCommand(sprintf('git merge --no-ff %s 2>&1', escapeshellarg($branchName)));
 
         //Trigger file alter Event
         $this->triggerGitAlterFilesEvent();

src/VersionControl/GitCommandBundle/GitCommands/Command/GitStatusCommand.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));

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

Indentation +15 added lines, -15 removed lines

@@ -70,8 +70,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);
@@ -82,31 +82,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));

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

Spacing +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
      * Get array of conflict file names
      * @return array of conflict file names
      */
-    public function getConflictFileNames(){
+    public function getConflictFileNames() {
         
         $command = " git diff --name-only --diff-filter=U";
         $response = $this->command->runCommand($command);