diff --git a/legacy/application/common/DateHelper.php b/legacy/application/common/DateHelper.php index daba57731..9c75e5b2a 100644 --- a/legacy/application/common/DateHelper.php +++ b/legacy/application/common/DateHelper.php @@ -434,7 +434,6 @@ class Application_Common_DateHelper * * Convert float seconds value to playlist time format * - * @param float $seconds * @param mixed $p_seconds * * @return string diff --git a/legacy/application/common/TuneIn.php b/legacy/application/common/TuneIn.php index 811236391..8d615e527 100644 --- a/legacy/application/common/TuneIn.php +++ b/legacy/application/common/TuneIn.php @@ -3,7 +3,7 @@ class Application_Common_TuneIn { /** - * @param $title url encoded string + * @param $title url encoded string * @param $artist url encoded string */ public static function sendMetadataToTunein($title, $artist) diff --git a/legacy/application/common/enum/MediaType.php b/legacy/application/common/enum/MediaType.php index 8bb2d5865..ffd047086 100644 --- a/legacy/application/common/enum/MediaType.php +++ b/legacy/application/common/enum/MediaType.php @@ -12,6 +12,6 @@ final class MediaType public static function getDefault() { - return static::__default; + return self::__default; } } diff --git a/legacy/application/controllers/ApiController.php b/legacy/application/controllers/ApiController.php index c5f8d55e2..11b82a784 100644 --- a/legacy/application/controllers/ApiController.php +++ b/legacy/application/controllers/ApiController.php @@ -590,9 +590,6 @@ class ApiController extends Zend_Controller_Action * New API endpoint to display metadata from any single track. * * Find metadata to any track imported (eg. id=1&return=json) - * - * @param int $id track ID - * @param string $return json, artwork_data, or artwork */ public function trackAction() { diff --git a/legacy/application/controllers/PlaylistController.php b/legacy/application/controllers/PlaylistController.php index 49b04182a..756f5f6c7 100644 --- a/legacy/application/controllers/PlaylistController.php +++ b/legacy/application/controllers/PlaylistController.php @@ -253,7 +253,7 @@ class PlaylistController extends Zend_Controller_Action Logging::info("Currently active {$type} {$obj_sess->id}"); if (in_array($obj_sess->id, $ids)) { Logging::info("Deleting currently active {$type}"); - // Application_Model_Library::changePlaylist(null, $type); + // Application_Model_Library::changePlaylist(null, $type); } else { Logging::info("Not deleting currently active {$type}"); $obj = new $objInfo['className']($obj_sess->id); @@ -562,7 +562,7 @@ class PlaylistController extends Zend_Controller_Action $bl->saveSmartBlockCriteria($params['data']); $this->createUpdateResponse($bl, true); $this->view->result = 0; - // $result['html'] = $this->createFullResponse($bl, true, true); + // $result['html'] = $this->createFullResponse($bl, true, true); } else { $this->view->form = $form; $this->view->unsavedName = $params['name']; @@ -601,7 +601,7 @@ class PlaylistController extends Zend_Controller_Action $result = $bl->generateSmartBlock($params['data']); $this->view->result = $result['result']; $this->createUpdateResponse($bl, true); - // $this->_helper->json->sendJson(array("result"=>0, "html"=>$this->createFullResponse($bl, true, true))); + // $this->_helper->json->sendJson(array("result"=>0, "html"=>$this->createFullResponse($bl, true, true))); } else { $this->view->obj = $bl; $this->view->id = $bl->getId(); diff --git a/legacy/application/controllers/PreferenceController.php b/legacy/application/controllers/PreferenceController.php index effb358f1..61abc1e78 100644 --- a/legacy/application/controllers/PreferenceController.php +++ b/legacy/application/controllers/PreferenceController.php @@ -69,7 +69,7 @@ class PreferenceController extends Zend_Controller_Action $this->view->statusMsg = "
" . _('Preferences updated.') . '
'; $form = new Application_Form_Preferences(); $this->view->form = $form; - // $this->_helper->json->sendJson(array("valid"=>"true", "html"=>$this->view->render('preference/index.phtml'))); + // $this->_helper->json->sendJson(array("valid"=>"true", "html"=>$this->view->render('preference/index.phtml'))); } else { $this->view->form = $form; // $this->_helper->json->sendJson(array("valid"=>"false", "html"=>$this->view->render('preference/index.phtml'))); diff --git a/legacy/application/models/Block.php b/legacy/application/models/Block.php index f4003ca03..d5cc882a2 100644 --- a/legacy/application/models/Block.php +++ b/legacy/application/models/Block.php @@ -707,8 +707,6 @@ SQL; /** * Change fadeIn and fadeOut values for block Element. * - * @param int $pos - * position of audioclip in block * @param string $fadeIn * new value in ss.ssssss or extent format * @param string $fadeOut @@ -812,8 +810,6 @@ SQL; /** * Change cueIn/cueOut values for block element. * - * @param int $pos - * position of audioclip in block * @param string $cueIn * new value in ss.ssssss or extent format * @param string $cueOut diff --git a/legacy/application/models/Playlist.php b/legacy/application/models/Playlist.php index 66f6ccfab..7c5acaa21 100644 --- a/legacy/application/models/Playlist.php +++ b/legacy/application/models/Playlist.php @@ -781,8 +781,6 @@ SQL; /** * Change cueIn/cueOut values for playlist element. * - * @param int $pos - * position of audioclip in playlist * @param string $cueIn * new value in ss.ssssss or extent format * @param string $cueOut @@ -1033,8 +1031,6 @@ SQL; /** * Delete all files from playlist. - * - * @param int $p_playlistId */ public function deleteAllFilesFromPlaylist() { diff --git a/legacy/application/models/Preference.php b/legacy/application/models/Preference.php index a3232addf..c126502e9 100644 --- a/legacy/application/models/Preference.php +++ b/legacy/application/models/Preference.php @@ -952,7 +952,7 @@ class Application_Model_Preference /** * Sets the time scale preference (agendaDay/agendaWeek/month) in Calendar. * - * @param $timeScale new time scale + * @param $timeScale new time scale */ public static function SetCalendarTimeScale($timeScale) { @@ -976,7 +976,7 @@ class Application_Model_Preference /** * Sets the number of entries to show preference in library under Playlist Builder. * - * @param $numEntries new number of entries to show + * @param $numEntries new number of entries to show */ public static function SetLibraryNumEntries($numEntries) { @@ -1000,7 +1000,7 @@ class Application_Model_Preference /** * Sets the time interval preference in Calendar. * - * @param $timeInterval new time interval + * @param $timeInterval new time interval */ public static function SetCalendarTimeInterval($timeInterval) { diff --git a/legacy/application/models/Schedule.php b/legacy/application/models/Schedule.php index 6a334f47c..daef86964 100644 --- a/legacy/application/models/Schedule.php +++ b/legacy/application/models/Schedule.php @@ -171,9 +171,9 @@ SQL; * If a current media item is currently playing, this function then attempts to * find an item that played previously and is scheduled to play next. * - * @param $utcNow DateTime current time in UTC - * @param $currentShowInstanceId int id of the show instance currently playing - * @param $source string the current prioritized source + * @param $utcNow DateTime current time in UTC + * @param $currentShowInstanceId int id of the show instance currently playing + * @param $source string the current prioritized source * * @return array with data about the previous, current, and next media items playing. * Returns an empty arrays if there is no media item currently playing @@ -871,7 +871,6 @@ SQL; * @param array $item schedule info about one track * @param int $media_id scheduled item's cc_files id * @param string $uri path to the scheduled item's physical location - * @param int $filsize The file's file size in bytes * @param mixed $filesize */ private static function createFileScheduleEvent(&$data, $item, $media_id, $uri, $filesize) diff --git a/legacy/application/models/Scheduler.php b/legacy/application/models/Scheduler.php index 20a574317..77698ae72 100644 --- a/legacy/application/models/Scheduler.php +++ b/legacy/application/models/Scheduler.php @@ -614,10 +614,10 @@ final class Application_Model_Scheduler /** * Enter description here ... * - * @param $scheduleItems - * cc_schedule items, where the items get inserted after - * @param $filesToInsert - * array of schedule item info, what gets inserted into cc_schedule + * @param $scheduleItems + * cc_schedule items, where the items get inserted after + * @param $filesToInsert + * array of schedule item info, what gets inserted into cc_schedule * @param mixed $mediaItems * @param mixed $moveAction * @param mixed $adjustSched diff --git a/legacy/application/models/Show.php b/legacy/application/models/Show.php index 447856ca5..8efef314d 100644 --- a/legacy/application/models/Show.php +++ b/legacy/application/models/Show.php @@ -959,14 +959,13 @@ SQL; /** * Get all the show instances in the given time range (inclusive). * - * @param dateTime $start_timestamp - * In UTC time - * @param dateTime $end_timestamp - * In UTC time - * @param unknown_type $excludeInstance - * @param bool $onlyRecord - * @param int $showId - * limits the results to instances of a given showId only + * @param dateTime $start_timestamp + * In UTC time + * @param dateTime $end_timestamp + * In UTC time + * @param bool $onlyRecord + * @param int $showId + * limits the results to instances of a given showId only * * @return array */ @@ -1054,14 +1053,9 @@ SQL; } /** - * @param DateTime $start - * -in UTC time - * @param DateTime $end - * -in UTC time - * @param bool $editable - * @param mixed $p_start - * @param mixed $p_end - * @param mixed $p_editable + * @param mixed $p_start + * @param mixed $p_end + * @param mixed $p_editable */ public static function &getFullCalendarEvents($p_start, $p_end, $p_editable = false) { @@ -1301,7 +1295,7 @@ SQL; * Gets the current show, previous and next with an n-day window from * the given timeNow, so timeNow-2days and timeNow+$daysToRetrieve days. * - * @param $utcNow A DateTime object containing the current time in UTC + * @param $utcNow A DateTime object containing the current time in UTC * @param mixed $utcEndStr * @param mixed $showsToRetrieve * diff --git a/legacy/application/models/ShowInstance.php b/legacy/application/models/ShowInstance.php index feacc7537..b5aa109df 100644 --- a/legacy/application/models/ShowInstance.php +++ b/legacy/application/models/ShowInstance.php @@ -234,8 +234,6 @@ SQL; /** * Add a playlist as the last item of the current show. * - * @param int $plId - * Playlist ID * @param mixed $pl_id * @param mixed $checkUserPerm */ @@ -257,8 +255,6 @@ SQL; /** * Add a playlist as the first item of the current show. * - * @param int $plId - * Playlist ID * @param mixed $pl_id * @param mixed $checkUserPerm */ diff --git a/legacy/application/models/StoredFile.php b/legacy/application/models/StoredFile.php index 887f2b983..072d773ed 100644 --- a/legacy/application/models/StoredFile.php +++ b/legacy/application/models/StoredFile.php @@ -247,12 +247,8 @@ class Application_Model_StoredFile /** * Set metadata element value. * - * @param string $category - * Metadata element by metadata constant - * @param string $value - * value to store, if NULL then delete record - * @param mixed $p_category - * @param mixed $p_value + * @param mixed $p_category + * @param mixed $p_value */ public function setMetadataValue($p_category, $p_value) { @@ -264,12 +260,8 @@ class Application_Model_StoredFile /** * Set metadata element value. * - * @param string $category - * Metadata element by db column - * @param string $value - * value to store, if NULL then delete record - * @param mixed $p_category - * @param mixed $p_value + * @param mixed $p_category + * @param mixed $p_value */ public function setDbColMetadataValue($p_category, $p_value) { @@ -468,7 +460,6 @@ SQL; * This function is for when media monitor detects deletion of file * and trying to update airtime side. * - * @param bool $p_deleteFile * @param mixed $deleteFromPlaylist */ public function deleteByMediaMonitor($deleteFromPlaylist = false) @@ -1009,8 +1000,8 @@ SQL; /** * Enter description here ... * - * @param $dir_id - if this is not provided, it returns all files with full - * path constructed + * @param $dir_id - if this is not provided, it returns all files with full + * path constructed * @param mixed $all */ public static function listAllFiles($dir_id = null, $all = true) diff --git a/legacy/application/models/User.php b/legacy/application/models/User.php index c6216db71..aac98773e 100644 --- a/legacy/application/models/User.php +++ b/legacy/application/models/User.php @@ -264,7 +264,7 @@ class Application_Model_User * uses it to figure out who to reassign the deleted users files to. * * @param $ignoreUser String optional userid of a user that shall be ignored when - * when looking for the "first" admin + * when looking for the "first" admin * * @return null|CcSubj */ diff --git a/legacy/application/models/airtime/CcFiles.php b/legacy/application/models/airtime/CcFiles.php index 5a49fb30f..4aeee2c99 100644 --- a/legacy/application/models/airtime/CcFiles.php +++ b/legacy/application/models/airtime/CcFiles.php @@ -188,7 +188,7 @@ class CcFiles extends BaseCcFiles } /** Update a file with metadata specified in an array. - * @param $fileId string The ID of the file to update in the DB + * @param $fileId string The ID of the file to update in the DB * @param $fileArray array An associative array containing metadata. Replaces those fields if they exist. * * @return array a sanitized version of the file metadata array diff --git a/legacy/application/models/airtime/CcShowDays.php b/legacy/application/models/airtime/CcShowDays.php index 514597f32..736e38470 100644 --- a/legacy/application/models/airtime/CcShowDays.php +++ b/legacy/application/models/airtime/CcShowDays.php @@ -39,8 +39,6 @@ class CcShowDays extends BaseCcShowDays /** * Returns the end of a show in the timezone it was created in. - * - * @param DateTime $startDateTime first show in show's local time */ public function getLocalEndDateAndTime() { diff --git a/legacy/application/services/PodcastEpisodeService.php b/legacy/application/services/PodcastEpisodeService.php index 7a1283010..c255bd1b9 100644 --- a/legacy/application/services/PodcastEpisodeService.php +++ b/legacy/application/services/PodcastEpisodeService.php @@ -197,10 +197,10 @@ class Application_Service_PodcastEpisodeService extends Application_Service_Thir /** * Update a ThirdPartyTrackReferences object for a completed upload. * - * @param $task CeleryTasks the completed CeleryTasks object - * @param $episodeId int PodcastEpisodes identifier - * @param $episode stdClass simple object containing Podcast episode information - * @param $status string Celery task status + * @param $task CeleryTasks the completed CeleryTasks object + * @param $episodeId int PodcastEpisodes identifier + * @param $episode stdClass simple object containing Podcast episode information + * @param $status string Celery task status * * @return ThirdPartyTrackReferences the updated ThirdPartyTrackReferences object * diff --git a/legacy/application/services/PodcastService.php b/legacy/application/services/PodcastService.php index b0c2d9b8d..361f01422 100644 --- a/legacy/application/services/PodcastService.php +++ b/legacy/application/services/PodcastService.php @@ -142,8 +142,8 @@ class Application_Service_PodcastService } /** - * @param $title passed in directly from web UI input - * This will automatically create a smartblock and playlist for this podcast + * @param $title passed in directly from web UI input + * This will automatically create a smartblock and playlist for this podcast * @param mixed $podcast */ public static function createPodcastSmartblockAndPlaylist($podcast, $title = null) diff --git a/legacy/application/services/SchedulerService.php b/legacy/application/services/SchedulerService.php index bfa9bfb53..e8806ab60 100644 --- a/legacy/application/services/SchedulerService.php +++ b/legacy/application/services/SchedulerService.php @@ -43,7 +43,7 @@ class Application_Service_SchedulerService /** * Applies the show start difference to any scheduled items. * - * @param $diff (integer, difference between unix epoch in seconds) + * @param $diff (integer, difference between unix epoch in seconds) * @param mixed $instanceIds */ public static function updateScheduleStartTime($instanceIds, $diff) diff --git a/legacy/application/services/ShowFormService.php b/legacy/application/services/ShowFormService.php index 560e54677..ba207389c 100644 --- a/legacy/application/services/ShowFormService.php +++ b/legacy/application/services/ShowFormService.php @@ -469,8 +469,7 @@ class Application_Service_ShowFormService /** * Enter description here ... * - * @param DateTime $showStart user's local time - * @param mixed $p_showStart + * @param mixed $p_showStart */ private function hasShowStarted($p_showStart) { @@ -658,9 +657,8 @@ class Application_Service_ShowFormService * When the timezone is changed in add-show form this function * applies the new timezone to the start and end time. * - * @param $date String - * @param $time String - * @param $timezone String + * @param $date String + * @param $time String * @param mixed $newTimezone * @param mixed $oldTimezone */ diff --git a/legacy/application/services/ShowService.php b/legacy/application/services/ShowService.php index 562db8c26..b1302b92d 100644 --- a/legacy/application/services/ShowService.php +++ b/legacy/application/services/ShowService.php @@ -529,8 +529,6 @@ SQL; * - Update start and end time * * @param $showData edit show form values in raw form - * @param $isRecorded value computed from the edit show form - * @param $repeatType value computed from the edit show form */ private function delegateInstanceCleanup($showData) { @@ -597,7 +595,7 @@ SQL; $this->deleteAllInstances($showId); $this->deleteAllShowDays($showId); - // when repeating by day of the month (1st, 2nd, etc.) we do not store the repeat week days + // when repeating by day of the month (1st, 2nd, etc.) we do not store the repeat week days } elseif ($currentRepeatType != 2) { // repeat type is the same, check if the days of the week are the same $repeatingDaysChanged = false; @@ -755,10 +753,10 @@ SQL; /** * Enter description here ... * - * @param $daysRemoved array of days (days of the week) removed - * (days of the week are represented numerically - * 0=>sunday, 1=>monday, 2=>tuesday, etc.) - * @param $showDays array of ccShowDays objects + * @param $daysRemoved array of days (days of the week) removed + * (days of the week are represented numerically + * 0=>sunday, 1=>monday, 2=>tuesday, etc.) + * @param $showDays array of ccShowDays objects * @param mixed $showId */ private function deleteRemovedShowDayInstances($daysRemoved, $showDays, $showId) @@ -883,10 +881,10 @@ SQL; CcShowQuery::create() ->filterByDbId($showId) ->delete(); - // There is only one cc_show_instance if the user selects 'Delete This Instance' - // There is more than one cc_show_instance if the user selects 'Delete This - // Instance and All Following'. We only need to set the last_show value - // when 'Delete This Instance and All Following' has been selected + // There is only one cc_show_instance if the user selects 'Delete This Instance' + // There is more than one cc_show_instance if the user selects 'Delete This + // Instance and All Following'. We only need to set the last_show value + // when 'Delete This Instance and All Following' has been selected } elseif (count($ccShowInstances) > 1) { $this->setLastRepeatingShowDate($showId); } @@ -1088,7 +1086,6 @@ SQL; /** * Updates the start and end time for cc_show_instances. * - * @param $showData edit show form data * @param mixed $diff */ private function updateInstanceStartEndTime($diff) @@ -1205,7 +1202,6 @@ SQL; * @param unknown_type $showDay * @param unknown_type $populateUntil * @param unknown_type $repeatInterval - * @param unknown_type $isRebroadcast * @param mixed $repeatType * @param null|mixed $daysAdded */ @@ -1426,7 +1422,6 @@ SQL; * i.e. second monday of each month. * * @param string $showStart - * @param string $timezone user's local timezone */ public static function getMonthlyWeeklyRepeatInterval($showStart) { @@ -1480,7 +1475,7 @@ SQL; /** * Enter description here ... * - * @param $start user's local time + * @param $start user's local time * @param mixed $timezone * @param mixed $startTime */ @@ -1646,7 +1641,6 @@ SQL; /** * Sets the fields for a cc_show table row. * - * @param $ccShow * @param mixed $showData */ public function setCcShow($showData) @@ -1691,11 +1685,6 @@ SQL; /** * Sets the fields for a cc_show_days table row. * - * @param $showId - * @param $userId - * @param $repeatType - * @param $isRecorded - * @param $showDay ccShowDay object we are setting values on * @param mixed $showData */ private function setCcShowDays($showData) @@ -1824,9 +1813,6 @@ SQL; /** * Sets the fields for a cc_show_rebroadcast table row. * - * @param $showId - * @param $repeatType - * @param $isRecorded * @param mixed $showData */ private function setCcShowRebroadcasts($showData) @@ -1873,7 +1859,6 @@ SQL; /** * Sets the fields for a cc_show_hosts table row. * - * @param $showId * @param mixed $showData */ private function setCcShowHosts($showData) @@ -1911,7 +1896,6 @@ SQL; * * @param DateTime $showStart user's local time * @param string $duration time interval (h)h:(m)m(:ss) - * @param string $timezone "Europe/Prague" * @param array $offset (days, hours, mins) used for rebroadcast shows * * @return array of 2 DateTime objects, start/end time of the show in UTC diff --git a/legacy/application/services/ThirdPartyCeleryService.php b/legacy/application/services/ThirdPartyCeleryService.php index 90b604fac..fcdc38803 100644 --- a/legacy/application/services/ThirdPartyCeleryService.php +++ b/legacy/application/services/ThirdPartyCeleryService.php @@ -46,7 +46,7 @@ abstract class Application_Service_ThirdPartyCeleryService extends Application_S * * @param $fileId int CcFiles identifier * @param $brokerTaskId int broker task identifier to so we can asynchronously - * receive completed task messages + * receive completed task messages * @param $taskName string broker task name * * @return CeleryTasks the created task @@ -73,7 +73,7 @@ abstract class Application_Service_ThirdPartyCeleryService extends Application_S * Update a CeleryTasks object for a completed task * TODO: should we have a database layer class to handle Propel operations? * - * @param $task CeleryTasks the completed CeleryTasks object + * @param $task CeleryTasks the completed CeleryTasks object * @param $status string Celery task status * * @throws Exception @@ -90,10 +90,10 @@ abstract class Application_Service_ThirdPartyCeleryService extends Application_S * * Manipulation and use of the track object is left up to child implementations * - * @param $task CeleryTasks the completed CeleryTasks object - * @param $trackId int ThirdPartyTrackReferences identifier - * @param $result mixed Celery task result message - * @param $status string Celery task status + * @param $task CeleryTasks the completed CeleryTasks object + * @param $trackId int ThirdPartyTrackReferences identifier + * @param $result mixed Celery task result message + * @param $status string Celery task status * * @return ThirdPartyTrackReferences the updated ThirdPartyTrackReferences object * diff --git a/legacy/tools/composer.json b/legacy/tools/composer.json index 1d4ef9947..e83f006bb 100644 --- a/legacy/tools/composer.json +++ b/legacy/tools/composer.json @@ -1,6 +1,6 @@ { "require": { "php": "^7.4", - "friendsofphp/php-cs-fixer": "<3.16.1" + "friendsofphp/php-cs-fixer": "<3.17.1" } }