@@ -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, |
@@ -10,7 +10,6 @@ |
||
10 | 10 | |
11 | 11 | |
12 | 12 | use GitElephant\Objects\Commit; |
13 | -use GitElephant\Objects\Tag; |
|
14 | 13 | use GitElephant\Objects\TreeishInterface; |
15 | 14 | use \GitElephant\Repository; |
16 | 15 |