minor KnpLabs#1034 Fix incorrect phpdoc (gemal)

acrobat · web-flow · commit 0349838d5f9b · 2021-10-27T19:51:10.000+02:00
This PR was merged into the 3.4.x-dev branch. Discussion ---------- Fixes KnpLabs#1033 Commits ------- 87838df Fix incorrect phpdoc
diff --git a/lib/Github/Api/Repo.php b/lib/Github/Api/Repo.php
@@ -626,7 +626,7 @@ public function subscribers($username, $repository, $page = 1)
      * @param string $head       The head to merge. This can be a branch name or a commit SHA1.
      * @param string $message    Commit message to use for the merge commit. If omitted, a default message will be used.
      *
-     * @return array|null
+     * @return array|string
      */
     public function merge($username, $repository, $base, $head, $message = null)
     {

Original file line number	Diff line number	Diff line change
`@@ -626,7 +626,7 @@ public function subscribers($username, $repository, $page = 1)`
`626`	`626`	`* @param string $head The head to merge. This can be a branch name or a commit SHA1.`
`627`	`627`	`* @param string $message Commit message to use for the merge commit. If omitted, a default message will be used.`
`628`	`628`	`*`
`629`		`- * @return array\|null`
	`629`	`+ * @return array\|string`
`630`	`630`	`*/`
`631`	`631`	`public function merge($username, $repository, $base, $head, $message = null)`
`632`	`632`	`{`