Completed
Pull Request — develop (#132)
by
unknown
02:58
created
tests/GitElephant/Status/StatusTest.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -186,7 +186,7 @@
 block discarded – undo
186 186
     }
187 187
 
188 188
     /**
189
-     * @param mixed $subject
189
+     * @param \PhpCollection\Sequence $subject
190 190
      */
191 191
     private function assertInterfaces($subject)
192 192
     {
Please login to merge, or discard this patch.
tests/GitElephant/TestCase.php 1 patch
Doc Comments   +16 added lines, -2 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
     protected $finder;
51 51
 
52 52
     /**
53
-     * @param null $name
53
+     * @param integer $name
54 54
      *
55 55
      * @return \GitElephant\Repository
56 56
      */
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
     /**
122 122
      * @param string      $name       file name
123 123
      * @param string|null $folder     folder name
124
-     * @param null        $content    content
124
+     * @param string|null        $content    content
125 125
      * @param Repository  $repository repository to add file to
126 126
      *
127 127
      * @return void
@@ -238,6 +238,9 @@  discard block
 block discarded – undo
238 238
             ->will($this->returnValue($this->getMockCommand()));
239 239
     }
240 240
 
241
+    /**
242
+     * @param string[] $output
243
+     */
241 244
     protected function addOutputToMockRepo(\PHPUnit_Framework_MockObject_MockObject $repo, $output)
242 245
     {
243 246
         $repo
@@ -274,6 +277,17 @@  discard block
 block discarded – undo
274 277
         return $this->getMock('GitElephant\GitBinary');
275 278
     }
276 279
 
280
+    /**
281
+     * @param string $sha
282
+     * @param string $tree
283
+     * @param string $author
284
+     * @param string $committer
285
+     * @param string $emailAuthor
286
+     * @param string $emailCommitter
287
+     * @param string $datetimeAuthor
288
+     * @param string $datetimeCommitter
289
+     * @param string $message
290
+     */
277 291
     protected function doCommitTest(
278 292
         Commit $commit,
279 293
         $sha,
Please login to merge, or discard this patch.
tests/GitElephant/Command/ResetCommandTest.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,6 @@
 block discarded – undo
8 8
 
9 9
 namespace GitElephant\Command;
10 10
 
11
-use GitElephant\Objects\Commit;
12 11
 use \GitElephant\TestCase;
13 12
 
14 13
 class ResetCommandTest extends TestCase
Please login to merge, or discard this patch.
src/GitElephant/Objects/Commit.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
351 351
      *
352 352
      * @param bool $short short version
353 353
      *
354
-     * @return mixed
354
+     * @return string
355 355
      */
356 356
     public function getSha($short = false)
357 357
     {
@@ -361,7 +361,7 @@  discard block
 block discarded – undo
361 361
     /**
362 362
      * tree getter
363 363
      *
364
-     * @return mixed
364
+     * @return string
365 365
      */
366 366
     public function getTree()
367 367
     {
@@ -371,7 +371,7 @@  discard block
 block discarded – undo
371 371
     /**
372 372
      * datetimeAuthor getter
373 373
      *
374
-     * @return mixed
374
+     * @return \DateTime
375 375
      */
376 376
     public function getDatetimeAuthor()
377 377
     {
Please login to merge, or discard this patch.
src/GitElephant/Objects/Diff/Diff.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -90,7 +90,7 @@
 block discarded – undo
90 90
      *
91 91
      * @param null $commit1 commit 1
92 92
      * @param null $commit2 commit 2
93
-     * @param null $path    path
93
+     * @param null|string $path    path
94 94
      *
95 95
      * @throws \RuntimeException
96 96
      * @throws \Symfony\Component\Process\Exception\InvalidArgumentException
Please login to merge, or discard this patch.
src/GitElephant/Objects/LogRange.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@
 block discarded – undo
54 54
      * @param string                  $refEnd      ending reference
55 55
      * @param null                    $path        path
56 56
      * @param int                     $limit       limit
57
-     * @param null                    $offset      offset
57
+     * @param integer|null                    $offset      offset
58 58
      * @param boolean                 $firstParent first parent
59 59
      *
60 60
      * @throws \RuntimeException
Please login to merge, or discard this patch.
src/GitElephant/Objects/Tree.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@
 block discarded – undo
79 79
      * @param \GitElephant\Repository $repository  repo
80 80
      * @param array                   $outputLines output lines from command.log
81 81
      *
82
-     * @return \GitElephant\Objects\Log
82
+     * @return Tree
83 83
      */
84 84
     public static function createFromOutputLines(Repository $repository, $outputLines)
85 85
     {
Please login to merge, or discard this patch.
src/GitElephant/Repository.php 1 patch
Doc Comments   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
      * create a repository from a remote git url, or a local filesystem
147 147
      * and save it in a temp folder
148 148
      *
149
-     * @param string|Repository $git            the git remote url, or the filesystem path
149
+     * @param string $git            the git remote url, or the filesystem path
150 150
      * @param null              $repositoryPath path
151 151
      * @param GitBinary         $binary         binary
152 152
      * @param null              $name           repository name
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
     /**
195 195
      * Stage the working tree content
196 196
      *
197
-     * @param string|Object $path the path to store
197
+     * @param string $path the path to store
198 198
      *
199 199
      * @throws \RuntimeException
200 200
      * @throws \Symfony\Component\Process\Exception\LogicException
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
     /**
213 213
      * Unstage a tree content
214 214
      *
215
-     * @param string|Object $path the path to unstage
215
+     * @param string $path the path to unstage
216 216
      *
217 217
      * @throws \RuntimeException
218 218
      * @throws \Symfony\Component\Process\Exception\LogicException
@@ -230,8 +230,8 @@  discard block
 block discarded – undo
230 230
     /**
231 231
      * Move a file/directory
232 232
      *
233
-     * @param string|Object $from source path
234
-     * @param string|Object $to   destination path
233
+     * @param string $from source path
234
+     * @param string $to   destination path
235 235
      *
236 236
      * @throws \RuntimeException
237 237
      * @throws \Symfony\Component\Process\Exception\LogicException
@@ -250,7 +250,7 @@  discard block
 block discarded – undo
250 250
     /**
251 251
      * Remove a file/directory
252 252
      *
253
-     * @param string|Object $path      the path to remove
253
+     * @param string $path      the path to remove
254 254
      * @param bool          $recursive recurse
255 255
      * @param bool          $force     force
256 256
      *
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
330 330
     }
331 331
 
332 332
     /**
333
-     * @param TreeishInterface|Commit|string $arg
333
+     * @param Commit $arg
334 334
      * @param array $options
335 335
      */
336 336
     public function reset($arg, $options)
@@ -806,7 +806,7 @@  discard block
 block discarded – undo
806 806
      *
807 807
      * @param string|TreeishInterface|array $ref         the treeish to check, as a string, as an object or as an array
808 808
      * @param string|Object                 $path        the physical path to the tree relative to the repository root
809
-     * @param int|null                      $limit       limit to n entries
809
+     * @param integer                      $limit       limit to n entries
810 810
      * @param int|null                      $offset      skip n entries
811 811
      * @param boolean|false                 $firstParent skip commits brought in to branch by a merge
812 812
      *
@@ -823,7 +823,7 @@  discard block
 block discarded – undo
823 823
      * @param string        $refStart
824 824
      * @param string        $refEnd
825 825
      * @param string|Object $path        the physical path to the tree relative to the repository root
826
-     * @param int|null      $limit       limit to n entries
826
+     * @param integer      $limit       limit to n entries
827 827
      * @param int|null      $offset      skip n entries
828 828
      * @param boolean|false $firstParent skip commits brought in to branch by a merge
829 829
      *
@@ -848,7 +848,7 @@  discard block
 block discarded – undo
848 848
      * Get a log for an object
849 849
      *
850 850
      * @param \GitElephant\Objects\Object             $obj    The Object instance
851
-     * @param null|string|\GitElephant\Objects\Branch $branch The branch to read from
851
+     * @param string|null $branch The branch to read from
852 852
      * @param int                                     $limit  Limit to n entries
853 853
      * @param int|null                                $offset Skip n entries
854 854
      *
@@ -917,7 +917,7 @@  discard block
 block discarded – undo
917 917
      * Get a Diff object for a commit with its parent, by default the diff is between the current head and its parent
918 918
      *
919 919
      * @param \GitElephant\Objects\Commit|string      $commit1 A TreeishInterface instance
920
-     * @param \GitElephant\Objects\Commit|string|null $commit2 A TreeishInterface instance
920
+     * @param Commit $commit2 A TreeishInterface instance
921 921
      * @param null|string|Object                      $path    The path to get the diff for or a Object instance
922 922
      *
923 923
      * @throws \RuntimeException
@@ -933,7 +933,7 @@  discard block
 block discarded – undo
933 933
      * Clone a repository
934 934
      *
935 935
      * @param string $url the repository url (i.e. git://github.com/matteosister/GitElephant.git)
936
-     * @param null   $to  where to clone the repo
936
+     * @param string|null   $to  where to clone the repo
937 937
      *
938 938
      * @throws \RuntimeException
939 939
      * @throws \Symfony\Component\Process\Exception\LogicException
@@ -1069,7 +1069,7 @@  discard block
 block discarded – undo
1069 1069
      * output a node content as an array of lines
1070 1070
      *
1071 1071
      * @param \GitElephant\Objects\Object                  $obj     The Object of type BLOB
1072
-     * @param \GitElephant\Objects\TreeishInterface|string $treeish A treeish object
1072
+     * @param null|Branch $treeish A treeish object
1073 1073
      *
1074 1074
      * @throws \RuntimeException
1075 1075
      * @throws \Symfony\Component\Process\Exception\LogicException
Please login to merge, or discard this patch.