@@ -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 | { |
@@ -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|Object $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|Object $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|Object $from source path |
|
| 232 | - * @param string|Object $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|Object $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 | * |
@@ -781,7 +781,7 @@ discard block |
||
| 781 | 781 | * |
| 782 | 782 | * @throws \RuntimeException |
| 783 | 783 | * @throws \Symfony\Component\Process\Exception\RuntimeException |
| 784 | - * @return int|void |
|
| 784 | + * @return integer |
|
| 785 | 785 | */ |
| 786 | 786 | public function countCommits($start = 'HEAD') |
| 787 | 787 | { |
@@ -793,9 +793,9 @@ discard block |
||
| 793 | 793 | /** |
| 794 | 794 | * Get a log for a ref |
| 795 | 795 | * |
| 796 | - * @param string|TreeishInterface $ref the treeish to check |
|
| 796 | + * @param string|null $ref the treeish to check |
|
| 797 | 797 | * @param string|Object $path the physical path to the tree relative to the repository root |
| 798 | - * @param int|null $limit limit to n entries |
|
| 798 | + * @param integer $limit limit to n entries |
|
| 799 | 799 | * @param int|null $offset skip n entries |
| 800 | 800 | * @param boolean|false $firstParent skip commits brought in to branch by a merge |
| 801 | 801 | * |
@@ -812,7 +812,7 @@ discard block |
||
| 812 | 812 | * @param string $refStart |
| 813 | 813 | * @param string $refEnd |
| 814 | 814 | * @param string|Object $path the physical path to the tree relative to the repository root |
| 815 | - * @param int|null $limit limit to n entries |
|
| 815 | + * @param integer $limit limit to n entries |
|
| 816 | 816 | * @param int|null $offset skip n entries |
| 817 | 817 | * @param boolean|false $firstParent skip commits brought in to branch by a merge |
| 818 | 818 | * |
@@ -838,7 +838,7 @@ discard block |
||
| 838 | 838 | * Get a log for an object |
| 839 | 839 | * |
| 840 | 840 | * @param \GitElephant\Objects\Object $obj The Object instance |
| 841 | - * @param null|string|\GitElephant\Objects\Branch $branch The branch to read from |
|
| 841 | + * @param string|null $branch The branch to read from |
|
| 842 | 842 | * @param int $limit Limit to n entries |
| 843 | 843 | * @param int|null $offset Skip n entries |
| 844 | 844 | * |
@@ -903,7 +903,7 @@ discard block |
||
| 903 | 903 | * Get a Diff object for a commit with its parent, by default the diff is between the current head and its parent |
| 904 | 904 | * |
| 905 | 905 | * @param \GitElephant\Objects\Commit|string $commit1 A TreeishInterface instance |
| 906 | - * @param \GitElephant\Objects\Commit|string|null $commit2 A TreeishInterface instance |
|
| 906 | + * @param Commit $commit2 A TreeishInterface instance |
|
| 907 | 907 | * @param null|string|Object $path The path to get the diff for or a Object instance |
| 908 | 908 | * |
| 909 | 909 | * @throws \RuntimeException |
@@ -919,7 +919,7 @@ discard block |
||
| 919 | 919 | * Clone a repository |
| 920 | 920 | * |
| 921 | 921 | * @param string $url the repository url (i.e. git://github.com/matteosister/GitElephant.git) |
| 922 | - * @param null $to where to clone the repo |
|
| 922 | + * @param string|null $to where to clone the repo |
|
| 923 | 923 | * |
| 924 | 924 | * @throws \RuntimeException |
| 925 | 925 | * @throws \Symfony\Component\Process\Exception\LogicException |
@@ -1055,7 +1055,7 @@ discard block |
||
| 1055 | 1055 | * output a node content as an array of lines |
| 1056 | 1056 | * |
| 1057 | 1057 | * @param \GitElephant\Objects\Object $obj The Object of type BLOB |
| 1058 | - * @param \GitElephant\Objects\TreeishInterface|string $treeish A treeish object |
|
| 1058 | + * @param null|Branch $treeish A treeish object |
|
| 1059 | 1059 | * |
| 1060 | 1060 | * @throws \RuntimeException |
| 1061 | 1061 | * @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($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, |