From: Roland Haeder Date: Fri, 12 Sep 2014 20:27:37 +0000 (+0200) Subject: Fixed type-hints. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;ds=sidebyside;h=368cf7b16af2679af97c0202f61e5d73335c6cc9;p=quix0rs-gnu-social.git Fixed type-hints. Signed-off-by: Roland Haeder --- diff --git a/lib/router.php b/lib/router.php index 54683e986e..19fb697a1c 100644 --- a/lib/router.php +++ b/lib/router.php @@ -34,7 +34,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { /** * URL Router * - * Cheap wrapper around Net_URL_Mapper + * Cheap wrapper around URLMapper * * @category URL * @package StatusNet @@ -209,7 +209,7 @@ class Router // The second of these is needed to make the link work correctly // when inserted into the page. The first is needed to match the - // route on the way in. Seems to be another Net_URL_Mapper bug to me. + // route on the way in. Seems to be another URLMapper bug to me. $m->connect('search/notice/rss?q=:q', array('action' => 'noticesearchrss'), array('q' => '.+')); $m->connect('search/notice/rss', array('action' => 'noticesearchrss')); @@ -1155,7 +1155,7 @@ class Router } $url = $this->m->generate($args, $params, $fragment); - // Due to a bug in the Net_URL_Mapper code, the returned URL may + // Due to a bug in the URLMapper code, the returned URL may // contain a malformed query of the form ?p1=v1?p2=v2?p3=v3. We // repair that here rather than modifying the upstream code... diff --git a/lib/urlmapper.php b/lib/urlmapper.php index d17493e21d..bb288f8322 100644 --- a/lib/urlmapper.php +++ b/lib/urlmapper.php @@ -39,7 +39,7 @@ if (!defined('STATUSNET')) { * * Converts a path into a set of parameters, and vice versa * - * We used to use Net_URL_Mapper, so there's a wrapper class at Router, q.v. + * We used to use URLMapper, so there's a wrapper class at Router, q.v. * * NUM's vagaries are the main reason we have weirdnesses here. * diff --git a/plugins/AccountManager/AccountManagerPlugin.php b/plugins/AccountManager/AccountManagerPlugin.php index 90a8badd20..d7b064e7a7 100644 --- a/plugins/AccountManager/AccountManagerPlugin.php +++ b/plugins/AccountManager/AccountManagerPlugin.php @@ -43,10 +43,10 @@ class AccountManagerPlugin extends Plugin /** * Hook for RouterInitialized event. * - * @param Net_URL_Mapper $m path-to-action mapper + * @param URLMapper $m path-to-action mapper * @return boolean hook return */ - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { // Discovery actions $m->connect('main/amcd.json', diff --git a/plugins/ActivitySpam/ActivitySpamPlugin.php b/plugins/ActivitySpam/ActivitySpamPlugin.php index 4d1fa4f6d1..9db998784e 100644 --- a/plugins/ActivitySpam/ActivitySpamPlugin.php +++ b/plugins/ActivitySpam/ActivitySpamPlugin.php @@ -175,12 +175,12 @@ class ActivitySpamPlugin extends Plugin /** * Map URLs to actions * - * @param Net_URL_Mapper $m path-to-action mapper + * @param URLMapper $m path-to-action mapper * * @return boolean hook value; true means continue processing, false means stop. */ - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { $m->connect('main/train/spam', array('action' => 'train', 'category' => 'spam')); diff --git a/plugins/Adsense/AdsensePlugin.php b/plugins/Adsense/AdsensePlugin.php index 979abab953..78ad2f2b82 100644 --- a/plugins/Adsense/AdsensePlugin.php +++ b/plugins/Adsense/AdsensePlugin.php @@ -166,7 +166,7 @@ class AdsensePlugin extends UAPPlugin $action->script($this->adScript); } - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { $m->connect('panel/adsense', array('action' => 'adsenseadminpanel')); diff --git a/plugins/Autocomplete/AutocompletePlugin.php b/plugins/Autocomplete/AutocompletePlugin.php index 0f0c2592c2..380ab5a5dc 100644 --- a/plugins/Autocomplete/AutocompletePlugin.php +++ b/plugins/Autocomplete/AutocompletePlugin.php @@ -47,7 +47,7 @@ class AutocompletePlugin extends Plugin } } - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { $m->connect('main/autocomplete/suggest', array('action'=>'autocomplete')); } diff --git a/plugins/BitlyUrl/BitlyUrlPlugin.php b/plugins/BitlyUrl/BitlyUrlPlugin.php index 803f99ae95..e368ad2482 100644 --- a/plugins/BitlyUrl/BitlyUrlPlugin.php +++ b/plugins/BitlyUrl/BitlyUrlPlugin.php @@ -162,10 +162,10 @@ class BitlyUrlPlugin extends UrlShortenerPlugin /** * Hook for RouterInitialized event. * - * @param Net_URL_Mapper $m path-to-action mapper + * @param URLMapper $m path-to-action mapper * @return boolean hook return */ - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { $m->connect('panel/bitly', array('action' => 'bitlyadminpanel')); diff --git a/plugins/Blacklist/BlacklistPlugin.php b/plugins/Blacklist/BlacklistPlugin.php index 46eecb7dc8..d03ec97ac6 100644 --- a/plugins/Blacklist/BlacklistPlugin.php +++ b/plugins/Blacklist/BlacklistPlugin.php @@ -274,11 +274,11 @@ class BlacklistPlugin extends Plugin /** * Add our actions to the URL router * - * @param Net_URL_Mapper $m URL mapper for this hit + * @param URLMapper $m URL mapper for this hit * * @return boolean hook return */ - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { $m->connect('panel/blacklist', array('action' => 'blacklistadminpanel')); return true; diff --git a/plugins/Blog/BlogPlugin.php b/plugins/Blog/BlogPlugin.php index 8c2a9c9678..be104d445f 100644 --- a/plugins/Blog/BlogPlugin.php +++ b/plugins/Blog/BlogPlugin.php @@ -73,11 +73,11 @@ class BlogPlugin extends MicroAppPlugin /** * Map URLs to actions * - * @param Net_URL_Mapper $m path-to-action mapper + * @param URLMapper $m path-to-action mapper * * @return boolean hook value; true means continue processing, false means stop. */ - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { $m->connect('blog/new', array('action' => 'newblogentry')); diff --git a/plugins/Bookmark/BookmarkPlugin.php b/plugins/Bookmark/BookmarkPlugin.php index 3f426a407a..269a782d5a 100644 --- a/plugins/Bookmark/BookmarkPlugin.php +++ b/plugins/Bookmark/BookmarkPlugin.php @@ -109,11 +109,11 @@ class BookmarkPlugin extends MicroAppPlugin /** * Map URLs to actions * - * @param Net_URL_Mapper $m path-to-action mapper + * @param URLMapper $m path-to-action mapper * * @return boolean hook value; true means continue processing, false means stop. */ - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { if (common_config('singleuser', 'enabled')) { $nickname = User::singleUserNickname(); diff --git a/plugins/ClientSideShorten/ClientSideShortenPlugin.php b/plugins/ClientSideShorten/ClientSideShortenPlugin.php index 4d87ab2240..94629a07b0 100644 --- a/plugins/ClientSideShorten/ClientSideShortenPlugin.php +++ b/plugins/ClientSideShorten/ClientSideShortenPlugin.php @@ -47,7 +47,7 @@ class ClientSideShortenPlugin extends Plugin } } - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { if (common_logged_in()) { $m->connect('plugins/ClientSideShorten/shorten', array('action'=>'shorten')); diff --git a/plugins/Directory/DirectoryPlugin.php b/plugins/Directory/DirectoryPlugin.php index e38229dd21..5e1388f19f 100644 --- a/plugins/Directory/DirectoryPlugin.php +++ b/plugins/Directory/DirectoryPlugin.php @@ -71,12 +71,12 @@ class DirectoryPlugin extends Plugin /** * Map URLs to actions * - * @param Net_URL_Mapper $m path-to-action mapper + * @param URLMapper $m path-to-action mapper * * @return boolean hook value; true means continue processing, * false means stop. */ - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { $m->connect( diff --git a/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php b/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php index 2f45ba5bcd..6fc14e68e5 100644 --- a/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php +++ b/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php @@ -124,7 +124,7 @@ class DomainStatusNetworkPlugin extends Plugin return true; } - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { if (common_config('globalapi', 'enabled')) { foreach (array('register', 'login', 'recover') as $method) { diff --git a/plugins/Event/EventPlugin.php b/plugins/Event/EventPlugin.php index a1dffea3b9..5bc4716c94 100644 --- a/plugins/Event/EventPlugin.php +++ b/plugins/Event/EventPlugin.php @@ -67,11 +67,11 @@ class EventPlugin extends MicroAppPlugin /** * Map URLs to actions * - * @param Net_URL_Mapper $m path-to-action mapper + * @param URLMapper $m path-to-action mapper * * @return boolean hook value; true means continue processing, false means stop. */ - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { $m->connect('main/event/new', array('action' => 'newevent')); diff --git a/plugins/ExtendedProfile/ExtendedProfilePlugin.php b/plugins/ExtendedProfile/ExtendedProfilePlugin.php index d226a782a4..04e794e836 100644 --- a/plugins/ExtendedProfile/ExtendedProfilePlugin.php +++ b/plugins/ExtendedProfile/ExtendedProfilePlugin.php @@ -48,7 +48,7 @@ class ExtendedProfilePlugin extends Plugin * * Hook for RouterInitialized event. * - * @param Net_URL_Mapper $m URL mapper + * @param URLMapper $m URL mapper * * @return boolean hook return */ diff --git a/plugins/FacebookBridge/FacebookBridgePlugin.php b/plugins/FacebookBridge/FacebookBridgePlugin.php index 17419c819e..42a02fa1b3 100644 --- a/plugins/FacebookBridge/FacebookBridgePlugin.php +++ b/plugins/FacebookBridge/FacebookBridgePlugin.php @@ -153,11 +153,11 @@ class FacebookBridgePlugin extends Plugin /** * Map URLs to actions * - * @param Net_URL_Mapper $m path-to-action mapper + * @param URLMapper $m path-to-action mapper * * @return boolean hook value; true means continue processing, false means stop. */ - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { // Always add the admin panel route $m->connect('panel/facebook', array('action' => 'facebookadminpanel')); diff --git a/plugins/GNUsocialPhoto/GNUsocialPhotoPlugin.php b/plugins/GNUsocialPhoto/GNUsocialPhotoPlugin.php index 44a6e3fe34..78fe21d26d 100644 --- a/plugins/GNUsocialPhoto/GNUsocialPhotoPlugin.php +++ b/plugins/GNUsocialPhoto/GNUsocialPhotoPlugin.php @@ -44,7 +44,7 @@ class GNUsocialPhotoPlugin extends MicroAppPlugin return true; } - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { $m->connect('main/photo/new', array('action' => 'newphoto')); $m->connect('main/photo/:id', array('action' => 'showphoto')); diff --git a/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php b/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php index 36956e5b9b..986b5457a6 100644 --- a/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php +++ b/plugins/GNUsocialPhotos/GNUsocialPhotosPlugin.php @@ -44,7 +44,7 @@ class GNUsocialPhotosPlugin extends Plugin $schema->ensureTable('GNUsocialPhotoAlbum', GNUsocialPhotoAlbum::schemaDef()); } - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { $m->connect(':nickname/photos', array('action' => 'photos')); $m->connect(':nickname/photos/:albumid', array('action' => 'photos')); diff --git a/plugins/GNUsocialProfileExtensions/GNUsocialProfileExtensionsPlugin.php b/plugins/GNUsocialProfileExtensions/GNUsocialProfileExtensionsPlugin.php index 6b3c757b1e..abef3f47cf 100644 --- a/plugins/GNUsocialProfileExtensions/GNUsocialProfileExtensionsPlugin.php +++ b/plugins/GNUsocialProfileExtensions/GNUsocialProfileExtensionsPlugin.php @@ -40,10 +40,9 @@ class GNUsocialProfileExtensionsPlugin extends Plugin $schema = Schema::get(); $schema->ensureTable('GNUsocialProfileExtensionField', GNUsocialProfileExtensionField::schemaDef()); $schema->ensureTable('GNUsocialProfileExtensionResponse', GNUsocialProfileExtensionResponse::schemaDef()); - } - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { $m->connect(':nickname/bio', array('action' => 'bio')); $m->connect('admin/profilefields', array('action' => 'profilefieldsAdminPanel')); diff --git a/plugins/GNUsocialVideo/GNUsocialVideoPlugin.php b/plugins/GNUsocialVideo/GNUsocialVideoPlugin.php index 3310712ba7..abf0f30430 100644 --- a/plugins/GNUsocialVideo/GNUsocialVideoPlugin.php +++ b/plugins/GNUsocialVideo/GNUsocialVideoPlugin.php @@ -44,7 +44,7 @@ class GNUsocialVideoPlugin extends MicroAppPlugin return true; } - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { $m->connect('main/postvideo', array('action' => 'postvideo')); $m->connect('showvideo/:id', array('action' => 'showvideo')); diff --git a/plugins/GroupFavorited/GroupFavoritedPlugin.php b/plugins/GroupFavorited/GroupFavoritedPlugin.php index 90a1fe5ca0..bfb7374d1d 100644 --- a/plugins/GroupFavorited/GroupFavoritedPlugin.php +++ b/plugins/GroupFavorited/GroupFavoritedPlugin.php @@ -29,10 +29,10 @@ class GroupFavoritedPlugin extends Plugin /** * Hook for RouterInitialized event. * - * @param Net_URL_Mapper $m path-to-action mapper + * @param URLMapper $m path-to-action mapper * @return boolean hook return */ - function onRouterInitialized(Net_URL_Mapper $m) + function onRouterInitialized(URLMapper $m) { $m->connect('group/:nickname/favorited', array('action' => 'groupfavorited'), diff --git a/plugins/LinkPreview/LinkPreviewPlugin.php b/plugins/LinkPreview/LinkPreviewPlugin.php index ecf7d07dd4..f7a6e6e0c7 100644 --- a/plugins/LinkPreview/LinkPreviewPlugin.php +++ b/plugins/LinkPreview/LinkPreviewPlugin.php @@ -66,7 +66,7 @@ class LinkPreviewPlugin extends Plugin /** * Hook for RouterInitialized event. * - * @param Net_URL_Mapper $m URL mapper + * @param URLMapper $m URL mapper * * @return boolean hook return */ diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php index 6bbf7e8932..c802fbfb91 100644 --- a/plugins/Mapstraction/MapstractionPlugin.php +++ b/plugins/Mapstraction/MapstractionPlugin.php @@ -63,7 +63,7 @@ class MapstractionPlugin extends Plugin * * @return boolean event handler return */ - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { $m->connect(':nickname/all/map', array('action' => 'allmap'), diff --git a/plugins/ModPlus/ModPlusPlugin.php b/plugins/ModPlus/ModPlusPlugin.php index c3dff02acb..0b8a3287e1 100644 --- a/plugins/ModPlus/ModPlusPlugin.php +++ b/plugins/ModPlus/ModPlusPlugin.php @@ -64,7 +64,7 @@ class ModPlusPlugin extends Plugin * * Hook for RouterInitialized event. * - * @param Net_URL_Mapper $m URL mapper + * @param URLMapper $m URL mapper * * @return boolean hook return */ diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php index 3634c74837..c5c9e54563 100644 --- a/plugins/OStatus/OStatusPlugin.php +++ b/plugins/OStatus/OStatusPlugin.php @@ -48,10 +48,10 @@ class OStatusPlugin extends Plugin /** * Hook for RouterInitialized event. * - * @param Net_URL_Mapper $m path-to-action mapper + * @param URLMapper $m path-to-action mapper * @return boolean hook return */ - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { // Discovery actions $m->connect('main/ostatustag', diff --git a/plugins/OfflineBackup/OfflineBackupPlugin.php b/plugins/OfflineBackup/OfflineBackupPlugin.php index 1d7a17ca2c..c81c1fcd95 100644 --- a/plugins/OfflineBackup/OfflineBackupPlugin.php +++ b/plugins/OfflineBackup/OfflineBackupPlugin.php @@ -50,7 +50,7 @@ if (!defined('STATUSNET')) { class OfflineBackupPlugin extends Plugin { - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { $m->connect('main/backupaccount', array('action' => 'offlinebackup')); diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php index 705ecca671..5c97940ccf 100644 --- a/plugins/OpenID/OpenIDPlugin.php +++ b/plugins/OpenID/OpenIDPlugin.php @@ -68,7 +68,7 @@ class OpenIDPlugin extends Plugin * * Hook for RouterInitialized event. * - * @param Net_URL_Mapper $m URL mapper + * @param URLMapper $m URL mapper * * @return boolean hook return */ diff --git a/plugins/OpenX/OpenXPlugin.php b/plugins/OpenX/OpenXPlugin.php index 8d80197be3..69e45f2b79 100644 --- a/plugins/OpenX/OpenXPlugin.php +++ b/plugins/OpenX/OpenXPlugin.php @@ -173,7 +173,7 @@ ENDOFSCRIPT; return true; } - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { $m->connect('panel/openx', array('action' => 'openxadminpanel')); diff --git a/plugins/OpportunisticQM/OpportunisticQMPlugin.php b/plugins/OpportunisticQM/OpportunisticQMPlugin.php index 0163dc338f..32f11f12ce 100644 --- a/plugins/OpportunisticQM/OpportunisticQMPlugin.php +++ b/plugins/OpportunisticQM/OpportunisticQMPlugin.php @@ -1,11 +1,37 @@ . + * + * @category OpportunisticQMPlugin + * @package StatusNet + * @author Brion Vibber + * @copyright 2011 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 + * @link http://status.net/ + */ class OpportunisticQMPlugin extends Plugin { public $qmkey = false; public $secs_per_action = 1; // total seconds to run script per action public $rel_to_pageload = true; // relative to pageload or queue start - public function onRouterInitialized($m) + public function onRouterInitialized(URLMapper $m) { $m->connect('main/runqueue', array('action' => 'runqueue')); } diff --git a/plugins/Poll/PollPlugin.php b/plugins/Poll/PollPlugin.php index 5b3ed3dc45..ee02aae3d3 100644 --- a/plugins/Poll/PollPlugin.php +++ b/plugins/Poll/PollPlugin.php @@ -86,11 +86,11 @@ class PollPlugin extends MicroAppPlugin /** * Map URLs to actions * - * @param Net_URL_Mapper $m path-to-action mapper + * @param URLMapper $m path-to-action mapper * * @return boolean hook value; true means continue processing, false means stop. */ - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { $m->connect('main/poll/new', array('action' => 'newpoll')); diff --git a/plugins/QnA/QnAPlugin.php b/plugins/QnA/QnAPlugin.php index 18724d3137..bbb5fe8b5d 100644 --- a/plugins/QnA/QnAPlugin.php +++ b/plugins/QnA/QnAPlugin.php @@ -75,12 +75,12 @@ class QnAPlugin extends MicroAppPlugin /** * Map URLs to actions * - * @param Net_URL_Mapper $m path-to-action mapper + * @param URLMapper $m path-to-action mapper * * @return boolean hook value; true means continue processing, false means stop. */ - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { $UUIDregex = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'; diff --git a/plugins/RSSCloud/RSSCloudPlugin.php b/plugins/RSSCloud/RSSCloudPlugin.php index d8881efead..1b71ac903e 100644 --- a/plugins/RSSCloud/RSSCloudPlugin.php +++ b/plugins/RSSCloud/RSSCloudPlugin.php @@ -102,7 +102,7 @@ class RSSCloudPlugin extends Plugin * * @return boolean hook return */ - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { $m->connect('/main/rsscloud/request_notify', array('action' => 'RSSCloudRequestNotify')); diff --git a/plugins/Realtime/RealtimePlugin.php b/plugins/Realtime/RealtimePlugin.php index b0b79fd1c6..4d69ce6691 100644 --- a/plugins/Realtime/RealtimePlugin.php +++ b/plugins/Realtime/RealtimePlugin.php @@ -71,10 +71,10 @@ class RealtimePlugin extends Plugin /** * Hook for RouterInitialized event. * - * @param Net_URL_Mapper $m path-to-action mapper + * @param URLMapper $m path-to-action mapper * @return boolean hook return */ - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { $m->connect('main/channel/:channelkey/keepalive', array('action' => 'keepalivechannel'), diff --git a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php index a37a3918f6..99f61dcf02 100644 --- a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php +++ b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php @@ -80,7 +80,7 @@ class RequireValidatedEmailPlugin extends Plugin */ public $disallowLogin = false; - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { $m->connect('main/confirmfirst/:code', array('action' => 'confirmfirstemail')); diff --git a/plugins/Sample/SamplePlugin.php b/plugins/Sample/SamplePlugin.php index c61c021dc4..1c5fb02f4d 100644 --- a/plugins/Sample/SamplePlugin.php +++ b/plugins/Sample/SamplePlugin.php @@ -182,11 +182,11 @@ class SamplePlugin extends Plugin * action will be named 'FoobarAction', where action = 'foobar'. The class * must be loaded in the onAutoload() method. * - * @param Net_URL_Mapper $m path-to-action mapper + * @param URLMapper $m path-to-action mapper * * @return boolean hook value; true means continue processing, false means stop. */ - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { $m->connect('main/hello', array('action' => 'hello')); diff --git a/plugins/SearchSub/SearchSubPlugin.php b/plugins/SearchSub/SearchSubPlugin.php index 4a5f47ec7b..5aba38b6c1 100644 --- a/plugins/SearchSub/SearchSubPlugin.php +++ b/plugins/SearchSub/SearchSubPlugin.php @@ -63,11 +63,11 @@ class SearchSubPlugin extends Plugin /** * Map URLs to actions * - * @param Net_URL_Mapper $m path-to-action mapper + * @param URLMapper $m path-to-action mapper * * @return boolean hook value; true means continue processing, false means stop. */ - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { $m->connect('search/:search/subscribe', array('action' => 'searchsub'), diff --git a/plugins/Sitemap/SitemapPlugin.php b/plugins/Sitemap/SitemapPlugin.php index 07227b4a82..16f81f49c9 100644 --- a/plugins/Sitemap/SitemapPlugin.php +++ b/plugins/Sitemap/SitemapPlugin.php @@ -68,11 +68,11 @@ class SitemapPlugin extends Plugin /** * Map URLs to actions * - * @param Net_URL_Mapper $m path-to-action mapper + * @param URLMapper $m path-to-action mapper * * @return boolean hook value; true means continue processing, false means stop. */ - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { $m->connect('sitemapindex.xml', array('action' => 'sitemapindex')); diff --git a/plugins/SlicedFavorites/SlicedFavoritesPlugin.php b/plugins/SlicedFavorites/SlicedFavoritesPlugin.php index d179b0126c..fa541574af 100644 --- a/plugins/SlicedFavorites/SlicedFavoritesPlugin.php +++ b/plugins/SlicedFavorites/SlicedFavoritesPlugin.php @@ -52,10 +52,10 @@ class SlicedFavoritesPlugin extends Plugin /** * Hook for RouterInitialized event. * - * @param Net_URL_Mapper $m path-to-action mapper + * @param URLMapper $m path-to-action mapper * @return boolean hook return */ - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { $m->connect('favorited/:slice', array('action' => 'favoritedslice'), diff --git a/plugins/SubMirror/SubMirrorPlugin.php b/plugins/SubMirror/SubMirrorPlugin.php index 9955631b06..0630d4200d 100644 --- a/plugins/SubMirror/SubMirrorPlugin.php +++ b/plugins/SubMirror/SubMirrorPlugin.php @@ -28,10 +28,10 @@ class SubMirrorPlugin extends Plugin /** * Hook for RouterInitialized event. * - * @param Net_URL_Mapper $m path-to-action mapper + * @param URLMapper $m path-to-action mapper * @return boolean hook return */ - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { $m->connect('settings/mirror', array('action' => 'mirrorsettings')); diff --git a/plugins/TagSub/TagSubPlugin.php b/plugins/TagSub/TagSubPlugin.php index f43f5fc8e4..d60439bc80 100644 --- a/plugins/TagSub/TagSubPlugin.php +++ b/plugins/TagSub/TagSubPlugin.php @@ -63,11 +63,11 @@ class TagSubPlugin extends Plugin /** * Map URLs to actions * - * @param Net_URL_Mapper $m path-to-action mapper + * @param URLMapper $m path-to-action mapper * * @return boolean hook value; true means continue processing, false means stop. */ - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { $m->connect('tag/:tag/subscribe', array('action' => 'tagsub'), diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php index 3eea565a00..61faf0c14e 100644 --- a/plugins/TwitterBridge/TwitterBridgePlugin.php +++ b/plugins/TwitterBridge/TwitterBridgePlugin.php @@ -107,11 +107,11 @@ class TwitterBridgePlugin extends Plugin * * Hook for RouterInitialized event. * - * @param Net_URL_Mapper $m path-to-action mapper + * @param URLMapper $m path-to-action mapper * * @return boolean hook return */ - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { $m->connect('panel/twitter', array('action' => 'twitteradminpanel')); diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php index 446de6ea6b..8b2d2c3cfb 100644 --- a/plugins/UserFlag/UserFlagPlugin.php +++ b/plugins/UserFlag/UserFlagPlugin.php @@ -67,11 +67,11 @@ class UserFlagPlugin extends Plugin /** * Add our actions to the URL router * - * @param Net_URL_Mapper $m URL mapper for this hit + * @param URLMapper $m URL mapper for this hit * * @return boolean hook return */ - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { $m->connect('main/flag/profile', array('action' => 'flagprofile')); $m->connect('main/flag/clear', array('action' => 'clearflag')); diff --git a/plugins/WebFinger/WebFingerPlugin.php b/plugins/WebFinger/WebFingerPlugin.php index 0de9470708..5b7dc20d86 100644 --- a/plugins/WebFinger/WebFingerPlugin.php +++ b/plugins/WebFinger/WebFingerPlugin.php @@ -31,7 +31,7 @@ if (!defined('GNUSOCIAL')) { exit(1); } class WebFingerPlugin extends Plugin { - public function onRouterInitialized($m) + public function onRouterInitialized(URLMapper $m) { $m->connect('.well-known/host-meta', array('action' => 'hostmeta')); $m->connect('.well-known/host-meta.:format', diff --git a/plugins/YammerImport/YammerImportPlugin.php b/plugins/YammerImport/YammerImportPlugin.php index 9d6c5ad41e..7c99f329fa 100644 --- a/plugins/YammerImport/YammerImportPlugin.php +++ b/plugins/YammerImport/YammerImportPlugin.php @@ -29,10 +29,10 @@ class YammerImportPlugin extends Plugin /** * Hook for RouterInitialized event. * - * @param Net_URL_Mapper $m path-to-action mapper + * @param URLMapper $m path-to-action mapper * @return boolean hook return */ - function onRouterInitialized($m) + function onRouterInitialized(URLMapper $m) { $m->connect('panel/yammer', array('action' => 'yammeradminpanel'));