From eb9e5316d7cb9df3b12c1536bde91e08b63c4cd2 Mon Sep 17 00:00:00 2001 From: Ralf Lang Date: Sun, 20 Sep 2026 18:12:22 +0200 Subject: [PATCH] refactor: prefer injector->get over injector->getInstance Also prefer ::class over bare string names in many trivial places. This cannot be done blindly because older code uses some key names which don't exist as class or interface names. --- lib/Horde.php | 2 +- lib/Horde/Config.php | 12 +-- lib/Horde/Core/ActiveSync/Connector.php | 4 +- lib/Horde/Core/ActiveSync/Driver.php | 46 ++++---- lib/Horde/Core/ActiveSync/Imap/Factory.php | 4 +- lib/Horde/Core/ActiveSync/Mail.php | 12 +-- .../Core/Ajax/Application/Handler/Groups.php | 2 +- .../Core/Ajax/Application/Handler/Imple.php | 2 +- .../Core/Ajax/Imple/Geocoder/Geonames.php | 2 +- lib/Horde/Core/Ajax/Imple/SpellChecker.php | 2 +- .../Core/Ajax/Imple/UserAutoCompleter.php | 2 +- .../Imple/WeatherLocationAutoCompleter.php | 4 +- .../WeatherLocationAutoCompleter/Base.php | 2 +- .../WeatherLocationAutoCompleter/Metar.php | 4 +- .../WeatherLocationAutoCompleter/Weather.php | 2 +- lib/Horde/Core/Alarm/Handler/Mail.php | 2 +- lib/Horde/Core/Auth/Application.php | 6 +- lib/Horde/Core/Auth/Imsp.php | 2 +- lib/Horde/Core/Auth/Ldap.php | 6 +- lib/Horde/Core/Auth/Msad.php | 6 +- lib/Horde/Core/Auth/Signup/Base.php | 8 +- lib/Horde/Core/Auth/Signup/Form.php | 2 +- lib/Horde/Core/Auth/Signup/Sql.php | 10 +- lib/Horde/Core/Auth/X509.php | 2 +- lib/Horde/Core/Block/Collection.php | 2 +- lib/Horde/Core/Block/Layout/Manager.php | 4 +- lib/Horde/Core/Block/Layout/View.php | 4 +- lib/Horde/Core/Browser.php | 2 +- lib/Horde/Core/Cache/Session.php | 2 +- lib/Horde/Core/Controller/RequestMapper.php | 8 +- lib/Horde/Core/Data/Storage.php | 4 +- lib/Horde/Core/Dav/Auth.php | 2 +- lib/Horde/Core/Db/Migration.php | 2 +- lib/Horde/Core/Factory/ActiveSyncBackend.php | 6 +- lib/Horde/Core/Factory/ActiveSyncServer.php | 6 +- lib/Horde/Core/Factory/ActiveSyncState.php | 4 +- lib/Horde/Core/Factory/Alarm.php | 10 +- lib/Horde/Core/Factory/Auth.php | 18 ++-- lib/Horde/Core/Factory/Cache.php | 8 +- lib/Horde/Core/Factory/Data.php | 8 +- lib/Horde/Core/Factory/DavServer.php | 10 +- lib/Horde/Core/Factory/DavStorage.php | 2 +- lib/Horde/Core/Factory/Db.php | 4 +- lib/Horde/Core/Factory/DbBase.php | 2 +- lib/Horde/Core/Factory/Editor.php | 2 +- lib/Horde/Core/Factory/ElasticSearch.php | 2 +- lib/Horde/Core/Factory/Facebook.php | 4 +- lib/Horde/Core/Factory/Group.php | 6 +- lib/Horde/Core/Factory/HashTable.php | 4 +- lib/Horde/Core/Factory/History.php | 8 +- lib/Horde/Core/Factory/Identity.php | 2 +- .../Core/Factory/Identity/DavUsernameHook.php | 2 +- lib/Horde/Core/Factory/Image.php | 2 +- lib/Horde/Core/Factory/Imsp.php | 2 +- lib/Horde/Core/Factory/Ldap.php | 2 +- lib/Horde/Core/Factory/Lock.php | 6 +- lib/Horde/Core/Factory/Logger.php | 5 +- lib/Horde/Core/Factory/Mail.php | 2 +- lib/Horde/Core/Factory/MailBase.php | 2 +- lib/Horde/Core/Factory/Matcher.php | 4 +- lib/Horde/Core/Factory/Memcache.php | 2 +- lib/Horde/Core/Factory/MimeViewer.php | 6 +- lib/Horde/Core/Factory/NosqlBase.php | 2 +- lib/Horde/Core/Factory/Notification.php | 6 +- lib/Horde/Core/Factory/Perms.php | 6 +- lib/Horde/Core/Factory/PermsCore.php | 4 +- lib/Horde/Core/Factory/Prefs.php | 16 +-- lib/Horde/Core/Factory/Secret/Cbc.php | 2 +- lib/Horde/Core/Factory/SessionHandler.php | 10 +- lib/Horde/Core/Factory/Share.php | 2 +- lib/Horde/Core/Factory/ShareBase.php | 10 +- lib/Horde/Core/Factory/SpellChecker.php | 2 +- lib/Horde/Core/Factory/Template.php | 4 +- lib/Horde/Core/Factory/ThemesCache.php | 6 +- lib/Horde/Core/Factory/Timezone.php | 2 +- lib/Horde/Core/Factory/Token.php | 6 +- lib/Horde/Core/Factory/Tree.php | 2 +- lib/Horde/Core/Factory/Twitter.php | 8 +- lib/Horde/Core/Factory/UrlShortener.php | 2 +- lib/Horde/Core/Factory/Vfs.php | 4 +- lib/Horde/Core/Factory/View.php | 2 +- lib/Horde/Core/Factory/Weather.php | 4 +- lib/Horde/Core/Group/Ldap.php | 2 +- .../Core/HashTable/PersistentSession.php | 2 +- lib/Horde/Core/HashTable/Vfs.php | 4 +- lib/Horde/Core/HashTable/Wrapper.php | 6 +- lib/Horde/Core/Imsp/Utils.php | 8 +- lib/Horde/Core/Log/Wrapper.php | 2 +- lib/Horde/Core/LoginTasks.php | 4 +- lib/Horde/Core/LoginTasks/Backend/Horde.php | 4 +- lib/Horde/Core/Mime/Headers/Received.php | 2 +- .../Core/Mime/Viewer/Syntaxhighlighter.php | 2 +- lib/Horde/Core/Nosql.php | 16 +-- lib/Horde/Core/Notification/Handler.php | 2 +- .../Listener/SmartmobileStatus.php | 2 +- .../Core/Notification/Storage/Session.php | 2 +- lib/Horde/Core/Perms/Ui.php | 6 +- lib/Horde/Core/Prefs/Cache/Session.php | 2 +- lib/Horde/Core/Prefs/Identity.php | 2 +- lib/Horde/Core/Prefs/Storage/Hooks.php | 4 +- lib/Horde/Core/Prefs/Ui.php | 22 ++-- lib/Horde/Core/Prefs/Ui/Widgets.php | 16 +-- lib/Horde/Core/Share/Driver.php | 12 +-- lib/Horde/Core/Share/FactoryCallback.php | 2 +- lib/Horde/Core/TagBrowser.php | 2 +- lib/Horde/Core/Tagger.php | 6 +- .../Core/Text/Filter/Highlightquotes.php | 2 +- lib/Horde/Core/Topbar.php | 4 +- lib/Horde/Core/Tree/Renderer/Javascript.php | 4 +- lib/Horde/Core/Ui/FlagImage.php | 2 +- lib/Horde/Core/Ui/JsCalendar.php | 2 +- lib/Horde/Core/Ui/Language.php | 2 +- lib/Horde/Core/Ui/VarRenderer/Html.php | 32 +++--- .../Core/Ui/VarRenderer/TablesetHtml.php | 4 +- lib/Horde/Deprecated.php | 4 +- lib/Horde/Menu.php | 2 +- lib/Horde/PageOutput.php | 16 ++- lib/Horde/Registry.php | 100 +++++++++--------- lib/Horde/Registry/Application.php | 6 +- lib/Horde/Registry/Logout.php | 4 +- lib/Horde/Registry/Nlsconfig.php | 2 +- lib/Horde/Script/Cache/HordeCache.php | 2 +- lib/Horde/Script/Compress.php | 2 +- lib/Horde/Session.php | 16 ++- lib/Horde/Shutdown.php | 2 +- lib/Horde/Themes.php | 2 +- lib/Horde/Themes/Css.php | 6 +- lib/Horde/Themes/Css/Cache/HordeCache.php | 2 +- lib/Horde/Themes/Element.php | 2 +- src/Ajax/Application.php | 11 +- src/Auth/AuthCredentialStoreFactory.php | 2 +- src/Config/StateFactory.php | 2 +- src/Factory/ActiveSyncOpsSnapshotFactory.php | 4 +- src/Factory/ApiRegistryFactory.php | 6 +- src/Factory/ApplicationServiceFactory.php | 2 +- src/Factory/AuthBaseFactory.php | 3 +- src/Factory/AuthHttpBasicFactory.php | 3 +- src/Factory/AuthIsGlobalAdminFactory.php | 2 +- src/Factory/AuthLinkRepositoryFactory.php | 4 +- src/Factory/AuthServiceFactory.php | 10 +- src/Factory/AuthStorageFactory.php | 4 +- src/Factory/CheckCredentialsFactory.php | 2 +- src/Factory/ConfigLoaderFactory.php | 2 +- src/Factory/ConfigMetadataProviderFactory.php | 2 +- src/Factory/CssDiscovererFactory.php | 10 +- src/Factory/DateFormatPrefsFactory.php | 4 +- src/Factory/DbAdapterFactory.php | 4 +- src/Factory/DbServiceFactory.php | 2 +- src/Factory/ErrorFilterFactory.php | 2 +- src/Factory/EventDispatcherFactory.php | 2 +- src/Factory/GraphicDiscovererFactory.php | 6 +- src/Factory/GroupServiceFactory.php | 6 +- src/Factory/HordeLdapServiceFactory.php | 4 +- src/Factory/HttpClientFactory.php | 6 +- .../IdentityHistoryRepositoryFactory.php | 2 +- src/Factory/IdentityRepositoryFactory.php | 2 +- src/Factory/IdentityServiceFactory.php | 2 +- src/Factory/JsDiscovererFactory.php | 8 +- src/Factory/LdapGroupServiceFactory.php | 4 +- src/Factory/LdapPrefsServiceFactory.php | 4 +- src/Factory/OAuthAccessTokenIssuerFactory.php | 6 +- .../OAuthAccessTokenRepositoryFactory.php | 2 +- .../OAuthAuthorizationCodeGrantFactory.php | 8 +- ...AuthAuthorizationCodeRepositoryFactory.php | 2 +- .../OAuthAuthorizationEndpointFactory.php | 10 +- .../OAuthClientAuthenticatorFactory.php | 2 +- .../OAuthClientCredentialsGrantFactory.php | 4 +- src/Factory/OAuthClientRepositoryFactory.php | 2 +- src/Factory/OAuthConsentMiddlewareFactory.php | 14 +-- src/Factory/OAuthConsentRepositoryFactory.php | 2 +- src/Factory/OAuthDiscoveryEndpointFactory.php | 6 +- src/Factory/OAuthFlowStoreFactory.php | 4 +- src/Factory/OAuthIdTokenBuilderFactory.php | 8 +- .../OAuthIntrospectionEndpointFactory.php | 10 +- src/Factory/OAuthJwksEndpointFactory.php | 6 +- .../OAuthProviderConfigRepositoryFactory.php | 4 +- src/Factory/OAuthRefreshTokenGrantFactory.php | 10 +- .../OAuthRefreshTokenIssuerFactory.php | 2 +- .../OAuthRefreshTokenRepositoryFactory.php | 2 +- .../OAuthRevocationEndpointFactory.php | 10 +- src/Factory/OAuthScopeRepositoryFactory.php | 2 +- src/Factory/OAuthTokenEndpointFactory.php | 12 +-- src/Factory/OAuthTokenRepositoryFactory.php | 2 +- src/Factory/OAuthUserinfoEndpointFactory.php | 8 +- src/Factory/PathBuilderFactory.php | 2 +- src/Factory/PermissionServiceFactory.php | 6 +- src/Factory/PermsUi.php | 19 ++-- src/Factory/PrefsServiceFactory.php | 4 +- src/Factory/RouteUrlWriterFactory.php | 4 +- src/Factory/RuntimeRoutesProviderFactory.php | 4 +- src/Factory/SecretManagerFactory.php | 2 +- .../SessionEncryptionCoordinatorFactory.php | 2 +- src/Factory/SessionHandlerFactory.php | 14 +-- src/Factory/SessionSecretFactory.php | 2 +- src/Factory/SimpleCacheFactory.php | 6 +- src/Factory/ThemeInfoReaderFactory.php | 4 +- src/Factory/ThemeResolverFactory.php | 2 +- src/Factory/TinymcePageBinderFactory.php | 2 +- src/Factory/TokenServiceFactory.php | 6 +- src/Factory/TranslationManagerFactory.php | 2 +- src/Factory/UriBuilderFactory.php | 8 +- src/Factory/VersionServiceFactory.php | 10 +- src/Horde.php | 11 +- src/Middleware/AppRouter.php | 2 +- src/Middleware/HordeCore.php | 4 +- .../ChromeRendererDispatcherFactory.php | 4 +- .../DesktopChromeRendererFactory.php | 16 +-- src/PageOutput/PageComposerFactory.php | 2 +- .../PageOutputAssetManagerFactory.php | 2 +- .../RenderingModeResolverFactory.php | 4 +- .../ViewModeConfiguratorFactory.php | 10 +- src/Session/HordeSessionFactory.php | 2 +- .../PublishesModernSessionToAccessorTrait.php | 2 +- src/Session/SessionConfigFactory.php | 2 +- src/Session/SessionLifecycle.php | 8 +- src/Session/SessionLifecycleFactory.php | 10 +- src/Sidebar/AdminSidebarPanelFactory.php | 6 +- src/Sidebar/SidebarBuilderFactory.php | 4 +- src/Sidebar/SidebarRendererFactory.php | 4 +- src/Topbar/TopbarBuilderFactory.php | 8 +- src/Topbar/TopbarRendererFactory.php | 4 +- src/View/AccessKeyTrackerFactory.php | 6 +- .../AssetFilesystemFactoryIntegrationTest.php | 10 +- .../CssDiscovererFactoryIntegrationTest.php | 6 +- ...raphicDiscovererFactoryIntegrationTest.php | 6 +- .../JsDiscovererFactoryIntegrationTest.php | 6 +- .../ThemeResolverFactoryIntegrationTest.php | 8 +- .../UrlSignerFactoryIntegrationTest.php | 10 +- .../PathBuilderFactoryIntegrationTest.php | 10 +- .../SidebarRendererFactoryIntegrationTest.php | 6 +- .../TopbarRendererFactoryIntegrationTest.php | 6 +- .../Uri/UriBuilderFactoryIntegrationTest.php | 10 +- .../Config/LegacyMergedConfigInjectorTest.php | 22 ++-- test/Unit/Factory/GroupTest.php | 2 +- test/Unit/Session/HordeSessionNullTest.php | 2 +- 235 files changed, 671 insertions(+), 677 deletions(-) diff --git a/lib/Horde.php b/lib/Horde.php index 957a82b1..1753421a 100644 --- a/lib/Horde.php +++ b/lib/Horde.php @@ -55,7 +55,7 @@ public static function log( * before we can start logging. Otherwise, queue entries. */ if (isset($GLOBALS['injector']) && Horde_Core_Factory_Logger::available()) { - $GLOBALS['injector']->getInstance('Horde_Log_Logger')->logObject($log_ob); + $GLOBALS['injector']->get('Horde_Log_Logger')->logObject($log_ob); } else { Horde_Core_Factory_Logger::queue($log_ob); } diff --git a/lib/Horde/Config.php b/lib/Horde/Config.php index 99d4c892..8e953650 100644 --- a/lib/Horde/Config.php +++ b/lib/Horde/Config.php @@ -145,7 +145,7 @@ public function __construct($app = 'horde', ?Injector $injector = null) public function checkVersions() { $response = $GLOBALS['injector'] - ->getInstance('Horde_Core_Factory_HttpClient') + ->get(Horde_Core_Factory_HttpClient::class) ->create([ 'request.timeout' => 60, 'request.userAgent' => 'Horde ' . $GLOBALS['registry']->getVersion('horde', true), @@ -352,7 +352,7 @@ public function writePHPConfig($formvars, &$php = null) } /* Cannot write. Save to session. */ - $GLOBALS['injector']->getInstance(HordeSession::class) + $GLOBALS['injector']->get(HordeSession::class) ->setScoped('horde', 'config/' . $this->_app, $php); return false; @@ -540,7 +540,7 @@ protected function _parseLevel(&$conf, $children, $ctx) $name = $node->getAttribute('name'); // Don't pass Null or Integer to a Text Filter $desc = (string) $node->getAttribute('desc'); - $desc = $GLOBALS['injector']->getInstance('Horde_Core_Factory_TextFilter')->filter($desc, 'linkurls'); + $desc = $GLOBALS['injector']->get(Horde_Core_Factory_TextFilter::class)->filter($desc, 'linkurls'); $required = !($node->getAttribute('required') == 'false'); $quote = !($node->getAttribute('quote') == 'false'); @@ -556,7 +556,7 @@ protected function _parseLevel(&$conf, $children, $ctx) $conf[$name] = [ '_type' => 'description', - 'desc' => $GLOBALS['injector']->getInstance('Horde_Core_Factory_TextFilter')->filter($this->_default($curctx, $this->_getNodeOnlyText($node)), 'linkurls'), + 'desc' => $GLOBALS['injector']->get(Horde_Core_Factory_TextFilter::class)->filter($this->_default($curctx, $this->_getNodeOnlyText($node)), 'linkurls'), ]; break; @@ -1198,9 +1198,7 @@ public function configSQL($ctx, $node = null, $switchname = 'driverconfig') if ($useMetadata && $injector) { try { - $provider = $injector->getInstance( - ConfigMetadataProvider::class - ); + $provider = $injector->get(ConfigMetadataProvider::class); $adapter = new LegacyConfigAdapter($provider); // Get driver metadata converted to legacy format diff --git a/lib/Horde/Core/ActiveSync/Connector.php b/lib/Horde/Core/ActiveSync/Connector.php index 09ecbfba..04bed6d6 100644 --- a/lib/Horde/Core/ActiveSync/Connector.php +++ b/lib/Horde/Core/ActiveSync/Connector.php @@ -195,7 +195,7 @@ public function calendar_import_attendee( // iTips, check if we are allowed to autoupdate. If we have no // configuration, err on the side of caution and DO NOT auto import. $config = $GLOBALS['injector'] - ->getInstance('Horde_Core_Factory_MimeViewer') + ->get(Horde_Core_Factory_MimeViewer::class) ->getViewerConfig('text/calendar', $this->_registry->hasInterface('mail')); if ($config[1]['driver'] == 'Itip' && !empty($config[1]['auto_update_eventreply'])) { @@ -429,7 +429,7 @@ public function getRecipientCache($max = 100) || !$this->_registry->hasInterface('contacts')) { return []; } - $cache = $GLOBALS['injector']->getInstance('Horde_Cache'); + $cache = $GLOBALS['injector']->get('Horde_Cache'); $cache_key = 'HCASC:' . $this->_registry->getAuth() . ':' . $max; if (!$cache->exists($cache_key, 3600)) { $results = $this->_registry->mail->favouriteRecipients($max); diff --git a/lib/Horde/Core/ActiveSync/Driver.php b/lib/Horde/Core/ActiveSync/Driver.php index b04361e9..e0c70fc6 100644 --- a/lib/Horde/Core/ActiveSync/Driver.php +++ b/lib/Horde/Core/ActiveSync/Driver.php @@ -267,7 +267,7 @@ public function authenticate($username, $password, $domain = null) // backend is configured or when explicitly turned off. $throttleKey = $this->_authThrottleKey($username); if ($this->_authThrottleExceeded($throttleKey)) { - $injector->getInstance('Horde_Log_Logger')->warn(sprintf( + $injector->get('Horde_Log_Logger')->warn(sprintf( 'ActiveSync: too many failed authentication attempts for user %s; temporarily refusing further attempts.', $username )); @@ -277,12 +277,12 @@ public function authenticate($username, $password, $domain = null) // First try transparent/X509. Happens for authtype == 'cert' || 'basic_cert' if ($conf['activesync']['auth']['type'] != 'basic') { if (!$this->_auth->transparent()) { - $injector->getInstance('Horde_Log_Logger')->notice(sprintf('Login failed ActiveSync client certificate for user %s.', $username)); + $injector->get('Horde_Log_Logger')->notice(sprintf('Login failed ActiveSync client certificate for user %s.', $username)); $this->_recordAuthFailure($throttleKey); return false; } if ($username != $GLOBALS['registry']->getAuth()) { - $injector->getInstance('Horde_Log_Logger')->notice(sprintf( + $injector->get('Horde_Log_Logger')->notice(sprintf( 'Access granted based on transparent authentication of user %s, but ActiveSync client is requesting access for %s.', $GLOBALS['registry']->getAuth(), $username @@ -321,7 +321,7 @@ public function authenticate($username, $password, $domain = null) } if (!$authResult) { - $injector->getInstance('Horde_Log_Logger')->notice(sprintf('Login failed from ActiveSync client for user %s.', $username)); + $injector->get('Horde_Log_Logger')->notice(sprintf('Login failed from ActiveSync client for user %s.', $username)); $this->_recordAuthFailure($throttleKey); return false; } @@ -344,7 +344,7 @@ public function authenticate($username, $password, $domain = null) (string) $username )); } - $perms = $injector->getInstance('Horde_Perms'); + $perms = $injector->get('Horde_Perms'); if ($perms->exists('horde:activesync')) { // Check permissions to ActiveSync if (!$this->_getPolicyValue('activesync', $perms->getPermissions('horde:activesync', $username))) { @@ -3166,7 +3166,7 @@ public function getProvisioning(?Horde_ActiveSync_Device $device = null) { if (!empty($device)) { try { - $hooks = $GLOBALS['injector']->getInstance('Horde_Core_Hooks'); + $hooks = $GLOBALS['injector']->get(Horde_Core_Hooks::class); $result = $hooks->callHook('activesync_provisioning_check', 'horde', [$device, $this->_user]); if ($result !== -1) { return $result; @@ -3176,7 +3176,7 @@ public function getProvisioning(?Horde_ActiveSync_Device $device = null) } $provisioning = $GLOBALS['injector'] - ->getInstance('Horde_Perms') + ->get('Horde_Perms') ->getPermissions( 'horde:activesync:provisioning', $this->_user @@ -3251,7 +3251,7 @@ public function getSettings(array $settings, $device) break; case 'userinformation': $identities = $injector - ->getInstance('Horde_Core_Factory_Identity') + ->get(Horde_Core_Factory_Identity::class) ->create($registry->getAuth()); $as_ident = $prefs->getValue('activesync_identity'); if ($as_ident != 'horde') { @@ -3333,7 +3333,7 @@ public function setSettings(array $settings, $device) */ public function autoDiscover($params = [], $version = 1) { - $hooks = $GLOBALS['injector']->getInstance('Horde_Core_Hooks'); + $hooks = $GLOBALS['injector']->get(Horde_Core_Hooks::class); $url = parse_url((string) Horde::url(null, true)); if ($version == 2) { @@ -3347,7 +3347,7 @@ public function autoDiscover($params = [], $version = 1) // Attempt to get a username from the email address. $ident = $GLOBALS['injector'] - ->getInstance('Horde_Core_Factory_Identity') + ->get(Horde_Core_Factory_Identity::class) ->create($GLOBALS['registry']->getAuth()); $params['display_name'] = $ident->getValue('fullname'); $params['email'] = $ident->getValue('from_addr'); @@ -3411,7 +3411,7 @@ public function getUsernameFromEmail($email) // no break case 'hook': try { - return $GLOBALS['injector']->getInstance('Horde_Core_Hooks') + return $GLOBALS['injector']->get(Horde_Core_Hooks::class) ->callHook('activesync_get_autodiscover_username', 'horde', [$email]); } catch (Horde_Exception_HookNotSet $e) { return $email; @@ -3756,7 +3756,7 @@ public function meetingResponse(array $response) } // Update the vCal so the response will be reflected when imported. - $ident = $injector->getInstance('Horde_Core_Factory_Identity')->create($this->_user); + $ident = $injector->get(Horde_Core_Factory_Identity::class)->create($this->_user); //$cn = $ident->getValue('fullname'); $email = $ident->getValue('from_addr'); switch ($response['response']) { @@ -3845,7 +3845,7 @@ public function meetingResponse(array $response) } $itip = Horde_Itip::factory($vEvent, $resource); $itipOptions = new Horde_Core_Itip_Response_Options_Horde('UTF-8', []); - $mail = $injector->getInstance('Horde_Mail'); + $mail = $injector->get('Horde_Mail'); if (!empty($response['sendresponse'])) { try { @@ -3935,7 +3935,7 @@ public function versionCallback(Horde_ActiveSync $server) if ($mode === 'device') { $allowed = $this->_getDeviceScopedVersionPermission($server, $username); } else { - $perms = $GLOBALS['injector']->getInstance('Horde_Perms'); + $perms = $GLOBALS['injector']->get('Horde_Perms'); if (!$perms->exists('horde:activesync:version')) { return; } @@ -3991,7 +3991,7 @@ protected function _getDeviceScopedVersionPermission(Horde_ActiveSync $server, $ } try { - return $GLOBALS['injector']->getInstance('Horde_Core_Hooks') + return $GLOBALS['injector']->get(Horde_Core_Hooks::class) ->callHook('activesync_device_version', 'horde', [$deviceId, $username]); } catch (Horde_Exception_HookNotSet $e) { } @@ -4048,12 +4048,12 @@ public function createDeviceCallback(Horde_ActiveSync_Device $device) { global $injector, $registry; - $perms = $injector->getInstance('Horde_Perms'); + $perms = $injector->get('Horde_Perms'); // Check max_device if ($perms->exists('horde:activesync:max_devices')) { $max_devices = $this->_getPolicyValue('max_devices', $perms->getPermissions('horde:activesync:max_devices', $registry->getAuth())); - $state = $injector->getInstance('Horde_ActiveSyncState'); + $state = $injector->get('Horde_ActiveSyncState'); $devices = $state->listDevices($registry->getAuth()); if (count($devices) >= $max_devices) { $this->_logger->meta(sprintf( @@ -4065,7 +4065,7 @@ public function createDeviceCallback(Horde_ActiveSync_Device $device) } } try { - return $injector->getInstance('Horde_Core_Hooks') + return $injector->get(Horde_Core_Hooks::class) ->callHook('activesync_create_device', 'horde', [$device]); } catch (Horde_Exception_HookNotSet $e) { } @@ -4086,7 +4086,7 @@ public function createDeviceCallback(Horde_ActiveSync_Device $device) public function deviceCallback(Horde_ActiveSync_Device $device) { try { - return $GLOBALS['injector']->getInstance('Horde_Core_Hooks') + return $GLOBALS['injector']->get(Horde_Core_Hooks::class) ->callHook('activesync_device_check', 'horde', [$device]); } catch (Horde_Exception_HookNotSet $e) { } @@ -4105,7 +4105,7 @@ public function deviceCallback(Horde_ActiveSync_Device $device) public function modifyDeviceCallback(Horde_ActiveSync_Device $device) { try { - $device = $GLOBALS['injector']->getInstance('Horde_Core_Hooks') + $device = $GLOBALS['injector']->get(Horde_Core_Hooks::class) ->callHook('activesync_device_modify', 'horde', [$device]); if (!($device instanceof Horde_ActiveSync_Device)) { $this->_logger->err('activesync_device_modify hook must return device object.'); @@ -4539,7 +4539,7 @@ protected function _searchMailbox(array $query, array $options, bool $deepTraver protected function _searchGal(array $query, array $options, bool $deepTraversal): ?array { // If no perms to the GAL, return zero results. - $perms = $GLOBALS['injector']->getInstance('Horde_Perms'); + $perms = $GLOBALS['injector']->get('Horde_Perms'); if ($perms->exists('horde:activesync:no_gal') && $perms->getPermissions('horde:activesync:no_gal', $this->_user)) { return null; @@ -4689,7 +4689,7 @@ protected function _getPolicyFromPerms($deviceinfo = false) { $prefix = 'horde:activesync:provisioning:'; $policy = []; - $perms = $GLOBALS['injector']->getInstance('Horde_Perms'); + $perms = $GLOBALS['injector']->get('Horde_Perms'); if (!$perms->exists('horde:activesync:provisioning')) { return $policy; } @@ -4761,7 +4761,7 @@ protected function _getIdentityFromAddress() global $prefs; $ident = $GLOBALS['injector'] - ->getInstance('Horde_Core_Factory_Identity') + ->get(Horde_Core_Factory_Identity::class) ->create($this->_user); $as_ident = $prefs->getValue('activesync_identity'); diff --git a/lib/Horde/Core/ActiveSync/Imap/Factory.php b/lib/Horde/Core/ActiveSync/Imap/Factory.php index 7455adf5..f3e5c516 100644 --- a/lib/Horde/Core/ActiveSync/Imap/Factory.php +++ b/lib/Horde/Core/ActiveSync/Imap/Factory.php @@ -143,7 +143,7 @@ public function getMailboxes($force = false) } } try { - $this->_mailboxlist = $injector->getInstance('Horde_Core_Hooks')->callHook( + $this->_mailboxlist = $injector->get(Horde_Core_Hooks::class)->callHook( 'activesync_mailboxlist', 'horde', [$this->_mailboxlist] @@ -178,7 +178,7 @@ public function getSpecialMailboxes() // Sentmail is dependent on Identity. if (count($this->_specialMailboxlist['sent']) > 1) { $this->_specialMailboxlist['sent'] = $injector - ->getInstance('Horde_Core_Factory_Identity') + ->get(Horde_Core_Factory_Identity::class) ->create($registry->getAuth(), $registry->hasInterface('mail')) ->getValue('sent_mail_folder', $prefs->getValue('activesync_identity')); } else { diff --git a/lib/Horde/Core/ActiveSync/Mail.php b/lib/Horde/Core/ActiveSync/Mail.php index 0459eba3..14e6fabb 100644 --- a/lib/Horde/Core/ActiveSync/Mail.php +++ b/lib/Horde/Core/ActiveSync/Mail.php @@ -267,7 +267,7 @@ public function send() protected function _callPreSendHook() { - $hooks = $GLOBALS['injector']->getInstance('Horde_Core_Hooks'); + $hooks = $GLOBALS['injector']->get(Horde_Core_Hooks::class); $params = [ 'raw' => $this->_raw, 'imap_msg' => $this->imapMessage, @@ -321,7 +321,7 @@ protected function _sendRaw() } try { - $GLOBALS['injector']->getInstance('Horde_Mail') + $GLOBALS['injector']->get('Horde_Mail') ->send($recipients, $h_array, $this->_raw->getMessage()->stream); } catch (Horde_Mail_Exception $e) { throw new Horde_ActiveSync_Exception($e->getMessage()); @@ -362,7 +362,7 @@ protected function _tryWithoutBinary($recipients, array $headers) $mime = $this->_raw->getMimeObject(); $this->_raw->replaceMime($mime); try { - $GLOBALS['injector']->getInstance('Horde_Mail') + $GLOBALS['injector']->get('Horde_Mail') ->send($recipients, $headers, $this->_raw->getMessage()->stream); } catch (Exception $e) { return false; @@ -392,7 +392,7 @@ protected function _sendSmart() } try { - $mail->send($GLOBALS['injector']->getInstance('Horde_Mail')); + $mail->send($GLOBALS['injector']->get('Horde_Mail')); $this->_mailer = $mail; } catch (Horde_Mime_Exception $e) { throw new Horde_ActiveSync_Exception($e); @@ -610,7 +610,7 @@ protected function _getIdentityFromAddress() global $prefs; $ident = $GLOBALS['injector'] - ->getInstance('Horde_Core_Factory_Identity') + ->get(Horde_Core_Factory_Identity::class) ->create($this->_user); $as_ident = $prefs->getValue('activesync_identity'); @@ -635,7 +635,7 @@ protected function _getReplyToAddress() global $prefs; $ident = $GLOBALS['injector'] - ->getInstance('Horde_Core_Factory_Identity') + ->get(Horde_Core_Factory_Identity::class) ->create($this->_user); $as_ident = $prefs->getValue('activesync_identity'); diff --git a/lib/Horde/Core/Ajax/Application/Handler/Groups.php b/lib/Horde/Core/Ajax/Application/Handler/Groups.php index 1490e7b5..11adbf41 100644 --- a/lib/Horde/Core/Ajax/Application/Handler/Groups.php +++ b/lib/Horde/Core/Ajax/Application/Handler/Groups.php @@ -30,7 +30,7 @@ public function listGroups() try { $groups = $GLOBALS['injector'] - ->getInstance('Horde_Group') + ->get('Horde_Group') ->listAll(empty($GLOBALS['conf']['share']['any_group']) && !$GLOBALS['registry']->isAdmin() ? $GLOBALS['registry']->getAuth() diff --git a/lib/Horde/Core/Ajax/Application/Handler/Imple.php b/lib/Horde/Core/Ajax/Application/Handler/Imple.php index 7935e27f..3fe21773 100644 --- a/lib/Horde/Core/Ajax/Application/Handler/Imple.php +++ b/lib/Horde/Core/Ajax/Application/Handler/Imple.php @@ -27,7 +27,7 @@ public function imple() global $injector, $registry; $pushed = $registry->pushApp($this->vars->app); - $imple = $injector->getInstance('Horde_Core_Factory_Imple')->create($this->vars->imple, [], true); + $imple = $injector->get(Horde_Core_Factory_Imple::class)->create($this->vars->imple, [], true); $result = $imple->handle($this->vars); diff --git a/lib/Horde/Core/Ajax/Imple/Geocoder/Geonames.php b/lib/Horde/Core/Ajax/Imple/Geocoder/Geonames.php index 2e956eb5..35c37c71 100644 --- a/lib/Horde/Core/Ajax/Imple/Geocoder/Geonames.php +++ b/lib/Horde/Core/Ajax/Imple/Geocoder/Geonames.php @@ -61,7 +61,7 @@ protected function _handle(Horde_Variables|Variables $vars) 'username' => $vars->key, ]); - $response = $GLOBALS['injector']->getInstance('Horde_Core_Factory_HttpClient')->create()->get($url); + $response = $GLOBALS['injector']->get(Horde_Core_Factory_HttpClient::class)->create()->get($url); return new Horde_Core_Ajax_Response_Prototypejs([ 'results' => $response->getBody(), diff --git a/lib/Horde/Core/Ajax/Imple/SpellChecker.php b/lib/Horde/Core/Ajax/Imple/SpellChecker.php index 97839dd7..053baa46 100644 --- a/lib/Horde/Core/Ajax/Imple/SpellChecker.php +++ b/lib/Horde/Core/Ajax/Imple/SpellChecker.php @@ -99,7 +99,7 @@ protected function _handle(Horde_Variables|Variables $vars) try { return new Horde_Core_Ajax_Response_Prototypejs( - $injector->getInstance('Horde_Core_Factory_SpellChecker')->create($args, $input)->spellCheck($input) + $injector->get(Horde_Core_Factory_SpellChecker::class)->create($args, $input)->spellCheck($input) ); } catch (Horde_Exception $e) { Horde::log($e, Horde_Log::ERR); diff --git a/lib/Horde/Core/Ajax/Imple/UserAutoCompleter.php b/lib/Horde/Core/Ajax/Imple/UserAutoCompleter.php index 7485ce2e..16e56598 100644 --- a/lib/Horde/Core/Ajax/Imple/UserAutoCompleter.php +++ b/lib/Horde/Core/Ajax/Imple/UserAutoCompleter.php @@ -36,7 +36,7 @@ protected function _getAutoCompleter() protected function _handleAutoCompleter($input) { return $GLOBALS['injector'] - ->getInstance('Horde_Core_Factory_Auth') + ->get(Horde_Core_Factory_Auth::class) ->create() ->searchUsers($input); } diff --git a/lib/Horde/Core/Ajax/Imple/WeatherLocationAutoCompleter.php b/lib/Horde/Core/Ajax/Imple/WeatherLocationAutoCompleter.php index 7e1c00b0..434ee235 100644 --- a/lib/Horde/Core/Ajax/Imple/WeatherLocationAutoCompleter.php +++ b/lib/Horde/Core/Ajax/Imple/WeatherLocationAutoCompleter.php @@ -21,7 +21,7 @@ protected function _getAutoCompleter() { $indicator = $this->_params['id'] . '_loading_img'; - $GLOBALS['injector']->getInstance('Horde_PageOutput')->addInlineScript( + $GLOBALS['injector']->get(Horde_PageOutput::class)->addInlineScript( [ 'window.weatherupdate = window.weatherupdate || {}', 'window.weatherupdate["' . $this->_params['instance'] . '"] = { @@ -90,7 +90,7 @@ protected function _getAutoCompleter() */ protected function _handleAutoCompleter($input) { - return $GLOBALS['injector']->getInstance('Horde_Weather')->autocompleteLocation($input); + return $GLOBALS['injector']->get('Horde_Weather')->autocompleteLocation($input); } } diff --git a/lib/Horde/Core/Ajax/Imple/WeatherLocationAutoCompleter/Base.php b/lib/Horde/Core/Ajax/Imple/WeatherLocationAutoCompleter/Base.php index 406a37c2..907dc437 100644 --- a/lib/Horde/Core/Ajax/Imple/WeatherLocationAutoCompleter/Base.php +++ b/lib/Horde/Core/Ajax/Imple/WeatherLocationAutoCompleter/Base.php @@ -25,7 +25,7 @@ protected function _getAutoCompleterForBlock($block) global $injector; $indicator = $this->_params['id'] . '_loading_img'; - $injector->getInstance('Horde_PageOutput')->addInlineScript( + $injector->get(Horde_PageOutput::class)->addInlineScript( [ 'window.weatherupdate = window.weatherupdate || {}', 'window.weatherupdate["' . $this->_params['instance'] . '"] = { diff --git a/lib/Horde/Core/Ajax/Imple/WeatherLocationAutoCompleter/Metar.php b/lib/Horde/Core/Ajax/Imple/WeatherLocationAutoCompleter/Metar.php index 38b5c65b..e546c070 100644 --- a/lib/Horde/Core/Ajax/Imple/WeatherLocationAutoCompleter/Metar.php +++ b/lib/Horde/Core/Ajax/Imple/WeatherLocationAutoCompleter/Metar.php @@ -28,10 +28,10 @@ protected function _handleAutoCompleter($input) $weather = new Horde_Service_Weather_Metar( [ - 'cache' => $injector->getInstance('Horde_Cache'), + 'cache' => $injector->get('Horde_Cache'), 'cache_lifetime' => $conf['weather']['params']['lifetime'], 'http_client' => $injector->createInstance('Horde_Core_Factory_HttpClient')->create(), - 'db' => $injector->getInstance('Horde_Db_Adapter')] + 'db' => $injector->get('Horde_Db_Adapter')] ); return $weather->autocompleteLocation($input); diff --git a/lib/Horde/Core/Ajax/Imple/WeatherLocationAutoCompleter/Weather.php b/lib/Horde/Core/Ajax/Imple/WeatherLocationAutoCompleter/Weather.php index 79e7f6c4..51e417dd 100644 --- a/lib/Horde/Core/Ajax/Imple/WeatherLocationAutoCompleter/Weather.php +++ b/lib/Horde/Core/Ajax/Imple/WeatherLocationAutoCompleter/Weather.php @@ -25,7 +25,7 @@ protected function _getAutoCompleter() */ protected function _handleAutoCompleter($input) { - return $GLOBALS['injector']->getInstance('Horde_Weather')->autocompleteLocation($input); + return $GLOBALS['injector']->get('Horde_Weather')->autocompleteLocation($input); } } diff --git a/lib/Horde/Core/Alarm/Handler/Mail.php b/lib/Horde/Core/Alarm/Handler/Mail.php index 2bde725f..9c69c62c 100644 --- a/lib/Horde/Core/Alarm/Handler/Mail.php +++ b/lib/Horde/Core/Alarm/Handler/Mail.php @@ -118,7 +118,7 @@ public function notify(array $alarm) } if ($this->_mail === null) { - $this->_mail = $this->_injector->getInstance('Horde_Mail'); + $this->_mail = $this->_injector->get('Horde_Mail'); } try { diff --git a/lib/Horde/Core/Auth/Application.php b/lib/Horde/Core/Auth/Application.php index d250fbff..3393ac6b 100644 --- a/lib/Horde/Core/Auth/Application.php +++ b/lib/Horde/Core/Auth/Application.php @@ -407,7 +407,7 @@ public function listUsers($sort = false) public function listNames() { $factory = $GLOBALS['injector'] - ->getInstance('Horde_Core_Factory_Identity'); + ->get(Horde_Core_Factory_Identity::class); $names = []; foreach ($this->listUsers() as $user) { $names[$user] = $factory->create($user)->getName(); @@ -667,7 +667,7 @@ public function runHook($userId, $credentials, $type, $method = null) } try { - $result = $GLOBALS['injector']->getInstance('Horde_Core_Hooks') + $result = $GLOBALS['injector']->get(Horde_Core_Hooks::class) ->callHook($type, $this->_app, [$userId, $credentials]); } catch (Horde_Exception_HookNotSet $e) { return $ret_array; @@ -739,7 +739,7 @@ protected function _setAuth() ]); /* Only set the view mode on initial authentication */ - if (!$GLOBALS['injector']->getInstance(HordeSession::class) + if (!$GLOBALS['injector']->get(HordeSession::class) ->hasScoped('horde', 'view')) { $this->_setView(); } diff --git a/lib/Horde/Core/Auth/Imsp.php b/lib/Horde/Core/Auth/Imsp.php index 6021953c..d993e464 100644 --- a/lib/Horde/Core/Auth/Imsp.php +++ b/lib/Horde/Core/Auth/Imsp.php @@ -43,7 +43,7 @@ protected function _authenticate($userID, $credentials) // to create, and we don't have one until this method. $this->_params['username'] = $userID; $this->_params['password'] = $credentials['password']; - $this->_imsp = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Imsp')->create(null, $this->_params); + $this->_imsp = $GLOBALS['injector']->get(Horde_Core_Factory_Imsp::class)->create(null, $this->_params); if (!$this->_imsp->authenticate(false)) { throw new Horde_Auth_Exception('', Horde_Auth::REASON_BADLOGIN); } diff --git a/lib/Horde/Core/Auth/Ldap.php b/lib/Horde/Core/Auth/Ldap.php index ae0e604b..233fef44 100644 --- a/lib/Horde/Core/Auth/Ldap.php +++ b/lib/Horde/Core/Auth/Ldap.php @@ -26,7 +26,7 @@ class Horde_Core_Auth_Ldap extends Horde_Auth_Ldap */ public function addUser($userId, $credentials) { - [$userId, $credentials] = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Auth')->create()->runHook($userId, $credentials, 'preauthenticate', 'admin'); + [$userId, $credentials] = $GLOBALS['injector']->get(Horde_Core_Factory_Auth::class)->create()->runHook($userId, $credentials, 'preauthenticate', 'admin'); parent::addUser($userId, $credentials); } @@ -49,7 +49,7 @@ public function updateUser( $olddn = null, $newdn = null ) { - $auth = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Auth')->create(); + $auth = $GLOBALS['injector']->get(Horde_Core_Factory_Auth::class)->create(); [$oldID, $old_credentials] = $auth->runHook($oldID, $credentials, 'preauthenticate', 'admin'); [$newID, $new_credentials] = $auth->runHook($newID, $credentials, 'preauthenticate', 'admin'); @@ -69,7 +69,7 @@ public function updateUser( */ public function removeUser($userId, $dn = null) { - [$userId, $credentials] = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Auth')->create()->runHook($userId, [], 'preauthenticate', 'admin'); + [$userId, $credentials] = $GLOBALS['injector']->get(Horde_Core_Factory_Auth::class)->create()->runHook($userId, [], 'preauthenticate', 'admin'); parent::removeUser($userId, isset($credentials['ldap']) ? $credentials['ldap']['dn'] : null); } diff --git a/lib/Horde/Core/Auth/Msad.php b/lib/Horde/Core/Auth/Msad.php index dec0284f..a42f53a0 100644 --- a/lib/Horde/Core/Auth/Msad.php +++ b/lib/Horde/Core/Auth/Msad.php @@ -26,7 +26,7 @@ class Horde_Core_Auth_Msad extends Horde_Auth_Msad */ public function addUser($userId, $credentials) { - [$userId, $credentials] = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Auth')->create()->runHook($userId, $credentials, 'preauthenticate', 'admin'); + [$userId, $credentials] = $GLOBALS['injector']->get(Horde_Core_Factory_Auth::class)->create()->runHook($userId, $credentials, 'preauthenticate', 'admin'); parent::addUser($userId, $credentials); } @@ -47,7 +47,7 @@ public function updateUser( $olddn = null, $newdn = null ) { - [$oldId, $credentials] = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Auth')->create()->runHook($oldId, $credentials, 'preauthenticate', 'admin'); + [$oldId, $credentials] = $GLOBALS['injector']->get(Horde_Core_Factory_Auth::class)->create()->runHook($oldId, $credentials, 'preauthenticate', 'admin'); parent::updateUser($oldID, $newID, $credentials, $olddn, $newdn); } @@ -62,7 +62,7 @@ public function updateUser( */ public function removeUser($userId, $dn = null) { - [$userId, $credentials] = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Auth')->create()->runHook($userId, [], 'preauthenticate', 'admin'); + [$userId, $credentials] = $GLOBALS['injector']->get(Horde_Core_Factory_Auth::class)->create()->runHook($userId, [], 'preauthenticate', 'admin'); parent::removeUser($userId, isset($credentials['ldap']) ? $credentials['ldap']['dn'] : $dn); } diff --git a/lib/Horde/Core/Auth/Signup/Base.php b/lib/Horde/Core/Auth/Signup/Base.php index d25ac77d..5df7542a 100644 --- a/lib/Horde/Core/Auth/Signup/Base.php +++ b/lib/Horde/Core/Auth/Signup/Base.php @@ -41,7 +41,7 @@ public function addSignup(&$info) // Attempt to add/update any extra data handed in. if (!empty($info['extra'])) { try { - $injector->getInstance('Horde_Core_Hooks')->callHook( + $injector->get(Horde_Core_Hooks::class)->callHook( 'signup_addextra', 'horde', [ @@ -87,7 +87,7 @@ public function queueSignup(&$info) $this->_queueSignup($signup); try { - $injector->getInstance('Horde_Core_Hooks')->callHook( + $injector->get(Horde_Core_Hooks::class)->callHook( 'signup_queued', 'horde', [ @@ -114,7 +114,7 @@ public function queueSignup(&$info) 'Subject' => sprintf(Horde_Core_Translation::t('Account signup request for "%s"'), $signup->getName()), 'To' => $conf['signup']['email'], 'From' => $conf['signup']['email']]); - $mail->send($injector->getInstance('Horde_Mail')); + $mail->send($injector->get('Horde_Mail')); } } @@ -132,7 +132,7 @@ protected function _preSignup(&$info) global $auth, $injector; try { - $info = $injector->getInstance('Horde_Core_Hooks')->callHook( + $info = $injector->get(Horde_Core_Hooks::class)->callHook( 'signup_preprocess', 'horde', [$info] diff --git a/lib/Horde/Core/Auth/Signup/Form.php b/lib/Horde/Core/Auth/Signup/Form.php index 3c5d5a11..b4c13368 100644 --- a/lib/Horde/Core/Auth/Signup/Form.php +++ b/lib/Horde/Core/Auth/Signup/Form.php @@ -35,7 +35,7 @@ public function __construct($vars) /* Use hooks get any extra fields required in signing up. */ try { - $extra = $GLOBALS['injector']->getInstance('Horde_Core_Hooks') + $extra = $GLOBALS['injector']->get(Horde_Core_Hooks::class) ->callHook('signup_getextra', 'horde'); } catch (Horde_Exception_HookNotSet $e) { } diff --git a/lib/Horde/Core/Auth/Signup/Sql.php b/lib/Horde/Core/Auth/Signup/Sql.php index de1c5118..786104b3 100644 --- a/lib/Horde/Core/Auth/Signup/Sql.php +++ b/lib/Horde/Core/Auth/Signup/Sql.php @@ -56,7 +56,7 @@ protected function _queueSignup($signup) serialize($signup->getData()), ]; - $GLOBALS['injector']->getInstance('Horde_Core_Factory_Db')->create('horde', 'signup')->insert($query, $values); + $GLOBALS['injector']->get(Horde_Core_Factory_Db::class)->create('horde', 'signup')->insert($query, $values); } /** @@ -77,7 +77,7 @@ public function exists($user) . ' WHERE user_name = ?'; $values = [$user]; - return (bool) $GLOBALS['injector']->getInstance('Horde_Core_Factory_Db')->create('horde', 'signup')->selectValue($query, $values); + return (bool) $GLOBALS['injector']->get(Horde_Core_Factory_Db::class)->create('horde', 'signup')->selectValue($query, $values); } /** @@ -96,7 +96,7 @@ public function getQueuedSignup($username) . ' WHERE user_name = ?'; $values = [$username]; - $result = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Db')->create('horde', 'signup')->selectOne($query, $values); + $result = $GLOBALS['injector']->get(Horde_Core_Factory_Db::class)->create('horde', 'signup')->selectOne($query, $values); if (empty($result)) { throw new Horde_Exception(sprintf(Horde_Core_Translation::t('User "%s" does not exist.'), $username)); } @@ -118,7 +118,7 @@ public function getQueuedSignups() $query = 'SELECT * FROM ' . $this->_params['table'] . ' ORDER BY signup_date'; - $result = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Db')->create('horde', 'signup')->select($query); + $result = $GLOBALS['injector']->get(Horde_Core_Factory_Db::class)->create('horde', 'signup')->select($query); $signups = []; foreach ($result as $signup) { @@ -143,7 +143,7 @@ public function removeQueuedSignup($username) . ' WHERE user_name = ?'; $values = [$username]; - $GLOBALS['injector']->getInstance('Horde_Core_Factory_Db')->create('horde', 'signup')->delete($query, $values); + $GLOBALS['injector']->get(Horde_Core_Factory_Db::class)->create('horde', 'signup')->delete($query, $values); } /** diff --git a/lib/Horde/Core/Auth/X509.php b/lib/Horde/Core/Auth/X509.php index 1f65556b..ae61de59 100644 --- a/lib/Horde/Core/Auth/X509.php +++ b/lib/Horde/Core/Auth/X509.php @@ -21,7 +21,7 @@ protected function _validate($certificate) try { /** * ARCHITECTURE VIOLATION: Using deprecated Horde::callHook() - * @deprecated Use $GLOBALS['injector']->getInstance('Horde_Core_Hooks')->callHook() instead + * @deprecated Use $GLOBALS['injector']->get(Horde_Core_Hooks::class)->callHook() instead * @see Horde_Deprecated::callHook() */ return Horde::callHook('x509_validate', [$certificate]); diff --git a/lib/Horde/Core/Block/Collection.php b/lib/Horde/Core/Block/Collection.php index f6a9736f..d201b1b2 100644 --- a/lib/Horde/Core/Block/Collection.php +++ b/lib/Horde/Core/Block/Collection.php @@ -94,7 +94,7 @@ public function getLayout() public function getLayoutManager(?Horde_Session $session = null) { if ($session === null && isset($GLOBALS['injector'])) { - $session = $GLOBALS['injector']->getInstance('Horde_Session'); + $session = $GLOBALS['injector']->get(Horde_Session::class); } return new Horde_Core_Block_Layout_Manager($this, $session); diff --git a/lib/Horde/Core/Block/Layout/Manager.php b/lib/Horde/Core/Block/Layout/Manager.php index bb286387..9b090d95 100644 --- a/lib/Horde/Core/Block/Layout/Manager.php +++ b/lib/Horde/Core/Block/Layout/Manager.php @@ -239,7 +239,7 @@ public function handle($action, $row, $col, $url = null) || !$this->rowExists($row) || !$this->colExists($col)) { // Check permissions. - $max_blocks = $GLOBALS['injector']->getInstance('Horde_Core_Perms')->hasAppPermission('max_blocks'); + $max_blocks = $GLOBALS['injector']->get(Horde_Core_Perms::class)->hasAppPermission('max_blocks'); if (($max_blocks !== true) && ($max_blocks <= count($this))) { Horde::permissionDeniedError( @@ -335,7 +335,7 @@ public function getBlock($row, $col) if (!isset($this->_blocks[$row][$col])) { $field = $this->_layout[$row][$col]; $this->_blocks[$row][$col] = $GLOBALS['injector'] - ->getInstance('Horde_Core_Factory_BlockCollection') + ->get(Horde_Core_Factory_BlockCollection::class) ->create() ->getBlock( $field['app'], diff --git a/lib/Horde/Core/Block/Layout/View.php b/lib/Horde/Core/Block/Layout/View.php index 45d37c5b..0fc43d68 100644 --- a/lib/Horde/Core/Block/Layout/View.php +++ b/lib/Horde/Core/Block/Layout/View.php @@ -61,7 +61,7 @@ public function toHtml() $html = ''; - $bc = $GLOBALS['injector']->getInstance('Horde_Core_Factory_BlockCollection')->create(); + $bc = $GLOBALS['injector']->get(Horde_Core_Factory_BlockCollection::class)->create(); $covered = []; $js = []; foreach ($this->_layout as $row_num => $row) { @@ -154,7 +154,7 @@ public function getApplications() */ public function getStylesheets() { - $css = $GLOBALS['injector']->getInstance('Horde_PageOutput')->css; + $css = $GLOBALS['injector']->get(Horde_PageOutput::class)->css; $stylesheets = []; foreach ($this->getApplications() as $app) { diff --git a/lib/Horde/Core/Browser.php b/lib/Horde/Core/Browser.php index 6f765999..e29a3a1a 100644 --- a/lib/Horde/Core/Browser.php +++ b/lib/Horde/Core/Browser.php @@ -23,7 +23,7 @@ public function match($userAgent = null, $accept = null): void parent::match($userAgent, $accept); try { - $GLOBALS['injector']->getInstance('Horde_Core_Hooks') + $GLOBALS['injector']->get(Horde_Core_Hooks::class) ->callHook('browser_modify', 'horde', [$this]); } catch (Horde_Exception_HookNotSet $e) { } diff --git a/lib/Horde/Core/Cache/Session.php b/lib/Horde/Core/Cache/Session.php index 78e38952..3a13b795 100644 --- a/lib/Horde/Core/Cache/Session.php +++ b/lib/Horde/Core/Cache/Session.php @@ -76,7 +76,7 @@ public function __construct(array $params = []) } $this->_session = $params['session'] - ?? $GLOBALS['injector']->getInstance(SessionAccess::class); + ?? $GLOBALS['injector']->get(SessionAccess::class); unset($params['session']); parent::__construct(array_merge( diff --git a/lib/Horde/Core/Controller/RequestMapper.php b/lib/Horde/Core/Controller/RequestMapper.php index 42505f8d..c549e203 100644 --- a/lib/Horde/Core/Controller/RequestMapper.php +++ b/lib/Horde/Core/Controller/RequestMapper.php @@ -160,11 +160,11 @@ function ($a, $b) { */ public function getRequestConfiguration(Horde_Injector|Injector $injector) { - $request = $injector->getInstance('Horde_Controller_Request'); + $request = $injector->get('Horde_Controller_Request'); $requestServer = $_SERVER['SERVER_NAME']; $uriScheme = $_SERVER['REQUEST_SCHEME']; - $registry = $injector->getInstance('Horde_Registry'); - $settingsFinder = $injector->getInstance('Horde_Core_Controller_SettingsFinder'); + $registry = $injector->get(Horde_Registry::class); + $settingsFinder = $injector->get(Horde_Core_Controller_SettingsFinder::class); $config = $injector->createInstance('Horde_Core_Controller_RequestConfiguration'); $found = $this->_identifyApp($uriScheme, $request, $requestServer, $GLOBALS['registry']); @@ -222,7 +222,7 @@ public function getRequestConfiguration(Horde_Injector|Injector $injector) } // TODO: Move to some ControllerAuthHelper and check perms and admin if (!$registry->isAuthenticated()) { - $auth = $injector->getInstance('Horde_Core_Factory_Auth')->create(); + $auth = $injector->get(Horde_Core_Factory_Auth::class)->create(); // Default behaviour should be to authenticate if none given. // Older controllers expect this. diff --git a/lib/Horde/Core/Data/Storage.php b/lib/Horde/Core/Data/Storage.php index 66901736..a7e7a91b 100644 --- a/lib/Horde/Core/Data/Storage.php +++ b/lib/Horde/Core/Data/Storage.php @@ -50,7 +50,7 @@ public function get($key) global $injector; try { - return $injector->getInstance('Horde_Pack')->unpack( + return $injector->get('Horde_Pack')->unpack( $this->_ht->get($this->_hkey($key)) ); } catch (Exception $e) { @@ -69,7 +69,7 @@ public function set($key, $value = null) } else { $this->_ht->set( $this->_hkey($key), - $injector->getInstance('Horde_Pack')->pack($value) + $injector->get('Horde_Pack')->pack($value) ); } } diff --git a/lib/Horde/Core/Dav/Auth.php b/lib/Horde/Core/Dav/Auth.php index 983c563a..859b7a4b 100644 --- a/lib/Horde/Core/Dav/Auth.php +++ b/lib/Horde/Core/Dav/Auth.php @@ -33,7 +33,7 @@ public function getCurrentUser() { $user = $this->_auth->getCredential('userId'); try { - $user = $GLOBALS['injector']->getInstance('Horde_Core_Hooks') + $user = $GLOBALS['injector']->get(Horde_Core_Hooks::class) ->callHook('davusername', 'horde', [$user, false]); } catch (Horde_Exception_HookNotSet $e) { } diff --git a/lib/Horde/Core/Db/Migration.php b/lib/Horde/Core/Db/Migration.php index 0b95b75f..922749ea 100644 --- a/lib/Horde/Core/Db/Migration.php +++ b/lib/Horde/Core/Db/Migration.php @@ -143,7 +143,7 @@ public function __construct($basedir = null) public function getMigrator($app, ?Horde_Log_Logger $logger = null) { $app = Horde_String::lower($app); - $db = $GLOBALS['injector']->getInstance('Horde_Db_Adapter'); + $db = $GLOBALS['injector']->get('Horde_Db_Adapter'); return new Horde_Db_Migration_Migrator( $db, $logger, diff --git a/lib/Horde/Core/Factory/ActiveSyncBackend.php b/lib/Horde/Core/Factory/ActiveSyncBackend.php index 37ac9540..d1a91227 100644 --- a/lib/Horde/Core/Factory/ActiveSyncBackend.php +++ b/lib/Horde/Core/Factory/ActiveSyncBackend.php @@ -32,7 +32,7 @@ public function create(Horde_Injector|Injector $injector) // Backend driver and dependencies $params = ['registry' => $registry]; $adapter_params = ['factory' => new Horde_Core_ActiveSync_Imap_Factory([ - 'logger' => $injector->getInstance('Horde_Log_Logger'), + 'logger' => $injector->get('Horde_Log_Logger'), ])]; // Determine emailsync setting - force to off if we don't have a mail API. @@ -66,13 +66,13 @@ protected function _getAuth() global $conf, $injector; $params = [ - 'base_driver' => $injector->getInstance('Horde_Core_Factory_Auth')->create(), + 'base_driver' => $injector->get(Horde_Core_Factory_Auth::class)->create(), ]; if ($conf['activesync']['auth']['type'] != 'basic') { $x_params = $conf['activesync']['auth']['params']; $x_params['default_user'] = $GLOBALS['registry']->getAuth(); - $x_params['logger'] = $this->_injector->getInstance('Horde_Log_Logger'); + $x_params['logger'] = $this->_injector->get('Horde_Log_Logger'); $params['transparent_driver'] = Horde_Auth::factory('Horde_Core_Auth_X509', $x_params); } diff --git a/lib/Horde/Core/Factory/ActiveSyncServer.php b/lib/Horde/Core/Factory/ActiveSyncServer.php index 373872fa..c2f7a0e4 100644 --- a/lib/Horde/Core/Factory/ActiveSyncServer.php +++ b/lib/Horde/Core/Factory/ActiveSyncServer.php @@ -19,11 +19,11 @@ public function create(Horde_Injector|Injector $injector) } $server = new Horde_ActiveSync( - $injector->getInstance('Horde_ActiveSyncBackend'), + $injector->get('Horde_ActiveSyncBackend'), new Horde_ActiveSync_Wbxml_Decoder(fopen('php://input', 'r'), $level), new Horde_ActiveSync_Wbxml_Encoder(fopen('php://output', 'w+'), $level), - $injector->getInstance('Horde_ActiveSyncState'), - $injector->getInstance('Horde_Controller_Request') + $injector->get('Horde_ActiveSyncState'), + $injector->get('Horde_Controller_Request') ); $server->setSupportedVersion($conf['activesync']['version']); diff --git a/lib/Horde/Core/Factory/ActiveSyncState.php b/lib/Horde/Core/Factory/ActiveSyncState.php index f0cdd9a1..e5c3c8d0 100644 --- a/lib/Horde/Core/Factory/ActiveSyncState.php +++ b/lib/Horde/Core/Factory/ActiveSyncState.php @@ -18,14 +18,14 @@ public function create(Horde_Injector|Injector $injector) : 'sql'; switch (Horde_String::lower($driver)) { case 'nosql': - $nosql = $injector->getInstance('Horde_Core_Factory_Nosql')->create('horde', 'activesync'); + $nosql = $injector->get(Horde_Core_Factory_Nosql::class)->create('horde', 'activesync'); return new Horde_ActiveSync_State_Mongo([ 'connection' => $nosql, ]); case 'sql': return new Horde_ActiveSync_State_Sql([ - 'db' => $injector->getInstance('Horde_Core_Factory_Db')->create('horde', 'activesync'), + 'db' => $injector->get(Horde_Core_Factory_Db::class)->create('horde', 'activesync'), ]); } } diff --git a/lib/Horde/Core/Factory/Alarm.php b/lib/Horde/Core/Factory/Alarm.php index 4d3b8fc3..4b95bb59 100644 --- a/lib/Horde/Core/Factory/Alarm.php +++ b/lib/Horde/Core/Factory/Alarm.php @@ -56,7 +56,7 @@ public function create() case 'sql': try { $params['db'] = $this->_injector - ->getInstance('Horde_Core_Factory_Db') + ->get(Horde_Core_Factory_Db::class) ->create('horde', 'alarms'); } catch (Horde_Exception $e) { $driver = 'null'; @@ -65,7 +65,7 @@ public function create() break; } - $params['logger'] = $this->_injector->getInstance('Horde_Log_Logger'); + $params['logger'] = $this->_injector->get('Horde_Log_Logger'); $params['loader'] = [$this, 'load']; $this->_ttl = $params['ttl'] @@ -88,7 +88,7 @@ public function create() new Horde_Core_Alarm_Handler_Desktop([ 'icon' => new Horde_Core_Alarm_Handler_Desktop_Icon('alerts/alarm.png'), 'js_notify' => [ - $this->_injector->getInstance('Horde_PageOutput'), + $this->_injector->get(Horde_PageOutput::class), 'addInlineScript', ], ]) @@ -98,7 +98,7 @@ public function create() 'mail', new Horde_Core_Alarm_Handler_Mail([ 'injector' => $this->_injector, - 'identity' => $this->_injector->getInstance('Horde_Core_Factory_Identity'), + 'identity' => $this->_injector->get(Horde_Core_Factory_Identity::class), ]) ); @@ -121,7 +121,7 @@ public function load($user = null, $preload = true) { global $registry; - $session = $this->_injector->getInstance(HordeSession::class); + $session = $this->_injector->get(HordeSession::class); if ($this->_ttl && $session->hasScoped('horde', 'alarm_loaded') diff --git a/lib/Horde/Core/Factory/Auth.php b/lib/Horde/Core/Factory/Auth.php index 71997cf3..64ab7e87 100644 --- a/lib/Horde/Core/Factory/Auth.php +++ b/lib/Horde/Core/Factory/Auth.php @@ -51,7 +51,7 @@ public function create($app = null) $this->_instances[$app] = new Horde_Core_Auth_Application(array_filter([ 'app' => $app, 'base' => ($app === 'horde') ? $this->_create($GLOBALS['conf']['auth']['driver']) : null, - 'logger' => $this->_injector->getInstance('Horde_Log_Logger'), + 'logger' => $this->_injector->get('Horde_Log_Logger'), ])); } @@ -128,12 +128,12 @@ protected function _create($driver, $orig_params = null) } $params['db'] = $this->_injector - ->getInstance('Horde_Core_Factory_Db') + ->get(Horde_Core_Factory_Db::class) ->create('horde', is_null($orig_params) ? 'auth' : $orig_params); break; case 'horde_auth_http_remote': - $params['client'] = $this->_injector->getInstance('Horde_Core_Factory_HttpClient')->create(); + $params['client'] = $this->_injector->get(Horde_Core_Factory_HttpClient::class)->create(); break; case 'horde_core_auth_application': @@ -143,13 +143,13 @@ protected function _create($driver, $orig_params = null) break; case 'horde_core_auth_imsp': - $params['imsp'] = $this->_injector->getInstance('Horde_Core_Factory_Imsp')->create(); + $params['imsp'] = $this->_injector->get(Horde_Core_Factory_Imsp::class)->create(); break; case 'horde_core_auth_ldap': case 'horde_core_auth_msad': $params['ldap'] = $this->_injector - ->getInstance('Horde_Core_Factory_Ldap') + ->get(Horde_Core_Factory_Ldap::class) ->create('horde', is_null($orig_params) ? 'auth' : $orig_params); break; case 'horde_core_auth_x509': @@ -163,18 +163,18 @@ protected function _create($driver, $orig_params = null) case 'horde_auth_customsql': case 'horde_auth_sql': $params['db'] = $this->_injector - ->getInstance('Horde_Core_Factory_Db') + ->get(Horde_Core_Factory_Db::class) ->create('horde', is_null($orig_params) ? 'auth' : $orig_params); break; } $params['default_user'] = $GLOBALS['registry']->getAuth(); - $params['logger'] = $this->_injector->getInstance('Horde_Log_Logger'); + $params['logger'] = $this->_injector->get('Horde_Log_Logger'); if (!empty($params['count_bad_logins'])) { - $params['history_api'] = $this->_injector->getInstance('Horde_History'); + $params['history_api'] = $this->_injector->get('Horde_History'); } if (!empty($params['login_block'])) { - $params['lock_api'] = $this->_injector->getInstance('Horde_Lock'); + $params['lock_api'] = $this->_injector->get('Horde_Lock'); } $auth_ob = new $driver($params); diff --git a/lib/Horde/Core/Factory/Cache.php b/lib/Horde/Core/Factory/Cache.php index 5b94e2eb..dbacfdb8 100644 --- a/lib/Horde/Core/Factory/Cache.php +++ b/lib/Horde/Core/Factory/Cache.php @@ -50,7 +50,7 @@ public function create(Horde_Injector|Injector $injector) $params = [ 'compress' => true, - 'logger' => $injector->getInstance('Horde_Core_Log_Wrapper'), + 'logger' => $injector->get(Horde_Core_Log_Wrapper::class), ]; if (isset($conf['cache']['default_lifetime'])) { $params['lifetime'] = $conf['cache']['default_lifetime']; @@ -76,7 +76,7 @@ public function create(Horde_Injector|Injector $injector) break; case 'nosql': - $nosql = $injector->getInstance('Horde_Core_Factory_Nosql')->create('horde', 'cache'); + $nosql = $injector->get(Horde_Core_Factory_Nosql::class)->create('horde', 'cache'); if ($nosql instanceof Horde_Mongo_Client) { $sparams['mongo_db'] = $nosql; $driver = 'Horde_Cache_Storage_Mongo'; @@ -87,7 +87,7 @@ public function create(Horde_Injector|Injector $injector) break; case 'sql': - $sparams['db'] = $injector->getInstance('Horde_Core_Factory_Db')->create('horde', 'cache'); + $sparams['db'] = $injector->get(Horde_Core_Factory_Db::class)->create('horde', 'cache'); unset($sparams['driverconfig'], $sparams['umask']); break; } @@ -188,7 +188,7 @@ protected function _getStorage($driver, $params) protected function _resolveHashTable($injector): HashTable { try { - return $injector->getInstance(HashTable::class); + return $injector->get(HashTable::class); } catch (Throwable $e) { $hashtableDriver = $this->_describeConfiguredHashTableDriver(); /* Horde_Cache_Exception extends Horde_Exception_Wrapped, whose diff --git a/lib/Horde/Core/Factory/Data.php b/lib/Horde/Core/Factory/Data.php index 60affb2b..fe21dc8f 100644 --- a/lib/Horde/Core/Factory/Data.php +++ b/lib/Horde/Core/Factory/Data.php @@ -38,13 +38,13 @@ class Horde_Core_Factory_Data extends Horde_Core_Factory_Base public function create($driver, array $params = []) { $class = $this->_getDriverName($driver, 'Horde_Data'); - $params['browser'] = $this->_injector->getInstance('Horde_Browser'); - $params['vars'] = $this->_injector->getInstance('Horde_Variables'); + $params['browser'] = $this->_injector->get('Horde_Browser'); + $params['vars'] = $this->_injector->get('Horde_Variables'); $params['http'] = $this->_injector - ->getInstance('Horde_Core_Factory_HttpClient') + ->get(Horde_Core_Factory_HttpClient::class) ->create(['request.verifyPeer' => false]); - return new $class($this->_injector->getInstance('Horde_Core_Data_Storage'), $params); + return new $class($this->_injector->get(Horde_Core_Data_Storage::class), $params); } } diff --git a/lib/Horde/Core/Factory/DavServer.php b/lib/Horde/Core/Factory/DavServer.php index 59b7d28b..19916773 100644 --- a/lib/Horde/Core/Factory/DavServer.php +++ b/lib/Horde/Core/Factory/DavServer.php @@ -36,16 +36,16 @@ public function create(Horde_Injector|Injector $injector) new Horde_Core_Auth_UsernameHook( [ 'base' => $injector - ->getInstance('Horde_Core_Factory_Auth') + ->get(Horde_Core_Factory_Auth::class) ->create(), ] ), - $injector->getInstance('Horde_Core_Factory_Identity_DavUsernameHook') + $injector->get(Horde_Core_Factory_Identity_DavUsernameHook::class) ); $principals = new DAVACL\PrincipalCollection($principalBackend); $principals->disableListing = $conf['auth']['list_users'] == 'input'; - $calendarBackend = new Horde_Dav_Calendar_Backend($registry, $injector->getInstance('Horde_Dav_Storage')); + $calendarBackend = new Horde_Dav_Calendar_Backend($registry, $injector->get('Horde_Dav_Storage')); $caldav = new CalDAV\CalendarRoot($principalBackend, $calendarBackend); $contactsBackend = new Horde_Dav_Contacts_Backend($registry); $carddav = new CardDAV\AddressBookRoot($principalBackend, $contactsBackend); @@ -79,7 +79,7 @@ public function create(Horde_Injector|Injector $injector) $server->addPlugin( new DAV\Auth\Plugin( new Horde_Core_Dav_Auth( - $injector->getInstance('Horde_Core_Factory_Auth')->create() + $injector->get(Horde_Core_Factory_Auth::class)->create() ), 'Horde DAV Server' ) @@ -92,7 +92,7 @@ public function create(Horde_Injector|Injector $injector) ); $server->addPlugin( new DAV\Locks\Plugin( - new Horde_Dav_Locks($registry, $injector->getInstance('Horde_Lock')) + new Horde_Dav_Locks($registry, $injector->get('Horde_Lock')) ) ); /** diff --git a/lib/Horde/Core/Factory/DavStorage.php b/lib/Horde/Core/Factory/DavStorage.php index 9f2ba1af..73b1c475 100644 --- a/lib/Horde/Core/Factory/DavStorage.php +++ b/lib/Horde/Core/Factory/DavStorage.php @@ -33,7 +33,7 @@ public function create(Horde_Injector|Injector $injector) case 'Sql': $class = 'Horde_Dav_Storage_Sql'; $params['db'] = $injector - ->getInstance('Horde_Core_Factory_Db') + ->get(Horde_Core_Factory_Db::class) ->create('horde', 'davstorage'); break; diff --git a/lib/Horde/Core/Factory/Db.php b/lib/Horde/Core/Factory/Db.php index 983a0fc6..88ee41eb 100644 --- a/lib/Horde/Core/Factory/Db.php +++ b/lib/Horde/Core/Factory/Db.php @@ -198,14 +198,14 @@ protected function _createDb($config, $sig = null, $cache = true) if ($cache && !isset($config['cache'])) { /* Need to add cache ob here, after it is stored as an instance, * or else we enter infinite bootstrapping loop. Bug #13439 */ - $ob->setCache($this->_injector->getInstance('Horde_Cache')); + $ob->setCache($this->_injector->get('Horde_Cache')); } /* Bug #13463: setting logger before cache causes intermittent issues * with DB object during session shutdown. */ if (!isset($config['logger'])) { $ob->setLogger( - $this->_injector->getInstance('Horde_Log_Logger'), + $this->_injector->get('Horde_Log_Logger'), $logqueries ); } diff --git a/lib/Horde/Core/Factory/DbBase.php b/lib/Horde/Core/Factory/DbBase.php index acb44eb4..ca2d0ef2 100644 --- a/lib/Horde/Core/Factory/DbBase.php +++ b/lib/Horde/Core/Factory/DbBase.php @@ -17,6 +17,6 @@ class Horde_Core_Factory_DbBase extends Horde_Core_Factory_Injector */ public function create(Horde_Injector|Injector $injector) { - return $injector->getInstance('Horde_Core_Factory_Db')->create('horde'); + return $injector->get(Horde_Core_Factory_Db::class)->create('horde'); } } diff --git a/lib/Horde/Core/Factory/Editor.php b/lib/Horde/Core/Factory/Editor.php index d0545878..60caefc3 100644 --- a/lib/Horde/Core/Factory/Editor.php +++ b/lib/Horde/Core/Factory/Editor.php @@ -36,6 +36,6 @@ class Horde_Core_Factory_Editor extends Horde_Core_Factory_Injector */ public function create(Horde_Injector|Injector $injector) { - return $injector->getInstance('Horde_Core_Editor_Ckeditor'); + return $injector->get(Horde_Core_Editor_Ckeditor::class); } } diff --git a/lib/Horde/Core/Factory/ElasticSearch.php b/lib/Horde/Core/Factory/ElasticSearch.php index 621aecd7..13278356 100644 --- a/lib/Horde/Core/Factory/ElasticSearch.php +++ b/lib/Horde/Core/Factory/ElasticSearch.php @@ -38,6 +38,6 @@ class Horde_Core_Factory_ElasticSearch extends Horde_Core_Factory_Injector */ public function create(Horde_Injector|Injector $injector) { - return new Horde_ElasticSearch_Client('http://localhost:9200/', $injector->getInstance('Horde_Http_Client')); + return new Horde_ElasticSearch_Client('http://localhost:9200/', $injector->get('Horde_Http_Client')); } } diff --git a/lib/Horde/Core/Factory/Facebook.php b/lib/Horde/Core/Factory/Facebook.php index b5148c70..1fdcacf7 100644 --- a/lib/Horde/Core/Factory/Facebook.php +++ b/lib/Horde/Core/Factory/Facebook.php @@ -24,8 +24,8 @@ public function create(Horde_Injector|Injector $injector) $conf['facebook']['id'], $conf['facebook']['secret'], [ - 'http_client' => $injector->getInstance('Horde_Core_Factory_HttpClient')->create(), - 'http_request' => $injector->getInstance('Horde_Controller_Request_Http'), + 'http_client' => $injector->get(Horde_Core_Factory_HttpClient::class)->create(), + 'http_request' => $injector->get('Horde_Controller_Request_Http'), ] ); diff --git a/lib/Horde/Core/Factory/Group.php b/lib/Horde/Core/Factory/Group.php index 872fe44f..a1e8efe2 100644 --- a/lib/Horde/Core/Factory/Group.php +++ b/lib/Horde/Core/Factory/Group.php @@ -20,7 +20,7 @@ public function create(Horde_Injector|Injector $injector) } } if (!empty($GLOBALS['conf']['group']['cache'])) { - $params['cache'] = $injector->getInstance('Horde_Cache'); + $params['cache'] = $injector->get('Horde_Cache'); } switch ($driver) { @@ -32,14 +32,14 @@ public function create(Horde_Injector|Injector $injector) case 'Ldap': $class = 'Horde_Core_Group_Ldap'; $params['ldap'] = $injector - ->getInstance('Horde_Core_Factory_Ldap') + ->get(Horde_Core_Factory_Ldap::class) ->create('horde', 'group'); break; case 'Sql': $class = 'Horde_Group_Sql'; $params['db'] = $injector - ->getInstance('Horde_Core_Factory_Db') + ->get(Horde_Core_Factory_Db::class) ->create('horde', 'group'); break; diff --git a/lib/Horde/Core/Factory/HashTable.php b/lib/Horde/Core/Factory/HashTable.php index 5aca11f0..a37ab05b 100644 --- a/lib/Horde/Core/Factory/HashTable.php +++ b/lib/Horde/Core/Factory/HashTable.php @@ -35,13 +35,13 @@ public function create(Horde_Injector|Injector $injector) { global $conf; - $logger = $injector->getInstance('Horde_Core_Log_Wrapper'); + $logger = $injector->get(Horde_Core_Log_Wrapper::class); // DEPRECATED: BC config if (!empty($conf['memcache']['enabled'])) { return new Horde_HashTable_Memcache([ 'logger' => $logger, - 'memcache' => $injector->getInstance('Horde_Memcache'), + 'memcache' => $injector->get('Horde_Memcache'), ]); } diff --git a/lib/Horde/Core/Factory/History.php b/lib/Horde/Core/Factory/History.php index 8d986659..20b6d140 100644 --- a/lib/Horde/Core/Factory/History.php +++ b/lib/Horde/Core/Factory/History.php @@ -38,11 +38,11 @@ public function create(Horde_Injector|Injector $injector) : $conf['history']['driver']; $history = null; - $user = $injector->getInstance('Horde_Registry')->getAuth(); + $user = $injector->get(Horde_Registry::class)->getAuth(); switch (Horde_String::lower($driver)) { case 'nosql': - $nosql = $injector->getInstance('Horde_Core_Factory_Nosql')->create('horde', 'history'); + $nosql = $injector->get(Horde_Core_Factory_Nosql::class)->create('horde', 'history'); if ($nosql instanceof Horde_History_Mongo) { $history = new Horde_History_Mongo( $user, @@ -55,7 +55,7 @@ public function create(Horde_Injector|Injector $injector) try { $history = new Horde_History_Sql( $user, - $injector->getInstance('Horde_Core_Factory_Db')->create('horde', 'history') + $injector->get(Horde_Core_Factory_Db::class)->create('horde', 'history') ); } catch (Exception $e) { } @@ -64,7 +64,7 @@ public function create(Horde_Injector|Injector $injector) if (is_null($history)) { $history = new Horde_History_Null($user); - } elseif ($cache = $injector->getInstance('Horde_Cache')) { + } elseif ($cache = $injector->get('Horde_Cache')) { $history->setCache($cache); $history = new Horde_Core_History($history); } diff --git a/lib/Horde/Core/Factory/Identity.php b/lib/Horde/Core/Factory/Identity.php index ccf0cd78..9a87ae43 100644 --- a/lib/Horde/Core/Factory/Identity.php +++ b/lib/Horde/Core/Factory/Identity.php @@ -92,7 +92,7 @@ public function create($user = null, $driver = null) if (isset($prefs) && ($params['user'] == $registry->getAuth())) { $params['prefs'] = $prefs; } else { - $params['prefs'] = $this->_injector->getInstance('Horde_Core_Factory_Prefs')->create($registry->getApp() ?: 'horde', [ + $params['prefs'] = $this->_injector->get(Horde_Core_Factory_Prefs::class)->create($registry->getApp() ?: 'horde', [ 'cache' => false, 'user' => $user, ]); diff --git a/lib/Horde/Core/Factory/Identity/DavUsernameHook.php b/lib/Horde/Core/Factory/Identity/DavUsernameHook.php index ad957696..91d9718c 100644 --- a/lib/Horde/Core/Factory/Identity/DavUsernameHook.php +++ b/lib/Horde/Core/Factory/Identity/DavUsernameHook.php @@ -36,7 +36,7 @@ class Horde_Core_Factory_Identity_DavUsernameHook extends Horde_Core_Factory_Ide public function create($user = null, $driver = null) { try { - $user = $this->_injector->getInstance('Horde_Core_Hooks') + $user = $this->_injector->get(Horde_Core_Hooks::class) ->callHook('davusername', 'horde', [$user, true]); } catch (Horde_Exception_HookNotSet $e) { } diff --git a/lib/Horde/Core/Factory/Image.php b/lib/Horde/Core/Factory/Image.php index 1e07c4b4..c9fb98db 100644 --- a/lib/Horde/Core/Factory/Image.php +++ b/lib/Horde/Core/Factory/Image.php @@ -28,7 +28,7 @@ public function create(array $params = []) $context = [ 'tmpdir' => Horde::getTempdir(), - 'logger' => $this->_injector->getInstance('Horde_Log_Logger'), + 'logger' => $this->_injector->get('Horde_Log_Logger'), ]; switch ($driver) { diff --git a/lib/Horde/Core/Factory/Imsp.php b/lib/Horde/Core/Factory/Imsp.php index abbcaaf1..ef0bf5d2 100644 --- a/lib/Horde/Core/Factory/Imsp.php +++ b/lib/Horde/Core/Factory/Imsp.php @@ -89,7 +89,7 @@ protected function _factory($driver = null, array $params = []) $params['auth_method'] = $GLOBALS['conf']['imsp']['auth_method']; } - $params['authObj'] = $this->_injector->getInstance('Horde_Core_Factory_ImspAuth')->create($params['auth_method'], $params); + $params['authObj'] = $this->_injector->get(Horde_Core_Factory_ImspAuth::class)->create($params['auth_method'], $params); // @TODO: Separate class for the imtest client? unset($params['auth_method']); try { diff --git a/lib/Horde/Core/Factory/Ldap.php b/lib/Horde/Core/Factory/Ldap.php index 77f5aa3a..570fa232 100644 --- a/lib/Horde/Core/Factory/Ldap.php +++ b/lib/Horde/Core/Factory/Ldap.php @@ -67,7 +67,7 @@ public function create($app = 'horde', $backend = null) if (!isset($config['user'])) { $config['user'] = $config; } - $config['cache'] = $this->_injector->getInstance('Horde_Cache'); + $config['cache'] = $this->_injector->get('Horde_Cache'); $config['cache_root_dse'] = true; $e = null; diff --git a/lib/Horde/Core/Factory/Lock.php b/lib/Horde/Core/Factory/Lock.php index e7c8910c..963d779c 100644 --- a/lib/Horde/Core/Factory/Lock.php +++ b/lib/Horde/Core/Factory/Lock.php @@ -28,7 +28,7 @@ public function create(Horde_Injector|Injector $injector) : $conf['lock']['driver']; $params = Horde::getDriverConfig('lock', $driver); - $params['logger'] = $injector->getInstance('Horde_Log_Logger'); + $params['logger'] = $injector->get('Horde_Log_Logger'); switch (Horde_String::lower($driver)) { case 'none': @@ -36,7 +36,7 @@ public function create(Horde_Injector|Injector $injector) break; case 'nosql': - $nosql = $injector->getInstance('Horde_Core_Factory_Nosql')->create('horde', 'cache'); + $nosql = $injector->get(Horde_Core_Factory_Nosql::class)->create('horde', 'cache'); if ($nosql instanceof Horde_Mongo_Client) { $params['mongo_db'] = $nosql; $driver = 'mongo'; @@ -44,7 +44,7 @@ public function create(Horde_Injector|Injector $injector) break; case 'sql': - $params['db'] = $injector->getInstance('Horde_Core_Factory_Db')->create('horde', 'lock'); + $params['db'] = $injector->get(Horde_Core_Factory_Db::class)->create('horde', 'lock'); break; } diff --git a/lib/Horde/Core/Factory/Logger.php b/lib/Horde/Core/Factory/Logger.php index ab8f95b4..ef36cf2e 100644 --- a/lib/Horde/Core/Factory/Logger.php +++ b/lib/Horde/Core/Factory/Logger.php @@ -1,6 +1,7 @@ config === null) { - $this->config = $injector->getInstance('Horde\\Core\\Config\\LoggerConfig'); + $this->config = $injector->get(LoggerConfig::class); } $this->error = null; @@ -153,7 +154,7 @@ public static function processQueue($logger = null) } if (is_null($logger)) { - $logger = $GLOBALS['injector']->getInstance('Horde_Log_Logger'); + $logger = $GLOBALS['injector']->get('Horde_Log_Logger'); } foreach (self::$_queue as $val) { diff --git a/lib/Horde/Core/Factory/Mail.php b/lib/Horde/Core/Factory/Mail.php index eccee8b0..a2913eeb 100644 --- a/lib/Horde/Core/Factory/Mail.php +++ b/lib/Horde/Core/Factory/Mail.php @@ -117,7 +117,7 @@ public function getConfig() && strlen((string) ($auth = $registry->getAuth()))) { /* Try to get SMTP credentials via hook (e.g. for XOAUTH2 support). */ try { - $hooks = $this->_injector->getInstance('Horde_Core_Hooks'); + $hooks = $this->_injector->get(Horde_Core_Hooks::class); $smtp_creds = $hooks->callHook('smtp_credentials', 'horde', [$auth]); // Hook returned XOAUTH2 credentials diff --git a/lib/Horde/Core/Factory/MailBase.php b/lib/Horde/Core/Factory/MailBase.php index f06ac262..9d3cccac 100644 --- a/lib/Horde/Core/Factory/MailBase.php +++ b/lib/Horde/Core/Factory/MailBase.php @@ -35,7 +35,7 @@ class Horde_Core_Factory_MailBase extends Horde_Core_Factory_Injector */ public function create(Horde_Injector|Injector $injector) { - return $injector->getInstance('Horde_Core_Factory_Mail')->create(); + return $injector->get(Horde_Core_Factory_Mail::class)->create(); } } diff --git a/lib/Horde/Core/Factory/Matcher.php b/lib/Horde/Core/Factory/Matcher.php index 5a544fd1..4a642b3f 100644 --- a/lib/Horde/Core/Factory/Matcher.php +++ b/lib/Horde/Core/Factory/Matcher.php @@ -13,8 +13,8 @@ class Horde_Core_Factory_Matcher extends Horde_Core_Factory_Injector public function create(Horde_Injector|Injector $injector) { return new Matcher( - $injector->getInstance(Mapper::class), - $injector->getInstance('Horde_Controller_Request') + $injector->get(Mapper::class), + $injector->get('Horde_Controller_Request') ); } } diff --git a/lib/Horde/Core/Factory/Memcache.php b/lib/Horde/Core/Factory/Memcache.php index 1257eab8..400ab334 100644 --- a/lib/Horde/Core/Factory/Memcache.php +++ b/lib/Horde/Core/Factory/Memcache.php @@ -13,6 +13,6 @@ public function create(Horde_Injector|Injector $injector) { return empty($GLOBALS['conf']['memcache']['enabled']) ? null - : new Horde_Memcache(array_merge($GLOBALS['conf']['memcache'], ['logger' => $injector->getInstance('Horde_Core_Log_Wrapper')])); + : new Horde_Memcache(array_merge($GLOBALS['conf']['memcache'], ['logger' => $injector->get(Horde_Core_Log_Wrapper::class)])); } } diff --git a/lib/Horde/Core/Factory/MimeViewer.php b/lib/Horde/Core/Factory/MimeViewer.php index b97d6f1e..0a901aba 100644 --- a/lib/Horde/Core/Factory/MimeViewer.php +++ b/lib/Horde/Core/Factory/MimeViewer.php @@ -79,9 +79,9 @@ public function getViewerConfig($type, $app) $params = array_merge($config, [ 'charset' => 'UTF-8', // TODO: Logging - // 'logger' => $this->_injector->getInstance('Horde_Log_Logger'), + // 'logger' => $this->_injector->get('Horde_Log_Logger'), 'temp_file' => ['Horde', 'getTempFile'], - 'text_filter' => [$this->_injector->getInstance('Horde_Core_Factory_TextFilter'), 'filter'], + 'text_filter' => [$this->_injector->get(Horde_Core_Factory_TextFilter::class), 'filter'], ]); switch ($config['driver']) { @@ -92,7 +92,7 @@ public function getViewerConfig($type, $app) case 'Html': $params['browser'] = $GLOBALS['browser']; - $params['dns'] = $this->_injector->getInstance('Net_DNS2_Resolver'); + $params['dns'] = $this->_injector->get('Net_DNS2_Resolver'); $params['external_callback'] = ['Horde', 'externalUrl']; break; diff --git a/lib/Horde/Core/Factory/NosqlBase.php b/lib/Horde/Core/Factory/NosqlBase.php index abacfe09..d70380de 100644 --- a/lib/Horde/Core/Factory/NosqlBase.php +++ b/lib/Horde/Core/Factory/NosqlBase.php @@ -29,7 +29,7 @@ class Horde_Core_Factory_NosqlBase extends Horde_Core_Factory_Injector */ public function create(Horde_Injector|Injector $injector) { - return $injector->getInstance('Horde_Core_Factory_Nosql')->create('horde'); + return $injector->get(Horde_Core_Factory_Nosql::class)->create('horde'); } } diff --git a/lib/Horde/Core/Factory/Notification.php b/lib/Horde/Core/Factory/Notification.php index 130e6f3a..39cde349 100644 --- a/lib/Horde/Core/Factory/Notification.php +++ b/lib/Horde/Core/Factory/Notification.php @@ -28,15 +28,15 @@ public function create(Horde_Injector|Injector $injector) $this->_notify = new Horde_Core_Notification_Handler( new Horde_Core_Notification_Storage_Session( - $injector->getInstance(SessionAccess::class) + $injector->get(SessionAccess::class) ), - $injector->getInstance(SessionAccess::class) + $injector->get(SessionAccess::class) ); $this->_notify->addType('default', '*', 'Horde_Core_Notification_Event_Status'); $this->_notify->addType('status', 'horde.*', 'Horde_Core_Notification_Event_Status'); - $this->_notify->addDecorator(new Horde_Notification_Handler_Decorator_Alarm($injector->getInstance('Horde_Core_Factory_Alarm'), $registry->getAuth())); + $this->_notify->addDecorator(new Horde_Notification_Handler_Decorator_Alarm($injector->get(Horde_Core_Factory_Alarm::class), $registry->getAuth())); $this->_notify->addDecorator(new Horde_Core_Notification_Handler_Decorator_Hordelog()); return $this->_notify; diff --git a/lib/Horde/Core/Factory/Perms.php b/lib/Horde/Core/Factory/Perms.php index a0adfff1..4adf0aae 100644 --- a/lib/Horde/Core/Factory/Perms.php +++ b/lib/Horde/Core/Factory/Perms.php @@ -33,7 +33,7 @@ public function create(Horde_Injector|Injector $injector) case 'sql': try { $params['db'] = $injector - ->getInstance('Horde_Core_Factory_Db') + ->get(Horde_Core_Factory_Db::class) ->create('horde', 'perms'); } catch (Horde_Exception $e) { $driver = 'Null'; @@ -45,11 +45,11 @@ public function create(Horde_Injector|Injector $injector) new Horde_Cache_Storage_Stack([ 'stack' => [ new Horde_Cache_Storage_Memory(), - $injector->getInstance('Horde_Cache'), + $injector->get('Horde_Cache'), ], ]) ); - $params['logger'] = $injector->getInstance('Horde_Log_Logger'); + $params['logger'] = $injector->get('Horde_Log_Logger'); $class = $this->_getDriverName($driver, 'Horde_Perms'); return new $class($params); diff --git a/lib/Horde/Core/Factory/PermsCore.php b/lib/Horde/Core/Factory/PermsCore.php index abd8f2b7..7f6fa73d 100644 --- a/lib/Horde/Core/Factory/PermsCore.php +++ b/lib/Horde/Core/Factory/PermsCore.php @@ -23,8 +23,8 @@ class Horde_Core_Factory_PermsCore extends Horde_Core_Factory_Injector public function create(Horde_Injector|Injector $injector) { return new Horde_Core_Perms( - $injector->getInstance('Horde_Registry'), - $injector->getInstance('Horde_Perms') + $injector->get(Horde_Registry::class), + $injector->get('Horde_Perms') ); } } diff --git a/lib/Horde/Core/Factory/Prefs.php b/lib/Horde/Core/Factory/Prefs.php index b71a13ae..0f6f28d7 100644 --- a/lib/Horde/Core/Factory/Prefs.php +++ b/lib/Horde/Core/Factory/Prefs.php @@ -75,7 +75,7 @@ public function create($scope = 'horde', array $opts = []) $driver = $conf['prefs']['driver']; switch (Horde_String::lower($driver)) { case 'nosql': - $nosql = $this->_injector->getInstance('Horde_Core_Factory_Nosql')->create('horde', 'prefs'); + $nosql = $this->_injector->get(Horde_Core_Factory_Nosql::class)->create('horde', 'prefs'); if ($nosql instanceof Horde_Mongo_Client) { $driver = 'mongo'; } @@ -96,7 +96,7 @@ public function create($scope = 'horde', array $opts = []) $opts = array_merge([ 'cache' => true, - 'logger' => $this->_injector->getInstance('Horde_Log_Logger'), + 'logger' => $this->_injector->get('Horde_Log_Logger'), 'password' => '', 'sizecallback' => ((isset($conf['prefs']['maxsize'])) ? [$this, 'sizeCallback'] : null), 'user' => '', @@ -127,7 +127,7 @@ public function create($scope = 'horde', array $opts = []) switch ($driver) { case 'Horde_Prefs_Storage_Ldap': $params['ldap'] = $this->_injector - ->getInstance('Horde_Core_Factory_Ldap') + ->get(Horde_Core_Factory_Ldap::class) ->create('horde', 'prefs'); break; @@ -140,7 +140,7 @@ public function create($scope = 'horde', array $opts = []) break; case 'Horde_Prefs_Storage_Sql': - $params['db'] = $this->_injector->getInstance('Horde_Core_Factory_Db')->create('horde', 'prefs'); + $params['db'] = $this->_injector->get(Horde_Core_Factory_Db::class)->create('horde', 'prefs'); break; case 'Horde_Prefs_Storage_Imsp': @@ -148,7 +148,7 @@ public function create($scope = 'horde', array $opts = []) $imspParams['username'] = $registry->getAuth('bare'); $imspParams['password'] = $registry->getAuthCredential('password'); $params['imsp'] = $this->_injector - ->getInstance('Horde_Core_Factory_Imsp')->create('Options', $imspParams); + ->get(Horde_Core_Factory_Imsp::class)->create('Options', $imspParams); } $this->storage = new $driver($opts['user'], $params); } catch (Horde_Exception $e) { @@ -198,7 +198,7 @@ public function create($scope = 'horde', array $opts = []) */ protected function _notifyError($e) { - $session = $GLOBALS['injector']->getInstance(HordeSession::class); + $session = $GLOBALS['injector']->get(HordeSession::class); if (!$session->getScoped('horde', 'no_prefs')) { $session->setScoped('horde', 'no_prefs', true); if (isset($GLOBALS['notification'])) { @@ -229,7 +229,7 @@ protected function _getCache($user, $fallback) $params['cache'] = new Horde_Cache_Storage_Null(); $params['maxsize'] = 0; } else { - $params['cache'] = $injector->getInstance('Horde_Cache'); + $params['cache'] = $injector->get('Horde_Cache'); } return new Horde_Prefs_Cache_HordeCache( @@ -243,7 +243,7 @@ protected function _getCache($user, $fallback) * oversized) or is compressed within the session * (if stored in session cache). */ 'compress' => false, - 'logger' => $injector->getInstance('Horde_Core_Log_Wrapper'), + 'logger' => $injector->get(Horde_Core_Log_Wrapper::class), ] ), ] diff --git a/lib/Horde/Core/Factory/Secret/Cbc.php b/lib/Horde/Core/Factory/Secret/Cbc.php index d69afeb7..8c91f213 100644 --- a/lib/Horde/Core/Factory/Secret/Cbc.php +++ b/lib/Horde/Core/Factory/Secret/Cbc.php @@ -22,7 +22,7 @@ class Horde_Core_Factory_Secret_Cbc extends Horde_Core_Factory_Injector { public function create(Horde_Injector|Injector $injector) { - $state = $injector->getInstance(ConfigLoader::class)->load('horde'); + $state = $injector->get(ConfigLoader::class)->load('horde'); // Configuration values are stable for the object's lifetime // and ride in via $params on construction. The per-request diff --git a/lib/Horde/Core/Factory/SessionHandler.php b/lib/Horde/Core/Factory/SessionHandler.php index 10dd16cf..d71c508d 100644 --- a/lib/Horde/Core/Factory/SessionHandler.php +++ b/lib/Horde/Core/Factory/SessionHandler.php @@ -51,12 +51,12 @@ public function create(Horde_Injector|Injector $injector) case 'hashtable': // DEPRECATED case 'memcache': - $params['hashtable'] = $injector->getInstance('Horde_HashTable'); + $params['hashtable'] = $injector->get('Horde_HashTable'); $driver = 'hashtable'; break; case 'nosql': - $nosql = $injector->getInstance('Horde_Core_Factory_Nosql')->create('horde', 'sessionhandler'); + $nosql = $injector->get(Horde_Core_Factory_Nosql::class)->create('horde', 'sessionhandler'); if ($nosql instanceof Horde_Mongo_Client) { $params['mongo_db'] = $nosql; $driver = 'Horde_SessionHandler_Storage_Mongo'; @@ -64,7 +64,7 @@ public function create(Horde_Injector|Injector $injector) break; case 'sql': - $factory = $injector->getInstance('Horde_Core_Factory_Db'); + $factory = $injector->get(Horde_Core_Factory_Db::class); $config = $factory->getConfig('sessionhandler'); unset($config['umask'], $config['driverconfig']); $params['db'] = $factory->createDb($config); @@ -80,7 +80,7 @@ public function create(Horde_Injector|Injector $injector) $storage = new Horde_SessionHandler_Storage_Stack([ 'stack' => [ new Horde_SessionHandler_Storage_Hashtable([ - 'hashtable' => $injector->getInstance('Horde_HashTable'), + 'hashtable' => $injector->get('Horde_HashTable'), ]), $this->storage, ], @@ -98,7 +98,7 @@ public function create(Horde_Injector|Injector $injector) return new Horde_SessionHandler( $storage, [ - 'logger' => $injector->getInstance('Horde_Log_Logger'), + 'logger' => $injector->get('Horde_Log_Logger'), 'no_md5' => true, 'noset' => true, 'parse' => [$this, 'readSessionData'], diff --git a/lib/Horde/Core/Factory/Share.php b/lib/Horde/Core/Factory/Share.php index 212f17e4..2e9e001d 100644 --- a/lib/Horde/Core/Factory/Share.php +++ b/lib/Horde/Core/Factory/Share.php @@ -35,7 +35,7 @@ class Horde_Core_Factory_Share extends Horde_Core_Factory_Base */ public function create($app = null, $driver = null) { - return new Horde_Core_Share_Driver($this->_injector->getInstance('Horde_Core_Factory_ShareBase')->create($app, $driver)); + return new Horde_Core_Share_Driver($this->_injector->get(Horde_Core_Factory_ShareBase::class)->create($app, $driver)); } } diff --git a/lib/Horde/Core/Factory/ShareBase.php b/lib/Horde/Core/Factory/ShareBase.php index 82cad4fa..9b246b12 100644 --- a/lib/Horde/Core/Factory/ShareBase.php +++ b/lib/Horde/Core/Factory/ShareBase.php @@ -48,7 +48,7 @@ class Horde_Core_Factory_ShareBase extends Horde_Core_Factory_Base implements Ho public function create($app = null, $driver = null) { global $conf; - $registry = $this->_injector->getInstance('Horde_Registry'); + $registry = $this->_injector->get(Horde_Registry::class); if (empty($driver)) { $driver = $conf['share']['driver']; @@ -63,13 +63,13 @@ public function create($app = null, $driver = null) } $class = $this->_getDriverName($driver, 'Horde_Share'); - $ob = new $class($app, $registry->getAuth(), $this->_injector->getInstance('Horde_Perms'), $this->_injector->getInstance('Horde_Group')); + $ob = new $class($app, $registry->getAuth(), $this->_injector->get('Horde_Perms'), $this->_injector->get('Horde_Group')); $cb = new Horde_Core_Share_FactoryCallback($app, $driver); $ob->setShareCallback([$cb, 'create']); - $ob->setLogger($this->_injector->getInstance('Horde_Log_Logger')); + $ob->setLogger($this->_injector->get('Horde_Log_Logger')); if (!empty($conf['share']['cache'])) { - $session = $this->_injector->getInstance(HordeSession::class); + $session = $this->_injector->get(HordeSession::class); $cache_sig = self::STORAGE_KEY . $driver; $listCache = $session->getScoped($app, $cache_sig); $ob->setListCache($listCache); @@ -102,7 +102,7 @@ public function create($app = null, $driver = null) */ public function shutdown() { - $session = $this->_injector->getInstance(HordeSession::class); + $session = $this->_injector->get(HordeSession::class); foreach ($this->_toCache as $sig => $val) { try { diff --git a/lib/Horde/Core/Factory/SpellChecker.php b/lib/Horde/Core/Factory/SpellChecker.php index 5970f948..316b10ac 100644 --- a/lib/Horde/Core/Factory/SpellChecker.php +++ b/lib/Horde/Core/Factory/SpellChecker.php @@ -50,7 +50,7 @@ public function create(array $args = [], $input = null) if (empty($args['locale'])) { if (!is_null($input)) { try { - $args['locale'] = $this->_injector->getInstance('Horde_Core_Factory_LanguageDetect')->getLanguageCode($input); + $args['locale'] = $this->_injector->get(Horde_Core_Factory_LanguageDetect::class)->getLanguageCode($input); } catch (Horde_Exception $e) { } } diff --git a/lib/Horde/Core/Factory/Template.php b/lib/Horde/Core/Factory/Template.php index 956bbad2..071d524a 100644 --- a/lib/Horde/Core/Factory/Template.php +++ b/lib/Horde/Core/Factory/Template.php @@ -11,8 +11,8 @@ class Horde_Core_Factory_Template extends Horde_Core_Factory_Injector public function create(Horde_Injector|Injector $injector) { return new Horde_Template([ - 'cacheob' => $injector->getInstance('Horde_Cache'), - 'logger' => $injector->getInstance('Horde_Log_Logger'), + 'cacheob' => $injector->get('Horde_Cache'), + 'logger' => $injector->get('Horde_Log_Logger'), ]); } diff --git a/lib/Horde/Core/Factory/ThemesCache.php b/lib/Horde/Core/Factory/ThemesCache.php index d29d9e98..a0530778 100644 --- a/lib/Horde/Core/Factory/ThemesCache.php +++ b/lib/Horde/Core/Factory/ThemesCache.php @@ -48,7 +48,7 @@ public function create($app, $theme) if (!isset($this->_instances[$sig])) { $cache = empty($GLOBALS['conf']['cachethemes']) ? null - : $this->_injector->getInstance('Horde_Cache'); + : $this->_injector->get('Horde_Cache'); if (!$cache || ($cache instanceof Horde_Cache_Null)) { $instance = new Horde_Themes_Cache($app, $theme); @@ -86,7 +86,7 @@ public function expireCache($app, $theme) { $sig = implode('|', [$app, $theme]); - $cache = $this->_injector->getInstance('Horde_Cache'); + $cache = $this->_injector->get('Horde_Cache'); if ($cache->exists($sig, $GLOBALS['conf']['cachethemesparams']['lifetime'])) { if (!$cache->expire($sig)) { @@ -105,7 +105,7 @@ public function expireCache($app, $theme) */ public function shutdown() { - $cache = $this->_injector->getInstance('Horde_Cache'); + $cache = $this->_injector->get('Horde_Cache'); foreach ($this->_instances as $key => $val) { if ($val->changed) { diff --git a/lib/Horde/Core/Factory/Timezone.php b/lib/Horde/Core/Factory/Timezone.php index 46af9a93..4f2ee610 100644 --- a/lib/Horde/Core/Factory/Timezone.php +++ b/lib/Horde/Core/Factory/Timezone.php @@ -27,7 +27,7 @@ public function create(Horde_Injector|Injector $injector) } return new Horde_Timezone([ - 'cache' => $injector->getInstance('Horde_Cache'), + 'cache' => $injector->get('Horde_Cache'), 'location' => $GLOBALS['conf']['timezone']['location'], 'temp' => Horde::getTempDir(), ]); diff --git a/lib/Horde/Core/Factory/Token.php b/lib/Horde/Core/Factory/Token.php index dfedce70..9e9a3755 100644 --- a/lib/Horde/Core/Factory/Token.php +++ b/lib/Horde/Core/Factory/Token.php @@ -19,7 +19,7 @@ public function create(Horde_Injector|Injector $injector) ? [] : Horde::getDriverConfig('token', $conf['token']['driver']); - $params['logger'] = $injector->getInstance('Horde_Log_Logger'); + $params['logger'] = $injector->get('Horde_Log_Logger'); if (!$session->exists('horde', 'token_secret_key')) { $session->set('horde', 'token_secret_key', strval(new Horde_Support_Randomid())); @@ -32,7 +32,7 @@ public function create(Horde_Injector|Injector $injector) break; case 'nosql': - $nosql = $injector->getInstance('Horde_Core_Factory_Nosql')->create('horde', 'token'); + $nosql = $injector->get(Horde_Core_Factory_Nosql::class)->create('horde', 'token'); if ($nosql instanceof Horde_Mongo_Client) { $params['mongo_db'] = $nosql; $driver = 'Horde_Token_Mongo'; @@ -40,7 +40,7 @@ public function create(Horde_Injector|Injector $injector) break; case 'sql': - $params['db'] = $injector->getInstance('Horde_Core_Factory_Db')->create('horde', 'token'); + $params['db'] = $injector->get(Horde_Core_Factory_Db::class)->create('horde', 'token'); break; } diff --git a/lib/Horde/Core/Factory/Tree.php b/lib/Horde/Core/Factory/Tree.php index 3661b3b2..d752cb44 100644 --- a/lib/Horde/Core/Factory/Tree.php +++ b/lib/Horde/Core/Factory/Tree.php @@ -108,6 +108,6 @@ public static function setSession($instance, $id, $val) */ private static function session(): SessionAccess { - return $GLOBALS['injector']->getInstance(SessionAccess::class); + return $GLOBALS['injector']->get(SessionAccess::class); } } diff --git a/lib/Horde/Core/Factory/Twitter.php b/lib/Horde/Core/Factory/Twitter.php index 672d6442..be28fb35 100644 --- a/lib/Horde/Core/Factory/Twitter.php +++ b/lib/Horde/Core/Factory/Twitter.php @@ -41,12 +41,12 @@ public function create(Horde_Injector|Injector $injector) /* Create the Consumer */ $auth = new Horde_Service_Twitter_Auth_Oauth(new Horde_Oauth_Consumer($params)); - $request = new Horde_Service_Twitter_Request_Oauth($injector->getInstance('Horde_Controller_Request')); + $request = new Horde_Service_Twitter_Request_Oauth($injector->get('Horde_Controller_Request')); $twitter = new Horde_Service_Twitter($auth, $request); - //$twitter->setCache($injector->getInstance('Horde_Cache')); - $twitter->setLogger($injector->getInstance('Horde_Log_Logger')); - $twitter->setHttpClient($injector->getInstance('Horde_Core_Factory_HttpClient')->create()); + //$twitter->setCache($injector->get('Horde_Cache')); + $twitter->setLogger($injector->get('Horde_Log_Logger')); + $twitter->setHttpClient($injector->get(Horde_Core_Factory_HttpClient::class)->create()); return $twitter; } diff --git a/lib/Horde/Core/Factory/UrlShortener.php b/lib/Horde/Core/Factory/UrlShortener.php index a1a8d757..3ec99000 100644 --- a/lib/Horde/Core/Factory/UrlShortener.php +++ b/lib/Horde/Core/Factory/UrlShortener.php @@ -17,7 +17,7 @@ public function create(Horde_Injector|Injector $injector) : $GLOBALS['conf']['urlshortener']; $class = $this->_getDriverName($driver, 'Horde_Service_UrlShortener'); - return new $class($injector->getInstance('Horde_Http_Client')); + return new $class($injector->get('Horde_Http_Client')); } } diff --git a/lib/Horde/Core/Factory/Vfs.php b/lib/Horde/Core/Factory/Vfs.php index 0edc9882..db7ed926 100644 --- a/lib/Horde/Core/Factory/Vfs.php +++ b/lib/Horde/Core/Factory/Vfs.php @@ -90,7 +90,7 @@ public function getConfig($name = 'horde') break; case 'nosql': - $nosql = $this->_injector->getInstance('Horde_Core_Factory_Nosql')->create('horde', 'vfs'); + $nosql = $this->_injector->get(Horde_Core_Factory_Nosql::class)->create('horde', 'vfs'); if ($nosql instanceof Horde_Mongo_Client) { $vfs['params']['mongo_db'] = $nosql; $vfs['type'] = 'mongo'; @@ -103,7 +103,7 @@ public function getConfig($name = 'horde') $config = Horde::getDriverConfig('vfs', 'sql'); unset($config['umask'], $config['vfsroot']); $vfs['params']['db'] = $this->_injector - ->getInstance('Horde_Core_Factory_Db') + ->get(Horde_Core_Factory_Db::class) ->create('horde', $config); break; } diff --git a/lib/Horde/Core/Factory/View.php b/lib/Horde/Core/Factory/View.php index a25664c4..a6ee327b 100644 --- a/lib/Horde/Core/Factory/View.php +++ b/lib/Horde/Core/Factory/View.php @@ -33,7 +33,7 @@ class Horde_Core_Factory_View extends Horde_Core_Factory_Injector { public function create(Horde_Injector|Injector $injector) { - $registry = $injector->getInstance('Horde_Registry'); + $registry = $injector->get(Horde_Registry::class); $view = new Horde_View(['templatePath' => $registry->get('templates', $registry->getApp())]); $view->addHelper('Tag'); $view->addHelper('Text'); diff --git a/lib/Horde/Core/Factory/Weather.php b/lib/Horde/Core/Factory/Weather.php index cb4dadc6..3f658bf7 100644 --- a/lib/Horde/Core/Factory/Weather.php +++ b/lib/Horde/Core/Factory/Weather.php @@ -21,7 +21,7 @@ public function create(Horde_Injector|Injector $injector) // Parameters for all driver types $params = [ - 'cache' => $injector->getInstance('Horde_Cache'), + 'cache' => $injector->get('Horde_Cache'), 'cache_lifetime' => $conf['weather']['params']['lifetime'], 'http_client' => $injector->createInstance('Horde_Core_Factory_HttpClient')->create(), ]; @@ -38,7 +38,7 @@ public function create(Horde_Injector|Injector $injector) } break; case 'Metar': - $params['db'] = $injector->getInstance('Horde_Db_Adapter'); + $params['db'] = $injector->get('Horde_Db_Adapter'); break; } $class = $this->_getDriverName($driver, 'Horde_Service_Weather'); diff --git a/lib/Horde/Core/Group/Ldap.php b/lib/Horde/Core/Group/Ldap.php index 3babe279..8bbd1775 100644 --- a/lib/Horde/Core/Group/Ldap.php +++ b/lib/Horde/Core/Group/Ldap.php @@ -30,7 +30,7 @@ public function create($name, $email = null) try { return parent::create( $name, - $GLOBALS['injector']->getInstance('Horde_Core_Hooks')->callHook('groupldap', 'horde', [$name, $email]) + $GLOBALS['injector']->get(Horde_Core_Hooks::class)->callHook('groupldap', 'horde', [$name, $email]) ); } catch (Horde_Exception_HookNotSet $e) { return parent::create($name, $email); diff --git a/lib/Horde/Core/HashTable/PersistentSession.php b/lib/Horde/Core/HashTable/PersistentSession.php index 8e274d5c..84c7a3f8 100644 --- a/lib/Horde/Core/HashTable/PersistentSession.php +++ b/lib/Horde/Core/HashTable/PersistentSession.php @@ -59,7 +59,7 @@ class Horde_Core_HashTable_PersistentSession extends Horde_Core_HashTable_Vfs im public function __construct(array $params = []) { $this->_session = $params['session'] - ?? $GLOBALS['injector']->getInstance(SessionAccess::class); + ?? $GLOBALS['injector']->get(SessionAccess::class); /* Stable per-session VFS prefix. Derived from session_id() rather * than a CSRF token because such tokens are not stable across calls. diff --git a/lib/Horde/Core/HashTable/Vfs.php b/lib/Horde/Core/HashTable/Vfs.php index cae93e5e..258c8e83 100644 --- a/lib/Horde/Core/HashTable/Vfs.php +++ b/lib/Horde/Core/HashTable/Vfs.php @@ -53,7 +53,7 @@ public function __construct(array $params = []) global $injector; try { - $vfs = $injector->getInstance('Horde_Core_Factory_Vfs')->create(); + $vfs = $injector->get(Horde_Core_Factory_Vfs::class)->create(); } catch (Horde_Vfs_Exception $e) { } @@ -62,7 +62,7 @@ public function __construct(array $params = []) } parent::__construct(array_merge($params, [ - 'logger' => $injector->getInstance('Horde_Core_Log_Wrapper'), + 'logger' => $injector->get(Horde_Core_Log_Wrapper::class), 'vfs' => $vfs, ])); } diff --git a/lib/Horde/Core/HashTable/Wrapper.php b/lib/Horde/Core/HashTable/Wrapper.php index 0854d101..2949e543 100644 --- a/lib/Horde/Core/HashTable/Wrapper.php +++ b/lib/Horde/Core/HashTable/Wrapper.php @@ -43,7 +43,7 @@ class Horde_Core_HashTable_Wrapper public function __call($name, $arguments) { return call_user_func_array( - [$GLOBALS['injector']->getInstance('Horde_HashTable'), $name], + [$GLOBALS['injector']->get('Horde_HashTable'), $name], $arguments ); } @@ -53,7 +53,7 @@ public function __call($name, $arguments) */ public function __get($name) { - return $GLOBALS['injector']->getInstance('Horde_HashTable')->$name; + return $GLOBALS['injector']->get('Horde_HashTable')->$name; } /** @@ -61,7 +61,7 @@ public function __get($name) */ public function __set($name, $value) { - $GLOBALS['injector']->getInstance('Horde_HashTable')->$name = $value; + $GLOBALS['injector']->get('Horde_HashTable')->$name = $value; } } diff --git a/lib/Horde/Core/Imsp/Utils.php b/lib/Horde/Core/Imsp/Utils.php index 68ad0285..09655054 100644 --- a/lib/Horde/Core/Imsp/Utils.php +++ b/lib/Horde/Core/Imsp/Utils.php @@ -39,7 +39,7 @@ public static function getAllBooks(array $serverInfo) { $foundDefault = false; $results = []; - $imsp = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Imsp')->create('Book', $serverInfo['params']); + $imsp = $GLOBALS['injector']->get(Horde_Core_Factory_Imsp::class)->create('Book', $serverInfo['params']); $books = $imsp->getAddressBookList(); $bCount = count($books); for ($i = 0; $i < $bCount; $i++) { @@ -78,7 +78,7 @@ public static function getAllBooks(array $serverInfo) */ public static function createBook(array $source, $newName) { - $imsp = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Imsp')->create('Book', $source['params']); + $imsp = $GLOBALS['injector']->get(Horde_Core_Factory_Imsp::class)->create('Book', $source['params']); // We now check if the username is already prepended to // the address book name or not. @@ -106,7 +106,7 @@ public function synchShares($share_obj, array $serverInfo) $return = ['added' => [], 'removed' => []]; $params = []; - $imsp = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Imsp')->create('Book', $serverInfo['params']); + $imsp = $GLOBALS['injector']->get(Horde_Core_Factory_Imsp::class)->create('Book', $serverInfo['params']); $abooks = $imsp->getAddressBookList(); // Do we have a default address book? If not, create one. @@ -280,7 +280,7 @@ public static function permsToACL($perms) */ public static function setACL($params, $book, $name, $acl) { - $imsp = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Imsp')->create('Book', $params); + $imsp = $GLOBALS['injector']->get(Horde_Core_Factory_Imsp::class)->create('Book', $params); return $imsp->setACL($book, $name, $acl); } diff --git a/lib/Horde/Core/Log/Wrapper.php b/lib/Horde/Core/Log/Wrapper.php index 82af686f..aa5a96d8 100644 --- a/lib/Horde/Core/Log/Wrapper.php +++ b/lib/Horde/Core/Log/Wrapper.php @@ -32,7 +32,7 @@ public function __call($name, $arguments) { if (isset($GLOBALS['injector'])) { return call_user_func_array( - [$GLOBALS['injector']->getInstance('Horde_Log_Logger'), $name], + [$GLOBALS['injector']->get('Horde_Log_Logger'), $name], $arguments ); } diff --git a/lib/Horde/Core/LoginTasks.php b/lib/Horde/Core/LoginTasks.php index 4d86d21f..0853d1bc 100644 --- a/lib/Horde/Core/LoginTasks.php +++ b/lib/Horde/Core/LoginTasks.php @@ -54,9 +54,9 @@ public function runTasks(array $opts = []) } if (($this->_app != 'horde') - && ($GLOBALS['injector']->getInstance(HordeSession::class) + && ($GLOBALS['injector']->get(HordeSession::class) ->getScoped('horde', 'logintasks') !== true)) { - $GLOBALS['injector']->getInstance('Horde_Core_Factory_LoginTasks')->create('horde')->runTasks($opts); + $GLOBALS['injector']->get(Horde_Core_Factory_LoginTasks::class)->create('horde')->runTasks($opts); } parent::runTasks($opts); diff --git a/lib/Horde/Core/LoginTasks/Backend/Horde.php b/lib/Horde/Core/LoginTasks/Backend/Horde.php index 86ae93e9..e2ebf1d1 100644 --- a/lib/Horde/Core/LoginTasks/Backend/Horde.php +++ b/lib/Horde/Core/LoginTasks/Backend/Horde.php @@ -46,7 +46,7 @@ public function __construct($app) */ public function getTasklistFromCache() { - return $GLOBALS['injector']->getInstance(HordeSession::class) + return $GLOBALS['injector']->get(HordeSession::class) ->getScoped($this->_app, 'logintasks'); } @@ -58,7 +58,7 @@ public function getTasklistFromCache() */ public function storeTasklistInCache($tasklist) { - $GLOBALS['injector']->getInstance(HordeSession::class) + $GLOBALS['injector']->get(HordeSession::class) ->setScoped($this->_app, 'logintasks', $tasklist); } diff --git a/lib/Horde/Core/Mime/Headers/Received.php b/lib/Horde/Core/Mime/Headers/Received.php index 1ae1f443..5218ad68 100644 --- a/lib/Horde/Core/Mime/Headers/Received.php +++ b/lib/Horde/Core/Mime/Headers/Received.php @@ -57,7 +57,7 @@ public static function createHordeHop() $server_name = 'unknown'; } - $is_ssl = $injector->getInstance('Horde_Browser')->usingSSLConnection(); + $is_ssl = $injector->get('Horde_Browser')->usingSSLConnection(); return new self( null, diff --git a/lib/Horde/Core/Mime/Viewer/Syntaxhighlighter.php b/lib/Horde/Core/Mime/Viewer/Syntaxhighlighter.php index 1c291cdd..0e7c573a 100644 --- a/lib/Horde/Core/Mime/Viewer/Syntaxhighlighter.php +++ b/lib/Horde/Core/Mime/Viewer/Syntaxhighlighter.php @@ -31,7 +31,7 @@ protected function _renderInline() $language = $this->_mimeTypeToLanguage($mimeType); $brush = $this->_languageToBrush($language); - $page_output = $GLOBALS['injector']->getInstance('Horde_PageOutput'); + $page_output = $GLOBALS['injector']->get(Horde_PageOutput::class); if (!self::$_shLoaded) { $page_output->addScriptFile('syntaxhighlighter/scripts/syntaxhighlighter.js', 'horde'); diff --git a/lib/Horde/Core/Nosql.php b/lib/Horde/Core/Nosql.php index fdcdd1e2..50aa6c5c 100644 --- a/lib/Horde/Core/Nosql.php +++ b/lib/Horde/Core/Nosql.php @@ -49,28 +49,28 @@ public function getDrivers($app = 'horde', $mask = 0) if ($app == 'horde') { $backends = [ 'Horde_ActiveSync_State_Mongo' => function () use ($injector) { - return $injector->getInstance('Horde_ActiveSyncState'); + return $injector->get('Horde_ActiveSyncState'); }, 'Horde_Cache_Storage_Mongo' => function () use ($injector) { - return $injector->getInstance('Horde_Core_Factory_Cache')->storage; + return $injector->get(Horde_Core_Factory_Cache::class)->storage; }, 'Horde_History_Mongo' => function () use ($injector) { - return $injector->getInstance('Horde_History'); + return $injector->get('Horde_History'); }, 'Horde_Lock_Mongo' => function () use ($injector) { - return $injector->getInstance('Horde_Lock'); + return $injector->get('Horde_Lock'); }, 'Horde_Prefs_Storage_Mongo' => function () use ($injector) { - return $injector->getInstance('Horde_Core_Factory_Prefs')->storage; + return $injector->get(Horde_Core_Factory_Prefs::class)->storage; }, 'Horde_SessionHandler_Storage_Mongo' => function () use ($injector) { - return $injector->getInstance('Horde_Core_Factory_SessionHandler')->storage; + return $injector->get(Horde_Core_Factory_SessionHandler::class)->storage; }, 'Horde_Token_Mongo' => function () use ($injector) { - return $injector->getInstance('Horde_Token'); + return $injector->get('Horde_Token'); }, 'Horde_Vfs_Mongo' => function () use ($injector) { - return $injector->getInstance('Horde_Core_Factory_Vfs')->create(); + return $injector->get(Horde_Core_Factory_Vfs::class)->create(); }, ]; diff --git a/lib/Horde/Core/Notification/Handler.php b/lib/Horde/Core/Notification/Handler.php index b1d55a4f..0f4cf89a 100644 --- a/lib/Horde/Core/Notification/Handler.php +++ b/lib/Horde/Core/Notification/Handler.php @@ -66,7 +66,7 @@ public function __construct( ) { parent::__construct($storage); $this->_session = $session - ?? $GLOBALS['injector']->getInstance(SessionAccess::class); + ?? $GLOBALS['injector']->get(SessionAccess::class); } /** diff --git a/lib/Horde/Core/Notification/Listener/SmartmobileStatus.php b/lib/Horde/Core/Notification/Listener/SmartmobileStatus.php index 95ec7fa3..a1224a21 100644 --- a/lib/Horde/Core/Notification/Listener/SmartmobileStatus.php +++ b/lib/Horde/Core/Notification/Listener/SmartmobileStatus.php @@ -32,7 +32,7 @@ public function notify($events, $options = []) // TODO: Need to add delay to allow browser to correctly populate // location of original page, or else closing notification reloads // previous page (Ticket #11103). - $GLOBALS['injector']->getInstance('Horde_PageOutput')->addInlineScript([ + $GLOBALS['injector']->get(Horde_PageOutput::class)->addInlineScript([ '$(function() {HordeMobile.showNotifications(' . Horde_Serialize::serialize($events, Horde_Serialize::JSON) . ');});', diff --git a/lib/Horde/Core/Notification/Storage/Session.php b/lib/Horde/Core/Notification/Storage/Session.php index a5781a82..75000d9f 100644 --- a/lib/Horde/Core/Notification/Storage/Session.php +++ b/lib/Horde/Core/Notification/Storage/Session.php @@ -61,7 +61,7 @@ class Horde_Core_Notification_Storage_Session implements Horde_Notification_Stor public function __construct(?SessionAccess $session = null) { $this->_session = $session - ?? $GLOBALS['injector']->getInstance(SessionAccess::class); + ?? $GLOBALS['injector']->get(SessionAccess::class); } /** diff --git a/lib/Horde/Core/Perms/Ui.php b/lib/Horde/Core/Perms/Ui.php index 8327e67a..15fab169 100644 --- a/lib/Horde/Core/Perms/Ui.php +++ b/lib/Horde/Core/Perms/Ui.php @@ -88,7 +88,7 @@ public function renderTree($current = Horde_Perms::ROOT) $blank_img = Horde_Themes_Image::tag('blank.gif', ['attr' => ['width' => 16, 'height' => 16]]); /* Set up the tree. */ - $tree = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Tree')->create('perms_ui', 'Javascript', [ + $tree = $GLOBALS['injector']->get(Horde_Core_Factory_Tree::class)->create('perms_ui', 'Javascript', [ 'alternate' => true, 'hideHeaders' => true, ]); @@ -316,7 +316,7 @@ public function setupEditForm($permission) /* Users permissions. */ $perm_val = $permission->getUserPermissions(); $this->_form->setSection('users', Horde_Core_Translation::t('Individual Users'), Horde_Themes_Image::tag('user.png'), false); - $auth = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Auth')->create(); + $auth = $GLOBALS['injector']->get(Horde_Core_Factory_Auth::class)->create(); $user_list = []; if ($auth->hasCapability('list')) { /* The auth driver has list capabilities so set up an array which @@ -379,7 +379,7 @@ public function setupEditForm($permission) $this->_form->setSection('groups', Horde_Core_Translation::t('Groups'), Horde_Themes_Image::tag('group.png'), false); try { $group_list = $GLOBALS['injector'] - ->getInstance('Horde_Group') + ->get('Horde_Group') ->listAll(); } catch (Horde_Group_Exception $e) { $GLOBALS['notification']->push($e); diff --git a/lib/Horde/Core/Prefs/Cache/Session.php b/lib/Horde/Core/Prefs/Cache/Session.php index efb04ad0..6ed12d1a 100644 --- a/lib/Horde/Core/Prefs/Cache/Session.php +++ b/lib/Horde/Core/Prefs/Cache/Session.php @@ -95,6 +95,6 @@ public function remove($scope = null) */ private function _session(): SessionAccess { - return $GLOBALS['injector']->getInstance(SessionAccess::class); + return $GLOBALS['injector']->get(SessionAccess::class); } } diff --git a/lib/Horde/Core/Prefs/Identity.php b/lib/Horde/Core/Prefs/Identity.php index b08f1f74..ae5fc06f 100644 --- a/lib/Horde/Core/Prefs/Identity.php +++ b/lib/Horde/Core/Prefs/Identity.php @@ -82,7 +82,7 @@ public function verifyIdentity($id, $old_addr) $body->send( $new_addr, $msg_headers, - $injector->getInstance('Horde_Mail') + $injector->get('Horde_Mail') ); $notification->push( diff --git a/lib/Horde/Core/Prefs/Storage/Hooks.php b/lib/Horde/Core/Prefs/Storage/Hooks.php index 555ed932..386d33f9 100644 --- a/lib/Horde/Core/Prefs/Storage/Hooks.php +++ b/lib/Horde/Core/Prefs/Storage/Hooks.php @@ -30,7 +30,7 @@ public function get($scope_ob) try { $scope_ob->set( $name, - $GLOBALS['injector']->getInstance('Horde_Core_Hooks')->callHook( + $GLOBALS['injector']->get(Horde_Core_Hooks::class)->callHook( 'prefs_init', $scope_ob->scope, [ @@ -60,7 +60,7 @@ public function store($scope_ob) public function onChange($scope, $pref) { try { - $GLOBALS['injector']->getInstance('Horde_Core_Hooks') + $GLOBALS['injector']->get(Horde_Core_Hooks::class) ->callHook('prefs_change', $scope, [$pref]); } catch (Horde_Exception_HookNotSet $e) { } diff --git a/lib/Horde/Core/Prefs/Ui.php b/lib/Horde/Core/Prefs/Ui.php index a724bdb1..4145e0b4 100644 --- a/lib/Horde/Core/Prefs/Ui.php +++ b/lib/Horde/Core/Prefs/Ui.php @@ -150,7 +150,7 @@ public function getChangeablePrefs($group = null) { global $prefs; - $session = $GLOBALS['injector']->getInstance(HordeSession::class); + $session = $GLOBALS['injector']->get(HordeSession::class); if (is_null($group)) { if (!$this->group) { @@ -255,7 +255,7 @@ public function handleForm() /* Toggle Advanced/Basic mode. */ if (!empty($this->vars->show_advanced) || !empty($this->vars->show_basic)) { - $GLOBALS['injector']->getInstance(HordeSession::class) + $GLOBALS['injector']->get(HordeSession::class) ->setScoped('horde', 'prefs_advanced', !empty($this->vars->show_advanced)); } elseif (!$this->vars->actionID || !$this->group @@ -266,7 +266,7 @@ public function handleForm() return; } else { try { - $GLOBALS['injector']->getInstance('Horde_Token')->validate($this->vars->horde_prefs_token, 'horde.prefs'); + $GLOBALS['injector']->get('Horde_Token')->validate($this->vars->horde_prefs_token, 'horde.prefs'); } catch (Horde_Token_Exception $e) { $GLOBALS['notification']->push($e); return; @@ -374,7 +374,7 @@ protected function _handleForm($preflist, $save) /* Code for special elements written specifically for each * application. */ if (isset($this->prefs[$pref]['handler']) - && ($ob = $injector->getInstance($this->prefs[$pref]['handler']))) { + && ($ob = $injector->get($this->prefs[$pref]['handler']))) { $ob->init($this); $pref_updated = $ob->update($this); } @@ -433,7 +433,7 @@ public function selfUrl($options = []) $url->add('actionID', 'update_special'); } if (!empty($options['token'])) { - $url->add('horde_prefs_token', $GLOBALS['injector']->getInstance('Horde_Token')->get('horde.prefs')); + $url->add('horde_prefs_token', $GLOBALS['injector']->get('Horde_Token')->get('horde.prefs')); } return $url; } @@ -507,7 +507,7 @@ public function generateUI() if (($this->prefs[$pref]['type'] == 'special') && isset($this->prefs[$pref]['handler']) - && ($ob = $GLOBALS['injector']->getInstance($this->prefs[$pref]['handler']))) { + && ($ob = $GLOBALS['injector']->get($this->prefs[$pref]['handler']))) { $ob->init($this); echo $ob->display($this); continue; @@ -700,7 +700,7 @@ public function generateUI() $t->set('header', $header); $t->set('has_advanced', $this->hasAdvancedPrefs()); - if ($GLOBALS['injector']->getInstance(HordeSession::class) + if ($GLOBALS['injector']->get(HordeSession::class) ->getScoped('horde', 'prefs_advanced')) { $t->set('basic', $this->selfUrl()->add('show_basic', 1)); } else { @@ -715,7 +715,7 @@ public function generateUI() $t->set('app', htmlspecialchars($this->app)); $t->set('group', htmlspecialchars($this->group)); $t->set('label', htmlspecialchars($this->prefGroups[$this->group]['label'])); - $t->set('token', $GLOBALS['injector']->getInstance('Horde_Token')->get('horde.prefs')); + $t->set('token', $GLOBALS['injector']->get('Horde_Token')->get('horde.prefs')); // Search for previous and next groups. if (count($prefgroups) > 1) { @@ -862,7 +862,7 @@ protected function _addHordeIdentitiesPrefs($pref_list) */ protected function _identityHeader($members) { - $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create(null, $this->app); + $identity = $GLOBALS['injector']->get(Horde_Core_Factory_Identity::class)->create(null, $this->app); $default_identity = $identity->getDefault(); $t = $GLOBALS['injector']->createInstance('Horde_Template'); @@ -906,7 +906,7 @@ protected function _identityHeader($members) } $t->set('entry', $entry); - $GLOBALS['injector']->getInstance('Horde_PageOutput')->addInlineScript([ + $GLOBALS['injector']->get(Horde_PageOutput::class)->addInlineScript([ 'HordeIdentitySelect.identities = ' . Horde_Serialize::serialize($js, Horde_Serialize::JSON), ]); @@ -957,7 +957,7 @@ protected function _identitiesUpdate() { global $conf, $notification, $prefs; - $identity = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Identity')->create(null, $this->app); + $identity = $GLOBALS['injector']->get(Horde_Core_Factory_Identity::class)->create(null, $this->app); if ($this->vars->delete_identity) { $id = intval($this->vars->identity); diff --git a/lib/Horde/Core/Prefs/Ui/Widgets.php b/lib/Horde/Core/Prefs/Ui/Widgets.php index 608457e5..48b82a1c 100644 --- a/lib/Horde/Core/Prefs/Ui/Widgets.php +++ b/lib/Horde/Core/Prefs/Ui/Widgets.php @@ -22,7 +22,7 @@ class Horde_Core_Prefs_Ui_Widgets */ public static function sourceInit() { - $GLOBALS['injector']->getInstance('Horde_PageOutput')->addScriptFile('sourceselect.js', 'horde'); + $GLOBALS['injector']->get(Horde_PageOutput::class)->addScriptFile('sourceselect.js', 'horde'); } /** @@ -89,7 +89,7 @@ public static function source($data) 'unselected' => $val[1], ]; } - $GLOBALS['injector']->getInstance('Horde_PageOutput')->addInlineJsVars([ + $GLOBALS['injector']->get(Horde_PageOutput::class)->addInlineJsVars([ 'HordeSourceSelectPrefs.source_list' => $js, ]); } @@ -136,7 +136,7 @@ public static function sourceUpdate($ui) public static function addressbooksInit() { self::sourceInit(); - $GLOBALS['injector']->getInstance('Horde_PageOutput')->addScriptFile('addressbooksprefs.js', 'horde'); + $GLOBALS['injector']->get(Horde_PageOutput::class)->addScriptFile('addressbooksprefs.js', 'horde'); } /** @@ -231,7 +231,7 @@ public static function addressbooks($data) ]; } - $GLOBALS['injector']->getInstance('Horde_PageOutput')->addInlineJsVars([ + $GLOBALS['injector']->get(Horde_PageOutput::class)->addInlineJsVars([ 'HordeAddressbooksPrefs.fields' => $js, 'HordeAddressbooksPrefs.nonetext' => Horde_Core_Translation::t('No address book selected.'), ]); @@ -272,7 +272,7 @@ public static function addressbooksUpdate($ui) */ public static function alarmInit() { - $GLOBALS['injector']->getInstance('Horde_PageOutput')->addScriptFile('alarmprefs.js', 'horde'); + $GLOBALS['injector']->get(Horde_PageOutput::class)->addScriptFile('alarmprefs.js', 'horde'); } /** @@ -290,7 +290,7 @@ public static function alarm($data) { $pref = $data['pref']; - $GLOBALS['injector']->getInstance('Horde_PageOutput')->addInlineJsVars([ + $GLOBALS['injector']->get(Horde_PageOutput::class)->addInlineJsVars([ 'HordeAlarmPrefs.pref' => $pref, ]); @@ -303,7 +303,7 @@ public static function alarm($data) $param_list = $select_list = []; - foreach ($GLOBALS['injector']->getInstance('Horde_Alarm')->handlers() as $method => $handler) { + foreach ($GLOBALS['injector']->get('Horde_Alarm')->handlers() as $method => $handler) { $select_list[] = [ 'l' => $handler->getDescription(), 's' => in_array($method, $selected), @@ -386,7 +386,7 @@ public static function alarm($data) public static function alarmUpdate($ui, $data) { $pref = $data['pref']; - $methods = $GLOBALS['injector']->getInstance('Horde_Alarm')->handlers(); + $methods = $GLOBALS['injector']->get('Horde_Alarm')->handlers(); $val = (isset($ui->vars->$pref) && is_array($ui->vars->$pref)) ? $ui->vars->$pref : []; diff --git a/lib/Horde/Core/Share/Driver.php b/lib/Horde/Core/Share/Driver.php index 5d82bbb5..57d5542a 100644 --- a/lib/Horde/Core/Share/Driver.php +++ b/lib/Horde/Core/Share/Driver.php @@ -41,14 +41,14 @@ public function __construct(Horde_Share_Base $share) global $injector; $this->_share = $share; - $this->_share->setStorage($injector->getInstance($this->_storageMap[get_class($this->_share)])); + $this->_share->setStorage($injector->get($this->_storageMap[get_class($this->_share)])); $this->_share->addCallback('add', [$this, 'shareAddCallback']); $this->_share->addCallback('modify', [$this, 'shareModifyCallback']); $this->_share->addCallback('remove', [$this, 'shareRemoveCallback']); $this->_share->addCallback('list', [$this, 'shareListCallback']); try { - $injector->getInstance('Horde_Core_Hooks')->callHook('share_init', 'horde', [$this, $this->_share->getApp()]); + $injector->get(Horde_Core_Hooks::class)->callHook('share_init', 'horde', [$this, $this->_share->getApp()]); } catch (Horde_Exception_HookNotSet $e) { } } @@ -205,7 +205,7 @@ public function shareListCallback($userid, $shares, $params = []) { try { $params = new Horde_Support_Array($params); - return $GLOBALS['injector']->getInstance('Horde_Core_Hooks') + return $GLOBALS['injector']->get(Horde_Core_Hooks::class) ->callHook('share_list', 'horde', [$userid, $params['perm'], $params['attributes'], $shares]); } catch (Horde_Exception_HookNotSet $e) { } @@ -221,7 +221,7 @@ public function shareListCallback($userid, $shares, $params = []) public function shareAddCallback(Horde_Share_Object $share) { try { - $GLOBALS['injector']->getInstance('Horde_Core_Hooks') + $GLOBALS['injector']->get(Horde_Core_Hooks::class) ->callHook('share_add', 'horde', [$share]); } catch (Horde_Exception_HookNotSet $e) { } @@ -235,7 +235,7 @@ public function shareAddCallback(Horde_Share_Object $share) public function shareRemoveCallback(Horde_Share_Object $share) { try { - $GLOBALS['injector']->getInstance('Horde_Core_Hooks') + $GLOBALS['injector']->get(Horde_Core_Hooks::class) ->callHook('share_remove', 'horde', [$share]); } catch (Horde_Exception_HookNotSet $e) { } @@ -244,7 +244,7 @@ public function shareRemoveCallback(Horde_Share_Object $share) public function shareModifyCallback(Horde_Share_Object $share) { try { - $GLOBALS['injector']->getInstance('Horde_Core_Hooks') + $GLOBALS['injector']->get(Horde_Core_Hooks::class) ->callHook('share_modify', 'horde', [$share]); } catch (Horde_Exception_HookNotSet $e) { } diff --git a/lib/Horde/Core/Share/FactoryCallback.php b/lib/Horde/Core/Share/FactoryCallback.php index 5e78970f..2b624daf 100644 --- a/lib/Horde/Core/Share/FactoryCallback.php +++ b/lib/Horde/Core/Share/FactoryCallback.php @@ -28,7 +28,7 @@ public function __construct($app, $driver) public function create() { - return $GLOBALS['injector']->getInstance('Horde_Core_Factory_ShareBase')->create($this->_app, $this->_driver); + return $GLOBALS['injector']->get(Horde_Core_Factory_ShareBase::class)->create($this->_app, $this->_driver); } } diff --git a/lib/Horde/Core/TagBrowser.php b/lib/Horde/Core/TagBrowser.php index 15403ec0..09f5caa9 100644 --- a/lib/Horde/Core/TagBrowser.php +++ b/lib/Horde/Core/TagBrowser.php @@ -91,7 +91,7 @@ public function __construct( $owner = null ) { $this->_tagger = $tagger; - $this->_session = $GLOBALS['injector']->getInstance(SessionAccess::class); + $this->_session = $GLOBALS['injector']->get(SessionAccess::class); if (!empty($tags)) { $this->_tags = $this->_tagger->getTagIds($tags); diff --git a/lib/Horde/Core/Tagger.php b/lib/Horde/Core/Tagger.php index 26773e06..e0c0aab9 100644 --- a/lib/Horde/Core/Tagger.php +++ b/lib/Horde/Core/Tagger.php @@ -60,14 +60,14 @@ public function __construct() { global $injector; - $cache = $injector->getInstance('Horde_Cache'); + $cache = $injector->get('Horde_Cache'); $key = $this->_app . '.tagger.type_ids'; $ids = $cache->get($key, 360); if ($ids) { $this->_type_ids = unserialize($ids, ['allowed_classes' => false]); } else { - $types = $injector->getInstance('Content_Types_Manager') + $types = $injector->get('Content_Types_Manager') ->ensureTypes($this->_types); foreach ($this->_types as $k => $v) { $this->_type_ids[$v] = intval($types[$k]); @@ -75,7 +75,7 @@ public function __construct() $cache->set($key, serialize($this->_type_ids)); } - $this->_tagger = $injector->getInstance('Content_Tagger'); + $this->_tagger = $injector->get('Content_Tagger'); } /** diff --git a/lib/Horde/Core/Text/Filter/Highlightquotes.php b/lib/Horde/Core/Text/Filter/Highlightquotes.php index 60153554..25299601 100644 --- a/lib/Horde/Core/Text/Filter/Highlightquotes.php +++ b/lib/Horde/Core/Text/Filter/Highlightquotes.php @@ -29,7 +29,7 @@ class Horde_Core_Text_Filter_Highlightquotes extends Horde_Text_Filter_Highlight public function __construct(array $params = []) { if (empty($params['noJS'])) { - $page_output = $GLOBALS['injector']->getInstance('Horde_PageOutput'); + $page_output = $GLOBALS['injector']->get(Horde_PageOutput::class); $page_output->addScriptFile('scriptaculous/effects.js', 'horde'); $page_output->addScriptFile('toggle_quotes.js', 'horde'); } diff --git a/lib/Horde/Core/Topbar.php b/lib/Horde/Core/Topbar.php index 959f6154..fdd036eb 100644 --- a/lib/Horde/Core/Topbar.php +++ b/lib/Horde/Core/Topbar.php @@ -47,7 +47,7 @@ public function __construct($treeRenderer, $rendererParams) { /* Set up the tree. */ $this->_tree = $GLOBALS['injector'] - ->getInstance('Horde_Core_Factory_Tree') + ->get(Horde_Core_Factory_Tree::class) ->create('horde_menu', $treeRenderer, $rendererParams); } @@ -113,7 +113,7 @@ public function getTree() /* Add the administration menu if the user is an admin or has any * admin permissions. */ - $perms = $injector->getInstance('Horde_Perms'); + $perms = $injector->get('Horde_Perms'); $admin_item_count = 0; try { foreach ($registry->callByPackage('horde', 'admin_list') as $method => $val) { diff --git a/lib/Horde/Core/Tree/Renderer/Javascript.php b/lib/Horde/Core/Tree/Renderer/Javascript.php index ffba00bd..f18ab6c1 100644 --- a/lib/Horde/Core/Tree/Renderer/Javascript.php +++ b/lib/Horde/Core/Tree/Renderer/Javascript.php @@ -31,7 +31,7 @@ public function __construct(Horde_Tree $tree, array $params = []) { parent::__construct($tree, $params); - $GLOBALS['injector']->getInstance('Horde_PageOutput')->addScriptFile('hordetree.js', 'horde'); + $GLOBALS['injector']->get(Horde_PageOutput::class)->addScriptFile('hordetree.js', 'horde'); /* Check for a javascript session state. */ if (($session = $this->getOption('session')) @@ -113,7 +113,7 @@ public function getTree($static = false) $js_var = $this->_tree->instance; } - $GLOBALS['injector']->getInstance('Horde_PageOutput')->addInlineScript([ + $GLOBALS['injector']->get(Horde_PageOutput::class)->addInlineScript([ 'window.' . $js_var . ' = new Horde_Tree(' . Horde_Serialize::serialize($opts, Horde_Serialize::JSON) . ')', ], true); diff --git a/lib/Horde/Core/Ui/FlagImage.php b/lib/Horde/Core/Ui/FlagImage.php index 079f9def..1d9b6af0 100644 --- a/lib/Horde/Core/Ui/FlagImage.php +++ b/lib/Horde/Core/Ui/FlagImage.php @@ -75,7 +75,7 @@ public static function getFlagImageObByHost($host) $resolver = new Horde\Nls\Dns\NativeResolver(); try { - $netDnsResolver = $injector->getInstance('Net_DNS2_Resolver'); + $netDnsResolver = $injector->get('Net_DNS2_Resolver'); $resolver = new Horde\Nls\Dns\NetDns2Resolver($netDnsResolver); } catch (Exception $e) { } diff --git a/lib/Horde/Core/Ui/JsCalendar.php b/lib/Horde/Core/Ui/JsCalendar.php index aa6b6941..f503825c 100644 --- a/lib/Horde/Core/Ui/JsCalendar.php +++ b/lib/Horde/Core/Ui/JsCalendar.php @@ -77,7 +77,7 @@ public static function init(array $params = []) $js['Horde_Calendar.fullweekdays'] = self::fullWeekdays(); } - $page_output = $GLOBALS['injector']->getInstance('Horde_PageOutput'); + $page_output = $GLOBALS['injector']->get(Horde_PageOutput::class); $page_output->addScriptFile('calendar.js', 'horde'); $page_output->addInlineJsVars($js); } diff --git a/lib/Horde/Core/Ui/Language.php b/lib/Horde/Core/Ui/Language.php index ae82444a..ace4437a 100644 --- a/lib/Horde/Core/Ui/Language.php +++ b/lib/Horde/Core/Ui/Language.php @@ -32,7 +32,7 @@ public static function render() $html = ''; if (!$prefs->isLocked('language')) { - $session = $GLOBALS['injector']->getInstance(HordeSession::class); + $session = $GLOBALS['injector']->get(HordeSession::class); $session->setScoped('horde', 'language', $registry->preferredLang()); $html = sprintf( '', diff --git a/lib/Horde/Core/Ui/VarRenderer/Html.php b/lib/Horde/Core/Ui/VarRenderer/Html.php index 4829c80d..5afc7d7a 100644 --- a/lib/Horde/Core/Ui/VarRenderer/Html.php +++ b/lib/Horde/Core/Ui/VarRenderer/Html.php @@ -190,7 +190,7 @@ protected function _renderVarInput_image($form, &$var, &$vars) $image = $var->getImage($vars); $varname = $this->_genID($var->getVarName(), false); - $GLOBALS['injector']->getInstance('Horde_PageOutput')->addScriptFile('image.js', 'horde'); + $GLOBALS['injector']->get(Horde_PageOutput::class)->addScriptFile('image.js', 'horde'); /* Check if there is existing img information stored. */ if (isset($image['img'])) { @@ -333,7 +333,7 @@ protected function _renderVarInput_longtext($form, &$var, &$vars) ); if ($var->hasHelper('rte')) { - $GLOBALS['injector']->getInstance('Horde_Editor')->initialize( + $GLOBALS['injector']->get('Horde_Editor')->initialize( ['id' => $this->_genID($var->getVarName(), false), 'relativelinks' => $var->hasHelper('relativelinks'), 'config' => ['extraPlugins' => 'syntaxhighlight']] @@ -344,11 +344,11 @@ protected function _renderVarInput_longtext($form, &$var, &$vars) $html .= '
'; $imgId = $this->_genID($var->getVarName(), false) . 'ehelper'; - $page_output = $GLOBALS['injector']->getInstance('Horde_PageOutput'); + $page_output = $GLOBALS['injector']->get(Horde_PageOutput::class); $page_output->addScriptFile('open_html_helper.js', 'horde'); if ($var->hasHelper('emoticons')) { - $filter = $GLOBALS['injector']->getInstance('Horde_Core_Factory_TextFilter')->create('emoticons'); + $filter = $GLOBALS['injector']->get(Horde_Core_Factory_TextFilter::class)->create('emoticons'); $icon_list = []; foreach (array_flip($filter->getIcons() ?? []) as $icon => $string) { @@ -541,7 +541,7 @@ protected function _renderVarInput_monthdayyear($form, &$var, &$vars) return $this->_renderVarInput_basic($form, $var, $vars); } - $GLOBALS['injector']->getInstance('Horde_PageOutput')->addInlineScript( + $GLOBALS['injector']->get(Horde_PageOutput::class)->addInlineScript( "document.observe('Horde_Calendar:select', " . 'function(e) {' . 'var elt = e.element();' @@ -645,7 +645,7 @@ protected function _renderVarInput_colorpicker($form, &$var, &$vars) . ' value="' . htmlspecialchars((string) $color) . '" />'; if ($browser->hasFeature('javascript')) { - $GLOBALS['injector']->getInstance('Horde_PageOutput')->addScriptFile('colorpicker.js', 'horde'); + $GLOBALS['injector']->get(Horde_PageOutput::class)->addScriptFile('colorpicker.js', 'horde'); $html .= ' ' . Horde::link( '#', @@ -663,7 +663,7 @@ protected function _renderVarInput_sorter($form, &$var, &$vars) { $instance = $var->getProperty('instance'); - $page = $GLOBALS['injector']->getInstance('Horde_PageOutput'); + $page = $GLOBALS['injector']->get(Horde_PageOutput::class); $page->addScriptFile('sorter.js', 'horde'); $page->addInlineScript( sprintf( @@ -687,7 +687,7 @@ protected function _renderVarInput_sorter($form, &$var, &$vars) protected function _renderVarInput_assign($form, &$var, &$vars) { - $GLOBALS['injector']->getInstance('Horde_PageOutput')->addScriptFile('form_assign.js', 'horde'); + $GLOBALS['injector']->get(Horde_PageOutput::class)->addScriptFile('form_assign.js', 'horde'); $name = htmlspecialchars((string) $var->getVarName()); $size = $var->getSize(); @@ -853,7 +853,7 @@ protected function _renderVarInput_set($form, &$var, &$vars) $disable = Horde_Core_Translation::t('Select none'); $invert = Horde_Core_Translation::t('Invert selection'); $GLOBALS['injector'] - ->getInstance('Horde_PageOutput') + ->get(Horde_PageOutput::class) ->addInlineScript(sprintf( ' function %s() @@ -1057,7 +1057,7 @@ protected function _renderVarInput_obrowser($form, &$var, &$vars) $varvalue = $vars->get($varname); $fieldId = $this->_genID(uniqid(mt_rand()), false) . 'id'; $GLOBALS['injector'] - ->getInstance('Horde_PageOutput') + ->get(Horde_PageOutput::class) ->addInlineScript(sprintf( ' var obrowserWindowName; @@ -1139,7 +1139,7 @@ protected function _renderVarDisplay_email($form, &$var, &$vars) $email_val = $var->getValue($vars); if ($var->getProperty('link_compose')) { - $addrs = $GLOBALS['injector']->getInstance('Horde_Mail_Rfc822')->parseAddressList($email_val, [ + $addrs = $GLOBALS['injector']->get('Horde_Mail_Rfc822')->parseAddressList($email_val, [ 'limit' => $var->getProperty('allow_multi') ? 0 : 1, ]); @@ -1167,7 +1167,7 @@ protected function _renderVarDisplay_email($form, &$var, &$vars) return $link; } else { - $addrs = $GLOBALS['injector']->getInstance('Horde_Mail_Rfc822')->parseAddressList($email_val, [ + $addrs = $GLOBALS['injector']->get('Horde_Mail_Rfc822')->parseAddressList($email_val, [ 'limit' => $var->getProperty('allow_multi') ? 0 : 1, ]); @@ -1461,7 +1461,7 @@ protected function _renderVarDisplay_pgp($form, &$var, &$vars) return ''; } return '
'
-            . $GLOBALS['injector']->getInstance('Horde_Core_Factory_Crypt')->create('Pgp', $var->getPGPParams())->pgpPrettyKey($key)
+            . $GLOBALS['injector']->get(Horde_Core_Factory_Crypt::class)->create('Pgp', $var->getPGPParams())->pgpPrettyKey($key)
             . '
'; } @@ -1473,7 +1473,7 @@ protected function _renderVarDisplay_smime($form, &$var, &$vars) } try { return $GLOBALS['injector'] - ->getInstance('Horde_Core_Factory_Crypt') + ->get(Horde_Core_Factory_Crypt::class) ->create('Smime', $var->getSMIMEParams()) ->certToHTML($cert); } catch (Horde_Crypt_Exception $e) { @@ -1626,7 +1626,7 @@ protected function _renderVarDisplay_captcha($form, &$var, &$vars) } $cid = hash('md5', $var->getText()); - $cache = $GLOBALS['injector']->getInstance('Horde_Cache'); + $cache = $GLOBALS['injector']->get('Horde_Cache'); $cache->set($cid, serialize(['data' => $captcha->getCAPTCHAAsJPEG(), 'ctype' => 'image/jpeg'])); @@ -1693,7 +1693,7 @@ protected function _renderVarInput_selectFiles($form, &$var, &$vars) protected function _renderVarInput_category($form, &$var, &$vars) { - $GLOBALS['injector']->getInstance('Horde_PageOutput')->addScriptFile('form_helpers.js', 'horde'); + $GLOBALS['injector']->get(Horde_PageOutput::class)->addScriptFile('form_helpers.js', 'horde'); $this->_addOnLoadJavascript('addEvent(document.getElementById(\'' . $form->getName() . '\'), \'submit\', checkCategory);'); return '' . Horde_Prefs_CategoryManager::getJavaScript($form->getName(), $var->getVarName()) diff --git a/lib/Horde/Core/Ui/VarRenderer/TablesetHtml.php b/lib/Horde/Core/Ui/VarRenderer/TablesetHtml.php index 9da40906..2d356733 100644 --- a/lib/Horde/Core/Ui/VarRenderer/TablesetHtml.php +++ b/lib/Horde/Core/Ui/VarRenderer/TablesetHtml.php @@ -26,7 +26,7 @@ protected function _renderVarInput_tableset($form, &$var, &$vars) $disable = Horde_Core_Translation::t('Select none'); $invert = Horde_Core_Translation::t('Invert selection'); - $page = $GLOBALS['injector']->getInstance('Horde_PageOutput'); + $page = $GLOBALS['injector']->get(Horde_PageOutput::class); $page->addScriptFile('tables.js', 'horde'); $page->addInlineScript(sprintf( ' @@ -99,7 +99,7 @@ protected function _renderVarDisplay_tableset($form, &$var, &$vars) $values = $var->getValues(); $checkedValues = $var->getValue($vars); - $GLOBALS['injector']->getInstance('Horde_PageOutput')->addScriptFile('tables.js', 'horde'); + $GLOBALS['injector']->get(Horde_PageOutput::class)->addScriptFile('tables.js', 'horde'); $html = '' . ''; foreach ($header as $col_title) { diff --git a/lib/Horde/Deprecated.php b/lib/Horde/Deprecated.php index 2414633e..b02e59c7 100644 --- a/lib/Horde/Deprecated.php +++ b/lib/Horde/Deprecated.php @@ -185,7 +185,7 @@ public static function base64ImgData($in, $limit = null) */ public static function callHook($hook, $args = [], $app = 'horde') { - return $GLOBALS['injector']->getInstance('Horde_Core_Hooks') + return $GLOBALS['injector']->get(Horde_Core_Hooks::class) ->callHook($hook, $app, $args); } @@ -204,7 +204,7 @@ public static function callHook($hook, $args = [], $app = 'horde') */ public static function hookExists($hook, $app = 'horde') { - return $GLOBALS['injector']->getInstance('Horde_Core_Hooks') + return $GLOBALS['injector']->get(Horde_Core_Hooks::class) ->hookExists($hook, $app); } diff --git a/lib/Horde/Menu.php b/lib/Horde/Menu.php index 42c8327b..2d47479b 100644 --- a/lib/Horde/Menu.php +++ b/lib/Horde/Menu.php @@ -126,7 +126,7 @@ public function render() */ protected function _render() { - $sidebar = $GLOBALS['injector']->getInstance('Horde_View_Sidebar'); + $sidebar = $GLOBALS['injector']->get('Horde_View_Sidebar'); foreach ($this->_menu as $m) { /* Check for separators. */ diff --git a/lib/Horde/PageOutput.php b/lib/Horde/PageOutput.php index 5e2420a5..dcdeefe0 100644 --- a/lib/Horde/PageOutput.php +++ b/lib/Horde/PageOutput.php @@ -210,7 +210,7 @@ public function includeScriptFiles($full = false) $this->smartmobileInit = []; } - $out = $injector->getInstance('Horde_Core_JavascriptCache')->process($this->hsl, $full); + $out = $injector->get('Horde_Core_JavascriptCache')->process($this->hsl, $full); $this->hsl->clear(); @@ -449,12 +449,8 @@ private function injectSessionApiMetaTags() return; } try { - $renderer = $GLOBALS['injector']->getInstance( - Horde\Core\PageOutput\SessionApiMetaRenderer::class - ); - $session = $GLOBALS['injector']->getInstance( - Horde\Core\Session\HordeSession::class - ); + $renderer = $GLOBALS['injector']->get(Horde\Core\PageOutput\SessionApiMetaRenderer::class); + $session = $GLOBALS['injector']->get(Horde\Core\Session\HordeSession::class); } catch (Throwable $e) { return; } @@ -621,7 +617,7 @@ public function header(array $opts = []) { global $injector, $language, $registry, $session; - $tokenService = $injector->getInstance(Horde\Token\Token::class); + $tokenService = $injector->get(Horde\Token\Token::class); $view = new Horde_View([ 'templatePath' => $registry->get('templates', 'horde') . '/common', @@ -823,7 +819,7 @@ public function header(array $opts = []) echo $view->render('header'); if ($this->topbar) { - echo $injector->getInstance('Horde_View_Topbar')->render(); + echo $injector->get('Horde_View_Topbar')->render(); } // Send what we have currently output so the browser can start @@ -858,7 +854,7 @@ protected function _addThemeScripts() /* The cache instance may come back unserialized; themeScripts() is * derived on demand (not serialized), like the covered-apps list. */ - $cache = $injector->getInstance('Horde_Core_Factory_ThemesCache') + $cache = $injector->get(Horde_Core_Factory_ThemesCache::class) ->create($registry->getApp(), $theme); foreach ($cache->themeScripts() as $script) { diff --git a/lib/Horde/Registry.php b/lib/Horde/Registry.php index f455167c..8661e276 100644 --- a/lib/Horde/Registry.php +++ b/lib/Horde/Registry.php @@ -555,12 +555,8 @@ public function __construct($session_flags = 0, array $args = []) /* Optional injector profiling — activated by env var. */ if (getenv('HORDE_INJECTOR_PROFILE')) { try { - $dispatcher = $injector->getInstance( - EventDispatcherInterface::class - ); - $provider = $injector->getInstance( - ListenerProviderInterface::class - ); + $dispatcher = $injector->get(EventDispatcherInterface::class); + $provider = $injector->get(ListenerProviderInterface::class); $collector = new \Horde\Injector\BindingMapCollector(); $provider->addListener($collector); $injector->setEventDispatcher($dispatcher); @@ -584,7 +580,7 @@ public function __construct($session_flags = 0, array $args = []) /* Initial Horde-wide settings. */ /* Initialize browser object. */ - $GLOBALS['browser'] = $injector->getInstance('Horde_Browser'); + $GLOBALS['browser'] = $injector->get('Horde_Browser'); /* Get modified time of registry files. */ $regfiles = [ @@ -635,13 +631,13 @@ public function __construct($session_flags = 0, array $args = []) * instance; two divergent instances for the same PHP * session id decrypt each other's ciphertext with * different keys. See horde/Core#182. */ - $hordeSession = $injector->getInstance(HordeSession::class); + $hordeSession = $injector->get(HordeSession::class); $injector->setInstance(HordeSession::class, $hordeSession); /* Ensure the per-session CSRF secret exists before closing a * read-only session, so view/download scripts can validate * tokens generated on full page views. */ - $injector->getInstance(TokenServiceFactory::class) + $injector->get(TokenServiceFactory::class) ->createForSession($hordeSession); if ($session_flags & self::SESSION_READONLY) { @@ -667,7 +663,7 @@ public function __construct($session_flags = 0, array $args = []) $this->setLanguageEnvironment(null, 'horde'); /* Initialize global page output object. */ - $GLOBALS['page_output'] = $injector->getInstance('Horde_PageOutput'); + $GLOBALS['page_output'] = $injector->get(Horde_PageOutput::class); /* Initialize notification object. Always attach status listener by * default. */ @@ -681,7 +677,7 @@ public function __construct($session_flags = 0, array $args = []) $nclass = 'Horde_Core_Notification_Listener_SmartmobileStatus'; break; } - $GLOBALS['notification'] = $injector->getInstance('Horde_Notification'); + $GLOBALS['notification'] = $injector->get('Horde_Notification'); if (empty($args['nonotificationinit'])) { $GLOBALS['notification']->attachAllAppHandlers(); } @@ -760,7 +756,7 @@ public function __sleep() */ public function rebuild() { - $session = $GLOBALS['injector']->getInstance(HordeSession::class); + $session = $GLOBALS['injector']->get(HordeSession::class); $app = $this->getApp(); @@ -803,7 +799,7 @@ protected function _loadApplications() ]), [ 'lifetime' => 0, - 'logger' => $injector->getInstance('Horde_Log_Logger'), + 'logger' => $injector->get('Horde_Log_Logger'), ] ); @@ -811,7 +807,7 @@ protected function _loadApplications() && ($cdata = $cache->get($cid, 0))) { try { [$this->applications, $this->_interfaces] - = $injector->getInstance('Horde_Pack')->unpack($cdata); + = $injector->get('Horde_Pack')->unpack($cdata); return; } catch (Horde_Pack_Exception $e) { } @@ -829,7 +825,7 @@ protected function _loadApplications() /* Need to determine hash of generated data, since it is possible that * there is dynamic data in the config files. This only needs to * be done once per session. */ - $packed_data = $injector->getInstance('Horde_Pack')->pack([ + $packed_data = $injector->get('Horde_Pack')->pack([ $this->applications, $this->_interfaces, ]); @@ -848,7 +844,7 @@ protected function _loadApplications() */ protected function _cacheId($hash = null) { - $session = $GLOBALS['injector']->getInstance(HordeSession::class); + $session = $GLOBALS['injector']->get(HordeSession::class); if (!is_null($hash)) { $hash = hash('md5', $hash); @@ -919,7 +915,7 @@ public function getApiInstance($app, $type) * be done here because it is possible to try to load app-specific * libraries from other applications. */ if (!isset($this->_cache['ob'][$app])) { - $autoloader = $GLOBALS['injector']->getInstance('Horde_Autoloader'); + $autoloader = $GLOBALS['injector']->get('Horde_Autoloader'); $app_mappers = [ 'Controller' => 'controllers', @@ -1559,7 +1555,7 @@ public function getServiceLink($type, $app = null, $full = false): Url ->add( 'token', (string) $GLOBALS['injector'] - ->getInstance(Token::class) + ->get(Token::class) ->generate(HordeSession::CSRF_SEED) ); @@ -1751,7 +1747,7 @@ public function pushApp($app, array $options = []) } /* Run authenticated hooks, if necessary. */ - $hooks = $injector->getInstance('Horde_Core_Hooks'); + $hooks = $injector->get(Horde_Core_Hooks::class); if ($session->get('horde', 'auth_app_init/' . $app)) { try { $error = self::INITCALLBACK_FATAL; @@ -1787,7 +1783,7 @@ public function pushApp($app, array $options = []) /* Do login tasks. */ if ($checkPerms && !empty($options['logintasks']) - && ($tasks = $injector->getInstance('Horde_Core_Factory_LoginTasks')->create($app))) { + && ($tasks = $injector->get(Horde_Core_Factory_LoginTasks::class)->create($app))) { $tasks->runTasks(); } @@ -1885,7 +1881,7 @@ public function hasPermission( * authentication against the app's auth backend, i.e. IMAP for IMP. */ if (($perms != Horde_Perms::SHOW) - && $GLOBALS['injector']->getInstance('Horde_Core_Factory_Auth')->create($app)->requireAuth() + && $GLOBALS['injector']->get(Horde_Core_Factory_Auth::class)->create($app)->requireAuth() && !$this->isAuthenticated(['app' => $app, 'notransparent' => !empty($params['notransparent'])])) { return false; } @@ -1893,8 +1889,8 @@ public function hasPermission( /* Otherwise, allow access for admins, for apps that do not have any * explicit permissions, or for apps that allow the given permission. */ return $this->isAdmin() - || ($GLOBALS['injector']->getInstance('Horde_Perms')->exists($app) - ? $GLOBALS['injector']->getInstance('Horde_Perms')->hasPermission($app, $this->getAuth(), $perms) + || ($GLOBALS['injector']->get('Horde_Perms')->exists($app) + ? $GLOBALS['injector']->get('Horde_Perms')->hasPermission($app, $this->getAuth(), $perms) : (bool) $this->getAuth()); } @@ -1964,7 +1960,7 @@ public function loadPrefs($app = null) ]; } - $prefs = $injector->getInstance('Horde_Core_Factory_Prefs')->create($app, $opts); + $prefs = $injector->get(Horde_Core_Factory_Prefs::class)->create($app, $opts); } /** @@ -2137,7 +2133,7 @@ public function hasView($view, $app = null) */ public function setView($view = self::VIEW_BASIC) { - $GLOBALS['injector']->getInstance(HordeSession::class) + $GLOBALS['injector']->get(HordeSession::class) ->setScoped('horde', 'view', $view); } @@ -2148,7 +2144,7 @@ public function setView($view = self::VIEW_BASIC) */ public function getView() { - $session = $GLOBALS['injector']->getInstance(HordeSession::class); + $session = $GLOBALS['injector']->get(HordeSession::class); return $session->hasScoped('horde', 'view') ? $session->getScoped('horde', 'view') @@ -2261,7 +2257,7 @@ public function getInitialPage($app = null) */ public function clearAuth($destroy = true) { - $session = $GLOBALS['injector']->getInstance(HordeSession::class); + $session = $GLOBALS['injector']->get(HordeSession::class); /* Do application logout tasks. */ /* @todo: Replace with exclusively registered logout tasks. */ @@ -2318,7 +2314,7 @@ public function clearAuth($destroy = true) // shim's `$GLOBALS['session']->destroy()` wrapped exactly this // call; reaching for SessionLifecycle directly removes the // last shim hop inside Registry::clearAuth. - $lifecycle = $GLOBALS['injector']->getInstance(SessionLifecycle::class); + $lifecycle = $GLOBALS['injector']->get(SessionLifecycle::class); $lifecycle->destroy(); // Mark the modern HordeSession destroyed so @@ -2329,7 +2325,7 @@ public function clearAuth($destroy = true) // rebuilt instance, not the one we resolved at the top of // this method. $GLOBALS['injector'] - ->getInstance(HordeSession::class) + ->get(HordeSession::class) ->markDestroyed(); } } @@ -2343,7 +2339,7 @@ public function clearAuth($destroy = true) */ public function clearAuthApp($app) { - $session = $GLOBALS['injector']->getInstance(HordeSession::class); + $session = $GLOBALS['injector']->get(HordeSession::class); if ($session->getScoped('horde', 'auth/credentials') == $app) { return false; @@ -2390,7 +2386,7 @@ public function isAdmin(array $options = []) } return isset($options['permission']) - ? $GLOBALS['injector']->getInstance('Horde_Perms')->hasPermission($options['permission'], $user, $options['permlevel'] ?? Horde_Perms::EDIT) + ? $GLOBALS['injector']->get('Horde_Perms')->hasPermission($options['permission'], $user, $options['permlevel'] ?? Horde_Perms::EDIT) : false; } @@ -2428,7 +2424,7 @@ public function isAuthenticated(array $opts = []) $res = true; } elseif ($transparent) { try { - $res = $injector->getInstance('Horde_Core_Factory_Auth')->create($app)->transparent(); + $res = $injector->get(Horde_Core_Factory_Auth::class)->create($app)->transparent(); } catch (Horde_Exception $e) { Horde::log($e); $res = false; @@ -2480,7 +2476,7 @@ public function getLogoutUrl(array $options = []): Url if (!isset($options['reason'])) { // TODO: This only returns the error for Horde-wide // authentication, not for application auth. - $options['reason'] = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Auth')->create()->getError(); + $options['reason'] = $GLOBALS['injector']->get(Horde_Core_Factory_Auth::class)->create()->getError(); } $params = []; @@ -2492,7 +2488,7 @@ public function getLogoutUrl(array $options = []): Url || ($options['app'] == 'horde') || ($options['reason'] == Horde_Auth::REASON_LOGOUT)) { $params['horde_logout_token'] = (string) $GLOBALS['injector'] - ->getInstance(Token::class) + ->get(Token::class) ->generate(HordeSession::CSRF_SEED); } @@ -2504,7 +2500,7 @@ public function getLogoutUrl(array $options = []): Url $params['logout_reason'] = $options['reason']; if ($options['reason'] == Horde_Auth::REASON_MESSAGE) { $params['logout_msg'] = empty($options['msg']) - ? $GLOBALS['injector']->getInstance('Horde_Core_Factory_Auth')->create()->getError(true) + ? $GLOBALS['injector']->get(Horde_Core_Factory_Auth::class)->create()->getError(true) : $options['msg']; } } @@ -2551,7 +2547,7 @@ public function downloadUrl($filename, array $params = []): Url public function convertUsername($userId, $toHorde) { try { - return $GLOBALS['injector']->getInstance('Horde_Core_Hooks') + return $GLOBALS['injector']->get(Horde_Core_Hooks::class) ->callHook('authusername', 'horde', [$userId, $toHorde]); } catch (Horde_Exception_HookNotSet $e) { return $userId; @@ -2577,7 +2573,7 @@ public function getAuth($format = null) return $this->_cache['auth']; } - $session = $GLOBALS['injector']->getInstance(HordeSession::class); + $session = $GLOBALS['injector']->get(HordeSession::class); if ($format == 'original') { return $session->hasScoped('horde', 'auth/authId') @@ -2616,7 +2612,7 @@ public function getAuth($format = null) */ public function passwordChangeRequested() { - return (bool) $GLOBALS['injector']->getInstance(HordeSession::class) + return (bool) $GLOBALS['injector']->get(HordeSession::class) ->getScoped('horde', 'auth/change'); } @@ -2705,7 +2701,7 @@ protected function _getAuthCredentials($app) */ private function _credentialStore(): AuthCredentialStore { - return $GLOBALS['injector']->getInstance(AuthCredentialStore::class); + return $GLOBALS['injector']->get(AuthCredentialStore::class); } /** @@ -2715,7 +2711,7 @@ private function _credentialStore(): AuthCredentialStore */ private function _credentialBaseApp(): ?string { - $value = $GLOBALS['injector']->getInstance(HordeSession::class) + $value = $GLOBALS['injector']->get(HordeSession::class) ->getScoped('horde', 'auth/credentials'); return is_string($value) ? $value : null; @@ -2769,7 +2765,7 @@ public function remoteHost() } // Legacy mode: Perform DNS resolution - $dns = $injector->getInstance('Net_DNS2_Resolver'); + $dns = $injector->get('Net_DNS2_Resolver'); if ($dns && !isset($out->host)) { $out->host = $out->addr; @@ -2881,21 +2877,21 @@ public function checkExistingAuth($app = 'horde') && ($remoteaddr = $session->get('horde', 'auth/remoteAddr')) && ($remoteob = $this->remoteHost()) && ($remoteaddr != $remoteob->addr)) { - $injector->getInstance('Horde_Core_Factory_Auth')->create() + $injector->get(Horde_Core_Factory_Auth::class)->create() ->setError(Horde_Core_Auth_Application::REASON_SESSIONIP); return false; } if (!empty($conf['auth']['checkbrowser']) && ($session->get('horde', 'auth/browser') != $browser->getAgentString())) { - $injector->getInstance('Horde_Core_Factory_Auth')->create() + $injector->get(Horde_Core_Factory_Auth::class)->create() ->setError(Horde_Core_Auth_Application::REASON_BROWSER); return false; } if (!empty($conf['session']['max_time']) && (($conf['session']['max_time'] + $session->begin) < time())) { - $injector->getInstance('Horde_Core_Factory_Auth')->create() + $injector->get(Horde_Core_Factory_Auth::class)->create() ->setError(Horde_Core_Auth_Application::REASON_SESSIONMAXTIME); return false; } @@ -2903,7 +2899,7 @@ public function checkExistingAuth($app = 'horde') foreach (array_unique(['horde', $app]) as $val) { if (!isset($this->_cache['existing'][$val])) { - $auth = $injector->getInstance('Horde_Core_Factory_Auth')->create($val); + $auth = $injector->get(Horde_Core_Factory_Auth::class)->create($val); if (!$auth->validateAuth()) { if (!$auth->getError()) { $auth->setError(Horde_Auth::REASON_SESSION); @@ -2928,7 +2924,7 @@ public function checkExistingAuth($app = 'horde') public function removeUser($userId) { $GLOBALS['injector'] - ->getInstance('Horde_Core_Factory_Auth') + ->get(Horde_Core_Factory_Auth::class) ->create() ->removeUser($userId); $this->removeUserData($userId); @@ -2957,7 +2953,7 @@ public function removeUserData($user, $app = null) $errApps = []; if (!empty($applist)) { $prefs_ob = $GLOBALS['injector'] - ->getInstance('Horde_Core_Factory_Prefs') + ->get(Horde_Core_Factory_Prefs::class) ->create('horde', ['user' => $user]); // Remove all preference at once, if possible. @@ -3014,7 +3010,7 @@ public function removeUserData($user, $app = null) */ public function getAuthInfo() { - $session = $GLOBALS['injector']->getInstance(HordeSession::class); + $session = $GLOBALS['injector']->get(HordeSession::class); // Reproduce the legacy "prefix get" semantics: read all keys // starting with "auth/" under the horde scope, return them as a @@ -3038,7 +3034,7 @@ public function getAuthInfo() public function getAuthApps() { $apps = []; - foreach ($GLOBALS['injector']->getInstance(HordeSession::class)->keysForApp('horde') as $key) { + foreach ($GLOBALS['injector']->get(HordeSession::class)->keysForApp('horde') as $key) { if (str_starts_with($key, 'auth_app/')) { $apps[] = substr($key, 9); } @@ -3088,7 +3084,7 @@ public function getEmailCharset() */ public function preferredLang($lang = null) { - $session = $GLOBALS['injector']->getInstance(HordeSession::class); + $session = $GLOBALS['injector']->get(HordeSession::class); /* Check if we have a language set in the session */ if ($session->hasScoped('horde', 'language')) { @@ -3163,7 +3159,7 @@ public function setLanguage($lang = null) $lang = $this->preferredLang(); } - $GLOBALS['injector']->getInstance(HordeSession::class) + $GLOBALS['injector']->get(HordeSession::class) ->setScoped('horde', 'language', $lang); $changed = false; @@ -3228,7 +3224,7 @@ public function setLanguageEnvironment($lang = null, $app = null) return; } - $session = $GLOBALS['injector']->getInstance(HordeSession::class); + $session = $GLOBALS['injector']->get(HordeSession::class); $session->clearScopeWithPrefixes('horde', ['nls/']); } diff --git a/lib/Horde/Registry/Application.php b/lib/Horde/Registry/Application.php index 92ff10c6..85b7fae8 100644 --- a/lib/Horde/Registry/Application.php +++ b/lib/Horde/Registry/Application.php @@ -252,7 +252,7 @@ protected function _backupPrefs(Backup\User $backup, $app) { global $injector; - $prefs = $injector->getInstance('Horde_Core_Factory_Prefs') + $prefs = $injector->get(Horde_Core_Factory_Prefs::class) ->create($app, ['user' => $backup->user]); $prefs->retrieve(); $scope = $prefs->getScopeObject($app); @@ -284,7 +284,7 @@ protected function _restorePrefs(Backup\Collection $data, $app) { global $injector; - $prefs = $injector->getInstance('Horde_Core_Factory_Prefs') + $prefs = $injector->get(Horde_Core_Factory_Prefs::class) ->create($app, ['user' => $data->getUser()]); $prefs->retrieve(); @@ -534,7 +534,7 @@ final protected function _addSessVars($vars) */ final public function updateSessVars() { - $session = $GLOBALS['injector']->getInstance(HordeSession::class); + $session = $GLOBALS['injector']->get(HordeSession::class); foreach ($this->_sessVars as $key => $val) { $session->setScoped($this->_app, $key, $val); } diff --git a/lib/Horde/Registry/Logout.php b/lib/Horde/Registry/Logout.php index 3cec8193..92d49e74 100644 --- a/lib/Horde/Registry/Logout.php +++ b/lib/Horde/Registry/Logout.php @@ -67,7 +67,7 @@ public function run() foreach ($this->_getTasks() as $val) { try { - $ob = $injector->getInstance($val); + $ob = $injector->get($val); if ($ob instanceof Horde_Registry_Logout_Task) { $ob->logoutTask(); } @@ -105,6 +105,6 @@ private function _setTasks($queue) */ private function _session(): SessionAccess { - return $GLOBALS['injector']->getInstance(SessionAccess::class); + return $GLOBALS['injector']->get(SessionAccess::class); } } diff --git a/lib/Horde/Registry/Nlsconfig.php b/lib/Horde/Registry/Nlsconfig.php index 8c5f711c..266e9ba2 100644 --- a/lib/Horde/Registry/Nlsconfig.php +++ b/lib/Horde/Registry/Nlsconfig.php @@ -165,6 +165,6 @@ public function validLang($lang) */ private function _session(): SessionAccess { - return $GLOBALS['injector']->getInstance(SessionAccess::class); + return $GLOBALS['injector']->get(SessionAccess::class); } } diff --git a/lib/Horde/Script/Cache/HordeCache.php b/lib/Horde/Script/Cache/HordeCache.php index 48c6390b..2b5281e7 100644 --- a/lib/Horde/Script/Cache/HordeCache.php +++ b/lib/Horde/Script/Cache/HordeCache.php @@ -55,7 +55,7 @@ protected function _process($scripts, $full = false) json_encode($hashes) . $mtime ); - $cache = $injector->getInstance('Horde_Cache'); + $cache = $injector->get('Horde_Cache'); $cache_lifetime = empty($this->_params['lifetime']) ? 0 : $this->_params['lifetime']; diff --git a/lib/Horde/Script/Compress.php b/lib/Horde/Script/Compress.php index 6c85790c..56e2d68e 100644 --- a/lib/Horde/Script/Compress.php +++ b/lib/Horde/Script/Compress.php @@ -59,7 +59,7 @@ public function __construct($driver, array $params = []) global $injector; $this->_params = [ - 'logger' => $injector->getInstance('Horde_Log_Logger'), + 'logger' => $injector->get('Horde_Log_Logger'), ]; switch ($driver) { diff --git a/lib/Horde/Session.php b/lib/Horde/Session.php index 6020a219..2dff3a98 100644 --- a/lib/Horde/Session.php +++ b/lib/Horde/Session.php @@ -252,7 +252,7 @@ private function _resolveAccess(): ?SessionAccess return null; } try { - $access = $GLOBALS['injector']->getInstance(SessionAccess::class); + $access = $GLOBALS['injector']->get(SessionAccess::class); return $access instanceof SessionAccess ? $access : null; } catch (\Throwable) { return null; @@ -270,7 +270,7 @@ private function _resolveAccess(): ?SessionAccess private function _resolveModernFallback(): HordeSession { if (isset($GLOBALS['injector'])) { - return $GLOBALS['injector']->getInstance(HordeSession::class); + return $GLOBALS['injector']->get(HordeSession::class); } $sid = (string) (session_id() ?: 'none'); @@ -291,7 +291,7 @@ private function _resolveModernFallback(): HordeSession private function _resolveLifecycle(): ?SessionLifecycle { if (isset($GLOBALS['injector'])) { - return $GLOBALS['injector']->getInstance(SessionLifecycle::class); + return $GLOBALS['injector']->get(SessionLifecycle::class); } return null; } @@ -436,7 +436,7 @@ public function setup( * land in HordeSession before this mirror copies them back to * $_SESSION. addFinal() is single-slot last-writer-wins. */ if (isset($GLOBALS['injector'])) { - $GLOBALS['injector']->getInstance('Horde_Shutdown')->addFinal($this); + $GLOBALS['injector']->get(Horde_Shutdown::class)->addFinal($this); } if ($start) { @@ -869,9 +869,7 @@ private function _tokenService(): ModernToken } if (isset($GLOBALS['injector'])) { - $factory = $GLOBALS['injector']->getInstance( - TokenServiceFactory::class - ); + $factory = $GLOBALS['injector']->get(TokenServiceFactory::class); $this->tokenService = $factory->createForSession($this->modern()); return $this->tokenService; } @@ -948,7 +946,7 @@ public function store($data, $prune = true, $id = null) } $ob = new Horde_Core_Cache_SessionObjects(); - $ob->set($id, $injector->getInstance('Horde_Pack')->pack($data)); + $ob->set($id, $injector->get('Horde_Pack')->pack($data)); return $id; } @@ -962,7 +960,7 @@ public function retrieve($id) $ob = new Horde_Core_Cache_SessionObjects(); try { - return $injector->getInstance('Horde_Pack')->unpack($ob->get($id)); + return $injector->get('Horde_Pack')->unpack($ob->get($id)); } catch (Horde_Pack_Exception $e) { } diff --git a/lib/Horde/Shutdown.php b/lib/Horde/Shutdown.php index de51e039..10609883 100644 --- a/lib/Horde/Shutdown.php +++ b/lib/Horde/Shutdown.php @@ -53,7 +53,7 @@ class Horde_Shutdown */ public static function add(Horde_Shutdown_Task $task) { - $GLOBALS['injector']->getInstance('Horde_Shutdown')->addTask($task); + $GLOBALS['injector']->get(Horde_Shutdown::class)->addTask($task); } /** diff --git a/lib/Horde/Themes.php b/lib/Horde/Themes.php index ebf77a41..8674d86a 100644 --- a/lib/Horde/Themes.php +++ b/lib/Horde/Themes.php @@ -124,7 +124,7 @@ public static function soundList($app = null, $theme = null) $theme = $GLOBALS['prefs']->getValue('theme'); } - $cache = $GLOBALS['injector']->getInstance('Horde_Core_Factory_ThemesCache')->create($app, $theme); + $cache = $GLOBALS['injector']->get(Horde_Core_Factory_ThemesCache::class)->create($app, $theme); $sounds = []; foreach ($cache->build() as $val) { diff --git a/lib/Horde/Themes/Css.php b/lib/Horde/Themes/Css.php index cd923711..5d04c089 100644 --- a/lib/Horde/Themes/Css.php +++ b/lib/Horde/Themes/Css.php @@ -99,7 +99,7 @@ public function getStylesheetUrls(array $opts = []) } $cache_ob = empty($opts['nocache']) - ? $injector->getInstance('Horde_Core_CssCache') + ? $injector->get('Horde_Core_CssCache') : new Horde_Themes_Css_Cache_Null(); return $cache_ob->process($css, $this->_cacheid); @@ -155,7 +155,7 @@ public function getStylesheets($theme = '', array $opts = []) ? null : $opts['sub']; - $cache = $injector->getInstance('Horde_Core_Factory_ThemesCache')->create($curr_app, $theme); + $cache = $injector->get(Horde_Core_Factory_ThemesCache::class)->create($curr_app, $theme); $this->_cacheid = $cache->getCacheId(); /* Add external stylesheets first, since they are ALWAYS overwritable @@ -182,7 +182,7 @@ public function getStylesheets($theme = '', array $opts = []) } /* Add user-defined additional stylesheets. */ - $hooks = $injector->getInstance('Horde_Core_Hooks'); + $hooks = $injector->get(Horde_Core_Hooks::class); try { $add_css = array_merge($add_css, $hooks->callHook('cssfiles', 'horde', [$theme])); } catch (Horde_Exception_HookNotSet $e) { diff --git a/lib/Horde/Themes/Css/Cache/HordeCache.php b/lib/Horde/Themes/Css/Cache/HordeCache.php index ab3eb93a..61eb90c9 100644 --- a/lib/Horde/Themes/Css/Cache/HordeCache.php +++ b/lib/Horde/Themes/Css/Cache/HordeCache.php @@ -38,7 +38,7 @@ public function process($css, $cacheid) } } - $cache = $injector->getInstance('Horde_Cache'); + $cache = $injector->get('Horde_Cache'); $sig = hash( /* Use 64-bit FNV algo (instead of 32-bit) since this is a * publicly accessible key and we want to guarantee filename diff --git a/lib/Horde/Themes/Element.php b/lib/Horde/Themes/Element.php index 06595bf1..17ec58b5 100644 --- a/lib/Horde/Themes/Element.php +++ b/lib/Horde/Themes/Element.php @@ -131,7 +131,7 @@ public function __get($name) 'uri' => $registry->get('themesuri', $this->app) . '/' . $theme . '/' . $this->_dirname, ]; } else { - $cache = $GLOBALS['injector']->getInstance('Horde_Core_Factory_ThemesCache')->create($this->app, $theme); + $cache = $GLOBALS['injector']->get(Horde_Core_Factory_ThemesCache::class)->create($this->app, $theme); $mask = empty($this->_opts['nohorde']) ? 0 : Horde_Themes_Cache::APP_DEFAULT | Horde_Themes_Cache::APP_THEME; diff --git a/src/Ajax/Application.php b/src/Ajax/Application.php index cfa36ff9..8d713f63 100644 --- a/src/Ajax/Application.php +++ b/src/Ajax/Application.php @@ -40,6 +40,7 @@ use InvalidArgumentException; use stdClass; use Throwable; +use Horde_Core_Hooks; abstract class Application { @@ -122,7 +123,7 @@ public function __construct( if (!$auth) { throw new Horde_Exception('Accessing AJAX action without being authenticated.'); } - $tokenService = $injector->getInstance(Token::class); + $tokenService = $injector->get(Token::class); try { $valid = $tokenService->isValid((string) $token, HordeSession::CSRF_SEED); } catch (TokenException) { @@ -203,7 +204,7 @@ public function doAction() return; } - $hooks = $injector->getInstance('Horde_Core_Hooks'); + $hooks = $injector->get(Horde_Core_Hooks::class); /* Look for action in helpers. */ if ($ob = $this->_getHandler()) { @@ -288,7 +289,7 @@ public function send() if (!headers_sent()) { try { - $fresh = $injector->getInstance(Token::class) + $fresh = $injector->get(Token::class) ->generate(HordeSession::CSRF_SEED); header('X-Csrf-Token: ' . (string) $fresh); } catch (TokenException) { @@ -364,7 +365,7 @@ protected function _getHandler() protected function _tryApiRegistry($injector) { try { - $apiRegistry = $injector->getInstance(ApiRegistry::class); + $apiRegistry = $injector->get(ApiRegistry::class); } catch (Throwable $e) { return null; } @@ -375,7 +376,7 @@ protected function _tryApiRegistry($injector) } try { - $api = $injector->getInstance($apiClass); + $api = $injector->get($apiClass); } catch (Throwable $e) { return null; } diff --git a/src/Auth/AuthCredentialStoreFactory.php b/src/Auth/AuthCredentialStoreFactory.php index ef688522..1fb89008 100644 --- a/src/Auth/AuthCredentialStoreFactory.php +++ b/src/Auth/AuthCredentialStoreFactory.php @@ -32,7 +32,7 @@ class AuthCredentialStoreFactory public function create(Injector $injector): AuthCredentialStore { return new AuthCredentialStore( - $injector->getInstance(SessionAccess::class), + $injector->get(SessionAccess::class), ); } } diff --git a/src/Config/StateFactory.php b/src/Config/StateFactory.php index 6960405b..989d6861 100644 --- a/src/Config/StateFactory.php +++ b/src/Config/StateFactory.php @@ -45,6 +45,6 @@ public function create(Injector $injector): State } // Modern path: ConfigLoader reads conf.php directly from disk. - return $injector->getInstance(ConfigLoader::class)->load('horde'); + return $injector->get(ConfigLoader::class)->load('horde'); } } diff --git a/src/Factory/ActiveSyncOpsSnapshotFactory.php b/src/Factory/ActiveSyncOpsSnapshotFactory.php index 4cfd3e27..c1c0cf85 100644 --- a/src/Factory/ActiveSyncOpsSnapshotFactory.php +++ b/src/Factory/ActiveSyncOpsSnapshotFactory.php @@ -40,7 +40,7 @@ public function create(Horde_Injector|Injector $injector): SnapshotService $logging = $conf['activesync']['logging'] ?? []; return new SnapshotService( - state: $injector->getInstance('Horde_ActiveSyncState'), + state: $injector->get('Horde_ActiveSyncState'), logPaths: new DeviceLogPathResolver( is_string($logging['type'] ?? null) ? $logging['type'] @@ -49,7 +49,7 @@ public function create(Horde_Injector|Injector $injector): SnapshotService ? $logging['path'] : null ), - logger: $injector->getInstance('Horde_Log_Logger') + logger: $injector->get('Horde_Log_Logger') ); } } diff --git a/src/Factory/ApiRegistryFactory.php b/src/Factory/ApiRegistryFactory.php index 34425c49..4427fcb8 100644 --- a/src/Factory/ApiRegistryFactory.php +++ b/src/Factory/ApiRegistryFactory.php @@ -23,7 +23,7 @@ class ApiRegistryFactory public function create(Injector $injector): ApiRegistry { $registry = new ApiRegistry(); - $registryLoader = $injector->getInstance(RegistryConfigLoader::class); + $registryLoader = $injector->get(RegistryConfigLoader::class); $state = $registryLoader->load(); foreach ($state->listApplications() as $appName) { @@ -38,7 +38,7 @@ public function create(Injector $injector): ApiRegistry } try { - $appInstance = $injector->getInstance($className); + $appInstance = $injector->get($className); $interfaces = $appInstance->getApiInterfaceList(); } catch (Throwable) { continue; @@ -46,7 +46,7 @@ public function create(Injector $injector): ApiRegistry foreach ($interfaces as $interface => $providerClass) { try { - $provider = $injector->getInstance($providerClass); + $provider = $injector->get($providerClass); } catch (Throwable) { continue; } diff --git a/src/Factory/ApplicationServiceFactory.php b/src/Factory/ApplicationServiceFactory.php index 954e84f2..b9d33263 100644 --- a/src/Factory/ApplicationServiceFactory.php +++ b/src/Factory/ApplicationServiceFactory.php @@ -32,7 +32,7 @@ class ApplicationServiceFactory { public function create(Injector $injector): ApplicationService { - $registryLoader = $injector->getInstance(RegistryConfigLoader::class); + $registryLoader = $injector->get(RegistryConfigLoader::class); return new ApplicationService($registryLoader); } } diff --git a/src/Factory/AuthBaseFactory.php b/src/Factory/AuthBaseFactory.php index 49a31ac8..d512c1ef 100644 --- a/src/Factory/AuthBaseFactory.php +++ b/src/Factory/AuthBaseFactory.php @@ -23,11 +23,12 @@ use Horde_Auth_Base; use Horde_Core_Factory_Injector; use Horde\Injector\Injector; +use Horde_Core_Factory_Auth; class AuthBaseFactory extends Horde_Core_Factory_Injector { public function create(Injector $injector): Horde_Auth_Base { - return $injector->getInstance('Horde_Core_Factory_Auth')->create(); + return $injector->get(Horde_Core_Factory_Auth::class)->create(); } } diff --git a/src/Factory/AuthHttpBasicFactory.php b/src/Factory/AuthHttpBasicFactory.php index 69690500..8894c676 100644 --- a/src/Factory/AuthHttpBasicFactory.php +++ b/src/Factory/AuthHttpBasicFactory.php @@ -8,6 +8,7 @@ use Horde_Core_Factory_Injector as InjectorFactory; use Horde\Injector\Injector as Injector; use Horde_Registry; +use Horde_Core_Factory_Auth; class AuthHttpBasicFactory extends InjectorFactory { @@ -21,7 +22,7 @@ class AuthHttpBasicFactory extends InjectorFactory */ public function create(Injector $injector): AuthHttpBasic { - $driver = $injector->getInstance('Horde_Core_Factory_Auth')->create(); + $driver = $injector->get(Horde_Core_Factory_Auth::class)->create(); $registry = $injector->get(Horde_Registry::class); return new AuthHttpBasic($driver, $registry); } diff --git a/src/Factory/AuthIsGlobalAdminFactory.php b/src/Factory/AuthIsGlobalAdminFactory.php index 51e2d0e9..5b1bc08e 100644 --- a/src/Factory/AuthIsGlobalAdminFactory.php +++ b/src/Factory/AuthIsGlobalAdminFactory.php @@ -23,7 +23,7 @@ class AuthIsGlobalAdminFactory { public function create(Injector $injector): AuthIsGlobalAdmin { - $loader = $injector->getInstance(ConfigLoader::class); + $loader = $injector->get(ConfigLoader::class); $state = $loader->load('horde'); $admins = $state->get('auth.admins', []); diff --git a/src/Factory/AuthLinkRepositoryFactory.php b/src/Factory/AuthLinkRepositoryFactory.php index abaed00a..25594e8f 100644 --- a/src/Factory/AuthLinkRepositoryFactory.php +++ b/src/Factory/AuthLinkRepositoryFactory.php @@ -33,14 +33,14 @@ class AuthLinkRepositoryFactory public function create(Injector $injector): AuthLinkRepository { try { - $db = $injector->getInstance(Adapter::class); + $db = $injector->get(Adapter::class); return new SqlAuthLinkRepository($db); } catch (Throwable) { // SQL not available, try file-based } try { - $loader = $injector->getInstance(ConfigLoader::class); + $loader = $injector->get(ConfigLoader::class); $state = $loader->load('horde'); $filePath = $state->get('auth.authlink_file', ''); diff --git a/src/Factory/AuthServiceFactory.php b/src/Factory/AuthServiceFactory.php index b121f4a9..d261b10c 100644 --- a/src/Factory/AuthServiceFactory.php +++ b/src/Factory/AuthServiceFactory.php @@ -41,7 +41,7 @@ class AuthServiceFactory { public function create(Injector $injector): AuthService { - $loader = $injector->getInstance(ConfigLoader::class); + $loader = $injector->get(ConfigLoader::class); $state = $loader->load('horde'); $driver = $state->get('auth.driver', 'sql'); @@ -49,7 +49,7 @@ public function create(Injector $injector): AuthService $provider = $this->buildProvider($driver, $params, $injector); $policy = $this->buildPolicy($params, $injector); - $identityBridge = $injector->getInstance(IdentityBridgeService::class); + $identityBridge = $injector->get(IdentityBridgeService::class); return new AuthService($provider, $policy, $identityBridge); } @@ -87,7 +87,7 @@ private function buildPolicy(array $params, Injector $injector): AccessPolicy private function createSqlProvider(array $params, Injector $injector): Sql { - $dbService = $injector->getInstance(HordeDbService::class); + $dbService = $injector->get(HordeDbService::class); return new Sql( db: $dbService->getAdapter(), @@ -101,7 +101,7 @@ private function createSqlProvider(array $params, Injector $injector): Sql private function createLdapProvider(array $params, Injector $injector): Ldap { - $ldap = $injector->getInstance(Horde_Ldap::class); + $ldap = $injector->get(Horde_Ldap::class); return new Ldap( ldap: $ldap, @@ -123,7 +123,7 @@ private function createImapProvider(array $params, Injector $injector): Imap default => SecureMode::None, }; - $clientFactory = $injector->getInstance('Horde_Imap_Client_Factory'); + $clientFactory = $injector->get('Horde_Imap_Client_Factory'); return new Imap( clientFactory: $clientFactory, diff --git a/src/Factory/AuthStorageFactory.php b/src/Factory/AuthStorageFactory.php index 38607730..7ebe9ec5 100644 --- a/src/Factory/AuthStorageFactory.php +++ b/src/Factory/AuthStorageFactory.php @@ -28,14 +28,14 @@ class AuthStorageFactory { public function createLockManager(Injector $injector): LockManager { - $lock = $injector->getInstance(Horde_Lock::class); + $lock = $injector->get(Horde_Lock::class); return new HordeLockAdapter($lock); } public function createAttemptTracker(Injector $injector): LoginAttemptTracker { - $history = $injector->getInstance(Horde_History::class); + $history = $injector->get(Horde_History::class); return new HistoryAttemptTracker($history); } diff --git a/src/Factory/CheckCredentialsFactory.php b/src/Factory/CheckCredentialsFactory.php index 1c7a941b..72705e0d 100644 --- a/src/Factory/CheckCredentialsFactory.php +++ b/src/Factory/CheckCredentialsFactory.php @@ -21,7 +21,7 @@ class CheckCredentialsFactory { public function create(Injector $injector): CheckCredentials { - $authService = $injector->getInstance(AuthService::class); + $authService = $injector->get(AuthService::class); return new CheckCredentials($authService); } diff --git a/src/Factory/ConfigLoaderFactory.php b/src/Factory/ConfigLoaderFactory.php index 3aff8f89..02eebd57 100644 --- a/src/Factory/ConfigLoaderFactory.php +++ b/src/Factory/ConfigLoaderFactory.php @@ -45,7 +45,7 @@ public function create(Injector $injector): ConfigLoader // Try to get metadata provider if available $metadataProvider = null; try { - $metadataProvider = $injector->getInstance(ConfigMetadataProvider::class); + $metadataProvider = $injector->get(ConfigMetadataProvider::class); } catch (Exception $e) { // Metadata provider not available, continue without it } diff --git a/src/Factory/ConfigMetadataProviderFactory.php b/src/Factory/ConfigMetadataProviderFactory.php index 9b5d7393..8accb03b 100644 --- a/src/Factory/ConfigMetadataProviderFactory.php +++ b/src/Factory/ConfigMetadataProviderFactory.php @@ -43,7 +43,7 @@ public function __construct( */ public function create(): ConfigMetadataProvider { - $repository = $this->injector->getInstance(DriverRepository::class); + $repository = $this->injector->get(DriverRepository::class); return new ConfigMetadataProvider($repository); } } diff --git a/src/Factory/CssDiscovererFactory.php b/src/Factory/CssDiscovererFactory.php index 60bd2ca8..9efd2bef 100644 --- a/src/Factory/CssDiscovererFactory.php +++ b/src/Factory/CssDiscovererFactory.php @@ -30,19 +30,19 @@ class CssDiscovererFactory { public function create(Injector $injector): CssDiscoverer { - $pathBuilder = $injector->getInstance(PathBuilderInterface::class); - $uriBuilder = $injector->getInstance(UriBuilderInterface::class); - $filesystem = $injector->getInstance(AssetFilesystem::class); + $pathBuilder = $injector->get(PathBuilderInterface::class); + $uriBuilder = $injector->get(UriBuilderInterface::class); + $filesystem = $injector->get(AssetFilesystem::class); $textDirection = null; try { - $textDirection = $injector->getInstance(TextDirectionProvider::class); + $textDirection = $injector->get(TextDirectionProvider::class); } catch (Throwable) { } $hookProvider = null; try { - $hookProvider = $injector->getInstance(CssHookProvider::class); + $hookProvider = $injector->get(CssHookProvider::class); } catch (Throwable) { } diff --git a/src/Factory/DateFormatPrefsFactory.php b/src/Factory/DateFormatPrefsFactory.php index 2639db23..df036cac 100644 --- a/src/Factory/DateFormatPrefsFactory.php +++ b/src/Factory/DateFormatPrefsFactory.php @@ -37,13 +37,13 @@ public function create(Horde_Injector|Injector $injector): DateFormatPrefs { $logger = null; try { - $logger = $injector->getInstance(LoggerInterface::class); + $logger = $injector->get(LoggerInterface::class); } catch (Throwable) { // Logger unavailable — proceed without } return new DateFormatPrefs( - prefs: $injector->getInstance('Horde_Prefs'), + prefs: $injector->get('Horde_Prefs'), locale: $GLOBALS['language'] ?? 'en_US', logger: $logger, ); diff --git a/src/Factory/DbAdapterFactory.php b/src/Factory/DbAdapterFactory.php index 2da3d4f8..03d8c585 100644 --- a/src/Factory/DbAdapterFactory.php +++ b/src/Factory/DbAdapterFactory.php @@ -64,12 +64,12 @@ public function create(Injector $injector): Adapter $ob = new $class($config); try { - $ob->setCache($injector->getInstance('Horde_Cache')); + $ob->setCache($injector->get('Horde_Cache')); } catch (Throwable) { } try { - $ob->setLogger($injector->getInstance('Horde_Log_Logger')); + $ob->setLogger($injector->get('Horde_Log_Logger')); } catch (Throwable) { } diff --git a/src/Factory/DbServiceFactory.php b/src/Factory/DbServiceFactory.php index be2dfb37..257e17cc 100644 --- a/src/Factory/DbServiceFactory.php +++ b/src/Factory/DbServiceFactory.php @@ -60,7 +60,7 @@ class DbServiceFactory */ public function create(Injector $injector, string $serviceId = 'horde'): StandardHordeDbService { - $loader = $injector->getInstance(ConfigLoader::class); + $loader = $injector->get(ConfigLoader::class); $state = $loader->load('horde'); // Resolve config for this service diff --git a/src/Factory/ErrorFilterFactory.php b/src/Factory/ErrorFilterFactory.php index 40aa81fd..53075915 100644 --- a/src/Factory/ErrorFilterFactory.php +++ b/src/Factory/ErrorFilterFactory.php @@ -29,7 +29,7 @@ public function create(Injector $injector): ErrorFilter { $admins = []; try { - $configLoader = $injector->getInstance(ConfigLoader::class); + $configLoader = $injector->get(ConfigLoader::class); $conf = $configLoader->load('horde', 'conf.php'); $admins = $conf->get('auth.admins', []); if (!is_array($admins)) { diff --git a/src/Factory/EventDispatcherFactory.php b/src/Factory/EventDispatcherFactory.php index ace5831b..b3a4f9b9 100644 --- a/src/Factory/EventDispatcherFactory.php +++ b/src/Factory/EventDispatcherFactory.php @@ -58,7 +58,7 @@ public function create(Injector $injector): EventDispatcher $provider = $this->createListenerProvider($injector); try { - $logger = $injector->getInstance(LoggerInterface::class); + $logger = $injector->get(LoggerInterface::class); } catch (Throwable) { $logger = new NullLogger(); } diff --git a/src/Factory/GraphicDiscovererFactory.php b/src/Factory/GraphicDiscovererFactory.php index a2b42f8d..18af16a9 100644 --- a/src/Factory/GraphicDiscovererFactory.php +++ b/src/Factory/GraphicDiscovererFactory.php @@ -27,9 +27,9 @@ class GraphicDiscovererFactory { public function create(Injector $injector): GraphicDiscoverer { - $pathBuilder = $injector->getInstance(PathBuilderInterface::class); - $uriBuilder = $injector->getInstance(UriBuilderInterface::class); - $filesystem = $injector->getInstance(AssetFilesystem::class); + $pathBuilder = $injector->get(PathBuilderInterface::class); + $uriBuilder = $injector->get(UriBuilderInterface::class); + $filesystem = $injector->get(AssetFilesystem::class); return new CascadeGraphicDiscoverer($pathBuilder, $uriBuilder, $filesystem); } diff --git a/src/Factory/GroupServiceFactory.php b/src/Factory/GroupServiceFactory.php index 239081fa..472299d8 100644 --- a/src/Factory/GroupServiceFactory.php +++ b/src/Factory/GroupServiceFactory.php @@ -55,7 +55,7 @@ class GroupServiceFactory */ public function create(Injector $injector): GroupService { - $loader = $injector->getInstance(ConfigLoader::class); + $loader = $injector->get(ConfigLoader::class); $state = $loader->load('horde'); $driver = strtolower($state->get('group.driver', 'sql')); @@ -63,7 +63,7 @@ public function create(Injector $injector): GroupService return match ($driver) { 'sql' => $this->createSqlBackend($injector, $params), - 'ldap' => $injector->getInstance(LdapGroupServiceFactory::class)->create($injector), + 'ldap' => $injector->get(LdapGroupServiceFactory::class)->create($injector), default => throw new RuntimeException( "Unsupported group driver: {$driver}. " . "Modern GroupService currently supports 'sql' and 'ldap'. " @@ -95,7 +95,7 @@ private function createSqlBackend( Injector $injector, array $params, ): SqlGroupService { - $dbFactory = $injector->getInstance(DbServiceFactory::class); + $dbFactory = $injector->get(DbServiceFactory::class); $dbService = $dbFactory->create($injector, 'horde:group'); $backend = new Horde_Group_Sql([ diff --git a/src/Factory/HordeLdapServiceFactory.php b/src/Factory/HordeLdapServiceFactory.php index 4cf628f5..5d76f9c9 100644 --- a/src/Factory/HordeLdapServiceFactory.php +++ b/src/Factory/HordeLdapServiceFactory.php @@ -57,7 +57,7 @@ class HordeLdapServiceFactory */ public function create(Injector $injector, string $serviceId = 'horde'): StandardHordeLdapService { - $loader = $injector->getInstance(ConfigLoader::class); + $loader = $injector->get(ConfigLoader::class); // Parse service ID: 'horde' or 'horde:groups' [$app, $service] = $this->parseServiceId($serviceId); @@ -110,7 +110,7 @@ protected function createAdapter(array $ldapConfig, Injector $injector): Horde_L { // Add optional cache if available try { - $cache = $injector->getInstance('Horde_Cache'); + $cache = $injector->get('Horde_Cache'); if ($cache instanceof Horde_Cache) { $ldapConfig['cache'] = $cache; $ldapConfig['cache_root_dse'] = true; diff --git a/src/Factory/HttpClientFactory.php b/src/Factory/HttpClientFactory.php index 687fc532..122cdfba 100644 --- a/src/Factory/HttpClientFactory.php +++ b/src/Factory/HttpClientFactory.php @@ -47,8 +47,8 @@ public function create(Injector $injector): ClientInterface { $state = $this->loadConfig($injector); $options = $this->buildOptions($state); - $responseFactory = $injector->getInstance(ResponseFactoryInterface::class); - $streamFactory = $injector->getInstance(StreamFactoryInterface::class); + $responseFactory = $injector->get(ResponseFactoryInterface::class); + $streamFactory = $injector->get(StreamFactoryInterface::class); if (extension_loaded('curl')) { return new Curl($responseFactory, $streamFactory, $options); @@ -59,7 +59,7 @@ public function create(Injector $injector): ClientInterface private function loadConfig(Injector $injector): State { - $loader = $injector->getInstance(ConfigLoader::class); + $loader = $injector->get(ConfigLoader::class); return $loader->load('horde'); } diff --git a/src/Factory/IdentityHistoryRepositoryFactory.php b/src/Factory/IdentityHistoryRepositoryFactory.php index 2f2421ec..0bf12fcd 100644 --- a/src/Factory/IdentityHistoryRepositoryFactory.php +++ b/src/Factory/IdentityHistoryRepositoryFactory.php @@ -34,7 +34,7 @@ public function create(Injector $injector): IdentityHistoryRepository { if (class_exists(SqlIdentityHistoryRepository::class)) { try { - $db = $injector->getInstance(Adapter::class); + $db = $injector->get(Adapter::class); return new SqlIdentityHistoryRepository($db); } catch (Throwable) { return new InMemoryIdentityHistoryRepository(); diff --git a/src/Factory/IdentityRepositoryFactory.php b/src/Factory/IdentityRepositoryFactory.php index 96bb639b..c76b597e 100644 --- a/src/Factory/IdentityRepositoryFactory.php +++ b/src/Factory/IdentityRepositoryFactory.php @@ -34,7 +34,7 @@ public function create(Injector $injector): IdentityRepository { if (class_exists(SqlIdentityRepository::class)) { try { - $db = $injector->getInstance(Adapter::class); + $db = $injector->get(Adapter::class); return new SqlIdentityRepository($db); } catch (Throwable) { return new InMemoryIdentityRepository(); diff --git a/src/Factory/IdentityServiceFactory.php b/src/Factory/IdentityServiceFactory.php index c9e85cbc..add70360 100644 --- a/src/Factory/IdentityServiceFactory.php +++ b/src/Factory/IdentityServiceFactory.php @@ -40,7 +40,7 @@ class IdentityServiceFactory */ public function create(Injector $injector): IdentityService { - $prefsService = $injector->getInstance(PrefsService::class); + $prefsService = $injector->get(PrefsService::class); return new IdentityService($prefsService); } } diff --git a/src/Factory/JsDiscovererFactory.php b/src/Factory/JsDiscovererFactory.php index d0ae9a3b..fbe72b1f 100644 --- a/src/Factory/JsDiscovererFactory.php +++ b/src/Factory/JsDiscovererFactory.php @@ -28,10 +28,10 @@ class JsDiscovererFactory { public function create(Injector $injector): JsDiscoverer { - $pathBuilder = $injector->getInstance(PathBuilderInterface::class); - $uriBuilder = $injector->getInstance(UriBuilderInterface::class); - $filesystem = $injector->getInstance(AssetFilesystem::class); - $themeInfo = $injector->getInstance(ThemeInfoReader::class); + $pathBuilder = $injector->get(PathBuilderInterface::class); + $uriBuilder = $injector->get(UriBuilderInterface::class); + $filesystem = $injector->get(AssetFilesystem::class); + $themeInfo = $injector->get(ThemeInfoReader::class); return new ThemeJsDiscoverer($pathBuilder, $uriBuilder, $filesystem, $themeInfo); } diff --git a/src/Factory/LdapGroupServiceFactory.php b/src/Factory/LdapGroupServiceFactory.php index 87f74900..6e9556ff 100644 --- a/src/Factory/LdapGroupServiceFactory.php +++ b/src/Factory/LdapGroupServiceFactory.php @@ -40,13 +40,13 @@ class LdapGroupServiceFactory */ public function create(Injector $injector): LdapGroupService { - $loader = $injector->getInstance(ConfigLoader::class); + $loader = $injector->get(ConfigLoader::class); $config = $loader->load('horde'); // Resolve the LDAP connection for the 'groups' service specifically: // falls back to the default 'ldap' config if 'ldap.service.groups' // isn't set (see HordeLdapServiceFactory::resolveConfig()). - $ldapFactory = $injector->getInstance(HordeLdapServiceFactory::class); + $ldapFactory = $injector->get(HordeLdapServiceFactory::class); $ldapService = $ldapFactory->create($injector, 'horde:groups'); // Get group configuration (legacy conf.php key is singular: 'group', not 'groups') diff --git a/src/Factory/LdapPrefsServiceFactory.php b/src/Factory/LdapPrefsServiceFactory.php index b212c51b..af7c0d68 100644 --- a/src/Factory/LdapPrefsServiceFactory.php +++ b/src/Factory/LdapPrefsServiceFactory.php @@ -41,11 +41,11 @@ class LdapPrefsServiceFactory */ public function create(Injector $injector): LdapPrefsService { - $loader = $injector->getInstance(ConfigLoader::class); + $loader = $injector->get(ConfigLoader::class); $config = $loader->load('horde'); // Get LDAP service (may use service-specific connection) - $ldapService = $injector->getInstance(HordeLdapService::class); + $ldapService = $injector->get(HordeLdapService::class); // Get prefs configuration $params = $config->get('prefs.params', []); diff --git a/src/Factory/OAuthAccessTokenIssuerFactory.php b/src/Factory/OAuthAccessTokenIssuerFactory.php index 7ec839d0..9f3787b6 100644 --- a/src/Factory/OAuthAccessTokenIssuerFactory.php +++ b/src/Factory/OAuthAccessTokenIssuerFactory.php @@ -32,9 +32,9 @@ public function create(Injector $injector): AccessTokenIssuer $ttl = (int) ($oauthConf['access_token_ttl'] ?? 3600); return new AccessTokenIssuer( - $injector->getInstance(TokenEncoder::class), - $injector->getInstance(Rs256Signer::class), - $injector->getInstance(AccessTokenRepository::class), + $injector->get(TokenEncoder::class), + $injector->get(Rs256Signer::class), + $injector->get(AccessTokenRepository::class), $issuer, $ttl, ); diff --git a/src/Factory/OAuthAccessTokenRepositoryFactory.php b/src/Factory/OAuthAccessTokenRepositoryFactory.php index 95948dbe..e9326c66 100644 --- a/src/Factory/OAuthAccessTokenRepositoryFactory.php +++ b/src/Factory/OAuthAccessTokenRepositoryFactory.php @@ -29,7 +29,7 @@ public function create(Injector $injector): AccessTokenRepository { if (class_exists(SqlOAuthAccessTokenRepository::class)) { try { - $db = $injector->getInstance(Adapter::class); + $db = $injector->get(Adapter::class); return new SqlOAuthAccessTokenRepository($db); } catch (Throwable) { return new InMemoryAccessTokenRepository(); diff --git a/src/Factory/OAuthAuthorizationCodeGrantFactory.php b/src/Factory/OAuthAuthorizationCodeGrantFactory.php index 85594a1e..8db1e327 100644 --- a/src/Factory/OAuthAuthorizationCodeGrantFactory.php +++ b/src/Factory/OAuthAuthorizationCodeGrantFactory.php @@ -28,10 +28,10 @@ class OAuthAuthorizationCodeGrantFactory public function create(Injector $injector): AuthorizationCodeGrant { return new AuthorizationCodeGrant( - $injector->getInstance(AuthorizationCodeRepository::class), - $injector->getInstance(AccessTokenIssuer::class), - $injector->getInstance(RefreshTokenIssuer::class), - $injector->getInstance(ScopeRepository::class), + $injector->get(AuthorizationCodeRepository::class), + $injector->get(AccessTokenIssuer::class), + $injector->get(RefreshTokenIssuer::class), + $injector->get(ScopeRepository::class), ); } } diff --git a/src/Factory/OAuthAuthorizationCodeRepositoryFactory.php b/src/Factory/OAuthAuthorizationCodeRepositoryFactory.php index 82e696b4..ed0e85e4 100644 --- a/src/Factory/OAuthAuthorizationCodeRepositoryFactory.php +++ b/src/Factory/OAuthAuthorizationCodeRepositoryFactory.php @@ -29,7 +29,7 @@ public function create(Injector $injector): AuthorizationCodeRepository { if (class_exists(SqlOAuthAuthorizationCodeRepository::class)) { try { - $db = $injector->getInstance(Adapter::class); + $db = $injector->get(Adapter::class); return new SqlOAuthAuthorizationCodeRepository($db); } catch (Throwable) { return new InMemoryAuthorizationCodeRepository(); diff --git a/src/Factory/OAuthAuthorizationEndpointFactory.php b/src/Factory/OAuthAuthorizationEndpointFactory.php index dba5ecc0..87e67b66 100644 --- a/src/Factory/OAuthAuthorizationEndpointFactory.php +++ b/src/Factory/OAuthAuthorizationEndpointFactory.php @@ -29,11 +29,11 @@ class OAuthAuthorizationEndpointFactory public function create(Injector $injector): AuthorizationEndpoint { return new AuthorizationEndpoint( - $injector->getInstance(ClientRepository::class), - $injector->getInstance(ScopeRepository::class), - $injector->getInstance(AuthorizationCodeRepository::class), - $injector->getInstance(ResponseFactoryInterface::class), - $injector->getInstance(StreamFactoryInterface::class), + $injector->get(ClientRepository::class), + $injector->get(ScopeRepository::class), + $injector->get(AuthorizationCodeRepository::class), + $injector->get(ResponseFactoryInterface::class), + $injector->get(StreamFactoryInterface::class), ); } } diff --git a/src/Factory/OAuthClientAuthenticatorFactory.php b/src/Factory/OAuthClientAuthenticatorFactory.php index 0650f7ec..96105252 100644 --- a/src/Factory/OAuthClientAuthenticatorFactory.php +++ b/src/Factory/OAuthClientAuthenticatorFactory.php @@ -27,7 +27,7 @@ class OAuthClientAuthenticatorFactory public function create(Injector $injector): ClientAuthenticatorChain { return new ClientAuthenticatorChain( - $injector->getInstance(ClientRepository::class), + $injector->get(ClientRepository::class), new ClientSecretBasic(), new ClientSecretPost(), ); diff --git a/src/Factory/OAuthClientCredentialsGrantFactory.php b/src/Factory/OAuthClientCredentialsGrantFactory.php index e0a1e388..4e50c597 100644 --- a/src/Factory/OAuthClientCredentialsGrantFactory.php +++ b/src/Factory/OAuthClientCredentialsGrantFactory.php @@ -26,8 +26,8 @@ class OAuthClientCredentialsGrantFactory public function create(Injector $injector): ClientCredentialsGrant { return new ClientCredentialsGrant( - $injector->getInstance(AccessTokenIssuer::class), - $injector->getInstance(ScopeRepository::class), + $injector->get(AccessTokenIssuer::class), + $injector->get(ScopeRepository::class), ); } } diff --git a/src/Factory/OAuthClientRepositoryFactory.php b/src/Factory/OAuthClientRepositoryFactory.php index b69a6aa3..4c88cc10 100644 --- a/src/Factory/OAuthClientRepositoryFactory.php +++ b/src/Factory/OAuthClientRepositoryFactory.php @@ -29,7 +29,7 @@ public function create(Injector $injector): ClientRepository { if (class_exists(SqlOAuthClientRepository::class)) { try { - $db = $injector->getInstance(Adapter::class); + $db = $injector->get(Adapter::class); return new SqlOAuthClientRepository($db); } catch (Throwable) { return new InMemoryClientRepository(); diff --git a/src/Factory/OAuthConsentMiddlewareFactory.php b/src/Factory/OAuthConsentMiddlewareFactory.php index ec2700a3..0c01cad3 100644 --- a/src/Factory/OAuthConsentMiddlewareFactory.php +++ b/src/Factory/OAuthConsentMiddlewareFactory.php @@ -31,13 +31,13 @@ class OAuthConsentMiddlewareFactory public function create(Injector $injector): OAuthConsentMiddleware { return new OAuthConsentMiddleware( - $injector->getInstance(AuthorizationEndpoint::class), - $injector->getInstance(ConsentRepository::class), - $injector->getInstance(SessionAccess::class), - $injector->getInstance(Horde_PageOutput::class), - $injector->getInstance(Horde_Notification_Handler::class), - $injector->getInstance(ResponseFactoryInterface::class), - $injector->getInstance(StreamFactoryInterface::class), + $injector->get(AuthorizationEndpoint::class), + $injector->get(ConsentRepository::class), + $injector->get(SessionAccess::class), + $injector->get(Horde_PageOutput::class), + $injector->get(Horde_Notification_Handler::class), + $injector->get(ResponseFactoryInterface::class), + $injector->get(StreamFactoryInterface::class), ); } } diff --git a/src/Factory/OAuthConsentRepositoryFactory.php b/src/Factory/OAuthConsentRepositoryFactory.php index 1bac0bfc..892f40cb 100644 --- a/src/Factory/OAuthConsentRepositoryFactory.php +++ b/src/Factory/OAuthConsentRepositoryFactory.php @@ -29,7 +29,7 @@ public function create(Injector $injector): ConsentRepository { if (class_exists(SqlOAuthConsentRepository::class)) { try { - $db = $injector->getInstance(Adapter::class); + $db = $injector->get(Adapter::class); return new SqlOAuthConsentRepository($db); } catch (Throwable) { return new InMemoryConsentRepository(); diff --git a/src/Factory/OAuthDiscoveryEndpointFactory.php b/src/Factory/OAuthDiscoveryEndpointFactory.php index 2b06e5de..ed2d27fb 100644 --- a/src/Factory/OAuthDiscoveryEndpointFactory.php +++ b/src/Factory/OAuthDiscoveryEndpointFactory.php @@ -27,9 +27,9 @@ class OAuthDiscoveryEndpointFactory public function create(Injector $injector): DiscoveryEndpoint { return new DiscoveryEndpoint( - $injector->getInstance(ServerMetadata::class), - $injector->getInstance(ResponseFactoryInterface::class), - $injector->getInstance(StreamFactoryInterface::class), + $injector->get(ServerMetadata::class), + $injector->get(ResponseFactoryInterface::class), + $injector->get(StreamFactoryInterface::class), ); } } diff --git a/src/Factory/OAuthFlowStoreFactory.php b/src/Factory/OAuthFlowStoreFactory.php index 76607e3b..366eddb8 100644 --- a/src/Factory/OAuthFlowStoreFactory.php +++ b/src/Factory/OAuthFlowStoreFactory.php @@ -28,7 +28,7 @@ class OAuthFlowStoreFactory { public function create(Injector $injector): OAuthFlowStore { - $loader = $injector->getInstance(ConfigLoader::class); + $loader = $injector->get(ConfigLoader::class); $state = $loader->load('horde'); $driver = strtolower((string) $state->get('oauth_login.flow_store_driver', 'File')); @@ -50,7 +50,7 @@ private function createFileStore(array $params): FileOAuthFlowStore private function createSqlStore(Injector $injector, array $params): SqlOAuthFlowStore { - $dbService = $injector->getInstance(HordeDbService::class); + $dbService = $injector->get(HordeDbService::class); $table = !empty($params['table']) ? $params['table'] : 'horde_oauth_flows'; return new SqlOAuthFlowStore($dbService->getAdapter(), $table); diff --git a/src/Factory/OAuthIdTokenBuilderFactory.php b/src/Factory/OAuthIdTokenBuilderFactory.php index beb0f0cb..5fe42926 100644 --- a/src/Factory/OAuthIdTokenBuilderFactory.php +++ b/src/Factory/OAuthIdTokenBuilderFactory.php @@ -33,10 +33,10 @@ public function create(Injector $injector): IdTokenBuilder $ttl = (int) ($oauthConf['access_token_ttl'] ?? 3600); return new IdTokenBuilder( - $injector->getInstance(TokenEncoder::class), - $injector->getInstance(Rs256Signer::class), - $injector->getInstance(ClaimsMapper::class), - $injector->getInstance(ScopeClaimsMapping::class), + $injector->get(TokenEncoder::class), + $injector->get(Rs256Signer::class), + $injector->get(ClaimsMapper::class), + $injector->get(ScopeClaimsMapping::class), $issuer, $ttl, ); diff --git a/src/Factory/OAuthIntrospectionEndpointFactory.php b/src/Factory/OAuthIntrospectionEndpointFactory.php index 4d367764..a216f777 100644 --- a/src/Factory/OAuthIntrospectionEndpointFactory.php +++ b/src/Factory/OAuthIntrospectionEndpointFactory.php @@ -29,11 +29,11 @@ class OAuthIntrospectionEndpointFactory public function create(Injector $injector): IntrospectionEndpoint { return new IntrospectionEndpoint( - $injector->getInstance(ClientAuthenticatorChain::class), - $injector->getInstance(AccessTokenRepository::class), - $injector->getInstance(RefreshTokenRepository::class), - $injector->getInstance(ResponseFactoryInterface::class), - $injector->getInstance(StreamFactoryInterface::class), + $injector->get(ClientAuthenticatorChain::class), + $injector->get(AccessTokenRepository::class), + $injector->get(RefreshTokenRepository::class), + $injector->get(ResponseFactoryInterface::class), + $injector->get(StreamFactoryInterface::class), ); } } diff --git a/src/Factory/OAuthJwksEndpointFactory.php b/src/Factory/OAuthJwksEndpointFactory.php index 602eea86..8196002b 100644 --- a/src/Factory/OAuthJwksEndpointFactory.php +++ b/src/Factory/OAuthJwksEndpointFactory.php @@ -30,9 +30,9 @@ public function create(Injector $injector): JwksEndpoint $oauthConf = $conf['oauth_server'] ?? []; return new JwksEndpoint( - $injector->getInstance(PublicKey::class), - $injector->getInstance(ResponseFactoryInterface::class), - $injector->getInstance(StreamFactoryInterface::class), + $injector->get(PublicKey::class), + $injector->get(ResponseFactoryInterface::class), + $injector->get(StreamFactoryInterface::class), $oauthConf['key_id'] ?? 'horde-1', 'RS256', ); diff --git a/src/Factory/OAuthProviderConfigRepositoryFactory.php b/src/Factory/OAuthProviderConfigRepositoryFactory.php index 5022c3e8..d32e9095 100644 --- a/src/Factory/OAuthProviderConfigRepositoryFactory.php +++ b/src/Factory/OAuthProviderConfigRepositoryFactory.php @@ -42,13 +42,13 @@ public function create(Injector $injector): OAuthProviderConfigRepository { if (class_exists(SqlOAuthProviderConfigRepository::class)) { try { - $db = $injector->getInstance(Adapter::class); + $db = $injector->get(Adapter::class); } catch (Throwable) { return new NullOAuthProviderConfigRepository(); } try { - $secret = $injector->getInstance(SecretManager::class); + $secret = $injector->get(SecretManager::class); } catch (Throwable) { $secret = null; } diff --git a/src/Factory/OAuthRefreshTokenGrantFactory.php b/src/Factory/OAuthRefreshTokenGrantFactory.php index 94a9b4df..0a6ca164 100644 --- a/src/Factory/OAuthRefreshTokenGrantFactory.php +++ b/src/Factory/OAuthRefreshTokenGrantFactory.php @@ -29,11 +29,11 @@ class OAuthRefreshTokenGrantFactory public function create(Injector $injector): RefreshTokenGrant { return new RefreshTokenGrant( - $injector->getInstance(RefreshTokenRepository::class), - $injector->getInstance(AccessTokenRepository::class), - $injector->getInstance(AccessTokenIssuer::class), - $injector->getInstance(RefreshTokenIssuer::class), - $injector->getInstance(ScopeRepository::class), + $injector->get(RefreshTokenRepository::class), + $injector->get(AccessTokenRepository::class), + $injector->get(AccessTokenIssuer::class), + $injector->get(RefreshTokenIssuer::class), + $injector->get(ScopeRepository::class), ); } } diff --git a/src/Factory/OAuthRefreshTokenIssuerFactory.php b/src/Factory/OAuthRefreshTokenIssuerFactory.php index f27cda46..7baac8ab 100644 --- a/src/Factory/OAuthRefreshTokenIssuerFactory.php +++ b/src/Factory/OAuthRefreshTokenIssuerFactory.php @@ -29,7 +29,7 @@ public function create(Injector $injector): RefreshTokenIssuer $ttl = (int) ($oauthConf['refresh_token_ttl'] ?? 2592000); return new RefreshTokenIssuer( - $injector->getInstance(RefreshTokenRepository::class), + $injector->get(RefreshTokenRepository::class), $ttl, ); } diff --git a/src/Factory/OAuthRefreshTokenRepositoryFactory.php b/src/Factory/OAuthRefreshTokenRepositoryFactory.php index 0ac5cdde..a6870b3a 100644 --- a/src/Factory/OAuthRefreshTokenRepositoryFactory.php +++ b/src/Factory/OAuthRefreshTokenRepositoryFactory.php @@ -29,7 +29,7 @@ public function create(Injector $injector): RefreshTokenRepository { if (class_exists(SqlOAuthRefreshTokenRepository::class)) { try { - $db = $injector->getInstance(Adapter::class); + $db = $injector->get(Adapter::class); return new SqlOAuthRefreshTokenRepository($db); } catch (Throwable) { return new InMemoryRefreshTokenRepository(); diff --git a/src/Factory/OAuthRevocationEndpointFactory.php b/src/Factory/OAuthRevocationEndpointFactory.php index 2edece7e..382db672 100644 --- a/src/Factory/OAuthRevocationEndpointFactory.php +++ b/src/Factory/OAuthRevocationEndpointFactory.php @@ -29,11 +29,11 @@ class OAuthRevocationEndpointFactory public function create(Injector $injector): RevocationEndpoint { return new RevocationEndpoint( - $injector->getInstance(ClientAuthenticatorChain::class), - $injector->getInstance(AccessTokenRepository::class), - $injector->getInstance(RefreshTokenRepository::class), - $injector->getInstance(ResponseFactoryInterface::class), - $injector->getInstance(StreamFactoryInterface::class), + $injector->get(ClientAuthenticatorChain::class), + $injector->get(AccessTokenRepository::class), + $injector->get(RefreshTokenRepository::class), + $injector->get(ResponseFactoryInterface::class), + $injector->get(StreamFactoryInterface::class), ); } } diff --git a/src/Factory/OAuthScopeRepositoryFactory.php b/src/Factory/OAuthScopeRepositoryFactory.php index 65aedd46..7ef9845d 100644 --- a/src/Factory/OAuthScopeRepositoryFactory.php +++ b/src/Factory/OAuthScopeRepositoryFactory.php @@ -29,7 +29,7 @@ public function create(Injector $injector): ScopeRepository { if (class_exists(SqlOAuthScopeRepository::class)) { try { - $db = $injector->getInstance(Adapter::class); + $db = $injector->get(Adapter::class); return new SqlOAuthScopeRepository($db); } catch (Throwable) { return new InMemoryScopeRepository(); diff --git a/src/Factory/OAuthTokenEndpointFactory.php b/src/Factory/OAuthTokenEndpointFactory.php index 4b0b9156..dff2d7a4 100644 --- a/src/Factory/OAuthTokenEndpointFactory.php +++ b/src/Factory/OAuthTokenEndpointFactory.php @@ -30,12 +30,12 @@ class OAuthTokenEndpointFactory public function create(Injector $injector): TokenEndpoint { return new TokenEndpoint( - $injector->getInstance(ClientAuthenticatorChain::class), - $injector->getInstance(ResponseFactoryInterface::class), - $injector->getInstance(StreamFactoryInterface::class), - $injector->getInstance(AuthorizationCodeGrant::class), - $injector->getInstance(ClientCredentialsGrant::class), - $injector->getInstance(RefreshTokenGrant::class), + $injector->get(ClientAuthenticatorChain::class), + $injector->get(ResponseFactoryInterface::class), + $injector->get(StreamFactoryInterface::class), + $injector->get(AuthorizationCodeGrant::class), + $injector->get(ClientCredentialsGrant::class), + $injector->get(RefreshTokenGrant::class), ); } } diff --git a/src/Factory/OAuthTokenRepositoryFactory.php b/src/Factory/OAuthTokenRepositoryFactory.php index b584a90f..7d715c34 100644 --- a/src/Factory/OAuthTokenRepositoryFactory.php +++ b/src/Factory/OAuthTokenRepositoryFactory.php @@ -36,7 +36,7 @@ class OAuthTokenRepositoryFactory { public function create(Injector $injector): OAuthTokenRepository { - $loader = $injector->getInstance(ConfigLoader::class); + $loader = $injector->get(ConfigLoader::class); $state = $loader->load('horde'); $driver = $state->get('oauth.token_driver', 'null'); diff --git a/src/Factory/OAuthUserinfoEndpointFactory.php b/src/Factory/OAuthUserinfoEndpointFactory.php index ebed7265..a398970e 100644 --- a/src/Factory/OAuthUserinfoEndpointFactory.php +++ b/src/Factory/OAuthUserinfoEndpointFactory.php @@ -28,10 +28,10 @@ class OAuthUserinfoEndpointFactory public function create(Injector $injector): UserinfoEndpoint { return new UserinfoEndpoint( - $injector->getInstance(ClaimsMapper::class), - $injector->getInstance(ScopeClaimsMapping::class), - $injector->getInstance(ResponseFactoryInterface::class), - $injector->getInstance(StreamFactoryInterface::class), + $injector->get(ClaimsMapper::class), + $injector->get(ScopeClaimsMapping::class), + $injector->get(ResponseFactoryInterface::class), + $injector->get(StreamFactoryInterface::class), ); } } diff --git a/src/Factory/PathBuilderFactory.php b/src/Factory/PathBuilderFactory.php index 63b10e61..1028fdf1 100644 --- a/src/Factory/PathBuilderFactory.php +++ b/src/Factory/PathBuilderFactory.php @@ -25,7 +25,7 @@ class PathBuilderFactory { public function create(Injector $injector): PathBuilderInterface { - $registryLoader = $injector->getInstance(RegistryConfigLoader::class); + $registryLoader = $injector->get(RegistryConfigLoader::class); $registryState = $registryLoader->load(); return new PathBuilder($registryState); diff --git a/src/Factory/PermissionServiceFactory.php b/src/Factory/PermissionServiceFactory.php index 7a9024cf..bac6e189 100644 --- a/src/Factory/PermissionServiceFactory.php +++ b/src/Factory/PermissionServiceFactory.php @@ -53,7 +53,7 @@ class PermissionServiceFactory */ public function create(Injector $injector): PermissionService { - $loader = $injector->getInstance(ConfigLoader::class); + $loader = $injector->get(ConfigLoader::class); $state = $loader->load('horde'); $driver = strtolower($state->get('perms.driver', 'null')); @@ -82,10 +82,10 @@ private function createSqlBackend( array $params ): SqlPermissionService { // Get database connection via DbServiceFactory with pooling - $dbFactory = $injector->getInstance(DbServiceFactory::class); + $dbFactory = $injector->get(DbServiceFactory::class); $dbService = $dbFactory->create($injector, 'horde:perms'); - $groupService = $injector->getInstance(GroupService::class); + $groupService = $injector->get(GroupService::class); // Create legacy Horde_Perms_Sql backend. Horde_Perms_Sql calls // $this->_cache->get() unconditionally in getPermission() and diff --git a/src/Factory/PermsUi.php b/src/Factory/PermsUi.php index f6a4bbce..960caf83 100644 --- a/src/Factory/PermsUi.php +++ b/src/Factory/PermsUi.php @@ -28,6 +28,7 @@ use Horde_Perms_Base; use Horde_Registry; use Psr\Http\Message\ServerRequestInterface; +use Horde_Core_Factory_Auth; /** * Factory selecting the administrative permission UI implementation. @@ -79,10 +80,10 @@ private function createWithDenies( $templatePath = $this->resolveTemplatePath($injector); $groups = $this->resolveGroups($injector); $auth = $this->resolveAuth($injector); - $request = $injector->getInstance(ServerRequestInterface::class); - $tokens = $injector->getInstance(Token::class); - $uriBuilder = $injector->getInstance(UriBuilderInterface::class); - $registry = $injector->getInstance(Horde_Registry::class); + $request = $injector->get(ServerRequestInterface::class); + $tokens = $injector->get(Token::class); + $uriBuilder = $injector->get(UriBuilderInterface::class); + $registry = $injector->get(Horde_Registry::class); $notification = $this->resolveNotification($injector); return new NegativeUi( @@ -108,7 +109,7 @@ private function createWithDenies( private function resolveNotification(Injector $injector): ?\Horde_Notification_Handler { try { - $handler = $injector->getInstance('Horde_Notification'); + $handler = $injector->get('Horde_Notification'); return $handler instanceof \Horde_Notification_Handler ? $handler : null; } catch (\Throwable $e) { return null; @@ -122,7 +123,7 @@ private function resolveNotification(Injector $injector): ?\Horde_Notification_H */ private function resolveTemplatePath(Injector $injector): string { - $registry = $injector->getInstance(Horde_Registry::class); + $registry = $injector->get(Horde_Registry::class); return $registry->get('templates', 'horde') . '/admin/perms'; } @@ -134,7 +135,7 @@ private function resolveTemplatePath(Injector $injector): string private function resolveGroups(Injector $injector): ?Horde_Group { try { - $groups = $injector->getInstance(Horde_Group::class); + $groups = $injector->get(Horde_Group::class); return $groups instanceof Horde_Group ? $groups : null; } catch (\Throwable $e) { return null; @@ -149,7 +150,7 @@ private function resolveGroups(Injector $injector): ?Horde_Group private function resolveAuth(Injector $injector): ?Horde_Auth_Base { try { - $factory = $injector->getInstance('Horde_Core_Factory_Auth'); + $factory = $injector->get(Horde_Core_Factory_Auth::class); $auth = $factory->create(); return $auth instanceof Horde_Auth_Base ? $auth : null; } catch (\Throwable $e) { @@ -173,7 +174,7 @@ private function resolveAuth(Injector $injector): ?Horde_Auth_Base private function negativePermissionsEnabled(Injector $injector): bool { try { - $loader = $injector->getInstance(ConfigLoader::class); + $loader = $injector->get(ConfigLoader::class); $state = $loader->load('horde'); $modern = $state->get('perms.negative_permissions', null); if ($modern !== null) { diff --git a/src/Factory/PrefsServiceFactory.php b/src/Factory/PrefsServiceFactory.php index beae3c28..616d188e 100644 --- a/src/Factory/PrefsServiceFactory.php +++ b/src/Factory/PrefsServiceFactory.php @@ -93,7 +93,7 @@ class PrefsServiceFactory */ public function create(Injector $injector): PrefsService { - $loader = $injector->getInstance(ConfigLoader::class); + $loader = $injector->get(ConfigLoader::class); $state = $loader->load('horde'); $driver = $state->get('prefs.driver', 'sql'); @@ -116,7 +116,7 @@ public function create(Injector $injector): PrefsService private function createSqlBackend(Injector $injector, array $params): SqlPrefsService { // Get DB service (supports 'horde:prefs' pattern in future) - $dbService = $injector->getInstance(HordeDbService::class); + $dbService = $injector->get(HordeDbService::class); $table = $params['table'] ?? 'horde_prefs'; diff --git a/src/Factory/RouteUrlWriterFactory.php b/src/Factory/RouteUrlWriterFactory.php index b9b8df37..69f49d64 100644 --- a/src/Factory/RouteUrlWriterFactory.php +++ b/src/Factory/RouteUrlWriterFactory.php @@ -25,8 +25,8 @@ class RouteUrlWriterFactory { public function create(Injector $injector): RouteUrlWriter { - $provider = $injector->getInstance(RuntimeRoutesProvider::class); - $registryState = $injector->getInstance(RegistryConfigLoader::class)->load(); + $provider = $injector->get(RuntimeRoutesProvider::class); + $registryState = $injector->get(RegistryConfigLoader::class)->load(); $hordeConfig = $registryState->getApplication('horde'); $webroot = $hordeConfig['webroot'] ?? '/horde'; diff --git a/src/Factory/RuntimeRoutesProviderFactory.php b/src/Factory/RuntimeRoutesProviderFactory.php index 45332ae2..2e5b8108 100644 --- a/src/Factory/RuntimeRoutesProviderFactory.php +++ b/src/Factory/RuntimeRoutesProviderFactory.php @@ -32,10 +32,10 @@ class RuntimeRoutesProviderFactory { public function create(Injector $injector): RuntimeRoutesProvider { - $registryState = $injector->getInstance(RegistryConfigLoader::class)->load(); + $registryState = $injector->get(RegistryConfigLoader::class)->load(); if ($injector->has(ServerRequestInterface::class)) { - $request = $injector->getInstance(ServerRequestInterface::class); + $request = $injector->get(ServerRequestInterface::class); } else { $factory = new RequestFactory(); $method = $_SERVER['REQUEST_METHOD'] ?? 'GET'; diff --git a/src/Factory/SecretManagerFactory.php b/src/Factory/SecretManagerFactory.php index ab3d6d1a..2ac5833d 100644 --- a/src/Factory/SecretManagerFactory.php +++ b/src/Factory/SecretManagerFactory.php @@ -35,7 +35,7 @@ class SecretManagerFactory { public function create(Injector $injector): SecretManager { - $loader = $injector->getInstance(ConfigLoader::class); + $loader = $injector->get(ConfigLoader::class); $state = $loader->load('horde'); $key = $state->get('secret_key', ''); diff --git a/src/Factory/SessionEncryptionCoordinatorFactory.php b/src/Factory/SessionEncryptionCoordinatorFactory.php index 554d799f..357060a7 100644 --- a/src/Factory/SessionEncryptionCoordinatorFactory.php +++ b/src/Factory/SessionEncryptionCoordinatorFactory.php @@ -34,7 +34,7 @@ class SessionEncryptionCoordinatorFactory { public function create(Injector $injector): SessionEncryptionCoordinator { - $secret = $injector->getInstance(SessionSecret::class); + $secret = $injector->get(SessionSecret::class); return new SessionEncryptionCoordinator($secret); } diff --git a/src/Factory/SessionHandlerFactory.php b/src/Factory/SessionHandlerFactory.php index 8400374e..44d36cc5 100644 --- a/src/Factory/SessionHandlerFactory.php +++ b/src/Factory/SessionHandlerFactory.php @@ -62,7 +62,7 @@ class SessionHandlerFactory */ public function create(Injector $injector): SessionHandler { - $loader = $injector->getInstance(ConfigLoader::class); + $loader = $injector->get(ConfigLoader::class); $state = $loader->load('horde'); $driver = strtolower((string) $state->get('sessionhandler.type', 'builtin')); @@ -91,7 +91,7 @@ public function create(Injector $injector): SessionHandler return new SessionHandler( backend: $backend, serializer: new DefaultSessionSerializer(), - sessionFactory: $injector->getInstance(HordeSessionFactory::class), + sessionFactory: $injector->get(HordeSessionFactory::class), events: $this->getEventDispatcher($injector), ); } @@ -109,7 +109,7 @@ private function createBuiltinBackend(array $params): BuiltinBackend */ private function createSqlBackend(Injector $injector, array $params): SqlBackend { - $dbService = $injector->getInstance(HordeDbService::class); + $dbService = $injector->get(HordeDbService::class); $db = $dbService->getAdapter(); $table = $params['table'] ?? 'horde_sessionhandler'; @@ -135,7 +135,7 @@ private function createHashtableBackend(Injector $injector, array $params): Sess // Prefer modern LockableHashTable if available. try { - $modern = $injector->getInstance(LockableHashTable::class); + $modern = $injector->get(LockableHashTable::class); if ($modern instanceof LockableHashTable) { return new ModernHashtableBackend( hashTable: $modern, @@ -147,7 +147,7 @@ private function createHashtableBackend(Injector $injector, array $params): Sess // Modern interface not bound; fall through to legacy lookup. } - $ht = $injector->getInstance('Horde_HashTable'); + $ht = $injector->get('Horde_HashTable'); if (!$ht instanceof Horde_HashTable_Base || !$ht instanceof Horde_HashTable_Lock) { throw new RuntimeException( @@ -198,7 +198,7 @@ public function createSessionFactory(Injector $injector): HordeSessionFactory $decryptor = null; try { - $secret = $injector->getInstance('Horde_Secret_Cbc'); + $secret = $injector->get('Horde_Secret_Cbc'); if ($secret instanceof SessionSecret) { $encryptor = static fn(string $plaintext): string => $secret->write($secret->getKey(), $plaintext); $decryptor = static fn(string $ciphertext): string => $secret->read($secret->getKey(), $ciphertext); @@ -216,7 +216,7 @@ public function createSessionFactory(Injector $injector): HordeSessionFactory private function getEventDispatcher(Injector $injector): ?EventDispatcherInterface { try { - $dispatcher = $injector->getInstance(EventDispatcherInterface::class); + $dispatcher = $injector->get(EventDispatcherInterface::class); return $dispatcher instanceof EventDispatcherInterface ? $dispatcher : null; } catch (Throwable) { return null; diff --git a/src/Factory/SessionSecretFactory.php b/src/Factory/SessionSecretFactory.php index 370b6346..66a0b0a0 100644 --- a/src/Factory/SessionSecretFactory.php +++ b/src/Factory/SessionSecretFactory.php @@ -37,7 +37,7 @@ class SessionSecretFactory { public function create(Injector $injector): SessionSecret { - $resolved = $injector->getInstance('Horde_Secret_Cbc'); + $resolved = $injector->get('Horde_Secret_Cbc'); if (!$resolved instanceof SessionSecret) { throw new LogicException( diff --git a/src/Factory/SimpleCacheFactory.php b/src/Factory/SimpleCacheFactory.php index de204fa5..46c8a481 100644 --- a/src/Factory/SimpleCacheFactory.php +++ b/src/Factory/SimpleCacheFactory.php @@ -66,7 +66,7 @@ public function create(Injector $injector): Cache private function loadConfig(Injector $injector): State { - $loader = $injector->getInstance(ConfigLoader::class); + $loader = $injector->get(ConfigLoader::class); return $loader->load('horde'); } @@ -85,7 +85,7 @@ private function resolveDriver(State $state): string private function getLogger(Injector $injector): LoggerInterface { try { - return $injector->getInstance(LoggerInterface::class); + return $injector->get(LoggerInterface::class); } catch (Throwable) { return new NullLogger(); } @@ -126,7 +126,7 @@ private function createFileStorage(State $state, LoggerInterface $logger): FileS private function createSqlStorage(Injector $injector, LoggerInterface $logger): SqlStorage { - $db = $injector->getInstance(Horde_Db_Adapter::class); + $db = $injector->get(Horde_Db_Adapter::class); return new SqlStorage(db: $db, logger: $logger); } diff --git a/src/Factory/ThemeInfoReaderFactory.php b/src/Factory/ThemeInfoReaderFactory.php index e2ba96a9..2b0ca15d 100644 --- a/src/Factory/ThemeInfoReaderFactory.php +++ b/src/Factory/ThemeInfoReaderFactory.php @@ -27,8 +27,8 @@ class ThemeInfoReaderFactory public function create(Injector $injector): ThemeInfoReader { return new PhpThemeInfoReader( - $injector->getInstance(PathBuilderInterface::class), - $injector->getInstance(AssetFilesystem::class), + $injector->get(PathBuilderInterface::class), + $injector->get(AssetFilesystem::class), ); } } diff --git a/src/Factory/ThemeResolverFactory.php b/src/Factory/ThemeResolverFactory.php index 91568423..8ce993ae 100644 --- a/src/Factory/ThemeResolverFactory.php +++ b/src/Factory/ThemeResolverFactory.php @@ -25,7 +25,7 @@ class ThemeResolverFactory { public function create(Injector $injector): ThemeResolver { - $prefsService = $injector->getInstance(PrefsService::class); + $prefsService = $injector->get(PrefsService::class); return new PrefsThemeResolver($prefsService); } diff --git a/src/Factory/TinymcePageBinderFactory.php b/src/Factory/TinymcePageBinderFactory.php index a468533f..23de7cc9 100644 --- a/src/Factory/TinymcePageBinderFactory.php +++ b/src/Factory/TinymcePageBinderFactory.php @@ -31,7 +31,7 @@ class TinymcePageBinderFactory public function create(Injector $injector): TinymcePageBinder { return new TinymcePageBinder( - $injector->getInstance(Tinymce::class), + $injector->get(Tinymce::class), ); } } diff --git a/src/Factory/TokenServiceFactory.php b/src/Factory/TokenServiceFactory.php index 395d2b1c..2eab5e37 100644 --- a/src/Factory/TokenServiceFactory.php +++ b/src/Factory/TokenServiceFactory.php @@ -88,7 +88,7 @@ public function __construct( public function create(Injector $injector): Token { return $this->createForSession( - $this->injector->getInstance(HordeSession::class) + $this->injector->get(HordeSession::class) ); } @@ -169,7 +169,7 @@ public function createFromSecret(string $secret): Token private function loadState(): State { - $loader = $this->injector->getInstance(ConfigLoader::class); + $loader = $this->injector->get(ConfigLoader::class); return $loader->load('horde'); } @@ -244,7 +244,7 @@ private function getTimeout(): int */ private function buildSqlStorage(array $params): SqlStorage { - $dbService = $this->injector->getInstance(HordeDbService::class); + $dbService = $this->injector->get(HordeDbService::class); $table = isset($params['table']) && is_string($params['table']) ? $params['table'] : 'horde_tokens'; diff --git a/src/Factory/TranslationManagerFactory.php b/src/Factory/TranslationManagerFactory.php index c00b502c..72e445bc 100644 --- a/src/Factory/TranslationManagerFactory.php +++ b/src/Factory/TranslationManagerFactory.php @@ -45,7 +45,7 @@ class TranslationManagerFactory public function create(Injector $injector): TranslationManager { $manager = new TranslationManager(); - $registry = $injector->getInstance(Horde_Registry::class); + $registry = $injector->get(Horde_Registry::class); foreach ($registry->listAllApps() as $app) { try { diff --git a/src/Factory/UriBuilderFactory.php b/src/Factory/UriBuilderFactory.php index c884b84c..f630cbbf 100644 --- a/src/Factory/UriBuilderFactory.php +++ b/src/Factory/UriBuilderFactory.php @@ -29,20 +29,20 @@ class UriBuilderFactory { public function create(Injector $injector): UriBuilderInterface { - $registryLoader = $injector->getInstance(RegistryConfigLoader::class); + $registryLoader = $injector->get(RegistryConfigLoader::class); $registryState = $registryLoader->load(); - $routeProvider = $injector->getInstance(RouteMapperProvider::class); + $routeProvider = $injector->get(RouteMapperProvider::class); $request = null; try { - $request = $injector->getInstance(ServerRequestInterface::class); + $request = $injector->get(ServerRequestInterface::class); } catch (Throwable) { } $configState = null; try { - $configState = $injector->getInstance(ConfigLoader::class)->load('horde'); + $configState = $injector->get(ConfigLoader::class)->load('horde'); } catch (Throwable) { } diff --git a/src/Factory/VersionServiceFactory.php b/src/Factory/VersionServiceFactory.php index f624ebdb..3c0cf0dd 100644 --- a/src/Factory/VersionServiceFactory.php +++ b/src/Factory/VersionServiceFactory.php @@ -53,7 +53,7 @@ class VersionServiceFactory */ public function create(Injector $injector): VersionService { - $appService = $injector->getInstance(ApplicationService::class); + $appService = $injector->get(ApplicationService::class); $installed = new HordeYmlInstalledSource($appService); $available = $this->createAvailableSource($injector); @@ -74,11 +74,11 @@ public function create(Injector $injector): VersionService */ private function createAvailableSource(Injector $injector): AvailableVersionSource { - $httpClient = $injector->getInstance(ClientInterface::class); - $requestFactory = $injector->getInstance(RequestFactoryInterface::class); + $httpClient = $injector->get(ClientInterface::class); + $requestFactory = $injector->get(RequestFactoryInterface::class); try { - $cache = $injector->getInstance(CacheInterface::class); + $cache = $injector->get(CacheInterface::class); } catch (Throwable $e) { $logger = $this->getLogger($injector); $logger->warning( @@ -94,7 +94,7 @@ private function createAvailableSource(Injector $injector): AvailableVersionSour private function getLogger(Injector $injector): LoggerInterface { try { - return $injector->getInstance(LoggerInterface::class); + return $injector->get(LoggerInterface::class); } catch (Throwable) { return new NullLogger(); } diff --git a/src/Horde.php b/src/Horde.php index 89e07d1c..42d3c759 100644 --- a/src/Horde.php +++ b/src/Horde.php @@ -40,6 +40,7 @@ use Exception; use PEAR_Error; use Throwable; +use Horde_PageOutput; /** * Provides the base functionality shared by all Horde applications. @@ -121,7 +122,7 @@ public static function log( if (isset($GLOBALS['injector']) && Horde_Core_Factory_Logger::available()) { try { - $logger = $GLOBALS['injector']->getInstance(Logger::class); + $logger = $GLOBALS['injector']->get(Logger::class); self::drainBuffer($logger); $logger->log($resolvedPriority, $message, $context); return; @@ -130,7 +131,7 @@ public static function log( } // Legacy fallback. $log_ob = new Horde_Core_Log_Object($event, $priority, $options); - $GLOBALS['injector']->getInstance('Horde_Log_Logger')->logObject($log_ob); + $GLOBALS['injector']->get('Horde_Log_Logger')->logObject($log_ob); } else { // Framework not yet initialized — buffer for later. self::bufferLog($resolvedPriority, $message, $context); @@ -917,7 +918,7 @@ public static function linkTooltip( Horde_Serialize::JSON ); $title = ''; - $GLOBALS['injector']->getInstance('Horde_PageOutput') + $GLOBALS['injector']->get(Horde_PageOutput::class) ->addScriptFile('tooltips.js', 'horde'); } @@ -1074,7 +1075,7 @@ public static function getTempFile( } $tmpfile = Util::getTempFile($prefix, $delete, $dir, $secure); if ($session_remove) { - $session = $GLOBALS['injector']->getInstance(HordeSession::class); + $session = $GLOBALS['injector']->get(HordeSession::class); $stored = $session->getScoped('horde', 'gc_tempfiles'); $gcfiles = is_array($stored) ? $stored : []; $gcfiles[] = $tmpfile; @@ -1398,7 +1399,7 @@ public static function permissionDeniedError( ?string $error = null, ): void { try { - $GLOBALS['injector']->getInstance('Horde_Core_Hooks') + $GLOBALS['injector']->get(Horde_Core_Hooks::class) ->callHook('perms_denied', 'horde', [$app, $perm]); } catch (Horde_Exception_HookNotSet $e) { } diff --git a/src/Middleware/AppRouter.php b/src/Middleware/AppRouter.php index 468fc6f5..15fe0a41 100644 --- a/src/Middleware/AppRouter.php +++ b/src/Middleware/AppRouter.php @@ -100,7 +100,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface $controller = null; if ($controllerName) { try { - $controller = $this->injector->getInstance($controllerName); + $controller = $this->injector->get($controllerName); } catch (Exception $e) { throw new HordeException( 'Defined controller but could not create: ' . $controllerName . ' — ' . $e->getMessage(), diff --git a/src/Middleware/HordeCore.php b/src/Middleware/HordeCore.php index fa476de8..e3016085 100644 --- a/src/Middleware/HordeCore.php +++ b/src/Middleware/HordeCore.php @@ -62,7 +62,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface $injector->setInstance(ResponseFactoryInterface::class, new ResponseFactory()); } - $registry = $injector->getInstance('Horde_Registry'); + $registry = $injector->get(Horde_Registry::class); $request = $request->withAttribute('registry', $registry); // Bridge RuntimeRoutesProvider into legacy injector so controllers can use RoutesProvider @@ -99,7 +99,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface // Resolve controller if ($controllerName) { try { - $controller = $injector->getInstance($controllerName); + $controller = $injector->get($controllerName); } catch (Exception $e) { throw new HordeException( 'Defined controller but could not create: ' . $controllerName . ' — ' . $e->getMessage(), diff --git a/src/PageOutput/ChromeRendererDispatcherFactory.php b/src/PageOutput/ChromeRendererDispatcherFactory.php index a03250da..c65e37d0 100644 --- a/src/PageOutput/ChromeRendererDispatcherFactory.php +++ b/src/PageOutput/ChromeRendererDispatcherFactory.php @@ -23,8 +23,8 @@ class ChromeRendererDispatcherFactory public function create(Injector $injector): ChromeRendererDispatcher { return new ChromeRendererDispatcher( - $injector->getInstance(DesktopChromeRenderer::class), - $injector->getInstance(ResponsiveChromeRenderer::class), + $injector->get(DesktopChromeRenderer::class), + $injector->get(ResponsiveChromeRenderer::class), ); } } diff --git a/src/PageOutput/DesktopChromeRendererFactory.php b/src/PageOutput/DesktopChromeRendererFactory.php index 7d2f50fe..937f8df3 100644 --- a/src/PageOutput/DesktopChromeRendererFactory.php +++ b/src/PageOutput/DesktopChromeRendererFactory.php @@ -28,20 +28,20 @@ class DesktopChromeRendererFactory { public function create(Injector $injector): DesktopChromeRenderer { - $session = $injector->getInstance(SessionAccess::class); + $session = $injector->get(SessionAccess::class); $themeResolver = $injector->get(ThemeResolver::class); $authUid = $session->getAuthId(); $theme = $authUid !== null ? $themeResolver->resolve($authUid) : 'default'; return new DesktopChromeRenderer( - $injector->getInstance(AssetCollector::class), - $injector->getInstance(PageComposer::class), - $injector->getInstance(ViewModeConfigurator::class), - $injector->getInstance(TopbarBuilder::class), - $injector->getInstance(TopbarRenderer::class), - $injector->getInstance(SidebarRenderer::class), - $injector->getInstance(JsDiscoverer::class), + $injector->get(AssetCollector::class), + $injector->get(PageComposer::class), + $injector->get(ViewModeConfigurator::class), + $injector->get(TopbarBuilder::class), + $injector->get(TopbarRenderer::class), + $injector->get(SidebarRenderer::class), + $injector->get(JsDiscoverer::class), $theme, ); } diff --git a/src/PageOutput/PageComposerFactory.php b/src/PageOutput/PageComposerFactory.php index a3233e72..077f325d 100644 --- a/src/PageOutput/PageComposerFactory.php +++ b/src/PageOutput/PageComposerFactory.php @@ -32,7 +32,7 @@ class PageComposerFactory public function create(Horde_Injector|Injector $injector): PageComposer { return new PageComposer( - $injector->getInstance(AssetCollector::class), + $injector->get(AssetCollector::class), ); } } diff --git a/src/PageOutput/PageOutputAssetManagerFactory.php b/src/PageOutput/PageOutputAssetManagerFactory.php index 17ba22ef..6bbee70e 100644 --- a/src/PageOutput/PageOutputAssetManagerFactory.php +++ b/src/PageOutput/PageOutputAssetManagerFactory.php @@ -31,7 +31,7 @@ class PageOutputAssetManagerFactory { public function create(Horde_Injector|Injector $injector): PageOutputAssetManager { - $assetCollector = $injector->getInstance(AssetCollector::class); + $assetCollector = $injector->get(AssetCollector::class); return new PageOutputAssetManager($assetCollector); } diff --git a/src/PageOutput/RenderingModeResolverFactory.php b/src/PageOutput/RenderingModeResolverFactory.php index e5e98a10..f44ac8ec 100644 --- a/src/PageOutput/RenderingModeResolverFactory.php +++ b/src/PageOutput/RenderingModeResolverFactory.php @@ -25,8 +25,8 @@ class RenderingModeResolverFactory public function create(Injector $injector): RenderingModeResolver { return new RenderingModeResolver( - $injector->getInstance(SessionAccess::class), - $injector->getInstance(Browser::class), + $injector->get(SessionAccess::class), + $injector->get(Browser::class), ); } } diff --git a/src/PageOutput/ViewModeConfiguratorFactory.php b/src/PageOutput/ViewModeConfiguratorFactory.php index aeaa25a1..3f349cb7 100644 --- a/src/PageOutput/ViewModeConfiguratorFactory.php +++ b/src/PageOutput/ViewModeConfiguratorFactory.php @@ -37,11 +37,11 @@ class ViewModeConfiguratorFactory public function create(Horde_Injector|Injector $injector): ViewModeConfigurator { return new ViewModeConfigurator( - $injector->getInstance(Horde_Registry::class), - $injector->getInstance(PrefsService::class), - $injector->getInstance(SessionAccess::class), - $injector->getInstance(JsDiscoverer::class), - $injector->getInstance(Token::class), + $injector->get(Horde_Registry::class), + $injector->get(PrefsService::class), + $injector->get(SessionAccess::class), + $injector->get(JsDiscoverer::class), + $injector->get(Token::class), ); } } diff --git a/src/Session/HordeSessionFactory.php b/src/Session/HordeSessionFactory.php index 31db4d20..ad7f2c2b 100644 --- a/src/Session/HordeSessionFactory.php +++ b/src/Session/HordeSessionFactory.php @@ -76,7 +76,7 @@ public function restore(SessionId $id, array $payload): Session */ public function create(Injector $injector): HordeSession { - $secret = $injector->getInstance('Horde_Secret_Cbc'); + $secret = $injector->get('Horde_Secret_Cbc'); $encryptor = static fn(string $plaintext): string => (string) $secret->write($secret->getKey(), $plaintext); $decryptor = static fn(string $ciphertext): string diff --git a/src/Session/PublishesModernSessionToAccessorTrait.php b/src/Session/PublishesModernSessionToAccessorTrait.php index 5d5108bb..a2077cf4 100644 --- a/src/Session/PublishesModernSessionToAccessorTrait.php +++ b/src/Session/PublishesModernSessionToAccessorTrait.php @@ -57,7 +57,7 @@ private function publishModernSessionToAccessor(): void $GLOBALS['injector']->setInstance(HordeSession::class, $fresh); try { - $access = $GLOBALS['injector']->getInstance(SessionAccess::class); + $access = $GLOBALS['injector']->get(SessionAccess::class); if ($access instanceof SessionAccessor) { $access->replaceWith($fresh); } diff --git a/src/Session/SessionConfigFactory.php b/src/Session/SessionConfigFactory.php index ab3be79d..cacb24a7 100644 --- a/src/Session/SessionConfigFactory.php +++ b/src/Session/SessionConfigFactory.php @@ -38,7 +38,7 @@ class SessionConfigFactory */ public function create(Injector $injector): SessionConfig { - $loader = $injector->getInstance(ConfigLoader::class); + $loader = $injector->get(ConfigLoader::class); $state = $loader->load('horde'); return $this->fromState($state); diff --git a/src/Session/SessionLifecycle.php b/src/Session/SessionLifecycle.php index a4e3c7c4..cabe8ef2 100644 --- a/src/Session/SessionLifecycle.php +++ b/src/Session/SessionLifecycle.php @@ -454,7 +454,7 @@ public function regenerate(): void */ private function mintSuccessor(HordeSession $old): HordeSession { - $factory = $this->injector->getInstance(HordeSessionFactory::class); + $factory = $this->injector->get(HordeSessionFactory::class); $successor = $factory->restore( new SessionId((string) (session_id() ?: 'none')), $old->toPayload(), @@ -591,7 +591,7 @@ private function accessor(): SessionAccessor if ($this->accessor === null) { $resolved = null; try { - $resolved = $this->injector->getInstance(SessionAccess::class); + $resolved = $this->injector->get(SessionAccess::class); } catch (\Throwable) { // No SessionAccess binding — legacy test contexts and // partial DI setups build a SessionLifecycle without @@ -637,7 +637,7 @@ private function getSession(): HordeSession if ($this->accessor()->hasCurrent()) { return $this->accessor()->current(); } - return $this->injector->getInstance(HordeSession::class); + return $this->injector->get(HordeSession::class); } /** @@ -655,7 +655,7 @@ private function getSession(): HordeSession * (see horde/Core#190). * 2. The `HordeSession::class` injector binding — retained in * parallel because dozens of transient callers still do - * `$injector->getInstance(HordeSession::class)->…` inline and + * `$injector->get(HordeSession::class)->…` inline and * expect the current value there too. * * The instance is also published on `$GLOBALS['injector']` when that diff --git a/src/Session/SessionLifecycleFactory.php b/src/Session/SessionLifecycleFactory.php index 5ced4a6e..8866bf34 100644 --- a/src/Session/SessionLifecycleFactory.php +++ b/src/Session/SessionLifecycleFactory.php @@ -49,12 +49,12 @@ class SessionLifecycleFactory */ public function create(Injector $injector): SessionLifecycle { - $handler = $injector->getInstance(SessionHandler::class); - $config = $injector->getInstance(SessionConfig::class); + $handler = $injector->get(SessionHandler::class); + $config = $injector->get(SessionConfig::class); $secret = null; try { - $resolved = $injector->getInstance('Horde_Secret_Cbc'); + $resolved = $injector->get('Horde_Secret_Cbc'); if ($resolved instanceof SessionSecret) { $secret = $resolved; } @@ -76,7 +76,7 @@ public function create(Injector $injector): SessionLifecycle // clean() uses setKey directly because there's no payload // to drain. try { - $coordinator = $injector->getInstance(SessionEncryptionCoordinator::class); + $coordinator = $injector->get(SessionEncryptionCoordinator::class); } catch (Throwable) { // No coordinator binding configured. Lifecycle falls // back to its inline reEncryptAll path; behaviour is @@ -98,7 +98,7 @@ public function create(Injector $injector): SessionLifecycle // (correctness-degraded but non-crashing). $accessor = null; try { - $resolvedAccess = $injector->getInstance(SessionAccess::class); + $resolvedAccess = $injector->get(SessionAccess::class); if ($resolvedAccess instanceof SessionAccessor) { $accessor = $resolvedAccess; } diff --git a/src/Sidebar/AdminSidebarPanelFactory.php b/src/Sidebar/AdminSidebarPanelFactory.php index f76e943e..9b92a1e3 100644 --- a/src/Sidebar/AdminSidebarPanelFactory.php +++ b/src/Sidebar/AdminSidebarPanelFactory.php @@ -35,9 +35,9 @@ class AdminSidebarPanelFactory public function create(Horde_Injector|Injector $injector): AdminSidebarPanel { return new AdminSidebarPanel( - $injector->getInstance(Horde_Registry::class), - $injector->getInstance(PermissionService::class), - $injector->getInstance(PrefsService::class), + $injector->get(Horde_Registry::class), + $injector->get(PermissionService::class), + $injector->get(PrefsService::class), ); } } diff --git a/src/Sidebar/SidebarBuilderFactory.php b/src/Sidebar/SidebarBuilderFactory.php index a0395ef8..a4bb2854 100644 --- a/src/Sidebar/SidebarBuilderFactory.php +++ b/src/Sidebar/SidebarBuilderFactory.php @@ -34,8 +34,8 @@ class SidebarBuilderFactory public function create(Horde_Injector|Injector $injector): SidebarBuilder { return new SidebarBuilder( - $injector->getInstance(Horde_Registry::class), - $injector->getInstance(PrefsService::class), + $injector->get(Horde_Registry::class), + $injector->get(PrefsService::class), ); } } diff --git a/src/Sidebar/SidebarRendererFactory.php b/src/Sidebar/SidebarRendererFactory.php index bdabfef6..2f0a4afe 100644 --- a/src/Sidebar/SidebarRendererFactory.php +++ b/src/Sidebar/SidebarRendererFactory.php @@ -25,8 +25,8 @@ class SidebarRendererFactory public function create(Injector $injector): SidebarRenderer { return new SidebarRenderer( - $injector->getInstance(AssetCollector::class), - $injector->getInstance(JsDiscoverer::class), + $injector->get(AssetCollector::class), + $injector->get(JsDiscoverer::class), ); } } diff --git a/src/Topbar/TopbarBuilderFactory.php b/src/Topbar/TopbarBuilderFactory.php index 4fb917f2..f2424297 100644 --- a/src/Topbar/TopbarBuilderFactory.php +++ b/src/Topbar/TopbarBuilderFactory.php @@ -36,10 +36,10 @@ class TopbarBuilderFactory public function create(Horde_Injector|Injector $injector): TopbarBuilder { return new TopbarBuilder( - $injector->getInstance(Horde_Registry::class), - $injector->getInstance(PrefsService::class), - $injector->getInstance(PermissionService::class), - $injector->getInstance(SessionAccess::class), + $injector->get(Horde_Registry::class), + $injector->get(PrefsService::class), + $injector->get(PermissionService::class), + $injector->get(SessionAccess::class), ); } } diff --git a/src/Topbar/TopbarRendererFactory.php b/src/Topbar/TopbarRendererFactory.php index 3d5e74a0..c240f84e 100644 --- a/src/Topbar/TopbarRendererFactory.php +++ b/src/Topbar/TopbarRendererFactory.php @@ -25,8 +25,8 @@ class TopbarRendererFactory public function create(Injector $injector): TopbarRenderer { return new TopbarRenderer( - $injector->getInstance(AssetCollector::class), - $injector->getInstance(JsDiscoverer::class), + $injector->get(AssetCollector::class), + $injector->get(JsDiscoverer::class), ); } } diff --git a/src/View/AccessKeyTrackerFactory.php b/src/View/AccessKeyTrackerFactory.php index 7f0c7439..df70987b 100644 --- a/src/View/AccessKeyTrackerFactory.php +++ b/src/View/AccessKeyTrackerFactory.php @@ -24,8 +24,8 @@ public function create(Horde_Injector|Injector $injector): AccessKeyTracker { $accessKeysEnabled = true; try { - $prefs = $injector->getInstance(PrefsService::class); - $session = $injector->getInstance(HordeSession::class); + $prefs = $injector->get(PrefsService::class); + $session = $injector->get(HordeSession::class); $uid = $session->getAuthId() ?? ''; if ($uid !== '') { $accessKeysEnabled = (bool) $prefs->getValue($uid, 'horde', 'widget_accesskey'); @@ -35,7 +35,7 @@ public function create(Horde_Injector|Injector $injector): AccessKeyTracker $multibyte = false; try { - $registry = $injector->getInstance(Horde_Registry::class); + $registry = $injector->get(Horde_Registry::class); $multibyte = !empty($registry->nlsconfig->curr_multibyte); } catch (Throwable) { } diff --git a/test/Integration/Assets/AssetFilesystemFactoryIntegrationTest.php b/test/Integration/Assets/AssetFilesystemFactoryIntegrationTest.php index 6bd114e3..92971e6e 100644 --- a/test/Integration/Assets/AssetFilesystemFactoryIntegrationTest.php +++ b/test/Integration/Assets/AssetFilesystemFactoryIntegrationTest.php @@ -26,7 +26,7 @@ protected function setUp(): void #[Test] public function injectorResolvesAssetFilesystem(): void { - $fs = $this->injector->getInstance(AssetFilesystem::class); + $fs = $this->injector->get(AssetFilesystem::class); self::assertInstanceOf(AssetFilesystem::class, $fs); self::assertInstanceOf(LocalAssetFilesystem::class, $fs); @@ -35,7 +35,7 @@ public function injectorResolvesAssetFilesystem(): void #[Test] public function factoryProducedFilesystemChecksFiles(): void { - $fs = $this->injector->getInstance(AssetFilesystem::class); + $fs = $this->injector->get(AssetFilesystem::class); self::assertTrue($fs->fileExists(__FILE__)); self::assertFalse($fs->fileExists('/tmp/nonexistent-integration-' . uniqid() . '.php')); @@ -44,7 +44,7 @@ public function factoryProducedFilesystemChecksFiles(): void #[Test] public function localAssetFilesystemAlsoServesAsResponsiveAssetsFilesystem(): void { - $fs = $this->injector->getInstance(AssetFilesystem::class); + $fs = $this->injector->get(AssetFilesystem::class); self::assertInstanceOf(ResponsiveAssetsFilesystem::class, $fs); } @@ -52,8 +52,8 @@ public function localAssetFilesystemAlsoServesAsResponsiveAssetsFilesystem(): vo #[Test] public function injectorReturnsSameInstance(): void { - $first = $this->injector->getInstance(AssetFilesystem::class); - $second = $this->injector->getInstance(AssetFilesystem::class); + $first = $this->injector->get(AssetFilesystem::class); + $second = $this->injector->get(AssetFilesystem::class); self::assertSame($first, $second); } diff --git a/test/Integration/Assets/CssDiscovererFactoryIntegrationTest.php b/test/Integration/Assets/CssDiscovererFactoryIntegrationTest.php index f9abbe74..d43e1d73 100644 --- a/test/Integration/Assets/CssDiscovererFactoryIntegrationTest.php +++ b/test/Integration/Assets/CssDiscovererFactoryIntegrationTest.php @@ -51,7 +51,7 @@ public function getMapper(string $app): ?Mapper #[Test] public function injectorResolvesCssDiscoverer(): void { - $discoverer = $this->injector->getInstance(CssDiscoverer::class); + $discoverer = $this->injector->get(CssDiscoverer::class); self::assertInstanceOf(CssDiscoverer::class, $discoverer); self::assertInstanceOf(CascadeCssDiscoverer::class, $discoverer); @@ -60,8 +60,8 @@ public function injectorResolvesCssDiscoverer(): void #[Test] public function injectorReturnsSameInstance(): void { - $first = $this->injector->getInstance(CssDiscoverer::class); - $second = $this->injector->getInstance(CssDiscoverer::class); + $first = $this->injector->get(CssDiscoverer::class); + $second = $this->injector->get(CssDiscoverer::class); self::assertSame($first, $second); } diff --git a/test/Integration/Assets/GraphicDiscovererFactoryIntegrationTest.php b/test/Integration/Assets/GraphicDiscovererFactoryIntegrationTest.php index 8bef18c0..68a76023 100644 --- a/test/Integration/Assets/GraphicDiscovererFactoryIntegrationTest.php +++ b/test/Integration/Assets/GraphicDiscovererFactoryIntegrationTest.php @@ -51,7 +51,7 @@ public function getMapper(string $app): ?Mapper #[Test] public function injectorResolvesGraphicDiscoverer(): void { - $discoverer = $this->injector->getInstance(GraphicDiscoverer::class); + $discoverer = $this->injector->get(GraphicDiscoverer::class); self::assertInstanceOf(GraphicDiscoverer::class, $discoverer); self::assertInstanceOf(CascadeGraphicDiscoverer::class, $discoverer); @@ -60,8 +60,8 @@ public function injectorResolvesGraphicDiscoverer(): void #[Test] public function injectorReturnsSameInstance(): void { - $first = $this->injector->getInstance(GraphicDiscoverer::class); - $second = $this->injector->getInstance(GraphicDiscoverer::class); + $first = $this->injector->get(GraphicDiscoverer::class); + $second = $this->injector->get(GraphicDiscoverer::class); self::assertSame($first, $second); } diff --git a/test/Integration/Assets/JsDiscovererFactoryIntegrationTest.php b/test/Integration/Assets/JsDiscovererFactoryIntegrationTest.php index b2d3bb1c..0a392005 100644 --- a/test/Integration/Assets/JsDiscovererFactoryIntegrationTest.php +++ b/test/Integration/Assets/JsDiscovererFactoryIntegrationTest.php @@ -51,7 +51,7 @@ public function getMapper(string $app): ?Mapper #[Test] public function injectorResolvesJsDiscoverer(): void { - $discoverer = $this->injector->getInstance(JsDiscoverer::class); + $discoverer = $this->injector->get(JsDiscoverer::class); self::assertInstanceOf(JsDiscoverer::class, $discoverer); self::assertInstanceOf(PathBasedJsDiscoverer::class, $discoverer); @@ -60,8 +60,8 @@ public function injectorResolvesJsDiscoverer(): void #[Test] public function injectorReturnsSameInstance(): void { - $first = $this->injector->getInstance(JsDiscoverer::class); - $second = $this->injector->getInstance(JsDiscoverer::class); + $first = $this->injector->get(JsDiscoverer::class); + $second = $this->injector->get(JsDiscoverer::class); self::assertSame($first, $second); } diff --git a/test/Integration/Assets/ThemeResolverFactoryIntegrationTest.php b/test/Integration/Assets/ThemeResolverFactoryIntegrationTest.php index bc0995a4..2fcbca3d 100644 --- a/test/Integration/Assets/ThemeResolverFactoryIntegrationTest.php +++ b/test/Integration/Assets/ThemeResolverFactoryIntegrationTest.php @@ -30,7 +30,7 @@ protected function setUp(): void #[Test] public function injectorResolvesThemeResolver(): void { - $resolver = $this->injector->getInstance(ThemeResolver::class); + $resolver = $this->injector->get(ThemeResolver::class); self::assertInstanceOf(ThemeResolver::class, $resolver); self::assertInstanceOf(PrefsThemeResolver::class, $resolver); @@ -39,7 +39,7 @@ public function injectorResolvesThemeResolver(): void #[Test] public function factoryProducedResolverReturnsDefault(): void { - $resolver = $this->injector->getInstance(ThemeResolver::class); + $resolver = $this->injector->get(ThemeResolver::class); self::assertSame('default', $resolver->resolve('unknown-user')); } @@ -47,8 +47,8 @@ public function factoryProducedResolverReturnsDefault(): void #[Test] public function injectorReturnsSameInstance(): void { - $first = $this->injector->getInstance(ThemeResolver::class); - $second = $this->injector->getInstance(ThemeResolver::class); + $first = $this->injector->get(ThemeResolver::class); + $second = $this->injector->get(ThemeResolver::class); self::assertSame($first, $second); } diff --git a/test/Integration/Assets/UrlSignerFactoryIntegrationTest.php b/test/Integration/Assets/UrlSignerFactoryIntegrationTest.php index 98e22c53..9d8cb184 100644 --- a/test/Integration/Assets/UrlSignerFactoryIntegrationTest.php +++ b/test/Integration/Assets/UrlSignerFactoryIntegrationTest.php @@ -24,7 +24,7 @@ public function injectorResolvesHmacWhenSecretConfigured(): void try { $injector = new Injector(new TopLevel()); - $signer = $injector->getInstance(UrlSigner::class); + $signer = $injector->get(UrlSigner::class); self::assertInstanceOf(UrlSigner::class, $signer); self::assertInstanceOf(HmacUrlSigner::class, $signer); @@ -39,7 +39,7 @@ public function injectorResolvesNullWhenNoSecret(): void unset($GLOBALS['conf']); $injector = new Injector(new TopLevel()); - $signer = $injector->getInstance(UrlSigner::class); + $signer = $injector->get(UrlSigner::class); self::assertInstanceOf(NullUrlSigner::class, $signer); } @@ -51,8 +51,8 @@ public function injectorReturnsSameInstance(): void try { $injector = new Injector(new TopLevel()); - $first = $injector->getInstance(UrlSigner::class); - $second = $injector->getInstance(UrlSigner::class); + $first = $injector->get(UrlSigner::class); + $second = $injector->get(UrlSigner::class); self::assertSame($first, $second); } finally { @@ -68,7 +68,7 @@ public function factoryProducedSignerWorksEndToEnd(): void try { $injector = new Injector(new TopLevel()); - $signer = $injector->getInstance(UrlSigner::class); + $signer = $injector->get(UrlSigner::class); $now = 1700000000; $signed = $signer->signUrl('/test/page', $now); diff --git a/test/Integration/Path/PathBuilderFactoryIntegrationTest.php b/test/Integration/Path/PathBuilderFactoryIntegrationTest.php index b612909d..71c95566 100644 --- a/test/Integration/Path/PathBuilderFactoryIntegrationTest.php +++ b/test/Integration/Path/PathBuilderFactoryIntegrationTest.php @@ -41,7 +41,7 @@ protected function setUp(): void #[Test] public function injectorResolvesPathBuilderInterface(): void { - $builder = $this->injector->getInstance(PathBuilderInterface::class); + $builder = $this->injector->get(PathBuilderInterface::class); self::assertInstanceOf(PathBuilderInterface::class, $builder); self::assertInstanceOf(PathBuilder::class, $builder); @@ -50,7 +50,7 @@ public function injectorResolvesPathBuilderInterface(): void #[Test] public function factoryProducedBuilderResolvesRegistry(): void { - $builder = $this->injector->getInstance(PathBuilderInterface::class); + $builder = $this->injector->get(PathBuilderInterface::class); $result = $builder->withAppFileroot('turba'); self::assertSame('/srv/www/horde/turba', (string) $result); @@ -59,7 +59,7 @@ public function factoryProducedBuilderResolvesRegistry(): void #[Test] public function factoryProducedBuilderSupportsChaining(): void { - $builder = $this->injector->getInstance(PathBuilderInterface::class); + $builder = $this->injector->get(PathBuilderInterface::class); $result = $builder ->withAppFileroot('turba') ->withSlug('config') @@ -72,8 +72,8 @@ public function factoryProducedBuilderSupportsChaining(): void #[Test] public function injectorReturnsSameInstance(): void { - $first = $this->injector->getInstance(PathBuilderInterface::class); - $second = $this->injector->getInstance(PathBuilderInterface::class); + $first = $this->injector->get(PathBuilderInterface::class); + $second = $this->injector->get(PathBuilderInterface::class); self::assertSame($first, $second); } diff --git a/test/Integration/Sidebar/SidebarRendererFactoryIntegrationTest.php b/test/Integration/Sidebar/SidebarRendererFactoryIntegrationTest.php index 9434ce4e..40a717bf 100644 --- a/test/Integration/Sidebar/SidebarRendererFactoryIntegrationTest.php +++ b/test/Integration/Sidebar/SidebarRendererFactoryIntegrationTest.php @@ -50,7 +50,7 @@ public function getMapper(string $app): ?Mapper #[Test] public function injectorResolvesSidebarRenderer(): void { - $renderer = $this->injector->getInstance(SidebarRenderer::class); + $renderer = $this->injector->get(SidebarRenderer::class); self::assertInstanceOf(SidebarRenderer::class, $renderer); } @@ -58,8 +58,8 @@ public function injectorResolvesSidebarRenderer(): void #[Test] public function injectorReturnsSameInstance(): void { - $first = $this->injector->getInstance(SidebarRenderer::class); - $second = $this->injector->getInstance(SidebarRenderer::class); + $first = $this->injector->get(SidebarRenderer::class); + $second = $this->injector->get(SidebarRenderer::class); self::assertSame($first, $second); } diff --git a/test/Integration/Topbar/TopbarRendererFactoryIntegrationTest.php b/test/Integration/Topbar/TopbarRendererFactoryIntegrationTest.php index 04a5d46a..48c3c615 100644 --- a/test/Integration/Topbar/TopbarRendererFactoryIntegrationTest.php +++ b/test/Integration/Topbar/TopbarRendererFactoryIntegrationTest.php @@ -50,7 +50,7 @@ public function getMapper(string $app): ?Mapper #[Test] public function injectorResolvesTopbarRenderer(): void { - $renderer = $this->injector->getInstance(TopbarRenderer::class); + $renderer = $this->injector->get(TopbarRenderer::class); self::assertInstanceOf(TopbarRenderer::class, $renderer); } @@ -58,8 +58,8 @@ public function injectorResolvesTopbarRenderer(): void #[Test] public function injectorReturnsSameInstance(): void { - $first = $this->injector->getInstance(TopbarRenderer::class); - $second = $this->injector->getInstance(TopbarRenderer::class); + $first = $this->injector->get(TopbarRenderer::class); + $second = $this->injector->get(TopbarRenderer::class); self::assertSame($first, $second); } diff --git a/test/Integration/Uri/UriBuilderFactoryIntegrationTest.php b/test/Integration/Uri/UriBuilderFactoryIntegrationTest.php index db21681b..8470486c 100644 --- a/test/Integration/Uri/UriBuilderFactoryIntegrationTest.php +++ b/test/Integration/Uri/UriBuilderFactoryIntegrationTest.php @@ -51,7 +51,7 @@ public function getMapper(string $app): ?Mapper #[Test] public function injectorResolvesUriBuilderInterface(): void { - $builder = $this->injector->getInstance(UriBuilderInterface::class); + $builder = $this->injector->get(UriBuilderInterface::class); self::assertInstanceOf(UriBuilderInterface::class, $builder); self::assertInstanceOf(UriBuilder::class, $builder); @@ -60,7 +60,7 @@ public function injectorResolvesUriBuilderInterface(): void #[Test] public function factoryProducedBuilderResolvesRegistry(): void { - $builder = $this->injector->getInstance(UriBuilderInterface::class); + $builder = $this->injector->get(UriBuilderInterface::class); $result = $builder->withAppWebroot('kronolith'); self::assertSame('/horde/kronolith', $result->getPath()); @@ -69,7 +69,7 @@ public function factoryProducedBuilderResolvesRegistry(): void #[Test] public function factoryProducedBuilderSupportsPsr7Chain(): void { - $builder = $this->injector->getInstance(UriBuilderInterface::class); + $builder = $this->injector->get(UriBuilderInterface::class); $result = $builder ->withScheme('https') ->withHost('example.com') @@ -87,8 +87,8 @@ public function factoryProducedBuilderSupportsPsr7Chain(): void #[Test] public function injectorReturnsSameInstance(): void { - $first = $this->injector->getInstance(UriBuilderInterface::class); - $second = $this->injector->getInstance(UriBuilderInterface::class); + $first = $this->injector->get(UriBuilderInterface::class); + $second = $this->injector->get(UriBuilderInterface::class); self::assertSame($first, $second); } diff --git a/test/Unit/Config/LegacyMergedConfigInjectorTest.php b/test/Unit/Config/LegacyMergedConfigInjectorTest.php index 76875a49..e6e334f0 100644 --- a/test/Unit/Config/LegacyMergedConfigInjectorTest.php +++ b/test/Unit/Config/LegacyMergedConfigInjectorTest.php @@ -57,7 +57,7 @@ public function testLegacyMergedConfigCanBeBoundToInjector(): void $this->injector->setInstance(LegacyMergedConfig::class, $config); - $retrieved = $this->injector->getInstance(LegacyMergedConfig::class); + $retrieved = $this->injector->get(LegacyMergedConfig::class); $this->assertSame($config, $retrieved); $this->assertEquals('value', $retrieved->get('test')); @@ -74,7 +74,7 @@ public function testRebindingUpdatesInjectorInstance(): void $hordeConfig = new LegacyMergedConfig(['app' => 'horde', 'cache' => ['driver' => 'file']]); $this->injector->setInstance(LegacyMergedConfig::class, $hordeConfig); - $retrieved1 = $this->injector->getInstance(LegacyMergedConfig::class); + $retrieved1 = $this->injector->get(LegacyMergedConfig::class); $this->assertEquals('horde', $retrieved1->get('app')); $this->assertEquals('file', $retrieved1->get('cache.driver')); @@ -82,7 +82,7 @@ public function testRebindingUpdatesInjectorInstance(): void $impConfig = new LegacyMergedConfig(['app' => 'imp', 'cache' => ['driver' => 'memcache']]); $this->injector->setInstance(LegacyMergedConfig::class, $impConfig); - $retrieved2 = $this->injector->getInstance(LegacyMergedConfig::class); + $retrieved2 = $this->injector->get(LegacyMergedConfig::class); $this->assertEquals('imp', $retrieved2->get('app')); $this->assertEquals('memcache', $retrieved2->get('cache.driver')); @@ -107,7 +107,7 @@ public function testSimulatePushPopAppConfigSwitching(): void ]); $this->injector->setInstance(LegacyMergedConfig::class, $hordeConfig); - $config1 = $this->injector->getInstance(LegacyMergedConfig::class); + $config1 = $this->injector->get(LegacyMergedConfig::class); $this->assertEquals('horde', $config1->get('app')); $this->assertEquals('horde-db', $config1->get('database.host')); @@ -120,7 +120,7 @@ public function testSimulatePushPopAppConfigSwitching(): void ]); $this->injector->setInstance(LegacyMergedConfig::class, $impConfig); - $config2 = $this->injector->getInstance(LegacyMergedConfig::class); + $config2 = $this->injector->get(LegacyMergedConfig::class); $this->assertEquals('imp', $config2->get('app')); $this->assertEquals('horde-db', $config2->get('database.host')); $this->assertEquals('imap.example.com', $config2->get('mail.server')); @@ -129,7 +129,7 @@ public function testSimulatePushPopAppConfigSwitching(): void // (restore horde config) $this->injector->setInstance(LegacyMergedConfig::class, $hordeConfig); - $config3 = $this->injector->getInstance(LegacyMergedConfig::class); + $config3 = $this->injector->get(LegacyMergedConfig::class); $this->assertEquals('horde', $config3->get('app')); $this->assertEquals('horde-db', $config3->get('database.host')); $this->assertNull($config3->get('mail.server')); // imp-specific gone @@ -147,8 +147,8 @@ public function testMultipleFactoriesShareSameConfigInstance(): void $this->injector->setInstance(LegacyMergedConfig::class, $config); // Simulate two factories requesting config - $instance1 = $this->injector->getInstance(LegacyMergedConfig::class); - $instance2 = $this->injector->getInstance(LegacyMergedConfig::class); + $instance1 = $this->injector->get(LegacyMergedConfig::class); + $instance2 = $this->injector->get(LegacyMergedConfig::class); // Should be same instance (singleton per binding) $this->assertSame($instance1, $instance2); @@ -163,12 +163,12 @@ public function testLegacyMergedConfigBindingIndependentOfState(): void $this->injector->setInstance(LegacyMergedConfig::class, $legacyConfig); // Verify LegacyMergedConfig is bound - $retrieved = $this->injector->getInstance(LegacyMergedConfig::class); + $retrieved = $this->injector->get(LegacyMergedConfig::class); $this->assertSame($legacyConfig, $retrieved); // Verify State is NOT bound (would throw exception) try { - $this->injector->getInstance(State::class); + $this->injector->get(State::class); $this->fail('State should not be bound to injector'); } catch (Exception $e) { // Expected - State is not bound, throws from State constructor or injector @@ -184,7 +184,7 @@ public function testInjectedConfigIsImmutable(): void $config = new LegacyMergedConfig(['value' => 'original']); $this->injector->setInstance(LegacyMergedConfig::class, $config); - $retrieved = $this->injector->getInstance(LegacyMergedConfig::class); + $retrieved = $this->injector->get(LegacyMergedConfig::class); $this->expectException(RuntimeException::class); $this->expectExceptionMessage('ConfigState is immutable'); diff --git a/test/Unit/Factory/GroupTest.php b/test/Unit/Factory/GroupTest.php index e7c2c333..5d667011 100644 --- a/test/Unit/Factory/GroupTest.php +++ b/test/Unit/Factory/GroupTest.php @@ -34,7 +34,7 @@ public function testMock() $GLOBALS['conf']['group']['driver'] = 'mock'; $this->assertInstanceOf( 'Horde_Group_Mock', - $injector->getInstance('Horde_Group') + $injector->get('Horde_Group') ); } } diff --git a/test/Unit/Session/HordeSessionNullTest.php b/test/Unit/Session/HordeSessionNullTest.php index 49b58fb3..c5382ced 100644 --- a/test/Unit/Session/HordeSessionNullTest.php +++ b/test/Unit/Session/HordeSessionNullTest.php @@ -132,7 +132,7 @@ public function testPublishedSessionIsAlsoRegisteredAsSharedSingleton(): void // through the other during the request. self::assertSame( $accessor->current(), - $injector->getInstance(HordeSession::class), + $injector->get(HordeSession::class), 'HordeSession singleton and SessionAccessor current() diverged', ); }