Completed
Branch master (140226)
by Paul
09:21
created
VersionControl/GithubIssueBundle/Form/ProjectIssueIntegratorGithubType.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -29,15 +29,15 @@
 block discarded – undo
29 29
         ;
30 30
     }
31 31
 
32
-   /**
33
-    * @param OptionsResolverInterface $resolver
34
-    */
35
-   public function configureOptions(OptionsResolver $resolver)
36
-   {
37
-       $resolver->setDefaults(array(
32
+    /**
33
+     * @param OptionsResolverInterface $resolver
34
+     */
35
+    public function configureOptions(OptionsResolver $resolver)
36
+    {
37
+        $resolver->setDefaults(array(
38 38
             'data_class' => 'VersionControl\GithubIssueBundle\Entity\ProjectIssueIntegratorGithub',
39 39
         ));
40
-   }
40
+    }
41 41
 
42 42
     /**
43 43
      * @return string
Please login to merge, or discard this patch.
src/VersionControl/GithubIssueBundle/Form/IssueType.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -66,8 +66,8 @@
 block discarded – undo
66 66
                     },*/
67 67
                 ))
68 68
             //->add('project', 'hidden_entity',array(
69
-             //       'class' => 'VersionControl\GitControlBundle\Entity\Project'
70
-             //   ))
69
+                //       'class' => 'VersionControl\GitControlBundle\Entity\Project'
70
+                //   ))
71 71
             //->add('verUser')
72 72
             ->add('issueLabel', ChoiceType::class, array(
73 73
                     'choices' => $this->getIssueLabelChoices(),
Please login to merge, or discard this patch.
src/VersionControl/GithubIssueBundle/Repository/GithubBase.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
     public function __construct()
37 37
     {
38 38
         $this->client = new \Github\Client(
39
-               new \Github\HttpClient\CachedHttpClient(array('cache_dir' => $this->getCacheDir()))
39
+                new \Github\HttpClient\CachedHttpClient(array('cache_dir' => $this->getCacheDir()))
40 40
         );
41 41
     }
42 42
 
Please login to merge, or discard this patch.
src/VersionControl/GitCommandBundle/GitCommands/GitCommand.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -396,28 +396,28 @@
 block discarded – undo
396 396
                 break;
397 397
             case 'commit':
398 398
                  $command = new Command\GitCommitCommand($this);
399
-                 break;
399
+                    break;
400 400
             case 'diff':
401 401
                  $command = new Command\GitDiffCommand($this);
402
-                 break;
402
+                    break;
403 403
             case 'files':
404 404
                  $command = new Command\GitFilesCommand($this);
405
-                 break;
405
+                    break;
406 406
             case 'init':
407 407
                  $command = new Command\GitInitCommand($this);
408
-                 break;
408
+                    break;
409 409
             case 'log':
410 410
                  $command = new Command\GitLogCommand($this);
411
-                 break;
411
+                    break;
412 412
             case 'status':
413 413
                  $command = new Command\GitStatusCommand($this);
414
-                 break;
414
+                    break;
415 415
             case 'sync':
416 416
                  $command = new Command\GitSyncCommand($this);
417
-                 break;
417
+                    break;
418 418
             case 'undo':
419 419
                  $command = new Command\GitUndoCommand($this);
420
-                 break;
420
+                    break;
421 421
             default:
422 422
                 throw new InvalidArgumentException(sprintf('Unknown command instance called: "%s"', $name));
423 423
         }
Please login to merge, or discard this patch.
VersionControl/GitCommandBundle/GitCommands/Command/GitBranchCommand.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
             return true;
205 205
         } else {
206 206
             //$output = $this->command->runCommand(sprintf('(git check-ref-format "refs/heads/%s");echo -e "\n$?"',$branchName));
207
-           $response = $this->command->runCommand(sprintf('git check-ref-format "refs/heads/%s"', $branchName), false);
207
+            $response = $this->command->runCommand(sprintf('git check-ref-format "refs/heads/%s"', $branchName), false);
208 208
 
209 209
             if ($this->command->getLastExitStatus() !== 0) {
210 210
                 return false;
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
326 326
     {
327 327
         $response = $this->command->runCommand('git merge --abort 2>&1');
328 328
 
329
-         //Trigger file alter Event
329
+            //Trigger file alter Event
330 330
         $this->triggerGitAlterFilesEvent();
331 331
 
332 332
         return $response;
Please login to merge, or discard this patch.
VersionControl/GitCommandBundle/GitCommands/Command/GitStatusCommand.php 1 patch
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -117,8 +117,8 @@  discard block
 block discarded – undo
117 117
     {
118 118
         $gitFiles = $this->getFilesToCommit();
119 119
 
120
-         //Validated that this status is same as previous
121
-         $deleteFiles = array();
120
+            //Validated that this status is same as previous
121
+            $deleteFiles = array();
122 122
         $addFiles = array();
123 123
 
124 124
         $flippedFiles = array_flip($files);
@@ -129,31 +129,31 @@  discard block
 block discarded – undo
129 129
                     //do Nothing ignore
130 130
                 } elseif (($fileEntity->getIndexStatus() == ' ' || $fileEntity->getIndexStatus() == 'M' || $fileEntity->getIndexStatus() == 'A') && $fileEntity->getWorkTreeStatus() == 'D') {
131 131
                     //Delete files
132
-                     //[ MA]     D    deleted in work tree
133
-                     $deleteFiles[] = escapeshellarg($fileEntity->getPath1());
132
+                        //[ MA]     D    deleted in work tree
133
+                        $deleteFiles[] = escapeshellarg($fileEntity->getPath1());
134 134
                 } elseif ($fileEntity->getIndexStatus() == 'R' && ($fileEntity->getWorkTreeStatus() == 'D')) {
135 135
                     //Rename delete
136
-                     //[R]     D    deleted in work tree
137
-                     //$deleteFiles[] = escapeshellarg($fileEntity->getPath1());
138
-                     $deleteFiles[] = escapeshellarg($fileEntity->getPath2());
136
+                        //[R]     D    deleted in work tree
137
+                        //$deleteFiles[] = escapeshellarg($fileEntity->getPath1());
138
+                        $deleteFiles[] = escapeshellarg($fileEntity->getPath2());
139 139
                 } elseif ($fileEntity->getIndexStatus() == 'R' && ($fileEntity->getWorkTreeStatus() == 'M' || $fileEntity->getWorkTreeStatus() == 'A' || $fileEntity->getWorkTreeStatus() == ' ')) {
140 140
                     //Rename ADD
141
-                     //[R]     [ M]
142
-                     //$deleteFiles[] = escapeshellarg($fileEntity->getPath1());
143
-                     $addFiles[] = escapeshellarg($fileEntity->getPath2());
141
+                        //[R]     [ M]
142
+                        //$deleteFiles[] = escapeshellarg($fileEntity->getPath1());
143
+                        $addFiles[] = escapeshellarg($fileEntity->getPath2());
144 144
                 } elseif ($fileEntity->getWorkTreeStatus() == ' ') {
145 145
                     //[MARC]           index and work tree matches
146
-                     //Do Nothing
146
+                        //Do Nothing
147 147
                 } else {
148 148
                     $addFiles[] = escapeshellarg($fileEntity->getPath1());
149 149
                 }
150 150
             }
151 151
         }
152 152
 
153
-         //Run the commands once for add and delete
154
-         if (count($deleteFiles) > 0) {
155
-             $this->command->runCommand('git rm '.implode(' ', $deleteFiles));
156
-         }
153
+            //Run the commands once for add and delete
154
+            if (count($deleteFiles) > 0) {
155
+                $this->command->runCommand('git rm '.implode(' ', $deleteFiles));
156
+            }
157 157
 
158 158
         if (count($addFiles) > 0) {
159 159
             $this->command->runCommand('git add '.implode(' ', $addFiles));
Please login to merge, or discard this patch.
VersionControl/GitCommandBundle/GitCommands/Command/GitCommitCommand.php 1 patch
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -70,8 +70,8 @@  discard block
 block discarded – undo
70 70
     {
71 71
         $gitFiles = $this->getFilesToCommit();
72 72
 
73
-         //Validated that this status is same as previous
74
-         $deleteFiles = array();
73
+            //Validated that this status is same as previous
74
+            $deleteFiles = array();
75 75
         $addFiles = array();
76 76
 
77 77
         $flippedFiles = array_flip($files);
@@ -82,31 +82,31 @@  discard block
 block discarded – undo
82 82
                     //do Nothing ignore
83 83
                 } elseif (($fileEntity->getIndexStatus() == ' ' || $fileEntity->getIndexStatus() == 'M' || $fileEntity->getIndexStatus() == 'A') && $fileEntity->getWorkTreeStatus() == 'D') {
84 84
                     //Delete files
85
-                     //[ MA]     D    deleted in work tree
86
-                     $deleteFiles[] = escapeshellarg($fileEntity->getPath1());
85
+                        //[ MA]     D    deleted in work tree
86
+                        $deleteFiles[] = escapeshellarg($fileEntity->getPath1());
87 87
                 } elseif ($fileEntity->getIndexStatus() == 'R' && ($fileEntity->getWorkTreeStatus() == 'D')) {
88 88
                     //Rename delete
89
-                     //[R]     D    deleted in work tree
90
-                     //$deleteFiles[] = escapeshellarg($fileEntity->getPath1());
91
-                     $deleteFiles[] = escapeshellarg($fileEntity->getPath2());
89
+                        //[R]     D    deleted in work tree
90
+                        //$deleteFiles[] = escapeshellarg($fileEntity->getPath1());
91
+                        $deleteFiles[] = escapeshellarg($fileEntity->getPath2());
92 92
                 } elseif ($fileEntity->getIndexStatus() == 'R' && ($fileEntity->getWorkTreeStatus() == 'M' || $fileEntity->getWorkTreeStatus() == 'A' || $fileEntity->getWorkTreeStatus() == ' ')) {
93 93
                     //Rename ADD
94
-                     //[R]     [ M]
95
-                     //$deleteFiles[] = escapeshellarg($fileEntity->getPath1());
96
-                     $addFiles[] = escapeshellarg($fileEntity->getPath2());
94
+                        //[R]     [ M]
95
+                        //$deleteFiles[] = escapeshellarg($fileEntity->getPath1());
96
+                        $addFiles[] = escapeshellarg($fileEntity->getPath2());
97 97
                 } elseif ($fileEntity->getWorkTreeStatus() == ' ') {
98 98
                     //[MARC]           index and work tree matches
99
-                     //Do Nothing
99
+                        //Do Nothing
100 100
                 } else {
101 101
                     $addFiles[] = escapeshellarg($fileEntity->getPath1());
102 102
                 }
103 103
             }
104 104
         }
105 105
 
106
-         //Run the commands once for add and delete
107
-         if (count($deleteFiles) > 0) {
108
-             $this->command->runCommand('git rm '.implode(' ', $deleteFiles));
109
-         }
106
+            //Run the commands once for add and delete
107
+            if (count($deleteFiles) > 0) {
108
+                $this->command->runCommand('git rm '.implode(' ', $deleteFiles));
109
+            }
110 110
 
111 111
         if (count($addFiles) > 0) {
112 112
             $this->command->runCommand('git add '.implode(' ', $addFiles));
Please login to merge, or discard this patch.
src/VersionControl/GitCommandBundle/GitCommands/Command/GitTagCommand.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
         if ($this->validateTagName($version)) {
62 62
             $command = sprintf('git tag -a %s -m %s', escapeshellarg($version), escapeshellarg($message));
63 63
             if($commitShortCode){
64
-                 $command .= ' '.escapeshellarg($commitShortCode);
64
+                    $command .= ' '.escapeshellarg($commitShortCode);
65 65
             }
66 66
             $output = $this->command->runCommand($command);
67 67
         } else {
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
             return true;
102 102
         } else {
103 103
             //$output = $this->command->runCommand(sprintf('(git check-ref-format "refs/heads/%s");echo -e "\n$?"',$branchName));
104
-           $response = $this->command->runCommand(sprintf('git check-ref-format "refs/tags/%s"', $tagName), false);
104
+            $response = $this->command->runCommand(sprintf('git check-ref-format "refs/tags/%s"', $tagName), false);
105 105
 
106 106
             if ($this->command->getLastExitStatus() !== 0) {
107 107
                 return false;
Please login to merge, or discard this patch.
src/VersionControl/GitCommandBundle/GitCommands/Command/GitSyncCommand.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
     {
157 157
         $response = $this->command->runCommand('git reset --hard ORIG_HEAD');
158 158
 
159
-         //Trigger file alter Event
159
+            //Trigger file alter Event
160 160
         $this->triggerGitAlterFilesEvent();
161 161
 
162 162
         return $response;
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
 
226 226
         $response = $this->command->runCommand($command);
227 227
 
228
-         //Trigger file alter Event
228
+            //Trigger file alter Event
229 229
         $this->triggerGitAlterFilesEvent();
230 230
 
231 231
         return $response;
Please login to merge, or discard this patch.