diff options
| author | 2025-09-30 16:59:41 -0400 | |
|---|---|---|
| committer | 2025-09-30 22:59:41 +0200 | |
| commit | 72884813e13596d211471482ffdc6d723ed678c9 (patch) | |
| tree | 043856f23bdcae7f9f88294c47c499657c2d05ff /app/Controllers | |
| parent | bf6e634e042b726edd97335ac36b2305f8101b3f (diff) | |
Add hook enums (#8036)
- add an enum to handle hook types (enum are available since PHP 8.1)
- change hook calls from string value to enum value
Diffstat (limited to 'app/Controllers')
| -rw-r--r-- | app/Controllers/feedController.php | 18 | ||||
| -rw-r--r-- | app/Controllers/importExportController.php | 8 | ||||
| -rw-r--r-- | app/Controllers/javascriptController.php | 2 | ||||
| -rw-r--r-- | app/Controllers/updateController.php | 2 |
4 files changed, 15 insertions, 15 deletions
diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php index 0b8c63bbe..fe190dc77 100644 --- a/app/Controllers/feedController.php +++ b/app/Controllers/feedController.php @@ -55,7 +55,7 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController { $url = trim($url); /** @var string|null $urlHooked */ - $urlHooked = Minz_ExtensionManager::callHook('check_url_before_add', $url); + $urlHooked = Minz_ExtensionManager::callHook(Minz_HookType::CheckUrlBeforeAdd, $url); if ($urlHooked === null) { throw new FreshRSS_FeedNotAdded_Exception($url); } @@ -106,7 +106,7 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController { } /** @var FreshRSS_Feed|null $feed */ - $feed = Minz_ExtensionManager::callHook('feed_before_insert', $feed); + $feed = Minz_ExtensionManager::callHook(Minz_HookType::FeedBeforeInsert, $feed); if ($feed === null) { throw new FreshRSS_FeedNotAdded_Exception($url); } @@ -465,7 +465,7 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController { $categoriesEntriesTitle = []; foreach ($feeds as $feed) { - $feed = Minz_ExtensionManager::callHook('feed_before_actualize', $feed); + $feed = Minz_ExtensionManager::callHook(Minz_HookType::FeedBeforeActualize, $feed); if (!($feed instanceof FreshRSS_Feed)) { continue; } @@ -616,10 +616,10 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController { $entry->_isFavorite(null); // Do not change favourite state $entry->_isRead($mark_updated_article_unread ? false : null); //Change is_read according to policy. if ($mark_updated_article_unread) { - Minz_ExtensionManager::callHook('entry_auto_unread', $entry, 'updated_article'); + Minz_ExtensionManager::callHook(Minz_HookType::EntryAutoUnread, $entry, 'updated_article'); } - $entry = Minz_ExtensionManager::callHook('entry_before_insert', $entry); + $entry = Minz_ExtensionManager::callHook(Minz_HookType::EntryBeforeInsert, $entry); if (!($entry instanceof FreshRSS_Entry)) { // An extension has returned a null value, there is nothing to insert. continue; @@ -642,7 +642,7 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController { // If the entry has changed, there is a good chance for the full content to have changed as well. $entry->loadCompleteContent(true); - $entry = Minz_ExtensionManager::callHook('entry_before_update', $entry); + $entry = Minz_ExtensionManager::callHook(Minz_HookType::EntryBeforeUpdate, $entry); if (!($entry instanceof FreshRSS_Entry)) { // An extension has returned a null value, there is nothing to insert. continue; @@ -655,7 +655,7 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController { $id = uTimeString(); $entry->_id($id); - $entry = Minz_ExtensionManager::callHook('entry_before_insert', $entry); + $entry = Minz_ExtensionManager::callHook(Minz_HookType::EntryBeforeInsert, $entry); if (!($entry instanceof FreshRSS_Entry)) { // An extension has returned a null value, there is nothing to insert. continue; @@ -681,7 +681,7 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController { $feed->pubSubHubbubError(true); } - $entry = Minz_ExtensionManager::callHook('entry_before_add', $entry); + $entry = Minz_ExtensionManager::callHook(Minz_HookType::EntryBeforeAdd, $entry); if (!($entry instanceof FreshRSS_Entry)) { // An extension has returned a null value, there is nothing to insert. continue; @@ -911,7 +911,7 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController { // Case of a batch refresh (e.g. cron) $databaseDAO = FreshRSS_Factory::createDatabaseDAO(); $databaseDAO->minorDbMaintenance(); - Minz_ExtensionManager::callHookVoid('freshrss_user_maintenance'); + Minz_ExtensionManager::callHookVoid(Minz_HookType::FreshrssUserMaintenance); FreshRSS_feed_Controller::commitNewEntries(); $feedDAO = FreshRSS_Factory::createFeedDao(); diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php index 9f9f6b2bd..8e03299f9 100644 --- a/app/Controllers/importExportController.php +++ b/app/Controllers/importExportController.php @@ -478,14 +478,14 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController { } $newGuids[$entry->guid()] = true; - $entry = Minz_ExtensionManager::callHook('entry_before_insert', $entry); + $entry = Minz_ExtensionManager::callHook(Minz_HookType::EntryBeforeInsert, $entry); if (!($entry instanceof FreshRSS_Entry)) { // An extension has returned a null value, there is nothing to insert. continue; } if (isset($existingHashForGuids['f_' . $feed_id][$entry->guid()])) { - $entry = Minz_ExtensionManager::callHook('entry_before_update', $entry); + $entry = Minz_ExtensionManager::callHook(Minz_HookType::EntryBeforeUpdate, $entry); if (!($entry instanceof FreshRSS_Entry)) { // An extension has returned a null value, there is nothing to insert. continue; @@ -495,7 +495,7 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController { } else { $entry->_lastSeen(time()); - $entry = Minz_ExtensionManager::callHook('entry_before_add', $entry); + $entry = Minz_ExtensionManager::callHook(Minz_HookType::EntryBeforeAdd, $entry); if (!($entry instanceof FreshRSS_Entry)) { // An extension has returned a null value, there is nothing to insert. continue; @@ -581,7 +581,7 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController { } // Call the extension hook - $feed = Minz_ExtensionManager::callHook('feed_before_insert', $feed); + $feed = Minz_ExtensionManager::callHook(Minz_HookType::FeedBeforeInsert, $feed); if ($feed instanceof FreshRSS_Feed) { // addFeedObject checks if feed is already in DB so nothing else to // check here. diff --git a/app/Controllers/javascriptController.php b/app/Controllers/javascriptController.php index 5fd925f72..1370c00c7 100644 --- a/app/Controllers/javascriptController.php +++ b/app/Controllers/javascriptController.php @@ -32,7 +32,7 @@ class FreshRSS_javascript_Controller extends FreshRSS_ActionController { $databaseDAO = FreshRSS_Factory::createDatabaseDAO(); $databaseDAO->minorDbMaintenance(); - Minz_ExtensionManager::callHookVoid('freshrss_user_maintenance'); + Minz_ExtensionManager::callHookVoid(Minz_HookType::FreshrssUserMaintenance); $catDAO = FreshRSS_Factory::createCategoryDao(); $this->view->categories = $catDAO->listCategoriesOrderUpdate(FreshRSS_Context::userConf()->dynamic_opml_ttl_default); diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php index bec639b39..bd140b6d5 100644 --- a/app/Controllers/updateController.php +++ b/app/Controllers/updateController.php @@ -283,7 +283,7 @@ class FreshRSS_update_Controller extends FreshRSS_ActionController { $res = do_post_update(); } - Minz_ExtensionManager::callHookVoid('post_update'); + Minz_ExtensionManager::callHookVoid(Minz_HookType::PostUpdate); if ($res === true) { @unlink(UPDATE_FILENAME); |
