@@ -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 |
@@ -351,7 +351,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 371 | 371 | /** |
| 372 | 372 | * datetimeAuthor getter |
| 373 | 373 | * |
| 374 | - * @return mixed |
|
| 374 | + * @return \DateTime |
|
| 375 | 375 | */ |
| 376 | 376 | public function getDatetimeAuthor() |
| 377 | 377 | { |
@@ -79,7 +79,7 @@ |
||
| 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 | { |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | * create a repository from a remote git url, or a local filesystem |
| 145 | 145 | * and save it in a temp folder |
| 146 | 146 | * |
| 147 | - * @param string|Repository $git the git remote url, or the filesystem path |
|
| 147 | + * @param string $git the git remote url, or the filesystem path |
|
| 148 | 148 | * @param null $repositoryPath path |
| 149 | 149 | * @param GitBinary $binary binary |
| 150 | 150 | * @param null $name repository name |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | /** |
| 193 | 193 | * Stage the working tree content |
| 194 | 194 | * |
| 195 | - * @param string|NodeObject $path the path to store |
|
| 195 | + * @param string $path the path to store |
|
| 196 | 196 | * |
| 197 | 197 | * @throws \RuntimeException |
| 198 | 198 | * @throws \Symfony\Component\Process\Exception\LogicException |
@@ -210,7 +210,7 @@ discard block |
||
| 210 | 210 | /** |
| 211 | 211 | * Unstage a tree content |
| 212 | 212 | * |
| 213 | - * @param string|NodeObject $path the path to unstage |
|
| 213 | + * @param string $path the path to unstage |
|
| 214 | 214 | * |
| 215 | 215 | * @throws \RuntimeException |
| 216 | 216 | * @throws \Symfony\Component\Process\Exception\LogicException |
@@ -228,8 +228,8 @@ discard block |
||
| 228 | 228 | /** |
| 229 | 229 | * Move a file/directory |
| 230 | 230 | * |
| 231 | - * @param string|NodeObject $from source path |
|
| 232 | - * @param string|NodeObject $to destination path |
|
| 231 | + * @param string $from source path |
|
| 232 | + * @param string $to destination path |
|
| 233 | 233 | * |
| 234 | 234 | * @throws \RuntimeException |
| 235 | 235 | * @throws \Symfony\Component\Process\Exception\LogicException |
@@ -248,7 +248,7 @@ discard block |
||
| 248 | 248 | /** |
| 249 | 249 | * Remove a file/directory |
| 250 | 250 | * |
| 251 | - * @param string|NodeObject $path the path to remove |
|
| 251 | + * @param string $path the path to remove |
|
| 252 | 252 | * @param bool $recursive recurse |
| 253 | 253 | * @param bool $force force |
| 254 | 254 | * |
@@ -328,7 +328,7 @@ discard block |
||
| 328 | 328 | } |
| 329 | 329 | |
| 330 | 330 | /** |
| 331 | - * @param TreeishInterface|Commit|string $arg |
|
| 331 | + * @param Commit $arg |
|
| 332 | 332 | * @param array $options |
| 333 | 333 | */ |
| 334 | 334 | public function reset($arg,$options) |
@@ -804,7 +804,7 @@ discard block |
||
| 804 | 804 | * |
| 805 | 805 | * @param string|TreeishInterface|array $ref the treeish to check, as a string, as an object or as an array |
| 806 | 806 | * @param string|NodeObject $path the physical path to the tree relative to the repository root |
| 807 | - * @param int|null $limit limit to n entries |
|
| 807 | + * @param integer $limit limit to n entries |
|
| 808 | 808 | * @param int|null $offset skip n entries |
| 809 | 809 | * @param boolean|false $firstParent skip commits brought in to branch by a merge |
| 810 | 810 | * |
@@ -821,7 +821,7 @@ discard block |
||
| 821 | 821 | * @param string $refStart |
| 822 | 822 | * @param string $refEnd |
| 823 | 823 | * @param string|NodeObject $path the physical path to the tree relative to the repository root |
| 824 | - * @param int|null $limit limit to n entries |
|
| 824 | + * @param integer $limit limit to n entries |
|
| 825 | 825 | * @param int|null $offset skip n entries |
| 826 | 826 | * @param boolean|false $firstParent skip commits brought in to branch by a merge |
| 827 | 827 | * |
@@ -846,7 +846,7 @@ discard block |
||
| 846 | 846 | * Get a log for an object |
| 847 | 847 | * |
| 848 | 848 | * @param \GitElephant\Objects\NodeObject $obj The Object instance |
| 849 | - * @param null|string|\GitElephant\Objects\Branch $branch The branch to read from |
|
| 849 | + * @param string|null $branch The branch to read from |
|
| 850 | 850 | * @param int $limit Limit to n entries |
| 851 | 851 | * @param int|null $offset Skip n entries |
| 852 | 852 | * |
@@ -915,7 +915,7 @@ discard block |
||
| 915 | 915 | * Get a Diff object for a commit with its parent, by default the diff is between the current head and its parent |
| 916 | 916 | * |
| 917 | 917 | * @param \GitElephant\Objects\Commit|string $commit1 A TreeishInterface instance |
| 918 | - * @param \GitElephant\Objects\Commit|string|null $commit2 A TreeishInterface instance |
|
| 918 | + * @param Commit $commit2 A TreeishInterface instance |
|
| 919 | 919 | * @param null|string|NodeObject $path The path to get the diff for or a Object instance |
| 920 | 920 | * |
| 921 | 921 | * @throws \RuntimeException |
@@ -931,7 +931,7 @@ discard block |
||
| 931 | 931 | * Clone a repository |
| 932 | 932 | * |
| 933 | 933 | * @param string $url the repository url (i.e. git://github.com/matteosister/GitElephant.git) |
| 934 | - * @param null $to where to clone the repo |
|
| 934 | + * @param string|null $to where to clone the repo |
|
| 935 | 935 | * |
| 936 | 936 | * @throws \RuntimeException |
| 937 | 937 | * @throws \Symfony\Component\Process\Exception\LogicException |
@@ -1067,7 +1067,7 @@ discard block |
||
| 1067 | 1067 | * output a node content as an array of lines |
| 1068 | 1068 | * |
| 1069 | 1069 | * @param \GitElephant\Objects\NodeObject $obj The Object of type BLOB |
| 1070 | - * @param \GitElephant\Objects\TreeishInterface|string $treeish A treeish object |
|
| 1070 | + * @param null|Branch $treeish A treeish object |
|
| 1071 | 1071 | * |
| 1072 | 1072 | * @throws \RuntimeException |
| 1073 | 1073 | * @throws \Symfony\Component\Process\Exception\LogicException |
@@ -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, |