@@ -273,7 +273,7 @@ |
||
273 | 273 | /** |
274 | 274 | * Countable interface |
275 | 275 | * |
276 | - * @return int|void |
|
276 | + * @return integer |
|
277 | 277 | */ |
278 | 278 | public function count() |
279 | 279 | { |
@@ -114,7 +114,7 @@ |
||
114 | 114 | /** |
115 | 115 | * toString magic method |
116 | 116 | * |
117 | - * @return mixed |
|
117 | + * @return string |
|
118 | 118 | */ |
119 | 119 | public function __toString() |
120 | 120 | { |
@@ -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 integer|null $offset offset |
|
58 | 58 | * @param boolean $firstParent first parent |
59 | 59 | * |
60 | 60 | * @throws \RuntimeException |
@@ -213,7 +213,7 @@ discard block |
||
213 | 213 | /** |
214 | 214 | * Countable interface |
215 | 215 | * |
216 | - * @return int|void |
|
216 | + * @return integer |
|
217 | 217 | */ |
218 | 218 | public function count() |
219 | 219 | { |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | * @param string $message tag message |
61 | 61 | * |
62 | 62 | * @throws \RuntimeException |
63 | - * @return \GitElephant\Objects\Branch |
|
63 | + * @return Tag|null |
|
64 | 64 | */ |
65 | 65 | public static function create(Repository $repository, $name, $startPoint = null, $message = null) |
66 | 66 | { |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | * @throws \RuntimeException |
80 | 80 | * @throws \InvalidArgumentException |
81 | 81 | * @throws \Symfony\Component\Process\Exception\RuntimeException |
82 | - * @return Commit |
|
82 | + * @return Tag |
|
83 | 83 | */ |
84 | 84 | public static function createFromOutputLines(Repository $repository, $outputLines, $name) |
85 | 85 | { |
@@ -79,7 +79,7 @@ discard block |
||
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 | { |
@@ -478,7 +478,7 @@ discard block |
||
478 | 478 | /** |
479 | 479 | * Countable interface |
480 | 480 | * |
481 | - * @return int|void |
|
481 | + * @return integer |
|
482 | 482 | */ |
483 | 483 | public function count() |
484 | 484 | { |
@@ -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($line) |
171 | 171 | { |
@@ -186,7 +186,7 @@ |
||
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 | { |
@@ -50,7 +50,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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, |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | * create a repository from a remote git url, or a local filesystem |
146 | 146 | * and save it in a temp folder |
147 | 147 | * |
148 | - * @param string|Repository $git the git remote url, or the filesystem path |
|
148 | + * @param string $git the git remote url, or the filesystem path |
|
149 | 149 | * @param null $repositoryPath path |
150 | 150 | * @param GitBinary $binary binary |
151 | 151 | * @param null $name repository name |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | /** |
194 | 194 | * Stage the working tree content |
195 | 195 | * |
196 | - * @param string|Object $path the path to store |
|
196 | + * @param string $path the path to store |
|
197 | 197 | * |
198 | 198 | * @throws \RuntimeException |
199 | 199 | * @throws \Symfony\Component\Process\Exception\LogicException |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | /** |
212 | 212 | * Unstage a tree content |
213 | 213 | * |
214 | - * @param string|Object $path the path to unstage |
|
214 | + * @param string $path the path to unstage |
|
215 | 215 | * |
216 | 216 | * @throws \RuntimeException |
217 | 217 | * @throws \Symfony\Component\Process\Exception\LogicException |
@@ -229,8 +229,8 @@ discard block |
||
229 | 229 | /** |
230 | 230 | * Move a file/directory |
231 | 231 | * |
232 | - * @param string|Object $from source path |
|
233 | - * @param string|Object $to destination path |
|
232 | + * @param string $from source path |
|
233 | + * @param string $to destination path |
|
234 | 234 | * |
235 | 235 | * @throws \RuntimeException |
236 | 236 | * @throws \Symfony\Component\Process\Exception\LogicException |
@@ -249,7 +249,7 @@ discard block |
||
249 | 249 | /** |
250 | 250 | * Remove a file/directory |
251 | 251 | * |
252 | - * @param string|Object $path the path to remove |
|
252 | + * @param string $path the path to remove |
|
253 | 253 | * @param bool $recursive recurse |
254 | 254 | * @param bool $force force |
255 | 255 | * |
@@ -329,7 +329,7 @@ discard block |
||
329 | 329 | } |
330 | 330 | |
331 | 331 | /** |
332 | - * @param TreeishInterface|Commit|string $arg |
|
332 | + * @param Commit $arg |
|
333 | 333 | * @param array $options |
334 | 334 | */ |
335 | 335 | public function reset($arg,$options) |
@@ -791,7 +791,7 @@ discard block |
||
791 | 791 | * |
792 | 792 | * @throws \RuntimeException |
793 | 793 | * @throws \Symfony\Component\Process\Exception\RuntimeException |
794 | - * @return int|void |
|
794 | + * @return integer |
|
795 | 795 | */ |
796 | 796 | public function countCommits($start = 'HEAD') |
797 | 797 | { |
@@ -805,7 +805,7 @@ discard block |
||
805 | 805 | * |
806 | 806 | * @param string|TreeishInterface|array $ref the treeish to check, as a string, as an object or as an array |
807 | 807 | * @param string|Object $path the physical path to the tree relative to the repository root |
808 | - * @param int|null $limit limit to n entries |
|
808 | + * @param integer $limit limit to n entries |
|
809 | 809 | * @param int|null $offset skip n entries |
810 | 810 | * @param boolean|false $firstParent skip commits brought in to branch by a merge |
811 | 811 | * |
@@ -822,7 +822,7 @@ discard block |
||
822 | 822 | * @param string $refStart |
823 | 823 | * @param string $refEnd |
824 | 824 | * @param string|Object $path the physical path to the tree relative to the repository root |
825 | - * @param int|null $limit limit to n entries |
|
825 | + * @param integer $limit limit to n entries |
|
826 | 826 | * @param int|null $offset skip n entries |
827 | 827 | * @param boolean|false $firstParent skip commits brought in to branch by a merge |
828 | 828 | * |
@@ -847,7 +847,7 @@ discard block |
||
847 | 847 | * Get a log for an object |
848 | 848 | * |
849 | 849 | * @param \GitElephant\Objects\Object $obj The Object instance |
850 | - * @param null|string|\GitElephant\Objects\Branch $branch The branch to read from |
|
850 | + * @param string|null $branch The branch to read from |
|
851 | 851 | * @param int $limit Limit to n entries |
852 | 852 | * @param int|null $offset Skip n entries |
853 | 853 | * |
@@ -916,7 +916,7 @@ discard block |
||
916 | 916 | * Get a Diff object for a commit with its parent, by default the diff is between the current head and its parent |
917 | 917 | * |
918 | 918 | * @param \GitElephant\Objects\Commit|string $commit1 A TreeishInterface instance |
919 | - * @param \GitElephant\Objects\Commit|string|null $commit2 A TreeishInterface instance |
|
919 | + * @param Commit $commit2 A TreeishInterface instance |
|
920 | 920 | * @param null|string|Object $path The path to get the diff for or a Object instance |
921 | 921 | * |
922 | 922 | * @throws \RuntimeException |
@@ -932,7 +932,7 @@ discard block |
||
932 | 932 | * Clone a repository |
933 | 933 | * |
934 | 934 | * @param string $url the repository url (i.e. git://github.com/matteosister/GitElephant.git) |
935 | - * @param null $to where to clone the repo |
|
935 | + * @param string|null $to where to clone the repo |
|
936 | 936 | * |
937 | 937 | * @throws \RuntimeException |
938 | 938 | * @throws \Symfony\Component\Process\Exception\LogicException |
@@ -1068,7 +1068,7 @@ discard block |
||
1068 | 1068 | * output a node content as an array of lines |
1069 | 1069 | * |
1070 | 1070 | * @param \GitElephant\Objects\Object $obj The Object of type BLOB |
1071 | - * @param \GitElephant\Objects\TreeishInterface|string $treeish A treeish object |
|
1071 | + * @param null|Branch $treeish A treeish object |
|
1072 | 1072 | * |
1073 | 1073 | * @throws \RuntimeException |
1074 | 1074 | * @throws \Symfony\Component\Process\Exception\LogicException |