@@ -28,6 +28,9 @@ discard block |
||
28 | 28 | private $admin_path; |
29 | 29 | private $git_exec; |
30 | 30 | |
31 | + /** |
|
32 | + * @param string $admin_path |
|
33 | + */ |
|
31 | 34 | public function __construct($admin_path, Git_Exec $git_exec) { |
32 | 35 | $this->admin_path = $admin_path; |
33 | 36 | $this->git_exec = $git_exec; |
@@ -129,6 +132,9 @@ discard block |
||
129 | 132 | $this->removeUserExistingKeysFromAGivenKeyId($user_name, $ssh_key_id); |
130 | 133 | } |
131 | 134 | |
135 | + /** |
|
136 | + * @param string $filePath |
|
137 | + */ |
|
132 | 138 | private function writeKeyIfChanged($filePath, $key) { |
133 | 139 | $changed = true; |
134 | 140 | if (is_file($filePath)) { |
@@ -145,7 +151,6 @@ discard block |
||
145 | 151 | /** |
146 | 152 | * Remove all pub SSH keys previously associated to a user |
147 | 153 | * |
148 | - * @param IHaveAnSSHKey $user |
|
149 | 154 | * @param int $last_key_id |
150 | 155 | */ |
151 | 156 | private function removeUserExistingKeysFromAGivenKeyId($user_name, $last_key_id) { |
@@ -159,6 +164,9 @@ discard block |
||
159 | 164 | } |
160 | 165 | } |
161 | 166 | |
167 | + /** |
|
168 | + * @param string $userbase |
|
169 | + */ |
|
162 | 170 | private function getKeyNumber($userbase, $file) { |
163 | 171 | $matches = array(); |
164 | 172 | if (preg_match('%^'.$this->getKeyDirPath().'/'.$userbase.'([0-9]+).pub$%', $file, $matches)) { |
@@ -61,6 +61,9 @@ |
||
61 | 61 | } |
62 | 62 | } |
63 | 63 | |
64 | + /** |
|
65 | + * @param string $file_name |
|
66 | + */ |
|
64 | 67 | private function isReservedName($file_name) { |
65 | 68 | if ($this->isAdminKey($file_name) || $this->isGerritKey($file_name)) { |
66 | 69 | return true; |
@@ -95,8 +95,6 @@ discard block |
||
95 | 95 | /** |
96 | 96 | * Constructor |
97 | 97 | * |
98 | - * @param string $adminPath The path to admin folder of gitolite. |
|
99 | - * Default is $sys_data_dir . "/gitolite/admin" |
|
100 | 98 | */ |
101 | 99 | public function __construct( |
102 | 100 | Logger $logger, |
@@ -188,6 +186,9 @@ discard block |
||
188 | 186 | return realpath($this->adminPath .'/../repositories'); |
189 | 187 | } |
190 | 188 | |
189 | + /** |
|
190 | + * @param string $adminPath |
|
191 | + */ |
|
191 | 192 | public function setAdminPath($adminPath) { |
192 | 193 | $this->oldCwd = getcwd(); |
193 | 194 | $this->adminPath = $adminPath; |
@@ -264,6 +265,9 @@ discard block |
||
264 | 265 | return $res; |
265 | 266 | } |
266 | 267 | |
268 | + /** |
|
269 | + * @param string $message |
|
270 | + */ |
|
267 | 271 | public function commit($message) { |
268 | 272 | return $this->gitExec->commit($message); |
269 | 273 | } |
@@ -278,7 +282,7 @@ discard block |
||
278 | 282 | * @param String $oldName The old name of the project |
279 | 283 | * @param String $newName The new name of the project |
280 | 284 | * |
281 | - * @return true if success, false otherwise |
|
285 | + * @return boolean if success, false otherwise |
|
282 | 286 | */ |
283 | 287 | public function renameProject($oldName, $newName) { |
284 | 288 | $ok = true; |
@@ -302,6 +306,9 @@ discard block |
||
302 | 306 | return $ok; |
303 | 307 | } |
304 | 308 | |
309 | + /** |
|
310 | + * @param string $path |
|
311 | + */ |
|
305 | 312 | public function delete($path) { |
306 | 313 | if ( empty($path) || !is_writable($path) ) { |
307 | 314 | throw new GitDriverErrorException('Empty path or permission denied '.$path); |
@@ -316,6 +323,11 @@ discard block |
||
316 | 323 | return true; |
317 | 324 | } |
318 | 325 | |
326 | + /** |
|
327 | + * @param string $repo |
|
328 | + * @param string $old_ns |
|
329 | + * @param string $new_ns |
|
330 | + */ |
|
319 | 331 | public function fork($repo, $old_ns, $new_ns) { |
320 | 332 | $source = unixPathJoin(array($this->getRepositoriesPath(), $old_ns, $repo)) .'.git'; |
321 | 333 | $target = unixPathJoin(array($this->getRepositoriesPath(), $new_ns, $repo)) .'.git'; |
@@ -337,6 +349,9 @@ discard block |
||
337 | 349 | return false; |
338 | 350 | } |
339 | 351 | |
352 | + /** |
|
353 | + * @param string $cmd |
|
354 | + */ |
|
340 | 355 | protected function executeShellCommand($cmd) { |
341 | 356 | $cmd = $cmd.' 2>&1'; |
342 | 357 | exec($cmd, $output, $retVal); |
@@ -364,9 +379,8 @@ discard block |
||
364 | 379 | /** |
365 | 380 | * Backup gitolite repository |
366 | 381 | * |
367 | - * @param String $path The repository path |
|
368 | 382 | * @param String $backup_directory The repository backup directory path |
369 | - * @param String $repositoryName |
|
383 | + * @param String $repository |
|
370 | 384 | * |
371 | 385 | */ |
372 | 386 | public function backup(GitRepository $repository, $backup_directory) { |
@@ -418,6 +432,7 @@ discard block |
||
418 | 432 | * @param GitRepository $repository |
419 | 433 | * @param String git_root_path |
420 | 434 | * @param String $backup_directory |
435 | + * @param string $git_root_path |
|
421 | 436 | * |
422 | 437 | * @return boolean |
423 | 438 | * |
@@ -454,7 +469,6 @@ discard block |
||
454 | 469 | * Extract repository |
455 | 470 | * |
456 | 471 | * @param String $backup_path |
457 | - * @param String $restore_path |
|
458 | 472 | * |
459 | 473 | */ |
460 | 474 | private function extractRepository($backup_path) { |
@@ -136,6 +136,9 @@ discard block |
||
136 | 136 | $this->history_dao = $history_dao; |
137 | 137 | } |
138 | 138 | |
139 | + /** |
|
140 | + * @return string |
|
141 | + */ |
|
139 | 142 | protected function getText($key, $params = array()) { |
140 | 143 | return $GLOBALS['Language']->getText('plugin_git', $key, $params); |
141 | 144 | } |
@@ -144,6 +147,10 @@ discard block |
||
144 | 147 | return call_user_func_array(array($this,$action), $params); |
145 | 148 | } |
146 | 149 | |
150 | + /** |
|
151 | + * @param integer $projectId |
|
152 | + * @param integer $repositoryId |
|
153 | + */ |
|
147 | 154 | public function deleteRepository( $projectId, $repositoryId ) { |
148 | 155 | $controller = $this->getController(); |
149 | 156 | $projectId = intval($projectId); |
@@ -232,7 +239,6 @@ discard block |
||
232 | 239 | * |
233 | 240 | * @param Project $project |
234 | 241 | * @param PFUser $user |
235 | - * @param Project[] $parent_projects |
|
236 | 242 | */ |
237 | 243 | public function generateGerritRepositoryAndTemplateList(Project $project, PFUser $user) { |
238 | 244 | $repos = $this->factory->getAllGerritRepositoriesFromProject($project, $user); |
@@ -731,7 +737,6 @@ discard block |
||
731 | 737 | /** |
732 | 738 | * Internal method called by SystemEvent_PROJECT_IS_PRIVATE |
733 | 739 | * @param <type> $projectId |
734 | - * @param <type> $isPublic |
|
735 | 740 | * @return <type> |
736 | 741 | */ |
737 | 742 | public static function changeProjectRepositoriesAccess($projectId, $isPrivate, GitDao $dao, GitRepositoryFactory $factory) { |
@@ -792,12 +797,12 @@ discard block |
||
792 | 797 | /** |
793 | 798 | * Fork a bunch of repositories in a project for a given user |
794 | 799 | * |
795 | - * @param int $groupId The project id |
|
796 | - * @param array $repos_ids The array of id of repositories to fork |
|
800 | + * @param array $repos The array of id of repositories to fork |
|
797 | 801 | * @param string $namespace The namespace where the new repositories will live |
798 | 802 | * @param PFUser $user The owner of those new repositories |
799 | 803 | * @param Layout $response The response object |
800 | 804 | * @param array $forkPermissions Permissions to be applied for the new repository |
805 | + * @param string $redirect_url |
|
801 | 806 | */ |
802 | 807 | public function fork(array $repos, Project $to_project, $namespace, $scope, PFUser $user, Layout $response, $redirect_url, array $forkPermissions) { |
803 | 808 | try { |
@@ -838,7 +843,6 @@ discard block |
||
838 | 843 | * |
839 | 844 | * @param GitRepository $repository |
840 | 845 | * @param int $remote_server_id the id of the server to which we want to migrate |
841 | - * @param Boolean $migrate_access_right if the acess right will be migrated or not |
|
842 | 846 | * @param int $gerrit_template_id the id of template if any chosen |
843 | 847 | */ |
844 | 848 | public function migrateToGerrit(GitRepository $repository, $remote_server_id, $gerrit_template_id) { |
@@ -863,6 +867,9 @@ discard block |
||
863 | 867 | $this->getController()->redirect($this->url_manager->getRepositoryBaseUrl($repository)); |
864 | 868 | } |
865 | 869 | |
870 | + /** |
|
871 | + * @param string $error_key |
|
872 | + */ |
|
866 | 873 | private function addError($error_key) { |
867 | 874 | $this->getController()->addError($this->getText($error_key)); |
868 | 875 | } |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | |
115 | 115 | /** |
116 | 116 | * |
117 | - * @param GitRepository $respository |
|
117 | + * @param GitRepository $repository |
|
118 | 118 | * @return bool |
119 | 119 | */ |
120 | 120 | public function isCreated(GitRepository $repository) { |
@@ -320,7 +320,7 @@ discard block |
||
320 | 320 | * @param Statistics_Formatter $formatter instance of statistics formatter class |
321 | 321 | * @param String $type backend type |
322 | 322 | * @param Array $typeIndex backend type index |
323 | - * @param Array $typeArray backend type array |
|
323 | + * @param string[] $typeArray backend type array |
|
324 | 324 | * @param Boolean $keepedAlive keep only reposirtories that still active |
325 | 325 | * |
326 | 326 | * @return Void |
@@ -69,6 +69,9 @@ discard block |
||
69 | 69 | $this->tableName = $tableName; |
70 | 70 | } |
71 | 71 | |
72 | + /** |
|
73 | + * @param string $id |
|
74 | + */ |
|
72 | 75 | public function exists($id) { |
73 | 76 | if ( empty($id) ) { |
74 | 77 | return false; |
@@ -213,6 +216,9 @@ discard block |
||
213 | 216 | return false; |
214 | 217 | } |
215 | 218 | |
219 | + /** |
|
220 | + * @param string $newName |
|
221 | + */ |
|
216 | 222 | public function renameProject(Project $project, $newName) { |
217 | 223 | $oldPath = $this->da->quoteSmart($project->getUnixName().'/'); |
218 | 224 | $newPath = $this->da->quoteSmart($newName.'/'); |
@@ -284,6 +290,7 @@ discard block |
||
284 | 290 | /** |
285 | 291 | * Return the list of users that owns repositories in the project $projectId |
286 | 292 | * |
293 | + * @param integer $projectId |
|
287 | 294 | * @return DataAccessResult |
288 | 295 | */ |
289 | 296 | public function getProjectRepositoriesOwners($projectId) { |
@@ -298,6 +305,9 @@ discard block |
||
298 | 305 | return $this->retrieve($sql); |
299 | 306 | } |
300 | 307 | |
308 | + /** |
|
309 | + * @param integer $projectId |
|
310 | + */ |
|
301 | 311 | public function getAllGitoliteRespositories($projectId) { |
302 | 312 | $projectId = $this->da->escapeInt($projectId); |
303 | 313 | $type_gitolite = $this->da->quoteSmart(self::BACKEND_GITOLITE); |
@@ -359,6 +369,9 @@ discard block |
||
359 | 369 | return $this->retrieve($query); |
360 | 370 | } |
361 | 371 | |
372 | + /** |
|
373 | + * @param GitRepository $repository |
|
374 | + */ |
|
362 | 375 | public function hasChild($repository) { |
363 | 376 | $repoId = $this->da->escapeInt( $repository->getId() ); |
364 | 377 | if ( empty($repoId) ) { |
@@ -382,9 +395,12 @@ discard block |
||
382 | 395 | * This function log a Git Push in the database |
383 | 396 | * |
384 | 397 | * @param Integer $repoId Id of the git repository |
385 | - * @param Integer $UserId Id of the user that performed the push |
|
398 | + * @param Integer $userId Id of the user that performed the push |
|
386 | 399 | * @param Integer $pushTimestamp Date of the push |
387 | 400 | * @param Integer $commitsNumber Number of commits |
401 | + * @param string $refname |
|
402 | + * @param string $operation_type |
|
403 | + * @param string $refname_type |
|
388 | 404 | * |
389 | 405 | * @return Boolean |
390 | 406 | */ |
@@ -416,6 +432,9 @@ discard block |
||
416 | 432 | return $this->update($query); |
417 | 433 | } |
418 | 434 | |
435 | + /** |
|
436 | + * @param GitRepository $repository |
|
437 | + */ |
|
419 | 438 | public function getProjectRepositoryById($repository) { |
420 | 439 | $id = (int)$repository->getId(); |
421 | 440 | if ( empty($id) ) { |
@@ -449,6 +468,9 @@ discard block |
||
449 | 468 | return $this->retrieve($query); |
450 | 469 | } |
451 | 470 | |
471 | + /** |
|
472 | + * @param integer $id |
|
473 | + */ |
|
452 | 474 | public function searchDeletedRepositoryById($id) { |
453 | 475 | $id = $this->da->escapeInt($id); |
454 | 476 | $query = 'SELECT * '. |
@@ -540,6 +562,10 @@ discard block |
||
540 | 562 | return $this->retrieve($query); |
541 | 563 | } |
542 | 564 | |
565 | + /** |
|
566 | + * @param integer $project_id |
|
567 | + * @param string $path |
|
568 | + */ |
|
543 | 569 | public function isRepositoryExisting($project_id, $path) { |
544 | 570 | $project_id = $this->da->escapeInt($project_id); |
545 | 571 | $path = $this->da->quoteSmart($path); |
@@ -602,6 +628,10 @@ discard block |
||
602 | 628 | return count($this->retrieve($sql)) > 0; |
603 | 629 | } |
604 | 630 | |
631 | + /** |
|
632 | + * @param integer $project_id |
|
633 | + * @param integer[] $ugroup_ids |
|
634 | + */ |
|
605 | 635 | public function searchGerritRepositoriesWithPermissionsForUGroupAndProject($project_id, $ugroup_ids) { |
606 | 636 | $project_id = $this->da->escapeInt($project_id); |
607 | 637 | $ugroup_ids = $this->da->escapeIntImplode($ugroup_ids); |
@@ -621,6 +651,9 @@ discard block |
||
621 | 651 | |
622 | 652 | } |
623 | 653 | |
654 | + /** |
|
655 | + * @param integer $project_id |
|
656 | + */ |
|
624 | 657 | public function searchAllGerritRepositoriesOfProject($project_id) { |
625 | 658 | $project_id = $this->da->escapeInt($project_id); |
626 | 659 | $sql = "SELECT * |
@@ -690,7 +723,7 @@ discard block |
||
690 | 723 | * |
691 | 724 | * @param Int $repository_id |
692 | 725 | * |
693 | - * @return GitDaoException | true |
|
726 | + * @return boolean | true |
|
694 | 727 | */ |
695 | 728 | public function activate($repository_id) { |
696 | 729 | $id = $this->da->escapeInt($repository_id); |
@@ -701,6 +734,9 @@ discard block |
||
701 | 734 | return $this->update($query); |
702 | 735 | } |
703 | 736 | |
737 | + /** |
|
738 | + * @param integer $project_id |
|
739 | + */ |
|
704 | 740 | public function getPaginatedOpenRepositories($project_id, $limit, $offset) { |
705 | 741 | $project_id = $this->da->escapeInt($project_id); |
706 | 742 | $limit = $this->da->escapeInt($limit); |
@@ -34,6 +34,10 @@ discard block |
||
34 | 34 | public function __construct() { |
35 | 35 | } |
36 | 36 | |
37 | + /** |
|
38 | + * @param string $cmd |
|
39 | + * @param string $action_name |
|
40 | + */ |
|
37 | 41 | protected function execGitAction($cmd, $action_name) { |
38 | 42 | $out = array(); |
39 | 43 | $ret = -1; |
@@ -55,7 +59,7 @@ discard block |
||
55 | 59 | * Make a clone of a source repository |
56 | 60 | * @param <String> $source source directory |
57 | 61 | * @param <String> $destination destination directory |
58 | - * @param <String> $option String of options. |
|
62 | + * @param string $option String of options. |
|
59 | 63 | * @return <boolean> |
60 | 64 | */ |
61 | 65 | private function cloneRepo($source, $destination, $option) { |
@@ -67,6 +71,10 @@ discard block |
||
67 | 71 | return $this->execGitAction($cmd, "clone"); |
68 | 72 | } |
69 | 73 | |
74 | + /** |
|
75 | + * @param string $source |
|
76 | + * @param string $destination |
|
77 | + */ |
|
70 | 78 | public function fork($source, $destination) { |
71 | 79 | $this->checkFileExist($source); |
72 | 80 | |
@@ -75,12 +83,22 @@ discard block |
||
75 | 83 | return $this->setUpFreshRepository($destination); |
76 | 84 | } |
77 | 85 | |
86 | + /** |
|
87 | + * @param string $source |
|
88 | + * @param string $destination |
|
89 | + * @param string $branch |
|
90 | + */ |
|
78 | 91 | public function cloneAtSpecifiqBranch($source, $destination, $branch) { |
79 | 92 | $this->checkFileExist($source); |
80 | 93 | |
81 | 94 | return $this->cloneRepo($source, $destination, '--branch '.$branch); |
82 | 95 | } |
83 | 96 | |
97 | + /** |
|
98 | + * @param string $repositoryPath |
|
99 | + * @param string $email |
|
100 | + * @param string $name |
|
101 | + */ |
|
84 | 102 | public function changeGitUserInfo($repositoryPath, $email, $name) { |
85 | 103 | $this->checkFileExist($repositoryPath); |
86 | 104 | $cmdEmail = 'cd '. escapeshellarg($repositoryPath).' && git config --local user.email '.escapeshellarg($email).' 2>&1'; |
@@ -89,6 +107,10 @@ discard block |
||
89 | 107 | return $this->execGitAction($cmdEmail, 'change user email').' '.$this->execGitAction($cmdName, 'change user name'); |
90 | 108 | } |
91 | 109 | |
110 | + /** |
|
111 | + * @param string $repositoryPath |
|
112 | + * @param string $filePathFromRepository |
|
113 | + */ |
|
92 | 114 | public function add($repositoryPath, $filePathFromRepository) { |
93 | 115 | $this->checkFileExist($repositoryPath); |
94 | 116 | $cmd = 'cd '.escapeshellarg($repositoryPath).' && git add '.escapeshellarg($filePathFromRepository).' 2>&1'; |
@@ -96,6 +118,10 @@ discard block |
||
96 | 118 | return $this->execGitAction($cmd, 'add'); |
97 | 119 | } |
98 | 120 | |
121 | + /** |
|
122 | + * @param string $repositoryPath |
|
123 | + * @param string $message |
|
124 | + */ |
|
99 | 125 | public function commit($repositoryPath, $message) { |
100 | 126 | $this->checkFileExist($repositoryPath); |
101 | 127 | $cmd = 'cd '.escapeshellarg($repositoryPath).' && git commit --allow-empty -m '.escapeshellarg($message).' 2>&1'; |
@@ -103,6 +129,10 @@ discard block |
||
103 | 129 | return $this->execGitAction($cmd, 'commit'); |
104 | 130 | } |
105 | 131 | |
132 | + /** |
|
133 | + * @param string $repositoryPath |
|
134 | + * @param string $bareURL |
|
135 | + */ |
|
106 | 136 | public function mergeAndPush($repositoryPath, $bareURL) { |
107 | 137 | $this->checkFileExist($repositoryPath); |
108 | 138 | $cmd = 'cd '.escapeshellarg($repositoryPath).' && git pull --quiet --rebase && git push '. $bareURL .' 2>&1'; |
@@ -117,6 +147,9 @@ discard block |
||
117 | 147 | return $this->execGitAction($cmd, 'get informations'); |
118 | 148 | } |
119 | 149 | |
150 | + /** |
|
151 | + * @param string $repositoryPath |
|
152 | + */ |
|
120 | 153 | public function removeRepository($repositoryPath) { |
121 | 154 | $this->checkFileExist($repositoryPath); |
122 | 155 | $cmd = 'rm --recursive --dir --force '.escapeshellarg($repositoryPath).' 2>&1'; |
@@ -124,6 +157,9 @@ discard block |
||
124 | 157 | return $this->execGitAction($cmd, 'rm'); |
125 | 158 | } |
126 | 159 | |
160 | + /** |
|
161 | + * @return string |
|
162 | + */ |
|
127 | 163 | public function getGitVersion() { |
128 | 164 | $cmd = 'git --version'; |
129 | 165 | $cmd_result = $this->execGitAction($cmd, 'version'); |
@@ -187,6 +223,9 @@ discard block |
||
187 | 223 | return $this->setPermissions($path); |
188 | 224 | } |
189 | 225 | |
226 | + /** |
|
227 | + * @param string $path |
|
228 | + */ |
|
190 | 229 | public function delete($path) { |
191 | 230 | if ( empty($path) || !is_writable($path) ) { |
192 | 231 | throw new GitDriverErrorException('Empty path or permission denied '.$path); |
@@ -199,6 +238,10 @@ discard block |
||
199 | 238 | return true; |
200 | 239 | } |
201 | 240 | |
241 | + /** |
|
242 | + * @param string $hookName |
|
243 | + * @param string $repoPath |
|
244 | + */ |
|
202 | 245 | public function activateHook($hookName, $repoPath, $uid=false, $gid=false) { |
203 | 246 | //newer version of git |
204 | 247 | $hook = $repoPath.'/hooks/'.$hookName; |
@@ -225,6 +268,9 @@ discard block |
||
225 | 268 | return true; |
226 | 269 | } |
227 | 270 | |
271 | + /** |
|
272 | + * @param string $repoPath |
|
273 | + */ |
|
228 | 274 | public function masterExists($repoPath) { |
229 | 275 | if ( file_exists($repoPath.'/refs/heads/master') ) { |
230 | 276 | return true; |
@@ -241,6 +287,10 @@ discard block |
||
241 | 287 | return is_dir($repoPath.'/refs/heads'); |
242 | 288 | } |
243 | 289 | |
290 | + /** |
|
291 | + * @param string $repoPath |
|
292 | + * @param string $description |
|
293 | + */ |
|
244 | 294 | public function setDescription($repoPath, $description) { |
245 | 295 | if( ! file_put_contents($repoPath.'/description', $description) ) { |
246 | 296 | throw new GitDriverErrorException('Unable to set description'); |
@@ -248,6 +298,9 @@ discard block |
||
248 | 298 | return true; |
249 | 299 | } |
250 | 300 | |
301 | + /** |
|
302 | + * @param string $repoPath |
|
303 | + */ |
|
251 | 304 | public function getDescription($repoPath) { |
252 | 305 | return file_get_contents($repoPath.'/description'); |
253 | 306 | } |
@@ -70,10 +70,16 @@ |
||
70 | 70 | return permission_db_authorized_ugroups(Git::PERM_ADMIN, $project->getID()); |
71 | 71 | } |
72 | 72 | |
73 | + /** |
|
74 | + * @return integer |
|
75 | + */ |
|
73 | 76 | private function getDefaultGitAdminPermissions() { |
74 | 77 | return permission_db_get_defaults(Git::PERM_ADMIN); |
75 | 78 | } |
76 | 79 | |
80 | + /** |
|
81 | + * @param integer $project_id |
|
82 | + */ |
|
77 | 83 | public function getCurrentGitAdminUgroups($project_id) { |
78 | 84 | return $this->permissions_manager->getAuthorizedUgroupIds($project_id, Git::PERM_ADMIN); |
79 | 85 | } |
@@ -46,6 +46,9 @@ discard block |
||
46 | 46 | */ |
47 | 47 | const SERVICE_SHORTNAME = 'plugin_git'; |
48 | 48 | |
49 | + /** |
|
50 | + * @param integer $id |
|
51 | + */ |
|
49 | 52 | public function __construct($id) { |
50 | 53 | parent::__construct($id); |
51 | 54 | $this->setScope(Plugin::SCOPE_PROJECT); |
@@ -593,7 +596,6 @@ discard block |
||
593 | 596 | |
594 | 597 | /** |
595 | 598 | * |
596 | - * @param PFUser $user |
|
597 | 599 | * @return Git_UserAccountManager |
598 | 600 | */ |
599 | 601 | private function getUserAccountManager() { |
@@ -689,6 +691,9 @@ discard block |
||
689 | 691 | $this->getLogger()->info('Successfully pushed ssh keys for user: '.$user->getUnixName()); |
690 | 692 | } |
691 | 693 | |
694 | + /** |
|
695 | + * @return PFUser |
|
696 | + */ |
|
692 | 697 | private function getUserFromParameters($params) { |
693 | 698 | if (! isset($params['user']) || ! $params['user'] instanceof PFUser) { |
694 | 699 | $this->getLogger()->error('Invalid user passed in params: ' . print_r($params, true)); |
@@ -1083,6 +1088,9 @@ discard block |
||
1083 | 1088 | } |
1084 | 1089 | |
1085 | 1090 | |
1091 | + /** |
|
1092 | + * @return ProjectUGroup |
|
1093 | + */ |
|
1086 | 1094 | private function getUGroupFromParams(array $params) { |
1087 | 1095 | if (isset($params['ugroup'])) { |
1088 | 1096 | return $params['ugroup']; |