@@ -41,7 +41,7 @@ |
||
| 41 | 41 | /** |
| 42 | 42 | * |
| 43 | 43 | * @param SS_HTTPRequest $request |
| 44 | - * @return string |
|
| 44 | + * @return SS_HTTPResponse |
|
| 45 | 45 | */ |
| 46 | 46 | public function listProjects(SS_HTTPRequest $request) { |
| 47 | 47 | $response = array( |
@@ -300,6 +300,7 @@ |
||
| 300 | 300 | /** |
| 301 | 301 | * Utility function for triggering the db rebuild and flush. |
| 302 | 302 | * Also cleans up and generates new error pages. |
| 303 | + * @param DeploynautLogFile $log |
|
| 303 | 304 | */ |
| 304 | 305 | public function rebuild(DNEnvironment $environment, $log) { |
| 305 | 306 | $name = $environment->getFullName(); |
@@ -10,6 +10,7 @@ discard block |
||
| 10 | 10 | * @param DeploynautLogFile $log |
| 11 | 11 | * @param DNProject $project |
| 12 | 12 | * @param type $leaveMaintenancePage |
| 13 | + * @return void |
|
| 13 | 14 | */ |
| 14 | 15 | public function deploy(DNEnvironment $environment, $sha, DeploynautLogFile $log, DNProject $project, $leaveMaintenancePage = false); |
| 15 | 16 | |
@@ -19,6 +20,7 @@ discard block |
||
| 19 | 20 | * |
| 20 | 21 | * @param DNDataTransfer $dataTransfer |
| 21 | 22 | * @param DeploynautLogFile $log |
| 23 | + * @return void |
|
| 22 | 24 | */ |
| 23 | 25 | public function dataTransfer(DNDataTransfer $dataTransfer, DeploynautLogFile $log); |
| 24 | 26 | |
@@ -28,6 +30,7 @@ discard block |
||
| 28 | 30 | * @param DNEnvironment $environment |
| 29 | 31 | * @param DeploynautLogFile $log |
| 30 | 32 | * @param DNProject $project |
| 33 | + * @return void |
|
| 31 | 34 | */ |
| 32 | 35 | public function enableMaintenance(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project); |
| 33 | 36 | |
@@ -37,6 +40,7 @@ discard block |
||
| 37 | 40 | * @param DNEnvironment $environment |
| 38 | 41 | * @param DeploynautLogFile $log |
| 39 | 42 | * @param DNProject $project |
| 43 | + * @return void |
|
| 40 | 44 | */ |
| 41 | 45 | public function disableMaintenance(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project); |
| 42 | 46 | |
@@ -46,6 +50,7 @@ discard block |
||
| 46 | 50 | * @param DNEnvironment $environment |
| 47 | 51 | * @param DeploynautLogFile $log |
| 48 | 52 | * @param DNProject $project |
| 53 | + * @return void |
|
| 49 | 54 | */ |
| 50 | 55 | public function ping(DNEnvironment $environment, DeploynautLogFile $log, DNProject $project); |
| 51 | 56 | |
@@ -13,8 +13,9 @@ |
||
| 13 | 13 | /** |
| 14 | 14 | * Generate the package file, saving to the given location |
| 15 | 15 | * |
| 16 | - * @param $baseDir string The base directory of the project, checked out from git. |
|
| 16 | + * @param string $baseDir string The base directory of the project, checked out from git. |
|
| 17 | 17 | * @param $outputFilename string The filename to write to. |
| 18 | + * @param string $sha |
|
| 18 | 19 | * |
| 19 | 20 | * @return boolean True on success |
| 20 | 21 | */ |
@@ -72,7 +72,7 @@ |
||
| 72 | 72 | /** |
| 73 | 73 | * Take the identifier an make it safe to use as a directory name. |
| 74 | 74 | * |
| 75 | - * @param string $identfiier The unsanitised directory name. |
|
| 75 | + * @param string $identifier The unsanitised directory name. |
|
| 76 | 76 | */ |
| 77 | 77 | protected function sanitiseDirName($identifier) { |
| 78 | 78 | $safe = preg_replace('/[^A-Za-z0-9_-]/', '', $identifier); |
@@ -18,6 +18,7 @@ discard block |
||
| 18 | 18 | * Validate a commit sha |
| 19 | 19 | * |
| 20 | 20 | * @param string $sha |
| 21 | + * @param string $field |
|
| 21 | 22 | * @return boolean |
| 22 | 23 | */ |
| 23 | 24 | protected function validateCommit($sha, $field) { |
@@ -100,6 +101,10 @@ discard block |
||
| 100 | 101 | */ |
| 101 | 102 | class DeployForm extends Form { |
| 102 | 103 | |
| 104 | + /** |
|
| 105 | + * @param DNRoot $controller |
|
| 106 | + * @param string $name |
|
| 107 | + */ |
|
| 103 | 108 | public function __construct($controller, $name, DNEnvironment $environment, DNProject $project) { |
| 104 | 109 | if($environment->HasPipelineSupport()) { |
| 105 | 110 | // Determine if commits are filtered |
@@ -261,7 +266,6 @@ discard block |
||
| 261 | 266 | /** |
| 262 | 267 | * Generate fields necessary to select from a filtered commit list |
| 263 | 268 | * |
| 264 | - * @param DNEnvironment $environment |
|
| 265 | 269 | * @param DataList $commits List of commits |
| 266 | 270 | * @return FormField |
| 267 | 271 | */ |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | /** |
| 162 | 162 | * Action |
| 163 | 163 | * |
| 164 | - * @return string - HTML |
|
| 164 | + * @return HTMLText - HTML |
|
| 165 | 165 | */ |
| 166 | 166 | public function projects(SS_HTTPRequest $request) { |
| 167 | 167 | // Performs canView permission check by limiting visible projects in DNProjectsList() call. |
@@ -854,6 +854,7 @@ discard block |
||
| 854 | 854 | } |
| 855 | 855 | |
| 856 | 856 | /** |
| 857 | + * @param SS_HTTPRequest $request |
|
| 857 | 858 | * @return Form |
| 858 | 859 | */ |
| 859 | 860 | public function getDataTransferForm($request) { |
@@ -1189,6 +1190,8 @@ discard block |
||
| 1189 | 1190 | |
| 1190 | 1191 | /** |
| 1191 | 1192 | * Build snapshot move form. |
| 1193 | + * @param SS_HTTPRequest $request |
|
| 1194 | + * @param DataObject $dataArchive |
|
| 1192 | 1195 | */ |
| 1193 | 1196 | public function getMoveForm($request, $dataArchive = null) { |
| 1194 | 1197 | $dataArchive = $dataArchive ? $dataArchive : DNDataArchive::get()->byId($request->requestVar('DataArchiveID')); |
@@ -1330,7 +1333,7 @@ discard block |
||
| 1330 | 1333 | * TODO To be replaced with a method that just returns the list of archives this {@link Member} has access to. |
| 1331 | 1334 | * |
| 1332 | 1335 | * @param Member $member The {@link Member} to check (or null to check the currently logged in Member) |
| 1333 | - * @return boolean true if $member has access to upload or download to at least one {@link DNEnvironment}. |
|
| 1336 | + * @return boolean|null true if $member has access to upload or download to at least one {@link DNEnvironment}. |
|
| 1334 | 1337 | */ |
| 1335 | 1338 | public function CanViewArchives(Member $member = null) { |
| 1336 | 1339 | if(!$member) $member = Member::currentUser(); |
@@ -1357,7 +1360,7 @@ discard block |
||
| 1357 | 1360 | } |
| 1358 | 1361 | |
| 1359 | 1362 | /** |
| 1360 | - * @return ArrayList The list of all archive files that can be accessed by the currently logged-in {@link Member} |
|
| 1363 | + * @return PaginatedList The list of all archive files that can be accessed by the currently logged-in {@link Member} |
|
| 1361 | 1364 | */ |
| 1362 | 1365 | public function CompleteDataArchives() { |
| 1363 | 1366 | $project = $this->getCurrentProject(); |
@@ -1375,7 +1378,7 @@ discard block |
||
| 1375 | 1378 | } |
| 1376 | 1379 | |
| 1377 | 1380 | /** |
| 1378 | - * @return ArrayList The list of "pending" data archives which are waiting for a file |
|
| 1381 | + * @return PaginatedList The list of "pending" data archives which are waiting for a file |
|
| 1379 | 1382 | * to be delivered offline by post, and manually uploaded into the system. |
| 1380 | 1383 | */ |
| 1381 | 1384 | public function PendingDataArchives() { |
@@ -84,7 +84,7 @@ |
||
| 84 | 84 | * |
| 85 | 85 | * @param PipelineStep $source Client step |
| 86 | 86 | * @param string $from |
| 87 | - * @param string|Member $to |
|
| 87 | + * @param string $to |
|
| 88 | 88 | * @param string $subject |
| 89 | 89 | * @param string $body |
| 90 | 90 | */ |
@@ -919,6 +919,9 @@ |
||
| 919 | 919 | $fields->insertAfter($createConfigField, 'noDeployConfig'); |
| 920 | 920 | } |
| 921 | 921 | |
| 922 | + /** |
|
| 923 | + * @param FieldList $fields |
|
| 924 | + */ |
|
| 922 | 925 | protected function setPipelineConfigurationFields($fields) { |
| 923 | 926 | if(!$this->config()->get('allow_web_editing')) { |
| 924 | 927 | return; |