@@ -47,7 +47,7 @@ |
||
| 47 | 47 | * |
| 48 | 48 | * @param TreeishInterface $of the reference to diff |
| 49 | 49 | * @param TreeishInterface|null $with the source reference to diff with $of, if not specified is the current HEAD |
| 50 | - * @param null $path the path to diff, if not specified the full repository |
|
| 50 | + * @param null|string $path the path to diff, if not specified the full repository |
|
| 51 | 51 | * |
| 52 | 52 | * @throws \RuntimeException |
| 53 | 53 | * @return string |
@@ -47,7 +47,7 @@ |
||
| 47 | 47 | /** |
| 48 | 48 | * build a ls-tree command |
| 49 | 49 | * |
| 50 | - * @param string|Branch $ref The reference to build the tree from |
|
| 50 | + * @param Branch $ref The reference to build the tree from |
|
| 51 | 51 | * |
| 52 | 52 | * @throws \RuntimeException |
| 53 | 53 | * @return string |
@@ -57,7 +57,7 @@ |
||
| 57 | 57 | * @param bool $bare |
| 58 | 58 | * |
| 59 | 59 | * @throws \RuntimeException |
| 60 | - * @return MainCommand |
|
| 60 | + * @return string |
|
| 61 | 61 | */ |
| 62 | 62 | public function init($bare = false) |
| 63 | 63 | { |
@@ -44,7 +44,7 @@ |
||
| 44 | 44 | /** |
| 45 | 45 | * build the show command |
| 46 | 46 | * |
| 47 | - * @param string|\GitElephant\Objects\Commit $ref the reference for the show command |
|
| 47 | + * @param string $ref the reference for the show command |
|
| 48 | 48 | * |
| 49 | 49 | * @throws \RuntimeException |
| 50 | 50 | * @return string |
@@ -58,6 +58,9 @@ |
||
| 58 | 58 | $this->orderedSubjects = null; |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | + /** |
|
| 62 | + * @param string $subject |
|
| 63 | + */ |
|
| 61 | 64 | protected function addCommandSubject($subject) |
| 62 | 65 | { |
| 63 | 66 | $this->orderedSubjects[] = $subject; |
@@ -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 | { |
@@ -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 | { |
@@ -8,7 +8,6 @@ |
||
| 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 |
@@ -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 |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | } |
| 203 | 203 | |
| 204 | 204 | /** |
| 205 | - * @param $classname |
|
| 205 | + * @param string $classname |
|
| 206 | 206 | * |
| 207 | 207 | * @return \PHPUnit\Framework\MockObject\MockObject |
| 208 | 208 | */ |
@@ -251,6 +251,9 @@ discard block |
||
| 251 | 251 | ->will($this->returnValue($this->getMockCommand())); |
| 252 | 252 | } |
| 253 | 253 | |
| 254 | + /** |
|
| 255 | + * @param string[] $output |
|
| 256 | + */ |
|
| 254 | 257 | protected function addOutputToMockRepo(\PHPUnit\Framework\MockObject\MockObject $repo, $output) |
| 255 | 258 | { |
| 256 | 259 | $repo |
@@ -287,6 +290,17 @@ discard block |
||
| 287 | 290 | return $this->getMock('GitElephant\GitBinary'); |
| 288 | 291 | } |
| 289 | 292 | |
| 293 | + /** |
|
| 294 | + * @param string $sha |
|
| 295 | + * @param string $tree |
|
| 296 | + * @param string $author |
|
| 297 | + * @param string $committer |
|
| 298 | + * @param string $emailAuthor |
|
| 299 | + * @param string $emailCommitter |
|
| 300 | + * @param string $datetimeAuthor |
|
| 301 | + * @param string $datetimeCommitter |
|
| 302 | + * @param string $message |
|
| 303 | + */ |
|
| 290 | 304 | protected function doCommitTest( |
| 291 | 305 | Commit $commit, |
| 292 | 306 | $sha, |