@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | |
108 | 108 | /** |
109 | 109 | * @param \GitElephant\Repository $repository repository instance |
110 | - * @param string|TreeishInterface $name branch name |
|
110 | + * @param string $name branch name |
|
111 | 111 | * @param bool $create like checkout -b, create a branch and check it out |
112 | 112 | * |
113 | 113 | * @throws \RuntimeException |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | * @param string $branchString branch line output |
197 | 197 | * |
198 | 198 | * @throws \InvalidArgumentException |
199 | - * @return array |
|
199 | + * @return Repository |
|
200 | 200 | */ |
201 | 201 | public static function getMatches(string $branchString) |
202 | 202 | { |
@@ -357,7 +357,7 @@ discard block |
||
357 | 357 | * |
358 | 358 | * @param bool $short short version |
359 | 359 | * |
360 | - * @return mixed |
|
360 | + * @return string |
|
361 | 361 | */ |
362 | 362 | public function getSha(bool $short = false) |
363 | 363 | { |
@@ -367,7 +367,7 @@ discard block |
||
367 | 367 | /** |
368 | 368 | * tree getter |
369 | 369 | * |
370 | - * @return mixed |
|
370 | + * @return string |
|
371 | 371 | */ |
372 | 372 | public function getTree() |
373 | 373 | { |
@@ -377,7 +377,7 @@ discard block |
||
377 | 377 | /** |
378 | 378 | * datetimeAuthor getter |
379 | 379 | * |
380 | - * @return mixed |
|
380 | + * @return \DateTime |
|
381 | 381 | */ |
382 | 382 | public function getDatetimeAuthor() |
383 | 383 | { |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | * |
56 | 56 | * @param \GitElephant\Repository $repository repository |
57 | 57 | * @param null|string|\GitElephant\Objects\Commit $commit1 first commit |
58 | - * @param null|string|\GitElephant\Objects\Commit $commit2 second commit |
|
58 | + * @param null|string $commit2 second commit |
|
59 | 59 | * @param null|string $path path to consider |
60 | 60 | * |
61 | 61 | * @throws \RuntimeException |
@@ -90,7 +90,7 @@ discard block |
||
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 |
@@ -54,7 +54,7 @@ discard block |
||
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 null|integer $offset offset |
|
58 | 58 | * @param boolean $firstParent first parent |
59 | 59 | * |
60 | 60 | * @throws \RuntimeException |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | * @param string $refEnd treeish reference |
82 | 82 | * @param string $path path |
83 | 83 | * @param int $limit limit |
84 | - * @param string $offset offset |
|
84 | + * @param integer $offset offset |
|
85 | 85 | * @param boolean $firstParent first parent |
86 | 86 | * |
87 | 87 | * @throws \RuntimeException |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | * create a repository from a remote git url, or a local filesystem |
148 | 148 | * and save it in a temp folder |
149 | 149 | * |
150 | - * @param string|Repository $git the git remote url, or the filesystem path |
|
150 | + * @param string $git the git remote url, or the filesystem path |
|
151 | 151 | * @param null $repositoryPath path |
152 | 152 | * @param GitBinary $binary binary |
153 | 153 | * @param null $name repository name |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | /** |
196 | 196 | * Stage the working tree content |
197 | 197 | * |
198 | - * @param string|NodeObject $path the path to store |
|
198 | + * @param string $path the path to store |
|
199 | 199 | * |
200 | 200 | * @throws \RuntimeException |
201 | 201 | * @throws \Symfony\Component\Process\Exception\LogicException |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | /** |
214 | 214 | * Unstage a tree content |
215 | 215 | * |
216 | - * @param string|NodeObject $path the path to unstage |
|
216 | + * @param string $path the path to unstage |
|
217 | 217 | * |
218 | 218 | * @throws \RuntimeException |
219 | 219 | * @throws \Symfony\Component\Process\Exception\LogicException |
@@ -231,8 +231,8 @@ discard block |
||
231 | 231 | /** |
232 | 232 | * Move a file/directory |
233 | 233 | * |
234 | - * @param string|NodeObject $from source path |
|
235 | - * @param string|NodeObject $to destination path |
|
234 | + * @param string $from source path |
|
235 | + * @param string $to destination path |
|
236 | 236 | * |
237 | 237 | * @throws \RuntimeException |
238 | 238 | * @throws \Symfony\Component\Process\Exception\LogicException |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | /** |
252 | 252 | * Remove a file/directory |
253 | 253 | * |
254 | - * @param string|NodeObject $path the path to remove |
|
254 | + * @param string $path the path to remove |
|
255 | 255 | * @param bool $recursive recurse |
256 | 256 | * @param bool $force force |
257 | 257 | * |
@@ -305,7 +305,7 @@ discard block |
||
305 | 305 | * rev-parse command - often used to return a commit tag. |
306 | 306 | * |
307 | 307 | * @param array $options the options to apply to rev-parse |
308 | - * @param string|NodeObject|Commit $arg the argument (may be a branch head, etc) |
|
308 | + * @param string $arg the argument (may be a branch head, etc) |
|
309 | 309 | * |
310 | 310 | * @throws \RuntimeException |
311 | 311 | * @throws \InvalidArgumentException |
@@ -333,7 +333,7 @@ discard block |
||
333 | 333 | } |
334 | 334 | |
335 | 335 | /** |
336 | - * @param TreeishInterface|Commit|string $arg |
|
336 | + * @param Commit $arg |
|
337 | 337 | * @param array $options |
338 | 338 | */ |
339 | 339 | public function reset($arg, $options) |
@@ -600,7 +600,7 @@ discard block |
||
600 | 600 | * |
601 | 601 | * @param string $name The new tag name |
602 | 602 | * @param null $startPoint The reference to create the tag from |
603 | - * @param null $message the tag message |
|
603 | + * @param null|string $message the tag message |
|
604 | 604 | * |
605 | 605 | * @throws \RuntimeException |
606 | 606 | * @throws \Symfony\Component\Process\Exception\RuntimeException |
@@ -825,7 +825,7 @@ discard block |
||
825 | 825 | * |
826 | 826 | * @param string|TreeishInterface|array $ref the treeish to check, as a string, as an object or as an array |
827 | 827 | * @param string|NodeObject $path the physical path to the tree relative to the repository root |
828 | - * @param int|null $limit limit to n entries |
|
828 | + * @param integer $limit limit to n entries |
|
829 | 829 | * @param int|null $offset skip n entries |
830 | 830 | * @param boolean|false $firstParent skip commits brought in to branch by a merge |
831 | 831 | * |
@@ -848,7 +848,7 @@ discard block |
||
848 | 848 | * @param string $refStart |
849 | 849 | * @param string $refEnd |
850 | 850 | * @param string|NodeObject $path the physical path to the tree relative to the repository root |
851 | - * @param int|null $limit limit to n entries |
|
851 | + * @param integer $limit limit to n entries |
|
852 | 852 | * @param int|null $offset skip n entries |
853 | 853 | * @param boolean|false $firstParent skip commits brought in to branch by a merge |
854 | 854 | * |
@@ -880,7 +880,7 @@ discard block |
||
880 | 880 | * Get a log for an object |
881 | 881 | * |
882 | 882 | * @param \GitElephant\Objects\NodeObject $obj The Object instance |
883 | - * @param null|string|\GitElephant\Objects\Branch $branch The branch to read from |
|
883 | + * @param string|null $branch The branch to read from |
|
884 | 884 | * @param int $limit Limit to n entries |
885 | 885 | * @param int|null $offset Skip n entries |
886 | 886 | * |
@@ -950,9 +950,9 @@ discard block |
||
950 | 950 | /** |
951 | 951 | * Get a Diff object for a commit with its parent, by default the diff is between the current head and its parent |
952 | 952 | * |
953 | - * @param \GitElephant\Objects\Commit|string $commit1 A TreeishInterface instance |
|
954 | - * @param \GitElephant\Objects\Commit|string|null $commit2 A TreeishInterface instance |
|
955 | - * @param null|string|NodeObject $path The path to get the diff for or a Object instance |
|
953 | + * @param string $commit1 A TreeishInterface instance |
|
954 | + * @param null|string $commit2 A TreeishInterface instance |
|
955 | + * @param null|string $path The path to get the diff for or a Object instance |
|
956 | 956 | * |
957 | 957 | * @throws \RuntimeException |
958 | 958 | * @throws \InvalidArgumentException |
@@ -967,7 +967,7 @@ discard block |
||
967 | 967 | * Clone a repository |
968 | 968 | * |
969 | 969 | * @param string $url the repository url (i.e. git://github.com/matteosister/GitElephant.git) |
970 | - * @param null $to where to clone the repo |
|
970 | + * @param null|string $to where to clone the repo |
|
971 | 971 | * |
972 | 972 | * @throws \RuntimeException |
973 | 973 | * @throws \Symfony\Component\Process\Exception\LogicException |
@@ -1108,7 +1108,7 @@ discard block |
||
1108 | 1108 | * output a node content as an array of lines |
1109 | 1109 | * |
1110 | 1110 | * @param \GitElephant\Objects\NodeObject $obj The Object of type BLOB |
1111 | - * @param \GitElephant\Objects\TreeishInterface|string $treeish A treeish object |
|
1111 | + * @param null|Branch $treeish A treeish object |
|
1112 | 1112 | * |
1113 | 1113 | * @throws \RuntimeException |
1114 | 1114 | * @throws \Symfony\Component\Process\Exception\LogicException |
@@ -165,7 +165,7 @@ |
||
165 | 165 | /** |
166 | 166 | * @param string $line |
167 | 167 | * |
168 | - * @return mixed |
|
168 | + * @return string[] |
|
169 | 169 | */ |
170 | 170 | protected function splitStatusLine(string $line) |
171 | 171 | { |