From 0cb3a9265e0eb46294f2bd534e672dc226ce11ca Mon Sep 17 00:00:00 2001 From: Hereward Mills Date: Thu, 24 Dec 2015 11:20:05 +0000 Subject: [PATCH] Fix PHPDocs that contained incorrect params tags. --- app/controllers/admin/AssetsController.php | 14 +++++++----- app/controllers/admin/LicensesController.php | 10 +++++---- app/controllers/admin/ModelsController.php | 2 +- app/controllers/admin/SettingsController.php | 23 +++++++++----------- app/controllers/admin/UsersController.php | 8 ++++--- app/models/Depreciable.php | 4 +--- 6 files changed, 31 insertions(+), 30 deletions(-) diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index c797cbe603..eb68b32d50 100755 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -891,9 +891,9 @@ class AssetsController extends AdminController * @param int $assetId * @return View **/ - public function postUpload($assetID = null) + public function postUpload($assetId = null) { - $asset = Asset::find($assetID); + $asset = Asset::find($assetId); // the asset is valid $destinationPath = app_path().'/private_uploads'; @@ -965,11 +965,12 @@ class AssetsController extends AdminController * Delete the associated file * * @param int $assetId + * @param int $fileId * @return View **/ - public function getDeleteFile($assetID = null, $fileId = null) + public function getDeleteFile($assetId = null, $fileId = null) { - $asset = Asset::find($assetID); + $asset = Asset::find($assetId); $destinationPath = app_path().'/private_uploads'; // the asset is valid @@ -1003,12 +1004,13 @@ class AssetsController extends AdminController * Display/download the uploaded file * * @param int $assetId + * @param int $fileId * @return View **/ - public function displayFile($assetID = null, $fileId = null) + public function displayFile($assetId = null, $fileId = null) { - $asset = Asset::find($assetID); + $asset = Asset::find($assetId); // the asset is valid if (isset($asset->id)) { diff --git a/app/controllers/admin/LicensesController.php b/app/controllers/admin/LicensesController.php index 97fd5cf2e3..11a8858b7c 100755 --- a/app/controllers/admin/LicensesController.php +++ b/app/controllers/admin/LicensesController.php @@ -746,7 +746,7 @@ class LicensesController extends AdminController /** * Get the asset information to present to the asset view page * - * @param int $assetId + * @param int $licenseId * @return View **/ public function getView($licenseId = null) @@ -805,7 +805,7 @@ class LicensesController extends AdminController /** * Upload the file to the server * - * @param int $assetId + * @param int $licenseId * @return View **/ public function postUpload($licenseId = null) @@ -882,7 +882,8 @@ class LicensesController extends AdminController /** * Delete the associated file * - * @param int $assetId + * @param int $licenseId + * @param int $fileId * @return View **/ public function getDeleteFile($licenseId = null, $fileId = null) @@ -920,7 +921,8 @@ class LicensesController extends AdminController /** * Display/download the uploaded file * - * @param int $assetId + * @param int $licenseId + * @param int $fileId * @return View **/ public function displayFile($licenseId = null, $fileId = null) diff --git a/app/controllers/admin/ModelsController.php b/app/controllers/admin/ModelsController.php index 3625348fbb..115147d6e0 100755 --- a/app/controllers/admin/ModelsController.php +++ b/app/controllers/admin/ModelsController.php @@ -322,7 +322,7 @@ class ModelsController extends AdminController /** * Get the model information to present to the model view page * - * @param int $assetId + * @param int $modelId * @return View **/ public function getView($modelId = null) diff --git a/app/controllers/admin/SettingsController.php b/app/controllers/admin/SettingsController.php index 24d167ec83..98ee49604e 100755 --- a/app/controllers/admin/SettingsController.php +++ b/app/controllers/admin/SettingsController.php @@ -37,8 +37,6 @@ class SettingsController extends AdminController /** * Setting update. - * - * @param int $settingId * @return View */ public function getEdit() @@ -63,7 +61,6 @@ class SettingsController extends AdminController /** * Setting update form processing page. * - * @param int $settingId * @return Redirect */ public function postEdit() @@ -243,11 +240,11 @@ class SettingsController extends AdminController /** - * Download the dump file - * - * @param int $assetId - * @return View - **/ + * Download the dump file + * + * @param string|null $filename + * @return View + */ public function downloadFile($filename = null) { if (!Config::get('app.lock_passwords')) { @@ -268,11 +265,11 @@ class SettingsController extends AdminController } /** - * Download the dump file - * - * @param int $assetId - * @return View - **/ + * Download the dump file + * + * @param string|null $filename + * @return View + */ public function deleteFile($filename = null) { diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php index 629d3e7256..69e9a2f05a 100755 --- a/app/controllers/admin/UsersController.php +++ b/app/controllers/admin/UsersController.php @@ -989,7 +989,7 @@ class UsersController extends AdminController { /** * Upload the file to the server * - * @param int $assetId + * @param int $userId * @return View * */ public function postUpload($userId = null) { @@ -1054,7 +1054,8 @@ class UsersController extends AdminController { /** * Delete the associated file * - * @param int $assetId + * @param int $userId + * @param int $fileId * @return View * */ public function getDeleteFile($userId = null, $fileId = null) { @@ -1089,7 +1090,8 @@ class UsersController extends AdminController { /** * Display/download the uploaded file * - * @param int $assetId + * @param int $userId + * @param int $fileId * @return View * */ public function displayFile($userId = null, $fileId = null) { diff --git a/app/models/Depreciable.php b/app/models/Depreciable.php index ad1a880f40..5257072432 100644 --- a/app/models/Depreciable.php +++ b/app/models/Depreciable.php @@ -31,9 +31,7 @@ class Depreciable extends Elegant return $this->depreciation; } - /** - * @param $purchase_cost - * @param $purchase_date1 + /** * @return float|int */